Merge pull request galaxyproject#16787 from jmchilton/tool_shed_2

Initial bug fixes for tool shed 2.
ahmedhamidawan · Oct 4, 2023 · f51f64b · f51f64b
2 parents 605d8ca + 76c560f
commit f51f64b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/lib/tool_shed/managers/users.py b/lib/tool_shed/managers/users.py
@@ -12,7 +12,7 @@
 from tool_shed.webapp.model import User
 from tool_shed_client.schema import (
     CreateUserRequest,
-    User as ApiUser,
+    UserV2 as ApiUser,
 )
 
 
@@ -58,9 +58,11 @@ def api_create_user(trans: ProvidesUserContext, request: CreateUserRequest) -> A
 
 
 def get_api_user(app: ToolShedApp, user: User) -> ApiUser:
+    admin = app.config.is_admin_user(user)
     return ApiUser(
         id=app.security.encode_id(user.id),
         username=user.username,
+        is_admin=admin,
     )
 
 

diff --git a/lib/tool_shed/webapp/api2/users.py b/lib/tool_shed/webapp/api2/users.py
@@ -34,7 +34,7 @@
 from tool_shed.webapp.model import User as SaUser
 from tool_shed_client.schema import (
     CreateUserRequest,
-    User,
+    UserV2 as User,
 )
 from . import (
     depends,

diff --git a/lib/tool_shed/webapp/frontend/src/components/ShedToolbar.vue b/lib/tool_shed/webapp/frontend/src/components/ShedToolbar.vue
@@ -8,13 +8,11 @@ defineProps({
         required: true,
     },
 })
-// TODO: recover from the API
-const ADMINS = ["jmchilton"]
 
 const authStore = useAuthStore()
 void authStore.setup()
 
-const admin = computed(() => authStore.user && ADMINS.indexOf(authStore.user.username) > -1)
+const admin = computed(() => authStore.user && authStore.user.is_admin)
 </script>
 <template>
     <q-toolbar class="bg-primary glossy text-white">

diff --git a/lib/tool_shed/webapp/frontend/src/components/pages/RepositoryPage.vue b/lib/tool_shed/webapp/frontend/src/components/pages/RepositoryPage.vue
@@ -242,7 +242,7 @@ const toolsYaml = computed(
                         <revision-actions
                             :repository-id="repositoryId"
                             :current-metadata="currentMetadata"
-                            v-if="currentMetadata"
+                            v-if="currentMetadata && can_manage"
                             @update="onUpdate"
                         />
                     </revision-select>

diff --git a/lib/tool_shed/webapp/frontend/src/schema/schema.ts b/lib/tool_shed/webapp/frontend/src/schema/schema.ts
@@ -1007,10 +1007,12 @@ export interface components {
             /** Email */
             email: string
         }
-        /** User */
-        User: {
+        /** UserV2 */
+        UserV2: {
             /** Id */
             id: string
+            /** Is Admin */
+            is_admin: boolean
             /** Username */
             username: string
         }
@@ -1786,7 +1788,7 @@ export interface operations {
             /** @description Successful Response */
             200: {
                 content: {
-                    "application/json": components["schemas"]["User"][]
+                    "application/json": components["schemas"]["UserV2"][]
                 }
             }
         }
@@ -1805,7 +1807,7 @@ export interface operations {
             /** @description Successful Response */
             200: {
                 content: {
-                    "application/json": components["schemas"]["User"]
+                    "application/json": components["schemas"]["UserV2"]
                 }
             }
             /** @description Validation Error */
@@ -1825,7 +1827,7 @@ export interface operations {
             /** @description Successful Response */
             200: {
                 content: {
-                    "application/json": components["schemas"]["User"]
+                    "application/json": components["schemas"]["UserV2"]
                 }
             }
         }
@@ -1845,7 +1847,7 @@ export interface operations {
             /** @description Successful Response */
             200: {
                 content: {
-                    "application/json": components["schemas"]["User"]
+                    "application/json": components["schemas"]["UserV2"]
                 }
             }
             /** @description Validation Error */

diff --git a/lib/tool_shed_client/schema/__init__.py b/lib/tool_shed_client/schema/__init__.py
@@ -61,6 +61,10 @@ class User(BaseModel):
     username: str
 
 
+class UserV2(User):
+    is_admin: bool
+
+
 class Category(BaseModel):
     id: str
     name: str