fix: workspace setting validation

makeplane · Sep 19, 2024 · 3dcf356 · 3dcf356
1 parent c8c9638
commit 3dcf356
Showing 1 changed file with 32 additions and 32 deletions.
diff --git a/web/core/components/workspace/sidebar/workspace-menu.tsx b/web/core/components/workspace/sidebar/workspace-menu.tsx
@@ -43,7 +43,7 @@ export const SidebarWorkspaceMenu = observer(() => {
   const { setValue: toggleWorkspaceMenu, storedValue } = useLocalStorage<boolean>("is_workspace_menu_open", true);
   // derived values
   const isWorkspaceMenuOpen = !!storedValue;
-  const isAdmin = allowPermissions([EUserPermissions.ADMIN, EUserPermissions.MEMBER], EUserPermissionsLevel.WORKSPACE);
+  const isAdmin = allowPermissions([EUserPermissions.ADMIN], EUserPermissionsLevel.WORKSPACE);
 
   const handleLinkClick = (itemKey: string) => {
     if (window.innerWidth < 768) {
@@ -84,37 +84,37 @@ export const SidebarWorkspaceMenu = observer(() => {
           >
             <span>WORKSPACE</span>
           </Disclosure.Button>
-          {isAdmin && (
-            <CustomMenu
-              customButton={
-                <span
-                  ref={actionSectionRef}
-                  className="grid place-items-center p-0.5 text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80 rounded my-auto"
-                  onClick={() => {
-                    setIsMenuActive(!isMenuActive);
-                  }}
-                >
-                  <MoreHorizontal className="size-4" />
-                </span>
+          <CustomMenu
+            customButton={
+              <span
+                ref={actionSectionRef}
+                className="grid place-items-center p-0.5 text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-80 rounded my-auto"
+                onClick={() => {
+                  setIsMenuActive(!isMenuActive);
+                }}
+              >
+                <MoreHorizontal className="size-4" />
+              </span>
+            }
+            className={cn(
+              "h-full flex items-center opacity-0 z-20 pointer-events-none flex-shrink-0 group-hover/workspace-button:opacity-100 group-hover/workspace-button:pointer-events-auto my-auto",
+              {
+                "opacity-100 pointer-events-auto": isMenuActive,
               }
-              className={cn(
-                "h-full flex items-center opacity-0 z-20 pointer-events-none flex-shrink-0 group-hover/workspace-button:opacity-100 group-hover/workspace-button:pointer-events-auto my-auto",
-                {
-                  "opacity-100 pointer-events-auto": isMenuActive,
-                }
-              )}
-              customButtonClassName="grid place-items-center"
-              placement="bottom-start"
-            >
-              <CustomMenu.MenuItem>
-                <Link href={`/${workspaceSlug}/projects/archives`}>
-                  <div className="flex items-center justify-start gap-2">
-                    <ArchiveIcon className="h-3.5 w-3.5 stroke-[1.5]" />
-                    <span>Archives</span>
-                  </div>
-                </Link>
-              </CustomMenu.MenuItem>
+            )}
+            customButtonClassName="grid place-items-center"
+            placement="bottom-start"
+          >
+            <CustomMenu.MenuItem>
+              <Link href={`/${workspaceSlug}/projects/archives`}>
+                <div className="flex items-center justify-start gap-2">
+                  <ArchiveIcon className="h-3.5 w-3.5 stroke-[1.5]" />
+                  <span>Archives</span>
+                </div>
+              </Link>
+            </CustomMenu.MenuItem>
 
+            {isAdmin && (
               <CustomMenu.MenuItem>
                 <Link href={`/${workspaceSlug}/settings`}>
                   <div className="flex items-center justify-start gap-2">
@@ -123,8 +123,8 @@ export const SidebarWorkspaceMenu = observer(() => {
                   </div>
                 </Link>
               </CustomMenu.MenuItem>
-            </CustomMenu>
-          )}
+            )}
+          </CustomMenu>
           <Disclosure.Button
             as="button"
             className="sticky top-0 z-10 group/workspace-button px-0.5 py-1.5 flex items-center justify-between gap-1 text-custom-sidebar-text-400 hover:bg-custom-sidebar-background-90 rounded text-xs font-semibold"