From 7d55d670ee842e3e00b45d477ef58f6745db477d Mon Sep 17 00:00:00 2001
From: Katelyn Dickey <katedickey94@gmail.com>
Date: Sun, 25 Aug 2024 12:25:36 -0400
Subject: [PATCH] feat(workspaces): allow users to edit existing workspaces

---
 l10n                                          |  2 +-
 src/browser/base/content/zen-components       |  2 +-
 .../base/content/zen-popupset.inc.xhtml       | 27 +++++++++++++----
 .../content/zen-styles/zen-workspaces.css     | 30 +++++++++++++------
 src/browser/themes/shared/zen-icons/icons.css |  4 +++
 5 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/l10n b/l10n
index 32ef114c4..5ef2ab9fd 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit 32ef114c44376b24b06c04b27fc3f10f0c7d927f
+Subproject commit 5ef2ab9fd542e75086560a3d65e62d29a70bed10
diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components
index ca6aeb1c3..0b7a12513 160000
--- a/src/browser/base/content/zen-components
+++ b/src/browser/base/content/zen-components
@@ -1 +1 @@
-Subproject commit ca6aeb1c3a36ad57ca720c37bcbec7b4105061cd
+Subproject commit 0b7a125130f3c7811c8e9b2264f6461b5d25164a
diff --git a/src/browser/base/content/zen-popupset.inc.xhtml b/src/browser/base/content/zen-popupset.inc.xhtml
index b38bae987..2a4b968c3 100644
--- a/src/browser/base/content/zen-popupset.inc.xhtml
+++ b/src/browser/base/content/zen-popupset.inc.xhtml
@@ -78,7 +78,7 @@
 
 <panel flip="slide" type="arrow" orient="vertical" id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left">
   <panelmultiview id="PanelUI-zen-workspaces-multiview" mainViewId="PanelUI-zen-workspaces-view">
-    <panelview lockpanelvertical="true" id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
+    <panelview id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
       <vbox>
         <hbox>
           <h3 data-l10n-id="zen-panel-ui-current-window-text"></h3>
@@ -98,19 +98,19 @@
         </html:div>
       </vbox>
     </panelview>
-    <panelview lockpanelvertical="true" id="PanelUI-zen-workspaces-create" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
+    <panelview id="PanelUI-zen-workspaces-create" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
       <vbox>
         <h1 data-l10n-id="zen-panel-ui-workspaces-create-text"></h1>
-        <html:input autofocus="true" id="PanelUI-zen-workspaces-create-input" type="text" placeholder="Enter workspace name" oninput="ZenWorkspaces.onWorkspaceNameChange(this);" />
+        <html:input autofocus="true" id="PanelUI-zen-workspaces-create-input" type="text" placeholder="Enter workspace name" oninput="ZenWorkspaces.onWorkspaceCreationNameChange(this);" />
       </vbox>
       <html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-create-footer">
         <button disabled="true" default="true" slot="primary" id="PanelUI-zen-workspaces-create-save" oncommand="ZenWorkspaces.saveWorkspaceFromInput();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-save">
         </button>
-        <button id="PanelUI-zen-workspaces-create-cancel" oncommand="ZenWorkspaces.cancelWorkspaceCreation();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel">
+        <button id="PanelUI-zen-workspaces-create-cancel" oncommand="ZenWorkspaces.closeWorkspacesSubView();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel">
         </button>
       </html:moz-button-group>
     </panelview>
-    <panelview lockpanelvertical="true" id="PanelUI-zen-workspaces-create-icons" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
+    <panelview id="PanelUI-zen-workspaces-create-icons" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
       <vbox>
         <h1 data-l10n-id="zen-panel-ui-workspaces-create-text"></h1>
         <hbox id="PanelUI-zen-workspaces-create-icons-container">
@@ -119,7 +119,21 @@
       <html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-create-footer">
         <button default="true" slot="primary" id="PanelUI-zen-workspaces-create-save-icons" oncommand="ZenWorkspaces.saveWorkspaceFromIcon();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-save">
         </button>
-        <button id="PanelUI-zen-workspaces-create-cancel-icons" oncommand="ZenWorkspaces.cancelWorkspaceCreation();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel">
+        <button id="PanelUI-zen-workspaces-create-cancel-icons" oncommand="ZenWorkspaces.closeWorkspacesSubView();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel">
+        </button>
+      </html:moz-button-group>
+    </panelview>
+    <panelview id="PanelUI-zen-workspaces-edit" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
+      <vbox>
+        <h1 data-l10n-id="zen-panel-ui-workspaces-edit-text"></h1>
+        <html:input autofocus="true" id="PanelUI-zen-workspaces-edit-input" type="text" placeholder="Enter workspace name" oninput="ZenWorkspaces.onWorkspaceEditChange();" />
+        <hbox id="PanelUI-zen-workspaces-edit-icons-container">
+        </hbox>
+      </vbox>
+      <html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-edit-footer">
+        <button disabled="true" default="true" slot="primary" id="PanelUI-zen-workspaces-edit-save" oncommand="ZenWorkspaces.saveWorkspaceFromEdit();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-edit-save">
+        </button>
+        <button id="PanelUI-zen-workspaces-edit-cancel" oncommand="ZenWorkspaces.closeWorkspacesSubView();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-edit-cancel">
         </button>
       </html:moz-button-group>
     </panelview>
