feat: add preferences to toggle the working set visibility

.github/workflows/desktop-linux-prod-test-pull.yml

@@ -20,6 +20,8 @@ jobs:
           node-version: 20
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.85.1
 
       - name: install dependencies (ubuntu only)
         run: |

.github/workflows/desktop-linux-test-pull.yml

@@ -19,6 +19,8 @@ jobs:
           node-version: 20
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.85.1
 
       - name: install dependencies (ubuntu only)
         run: |

.github/workflows/desktop-mac-m1-test-pull.yml

@@ -19,6 +19,8 @@ jobs:
           node-version: 20
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.85.1
 
       - name: build phoenix dist-test
         run: |

.github/workflows/desktop-mac-test-pull.yml

@@ -19,6 +19,8 @@ jobs:
           node-version: 20
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.85.1
 
       - name: build phoenix dist-test
         run: |

.github/workflows/desktop-windows-test-pull.yml

@@ -19,6 +19,8 @@ jobs:
           node-version: 20
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.85.1
 
       - name: build phoenix dist-test
         run: |

docs/API-Reference/command/Commands.md

@@ -824,6 +824,18 @@ Sorts working set by file type
 ## CMD\_WORKING\_SORT\_TOGGLE\_AUTO
 Toggles automatic working set sorting
 
+**Kind**: global variable  
+<a name="CMD_TOGGLE_SHOW_WORKING_SET"></a>
+
+## CMD\_TOGGLE\_SHOW\_WORKING\_SET
+Toggles working set visibility
+
+**Kind**: global variable  
+<a name="CMD_TOGGLE_SHOW_FILE_TABS"></a>
+
+## CMD\_TOGGLE\_SHOW\_FILE\_TABS
+Toggles file tabs visibility
+
 **Kind**: global variable  
 <a name="CMD_KEYBOARD_NAV_UI_OVERLAY"></a>
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "phoenix",
-    "version": "4.1.0-0",
-    "apiVersion": "4.1.0",
+    "version": "4.1.1-0",
+    "apiVersion": "4.1.1",
     "homepage": "https://core.ai",
     "issues": {
         "url": "https://github.com/phcode-dev/phoenix/issues"
@@ -117,4 +117,4 @@
         "tinycolor2": "^1.4.2",
         "underscore": "^1.13.4"
     }
-}
+}

src-node/package.json

@@ -1,8 +1,8 @@
 {
     "name": "@phcode/node-core",
     "description": "Phoenix Node Core",
-    "version": "4.1.0-0",
-    "apiVersion": "4.1.0",
+    "version": "4.1.1-0",
+    "apiVersion": "4.1.1",
     "keywords": [],
     "author": "[email protected]",
     "homepage": "https://github.com/phcode-dev/phoenix",

src/command/Commands.js

@@ -451,6 +451,12 @@ define(function (require, exports, module) {
     /** Toggles automatic working set sorting */
     exports.CMD_WORKING_SORT_TOGGLE_AUTO  = "cmd.sortWorkingSetToggleAuto";  // WorkingSetSort.js       _handleToggleAutoSort()
 
+    /** Toggles working set visibility */
+    exports.CMD_TOGGLE_SHOW_WORKING_SET  = "cmd.toggleShowWorkingSet";      // SidebarView.js       _handleToggleWorkingSet()
+
+    /** Toggles file tabs visibility */
+    exports.CMD_TOGGLE_SHOW_FILE_TABS  = "cmd.toggleShowFileTabs";          // SidebarView.js       _handleToggleFileTabs()
+
     /** Opens keyboard navigation UI overlay */
     exports.CMD_KEYBOARD_NAV_UI_OVERLAY  = "cmd.keyboardNavUI";  // WorkingSetSort.js       _handleToggleAutoSort()
 

src/command/DefaultMenus.js

@@ -345,6 +345,9 @@ define(function (require, exports, module) {
         splitview_menu.addMenuDivider();
         splitview_menu.addMenuItem(Commands.CMD_WORKING_SORT_TOGGLE_AUTO);
         splitview_menu.addMenuItem(Commands.FILE_SHOW_FOLDERS_FIRST);
+        splitview_menu.addMenuDivider();
+        splitview_menu.addMenuItem(Commands.CMD_TOGGLE_SHOW_WORKING_SET);
+        splitview_menu.addMenuItem(Commands.CMD_TOGGLE_SHOW_FILE_TABS);
 
         var project_cmenu = Menus.registerContextMenu(Menus.ContextMenuIds.PROJECT_MENU);
         project_cmenu.addMenuItem(Commands.FILE_NEW);
@@ -474,4 +477,4 @@ define(function (require, exports, module) {
         Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_CONTEXT_MENU).on("beforeContextMenuOpen", _setMenuItemsVisible);
         Menus.getContextMenu(Menus.ContextMenuIds.PROJECT_MENU).on("beforeContextMenuOpen", _setMenuItemsVisible);
     });
-});
+});

