From 5ebd7586896dcdebd68754c48c1676f2925e123e Mon Sep 17 00:00:00 2001
From: Johannes Millan <johannes.millan@gmail.com>
Date: Sat, 20 Sep 2025 14:45:56 +0200
Subject: [PATCH] feat(projectFolders): make all the buttons and context menus
 work better

---
 .../magic-side-nav/nav-item/nav-item.component.html | 12 +-----------
 .../nav-list/nav-list-tree.component.html           | 11 ++++-------
 .../nav-list/nav-list-tree.component.scss           | 13 ++++---------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/app/core-ui/magic-side-nav/nav-item/nav-item.component.html b/src/app/core-ui/magic-side-nav/nav-item/nav-item.component.html
index 7cd2e8f703..fe427817bb 100644
--- a/src/app/core-ui/magic-side-nav/nav-item/nav-item.component.html
+++ b/src/app/core-ui/magic-side-nav/nav-item/nav-item.component.html
@@ -67,7 +67,7 @@
       [class.expanded]="expanded()"
       [class.collapsed]="!expanded()"
     >
-      chevron_right
+      expand_more
     </mat-icon>
     @if (label()) {
       <span
@@ -80,19 +80,9 @@
     }
   </button>
 
-  <button
-    [style.visibility]="showMoreButton() ? 'visible' : 'hidden'"
-    #folderSettingsBtn
-    class="additional-btn"
-    mat-icon-button
-  >
-    <mat-icon>more_vert</mat-icon>
-  </button>
-
   <context-menu
     [contextMenu]="folderContextMenu"
     [rightClickTriggerEl]="folderBtn"
-    [leftClickTriggerEl]="folderSettingsBtn"
   ></context-menu>
 
   <ng-template #folderContextMenu>
diff --git a/src/app/core-ui/magic-side-nav/nav-list/nav-list-tree.component.html b/src/app/core-ui/magic-side-nav/nav-list/nav-list-tree.component.html
index 37afcff013..70757dd584 100644
--- a/src/app/core-ui/magic-side-nav/nav-list/nav-list-tree.component.html
+++ b/src/app/core-ui/magic-side-nav/nav-list/nav-list-tree.component.html
@@ -1,13 +1,11 @@
 <div class="g-multi-btn-wrapper">
   <nav-item
-    [mode]="'folder'"
-    [container]="null"
-    [folderId]="item().id"
+    [container]="'group'"
     [expanded]="isExpanded()"
     [ariaControls]="'group-' + item().id"
     [icon]="item().icon"
     [svgIcon]="item().svgIcon"
-    [label]="item().label"
+    [label]="item().label | translate"
     [showLabels]="showLabels()"
     (clicked)="onHeaderClick()"
   ></nav-item>
@@ -62,13 +60,12 @@
       >
         <div class="nav-child-item folder-item draggable">
           <nav-item
-            [container]="'action'"
+            [mode]="'folder'"
+            [folderId]="node.data?.kind === 'folder' ? node.data.id : ''"
             [expanded]="expanded"
-            [icon]="expanded ? 'folder_open' : 'folder'"
             [label]="node.data?.kind === 'folder' ? node.data.name : node.data.label"
             [variant]="'nav'"
             [showLabels]="showLabels()"
-            [showMoreButton]="false"
             (clicked)="onChildClick(node)"
           ></nav-item>
         </div>
diff --git a/src/app/core-ui/magic-side-nav/nav-list/nav-list-tree.component.scss b/src/app/core-ui/magic-side-nav/nav-list/nav-list-tree.component.scss
index ce950422ad..4298d553ce 100644
--- a/src/app/core-ui/magic-side-nav/nav-list/nav-list-tree.component.scss
+++ b/src/app/core-ui/magic-side-nav/nav-list/nav-list-tree.component.scss
@@ -10,19 +10,17 @@
   display: flex;
   align-items: center;
   position: relative;
+  overflow: hidden;
 
   // Hide additional buttons by default on desktop
   .additional-btns {
-    opacity: 0;
-    visibility: hidden;
-    transition: all 0.2s ease;
+    display: none;
   }
 
   // Show additional buttons on focus/hover (desktop)
   &:focus-within .additional-btns,
   &:hover .additional-btns {
-    opacity: 1;
-    visibility: visible !important;
+    display: flex;
   }
 
   // Folder header drop zone styling
@@ -51,10 +49,7 @@
 
 .additional-btns {
   display: flex;
-  position: absolute;
-  right: 0;
-  top: 0;
-  bottom: 0;
+  margin-left: auto;
 }
 
 .additional-btn {