@@ -132,5 +146,6 @@
   <menuitem id="context_zenOpenWorkspace" oncommand="ZenWorkspaces.openWorkspace();" data-l10n-id="zen-workspaces-panel-context-open"/>
   <menuseparator/>
   <menuitem id="context_zenSetAsDefaultWorkspace" oncommand="ZenWorkspaces.setDefaultWorkspace();" data-l10n-id="zen-workspaces-panel-context-set-default"/>
+  <menuitem id="context_zenEditWorkspace" oncommand="ZenWorkspaces.contextEdit(event);" data-l10n-id="zen-workspaces-panel-context-edit"/>
   <menuitem id="context_zenDeleteWorkspace" oncommand="ZenWorkspaces.contextDelete(event);" data-l10n-id="zen-workspaces-panel-context-delete"/>
 </menupopup>
\ No newline at end of file
diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index e524e76db..9fe8675b1 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -62,11 +62,13 @@
   min-height: 150px;
 }
 
-#PanelUI-zen-workspaces-create-input {
+#PanelUI-zen-workspaces-create-input,
+#PanelUI-zen-workspaces-edit-input {
   margin-top: 10px;
 }
 
-#PanelUI-zen-workspaces-create-icons-container toolbarbutton {
+#PanelUI-zen-workspaces-create-icons-container toolbarbutton,
+#PanelUI-zen-workspaces-edit-icons-container toolbarbutton {
   width: 30px;
   height: 30px;
   display: flex;
@@ -76,24 +78,32 @@
   border-radius: 7px;
 }
 
-#PanelUI-zen-workspaces-create-icons-container toolbarbutton[selected="true"] {
+#PanelUI-zen-workspaces-create-icons-container toolbarbutton[selected="true"],
+#PanelUI-zen-workspaces-edit-icons-container toolbarbutton[selected="true"] {
   border-color: var(--zen-colors-secondary);
 }
 
-#PanelUI-zen-workspaces-create-icons-container toolbarbutton .toolbarbutton-icon {
+#PanelUI-zen-workspaces-create-icons-container toolbarbutton .toolbarbutton-icon,
+#PanelUI-zen-workspaces-edit-icons-container toolbarbutton .toolbarbutton-icon {
   display: none;
 }
 
-#PanelUI-zen-workspaces-create-icons-container toolbarbutton .toolbarbutton-text {
+#PanelUI-zen-workspaces-create-icons-container toolbarbutton .toolbarbutton-text,
+#PanelUI-zen-workspaces-edit-icons-container toolbarbutton .toolbarbutton-text {
   min-width: unset;
 }
 
-#PanelUI-zen-workspaces-create-icons-container {
+#PanelUI-zen-workspaces-create-icons-container,
+#PanelUI-zen-workspaces-edit-icons-container {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(30px, 1fr));
   gap: 8px;
 }
 
+#PanelUI-zen-workspaces-edit-icons-container toolbarbutton.toolbarbutton-1 {
+  margin-top: 10px;
+}
+
 #PanelUI-zen-workspaces-list {
   display: flex;
   flex-direction: column;
@@ -177,14 +187,16 @@
   height: 20px;
 }
 
-#PanelUI-zen-workspaces-create-footer {
+#PanelUI-zen-workspaces-create-footer,
+#PanelUI-zen-workspaces-edit-footer {
   padding-bottom: 0 !important;
-  margin-top: 20px;
+  margin-top: 10px;
   margin-left: 0;
   margin-bottom: 0 !important;
   width: 100%;
 }
 
-#PanelUI-zen-workspaces-create-footer button[default="true"] {
+#PanelUI-zen-workspaces-create-footer button[default="true"],
+#PanelUI-zen-workspaces-edit-footer button[default="true"] {
   width: 100%;
 }
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 650e43f48..5e36ee4f8 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -160,6 +160,10 @@
 	--menu-image: url("bookmark-hollow.svg") !important;
 }
 
+#context_zenEditWorkspace {
+	--menu-image: url("edit.svg") !important;
+}
+
 #add-ons-button,
 #appMenu-extensions-themes-button,
 #unified-extensions-button {