Merge branch 'users-gql' into users-gql-refactor-hamburger-conditions

quiltdata · May 30, 2024 · 3bb1775 · 3bb1775
2 parents 758cb36 + 8b8c39c
commit 3bb1775
Show file tree

Hide file tree

Showing 8 changed files with 265 additions and 173 deletions.
diff --git a/catalog/app/containers/Admin/Users/Users.tsx b/catalog/app/containers/Admin/Users/Users.tsx
diff --git a/catalog/app/containers/Admin/Users/gql/UserSelection.generated.ts b/catalog/app/containers/Admin/Users/gql/UserSelection.generated.ts
@@ -20,7 +20,7 @@ export type UserSelectionFragment = { readonly __typename: 'User' } & Pick<
         >)
       | ({ readonly __typename: 'ManagedRole' } & Pick<Types.ManagedRole, 'id' | 'name'>)
     >
-    readonly roles: ReadonlyArray<
+    readonly extraRoles: ReadonlyArray<
       | ({ readonly __typename: 'UnmanagedRole' } & Pick<
           Types.UnmanagedRole,
           'id' | 'name'
@@ -88,7 +88,7 @@ export const UserSelectionFragmentDoc = {
           },
           {
             kind: 'Field',
-            name: { kind: 'Name', value: 'roles' },
+            name: { kind: 'Name', value: 'extraRoles' },
             selectionSet: {
               kind: 'SelectionSet',
               selections: [

diff --git a/catalog/app/containers/Admin/Users/gql/UserSelection.graphql b/catalog/app/containers/Admin/Users/gql/UserSelection.graphql
@@ -19,7 +19,7 @@ fragment UserSelection on User {
       name
     }
   }
-  roles {
+  extraRoles {
     __typename
     ... on ManagedRole {
       id

diff --git a/...Admin/Users/gql/UserSetRoles.generated.ts → .../Admin/Users/gql/UserSetRole.generated.ts b/...Admin/Users/gql/UserSetRoles.generated.ts → .../Admin/Users/gql/UserSetRole.generated.ts
@@ -9,20 +9,20 @@ import {
   UserResultSelectionFragmentDoc,
 } from './UserResultSelection.generated'
 
-export type containers_Admin_Users_gql_UserSetRolesMutationVariables = Types.Exact<{
+export type containers_Admin_Users_gql_UserSetRoleMutationVariables = Types.Exact<{
   name: Types.Scalars['String']
-  roleNames: ReadonlyArray<Types.Scalars['String']>
-  activeRoleName: Types.Scalars['String']
+  role: Types.Scalars['String']
+  extraRoles: ReadonlyArray<Types.Scalars['String']>
 }>
 
-export type containers_Admin_Users_gql_UserSetRolesMutation = {
+export type containers_Admin_Users_gql_UserSetRoleMutation = {
   readonly __typename: 'Mutation'
 } & {
   readonly admin: { readonly __typename: 'AdminMutations' } & {
     readonly user: { readonly __typename: 'UserAdminMutations' } & {
       readonly mutate: Types.Maybe<
         { readonly __typename: 'MutateUserAdminMutations' } & {
-          readonly setRoles:
+          readonly setRole:
             | ({ readonly __typename: 'User' } & UserResultSelection_User_Fragment)
             | ({
                 readonly __typename: 'InvalidInput'
@@ -36,13 +36,13 @@ export type containers_Admin_Users_gql_UserSetRolesMutation = {
   }
 }
 
-export const containers_Admin_Users_gql_UserSetRolesDocument = {
+export const containers_Admin_Users_gql_UserSetRoleDocument = {
   kind: 'Document',
   definitions: [
     {
       kind: 'OperationDefinition',
       operation: 'mutation',
-      name: { kind: 'Name', value: 'containers_Admin_Users_gql_UserSetRoles' },
+      name: { kind: 'Name', value: 'containers_Admin_Users_gql_UserSetRole' },
       variableDefinitions: [
         {
           kind: 'VariableDefinition',
@@ -54,7 +54,15 @@ export const containers_Admin_Users_gql_UserSetRolesDocument = {
         },
         {
           kind: 'VariableDefinition',
-          variable: { kind: 'Variable', name: { kind: 'Name', value: 'roleNames' } },
+          variable: { kind: 'Variable', name: { kind: 'Name', value: 'role' } },
+          type: {
+            kind: 'NonNullType',
+            type: { kind: 'NamedType', name: { kind: 'Name', value: 'String' } },
+          },
+        },
+        {
+          kind: 'VariableDefinition',
+          variable: { kind: 'Variable', name: { kind: 'Name', value: 'extraRoles' } },
           type: {
             kind: 'NonNullType',
             type: {
@@ -66,14 +74,6 @@ export const containers_Admin_Users_gql_UserSetRolesDocument = {
             },
           },
         },
-        {
-          kind: 'VariableDefinition',
-          variable: { kind: 'Variable', name: { kind: 'Name', value: 'activeRoleName' } },
-          type: {
-            kind: 'NonNullType',
-            type: { kind: 'NamedType', name: { kind: 'Name', value: 'String' } },
-          },
-        },
       ],
       selectionSet: {
         kind: 'SelectionSet',
@@ -108,22 +108,22 @@ export const containers_Admin_Users_gql_UserSetRolesDocument = {
                           selections: [
                             {
                               kind: 'Field',
-                              name: { kind: 'Name', value: 'setRoles' },
+                              name: { kind: 'Name', value: 'setRole' },
                               arguments: [
                                 {
                                   kind: 'Argument',
-                                  name: { kind: 'Name', value: 'roleNames' },
+                                  name: { kind: 'Name', value: 'role' },
                                   value: {
                                     kind: 'Variable',
-                                    name: { kind: 'Name', value: 'roleNames' },
+                                    name: { kind: 'Name', value: 'role' },
                                   },
                                 },
                                 {
                                   kind: 'Argument',
-                                  name: { kind: 'Name', value: 'activeRoleName' },
+                                  name: { kind: 'Name', value: 'extraRoles' },
                                   value: {
                                     kind: 'Variable',
-                                    name: { kind: 'Name', value: 'activeRoleName' },
+                                    name: { kind: 'Name', value: 'extraRoles' },
                                   },
                                 },
                               ],
@@ -152,8 +152,8 @@ export const containers_Admin_Users_gql_UserSetRolesDocument = {
     ...UserResultSelectionFragmentDoc.definitions,
   ],
 } as unknown as DocumentNode<
-  containers_Admin_Users_gql_UserSetRolesMutation,
-  containers_Admin_Users_gql_UserSetRolesMutationVariables
+  containers_Admin_Users_gql_UserSetRoleMutation,
+  containers_Admin_Users_gql_UserSetRoleMutationVariables
 >
 
-export { containers_Admin_Users_gql_UserSetRolesDocument as default }
+export { containers_Admin_Users_gql_UserSetRoleDocument as default }
diff --git a/...ners/Admin/Users/gql/UserSetRoles.graphql → ...iners/Admin/Users/gql/UserSetRole.graphql b/...ners/Admin/Users/gql/UserSetRoles.graphql → ...iners/Admin/Users/gql/UserSetRole.graphql
@@ -1,10 +1,10 @@
 # import UserResultSelection from "./UserResultSelection.graphql"
 
-mutation ($name: String!, $roleNames: [String!]!, $activeRoleName: String!) {
+mutation ($name: String!, $role: String!, $extraRoles: [String!]!) {
   admin {
     user {
       mutate(name: $name) {
-        setRoles(roleNames: $roleNames, activeRoleName: $activeRoleName) {
+        setRole(role: $role, extraRoles: $extraRoles) {
           ...UserResultSelection
         }
       }

diff --git a/catalog/app/model/graphql/schema.generated.ts b/catalog/app/model/graphql/schema.generated.ts
@@ -1474,51 +1474,27 @@ export default {
             },
             args: [
               {
-                name: 'roleName',
-                type: {
-                  kind: 'SCALAR',
-                  name: 'String',
-                  ofType: null,
-                },
-              },
-            ],
-          },
-          {
-            name: 'setRoles',
-            type: {
-              kind: 'NON_NULL',
-              ofType: {
-                kind: 'UNION',
-                name: 'UserResult',
-                ofType: null,
-              },
-            },
-            args: [
-              {
-                name: 'roleNames',
+                name: 'role',
                 type: {
                   kind: 'NON_NULL',
                   ofType: {
-                    kind: 'LIST',
-                    ofType: {
-                      kind: 'NON_NULL',
-                      ofType: {
-                        kind: 'SCALAR',
-                        name: 'String',
-                        ofType: null,
-                      },
-                    },
+                    kind: 'SCALAR',
+                    name: 'String',
+                    ofType: null,
                   },
                 },
               },
               {
-                name: 'activeRoleName',
+                name: 'extraRoles',
                 type: {
-                  kind: 'NON_NULL',
+                  kind: 'LIST',
                   ofType: {
-                    kind: 'SCALAR',
-                    name: 'String',
-                    ofType: null,
+                    kind: 'NON_NULL',
+                    ofType: {
+                      kind: 'SCALAR',
+                      name: 'String',
+                      ofType: null,
+                    },
                   },
                 },
               },
@@ -5249,7 +5225,7 @@ export default {
             args: [],
           },
           {
-            name: 'roles',
+            name: 'extraRoles',
             type: {
               kind: 'NON_NULL',
               ofType: {

diff --git a/catalog/app/model/graphql/types.generated.ts b/catalog/app/model/graphql/types.generated.ts
@@ -333,7 +333,6 @@ export interface MutateUserAdminMutations {
   readonly delete: OperationResult
   readonly setEmail: UserResult
   readonly setRole: UserResult
-  readonly setRoles: UserResult
   readonly setAdmin: UserResult
   readonly setActive: UserResult
   readonly resetPassword: OperationResult
@@ -344,12 +343,8 @@ export interface MutateUserAdminMutationssetEmailArgs {
 }
 
 export interface MutateUserAdminMutationssetRoleArgs {
-  roleName: Maybe<Scalars['String']>
-}
-
-export interface MutateUserAdminMutationssetRolesArgs {
-  roleNames: ReadonlyArray<Scalars['String']>
-  activeRoleName: Scalars['String']
+  role: Scalars['String']
+  extraRoles: Maybe<ReadonlyArray<Scalars['String']>>
 }
 
 export interface MutateUserAdminMutationssetAdminArgs {
@@ -1139,7 +1134,7 @@ export interface User {
   readonly isSsoOnly: Scalars['Boolean']
   readonly isService: Scalars['Boolean']
   readonly role: Maybe<Role>
-  readonly roles: ReadonlyArray<Role>
+  readonly extraRoles: ReadonlyArray<Role>
 }
 
 export interface UserAdminMutations {
@@ -1169,7 +1164,8 @@ export interface UserAdminQueriesgetArgs {
 export interface UserInput {
   readonly name: Scalars['String']
   readonly email: Scalars['String']
-  readonly roleName: Maybe<Scalars['String']>
+  readonly role: Scalars['String']
+  readonly extraRoles: Maybe<ReadonlyArray<Scalars['String']>>
 }
 
 export type UserResult = User | InvalidInput | OperationError
diff --git a/shared/graphql/schema.graphql b/shared/graphql/schema.graphql
@@ -200,8 +200,8 @@ type User {
   isAdmin: Boolean!
   isSsoOnly: Boolean!
   isService: Boolean!
-  role: Role # XXX: activeRole?
-  roles: [Role!]! # XXX: better name
+  role: Role
+  extraRoles: [Role!]!
 }
 
 type AccessCountForDate {
@@ -838,16 +838,16 @@ union BrowsingSessionDisposeResult = Ok | OperationError
 input UserInput {
   name: String!
   email: String!
-  roleName: String
+  role: String!
+  extraRoles: [String!]
 }
 
 union UserResult = User | InvalidInput | OperationError
 
 type MutateUserAdminMutations {
   delete: OperationResult!
   setEmail(email: String!): UserResult!
-  setRole(roleName: String): UserResult!
-  setRoles(roleNames: [String!]!, activeRoleName: String!): UserResult!
+  setRole(role: String!, extraRoles: [String!]): UserResult!
   setAdmin(admin: Boolean!): UserResult!
   setActive(active: Boolean!): UserResult!
   resetPassword: OperationResult!
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ fragment UserSelection on User { @@
           name
         }
       }
-      roles {
+      extraRoles {
         __typename
         ... on ManagedRole {
           id
@@ Expand Down @@