src/config.json

@@ -38,8 +38,8 @@
         "bugsnagEnv": "development"
     },
     "name": "Phoenix Code",
-    "version": "4.1.0-0",
-    "apiVersion": "4.1.0",
+    "version": "4.1.1-0",
+    "apiVersion": "4.1.1",
     "homepage": "https://core.ai",
     "issues": {
         "url": "https://github.com/phcode-dev/phoenix/issues"

src/extensions/default/Git/main.js

@@ -27,7 +27,8 @@ define(function (require, exports, module) {
         "src/History",
         "src/NoRepo",
         "src/ProjectTreeMarks",
-        "src/Remotes"
+        "src/Remotes",
+        "src/TabBarIntegration"
     ];
     require(modules);
 
@@ -48,10 +49,12 @@ define(function (require, exports, module) {
 
     // export API's for other extensions
     if (typeof window === "object") {
+        const TabBarIntegration = require("src/TabBarIntegration");
         window.phoenixGitEvents = {
             EventEmitter: EventEmitter,
             Events: Events,
-            Git
+            Git,
+            TabBarIntegration
         };
     }
 });

src/extensions/default/Git/src/ErrorHandler.js

@@ -46,7 +46,6 @@ define(function (require, exports) {
     exports.showError = function (err, title, options = {}) {
         const dontStripError = options.dontStripError;
         const errorMetric = options.errorMetric;
-        Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'dialogErr', errorMetric || "Show");
         if (err.__shown) { return err; }
 
         exports.logError(err);
@@ -71,13 +70,15 @@ define(function (require, exports) {
         errorBody = window.debugMode ? `${errorBody}\n${errorStack}` : errorBody;
 
         if(options.useNotification){
+            Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'notifyErr', errorMetric || "Show");
             NotificationUI.createToastFromTemplate(title,
                 `<textarea readonly style="width: 200px; height: 200px; cursor: text; resize: none;">${errorBody}</textarea>`, {
                     toastStyle: NotificationUI.NOTIFICATION_STYLES_CSS_CLASS.ERROR,
                     dismissOnClick: false,
                     instantOpen: true
                 });
         } else {
+            Metrics.countEvent(Metrics.EVENT_TYPE.GIT, 'dialogErr', errorMetric || "Show");
             const compiledTemplate = Mustache.render(errorDialogTemplate, {
                 title: title,
                 body: errorBody,

src/extensions/default/Git/src/TabBarIntegration.js

@@ -0,0 +1,90 @@
+define(function (require) {
+    const EventEmitter = require("src/EventEmitter");
+    const Events = require("src/Events");
+    const Git = require("src/git/Git");
+    const Preferences = require("src/Preferences");
+
+    // the cache of file statuses by path
+    let fileStatusCache = {};
+
+    /**
+     * this function is responsible to get the Git status for a file path
+     *
+     * @param {string} fullPath - the file path
+     * @returns {Array|null} - Array of status strings or null if no status
+     */
+    function getFileStatus(fullPath) {
+        return fileStatusCache[fullPath] || null;
+    }
+
+    /**
+     * whether the file is modified or not
+     *
+     * @param {string} fullPath - the file path
+     * @returns {boolean} - True if the file is modified otherwise false
+     */
+    function isModified(fullPath) {
+        const status = getFileStatus(fullPath);
+        if (!status) {
+            return false;
+        }
+        return status.some(
+            (statusType) =>
+                statusType === Git.FILE_STATUS.MODIFIED ||
+                statusType === Git.FILE_STATUS.RENAMED ||
+                statusType === Git.FILE_STATUS.COPIED
+        );
+    }
+
+    /**
+     * whether the file is untracked or not
+     *
+     * @param {string} fullPath - the file path
+     * @returns {boolean} - True if the file is untracked otherwise false
+     */
+    function isUntracked(fullPath) {
+        const status = getFileStatus(fullPath);
+        if (!status) {
+            return false;
+        }
+
+        // return true if it's untracked or if it's newly added (which means it was untracked before staging)
+        return (
+            status.includes(Git.FILE_STATUS.UNTRACKED) ||
+            (status.includes(Git.FILE_STATUS.ADDED) && status.includes(Git.FILE_STATUS.STAGED))
+        );
+    }
+
+
+    // Update file status cache when Git status results are received
+    EventEmitter.on(Events.GIT_STATUS_RESULTS, function (files) {
+        // reset the cache
+        fileStatusCache = {};
+
+        const gitRoot = Preferences.get("currentGitRoot");
+        if (!gitRoot) {
+            return;
+        }
+
+        // we need to update cache with new status results
+        files.forEach(function (entry) {
+            const fullPath = gitRoot + entry.file;
+            fileStatusCache[fullPath] = entry.status;
+        });
+
+        // notify that file statuses have been updated
+        EventEmitter.emit("GIT_FILE_STATUS_CHANGED", fileStatusCache);
+    });
+
+    // clear cache when Git is disabled
+    EventEmitter.on(Events.GIT_DISABLED, function () {
+        fileStatusCache = {};
+        EventEmitter.emit("GIT_FILE_STATUS_CHANGED", fileStatusCache);
+    });
+
+    return {
+        getFileStatus: getFileStatus,
+        isModified: isModified,
+        isUntracked: isUntracked
+    };
+});

src/extensionsIntegrated/Phoenix/html/login-dialog.html

@@ -0,0 +1,17 @@
+<div class="profile-popup">
+    <div class="popup-header">
+        <h1 class="popup-title">{{welcomeTitle}}</h1>
+    </div>
+    <div class="popup-body">
+        <button id="phoenix-signin-btn" class="btn btn-primary">
+            <i class="fa fa-sign-in-alt"></i>
+            {{signInBtnText}}
+        </button>
+        <div class="support-link">
+            <button id="phoenix-support-btn" class="btn btn-link">
+                <i class="fa fa-question-circle"></i>
+                {{supportBtnText}}
+            </button>
+        </div>
+    </div>
+</div>

src/extensionsIntegrated/Phoenix/html/profile-panel.html

@@ -0,0 +1,39 @@
+<div class="profile-popup">
+    <div class="popup-header">
+        <div class="user-profile-header">
+            <div class="user-avatar">
+                {{initials}}
+            </div>
+            <div class="user-info">
+                <div class="user-name">{{userName}}</div>
+                <div class="user-plan">{{planName}}</div>
+            </div>
+        </div>
+    </div>
+    <div class="popup-body">
+        <div class="quota-section">
+            <div class="quota-header">
+                <span>{{quotaLabel}}</span>
+                <span>{{quotaUsed}} / {{quotaTotal}} {{quotaUnit}}</span>
+            </div>
+            <div class="progress-bar">
+                <div class="progress-fill" style="width: {{quotaPercent}}%;"></div>
+            </div>
+        </div>
+
+        <button id="phoenix-account-btn" class="btn btn-default menu-button">
+            <i class="fa fa-user"></i>
+            {{accountBtnText}}
+        </button>
+
+        <button id="phoenix-support-btn" class="btn btn-default menu-button">
+            <i class="fa fa-question-circle"></i>
+            {{supportBtnText}}
+        </button>
+
+        <button id="phoenix-signout-btn" class="btn btn-default menu-button signout">
+            <i class="fa fa-sign-out-alt"></i>
+            {{signOutBtnText}}
+        </button>
+    </div>
+</div>

src/extensionsIntegrated/Phoenix/main.js

@@ -32,23 +32,24 @@ define(function (require, exports, module) {
         Strings      = require("strings"),
         Dialogs      = require("widgets/Dialogs"),
         NotificationUI  = require("widgets/NotificationUI"),
-        DefaultDialogs = require("widgets/DefaultDialogs");
+        DefaultDialogs = require("widgets/DefaultDialogs"),
+        ProfileMenu = require("./profile-menu");
 
     const PERSIST_STORAGE_DIALOG_DELAY_SECS = 60000;
     let $icon;
 
     function _addToolbarIcon() {
-        const helpButtonID = "help-button";
+        const helpButtonID = "user-profile-button";
         $icon = $("<a>")
             .attr({
                 id: helpButtonID,
                 href: "#",
-                class: "help",
-                title: Strings.CMD_SUPPORT
+                class: "user",
+                title: Strings.CMD_USER_PROFILE
             })
             .appendTo($("#main-toolbar .bottom-buttons"));
         $icon.on('click', ()=>{
-            Phoenix.app.openURLInDefaultBrowser(brackets.config.support_url);
+            ProfileMenu.init();
         });
     }
     function _showUnSupportedBrowserDialogue() {