Merge pull request #586 from CBIIT/pbac-show-cli-tool-always

fix: CLI Tool should not be bound by `data_submission:create`
CBIIT · Jan 8, 2025 · b4fa1ad · b4fa1ad
2 parents 88c8f56 + 9f7e2bb
commit b4fa1ad
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 28 deletions.
diff --git a/src/components/Header/components/HeaderTabletAndMobile.tsx b/src/components/Header/components/HeaderTabletAndMobile.tsx
@@ -153,6 +153,19 @@ const Header = () => {
       id: "navbar-dropdown-item-user-profile",
       className: "navMobileSubItem",
     },
+    {
+      name: "Uploader CLI Tool",
+      onClick: () => setUploaderToolOpen(true),
+      id: "navbar-dropdown-item-uploader-tool",
+      className: "navMobileSubItem action",
+    },
+    {
+      name: "API Token",
+      onClick: () => setOpenAPITokenDialog(true),
+      id: "navbar-dropdown-item-api-token",
+      className: "navMobileSubItem action",
+      permissions: ["data_submission:create"],
+    },
     {
       name: "Manage Studies",
       link: "/studies",
@@ -174,20 +187,6 @@ const Header = () => {
       className: "navMobileSubItem",
       permissions: ["user:manage"],
     },
-    {
-      name: "Uploader CLI Tool",
-      onClick: () => setUploaderToolOpen(true),
-      id: "navbar-dropdown-item-uploader-tool",
-      className: "navMobileSubItem action",
-      permissions: ["data_submission:create"],
-    },
-    {
-      name: "API Token",
-      onClick: () => setOpenAPITokenDialog(true),
-      id: "navbar-dropdown-item-api-token",
-      className: "navMobileSubItem action",
-      permissions: ["data_submission:create"],
-    },
     {
       name: "Logout",
       link: "/logout",

diff --git a/src/components/Header/components/NavbarDesktop.tsx b/src/components/Header/components/NavbarDesktop.tsx
@@ -311,6 +311,19 @@ const NavBar = () => {
       id: "navbar-dropdown-item-user-profile",
       className: "navMobileSubItem",
     },
+    {
+      name: "Uploader CLI Tool",
+      onClick: () => setUploaderToolOpen(true),
+      id: "navbar-dropdown-item-uploader-tool",
+      className: "navMobileSubItem action",
+    },
+    {
+      name: "API Token",
+      onClick: () => setOpenAPITokenDialog(true),
+      id: "navbar-dropdown-item-api-token",
+      className: "navMobileSubItem action",
+      permissions: ["data_submission:create"],
+    },
     {
       name: "Manage Studies",
       link: "/studies",
@@ -332,20 +345,6 @@ const NavBar = () => {
       className: "navMobileSubItem",
       permissions: ["user:manage"],
     },
-    {
-      name: "Uploader CLI Tool",
-      onClick: () => setUploaderToolOpen(true),
-      id: "navbar-dropdown-item-uploader-tool",
-      className: "navMobileSubItem action",
-      permissions: ["data_submission:create"],
-    },
-    {
-      name: "API Token",
-      onClick: () => setOpenAPITokenDialog(true),
-      id: "navbar-dropdown-item-api-token",
-      className: "navMobileSubItem action",
-      permissions: ["data_submission:create"],
-    },
     {
       name: "Logout",
       onClick: () => handleLogout(),