refactor: remove get-roles GQL query

packages/backend/src/graphql/queries/get-roles.ee.js

@@ -1,9 +0,0 @@
-import Role from '../../models/role.js';
-
-const getRoles = async (_parent, params, context) => {
-  context.currentUser.can('read', 'Role');
-
-  return await Role.query().orderBy('name');
-};
-
-export default getRoles;

packages/backend/src/graphql/queries/get-roles.ee.test.js

@@ -1,134 +0,0 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import request from 'supertest';
-import app from '../../app';
-import createAuthTokenByUserId from '../../helpers/create-auth-token-by-user-id';
-import { createRole } from '../../../test/factories/role';
-import { createPermission } from '../../../test/factories/permission';
-import { createUser } from '../../../test/factories/user';
-import * as license from '../../helpers/license.ee';
-
-describe('graphQL getRoles query', () => {
-  let currentUserRole,
-    roleOne,
-    roleSecond,
-    query,
-    userWithPermissions,
-    userWithoutPermissions,
-    tokenWithPermissions,
-    tokenWithoutPermissions;
-
-  beforeEach(async () => {
-    currentUserRole = await createRole({ name: 'Current user role' });
-    roleOne = await createRole({ name: 'Role one' });
-    roleSecond = await createRole({ name: 'Role second' });
-
-    query = `
-      query {
-        getRoles {
-          id
-          key
-          name
-          description
-          isAdmin
-        }
-      }
-    `;
-
-    await createPermission({
-      action: 'read',
-      subject: 'Role',
-      roleId: currentUserRole.id,
-    });
-
-    userWithPermissions = await createUser({
-      roleId: currentUserRole.id,
-    });
-
-    userWithoutPermissions = await createUser({
-      roleId: roleOne.id,
-    });
-
-    tokenWithPermissions = createAuthTokenByUserId(userWithPermissions.id);
-    tokenWithoutPermissions = createAuthTokenByUserId(
-      userWithoutPermissions.id
-    );
-  });
-
-  describe('and with valid license', () => {
-    beforeEach(async () => {
-      vi.spyOn(license, 'hasValidLicense').mockResolvedValue(true);
-    });
-
-    describe('and without permissions', () => {
-      it('should throw not authorized error', async () => {
-        const response = await request(app)
-          .post('/graphql')
-          .set('Authorization', tokenWithoutPermissions)
-          .send({ query })
-          .expect(200);
-
-        expect(response.body.errors).toBeDefined();
-        expect(response.body.errors[0].message).toEqual('Not authorized!');
-      });
-    });
-
-    describe('and correct permissions', () => {
-      it('should return roles data', async () => {
-        const response = await request(app)
-          .post('/graphql')
-          .set('Authorization', tokenWithPermissions)
-          .send({ query })
-          .expect(200);
-
-        const expectedResponsePayload = {
-          data: {
-            getRoles: [
-              {
-                description: currentUserRole.description,
-                id: currentUserRole.id,
-                isAdmin: currentUserRole.key === 'admin',
-                key: currentUserRole.key,
-                name: currentUserRole.name,
-              },
-              {
-                description: roleOne.description,
-                id: roleOne.id,
-                isAdmin: roleOne.key === 'admin',
-                key: roleOne.key,
-                name: roleOne.name,
-              },
-              {
-                description: roleSecond.description,
-                id: roleSecond.id,
-                isAdmin: roleSecond.key === 'admin',
-                key: roleSecond.key,
-                name: roleSecond.name,
-              },
-            ],
-          },
-        };
-
-        expect(response.body).toEqual(expectedResponsePayload);
-      });
-    });
-  });
-
-  describe('and without valid license', () => {
-    beforeEach(async () => {
-      vi.spyOn(license, 'hasValidLicense').mockResolvedValue(false);
-    });
-
-    describe('and correct permissions', () => {
-      it('should throw not authorized error', async () => {
-        const response = await request(app)
-          .post('/graphql')
-          .set('Authorization', tokenWithPermissions)
-          .send({ query })
-          .expect(200);
-
-        expect(response.body.errors).toBeDefined();
-        expect(response.body.errors[0].message).toEqual('Not authorized!');
-      });
-    });
-  });
-});

packages/backend/src/graphql/query-resolvers.js

@@ -13,7 +13,6 @@ import getInvoices from './queries/get-invoices.ee.js';
 import getNotifications from './queries/get-notifications.js';
 import getPermissionCatalog from './queries/get-permission-catalog.ee.js';
 import getRole from './queries/get-role.ee.js';
-import getRoles from './queries/get-roles.ee.js';
 import getSamlAuthProviderRoleMappings from './queries/get-saml-auth-provider-role-mappings.ee.js';
 import getSamlAuthProvider from './queries/get-saml-auth-provider.ee.js';
 import getStepWithTestExecutions from './queries/get-step-with-test-executions.js';
@@ -40,7 +39,6 @@ const queryResolvers = {
   getNotifications,
   getPermissionCatalog,
   getRole,
-  getRoles,
   getSamlAuthProvider,
   getSamlAuthProviderRoleMappings,
   getStepWithTestExecutions,

packages/backend/src/graphql/schema.graphql

@@ -29,7 +29,6 @@ type Query {
   getInvoices: [Invoice]
   getPermissionCatalog: PermissionCatalog
   getRole(id: String!): Role
-  getRoles: [Role]
   getNotifications: [Notification]
   getSamlAuthProvider: SamlAuthProvider
   getSamlAuthProviderRoleMappings(id: String!): [SamlAuthProvidersRoleMapping]

packages/web/src/components/DeleteRoleButton/index.ee.jsx

@@ -4,6 +4,8 @@ import DeleteIcon from '@mui/icons-material/Delete';
 import IconButton from '@mui/material/IconButton';
 import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 import * as React from 'react';
+import { useQueryClient } from '@tanstack/react-query';
+
 import Can from 'components/Can';
 import ConfirmationDialog from 'components/ConfirmationDialog';
 import { DELETE_ROLE } from 'graphql/mutations/delete-role.ee';
@@ -12,15 +14,18 @@ import useFormatMessage from 'hooks/useFormatMessage';
 function DeleteRoleButton(props) {
   const { disabled, roleId } = props;
   const [showConfirmation, setShowConfirmation] = React.useState(false);
-  const [deleteRole] = useMutation(DELETE_ROLE, {
-    variables: { input: { id: roleId } },
-    refetchQueries: ['GetRoles'],
-  });
   const formatMessage = useFormatMessage();
   const enqueueSnackbar = useEnqueueSnackbar();
+  const queryClient = useQueryClient();
+
+  const [deleteRole] = useMutation(DELETE_ROLE, {
+    variables: { input: { id: roleId } },
+  });
+
   const handleConfirm = React.useCallback(async () => {
     try {
       await deleteRole();
+      queryClient.invalidateQueries({ queryKey: ['roles'] });
       setShowConfirmation(false);
       enqueueSnackbar(formatMessage('deleteRoleButton.successfullyDeleted'), {
         variant: 'success',
@@ -31,7 +36,8 @@ function DeleteRoleButton(props) {
     } catch (error) {
       throw new Error('Failed while deleting!');
     }
-  }, [deleteRole]);
+  }, [deleteRole, enqueueSnackbar, formatMessage, queryClient]);
+
   return (
     <>
       <Can I="delete" a="Role" passThrough>

packages/web/src/graphql/queries/get-roles.ee.js

@@ -1,12 +0,0 @@
-import { gql } from '@apollo/client';
-export const GET_ROLES = gql`
-  query GetRoles {
-    getRoles {
-      id
-      key
-      name
-      description
-      isAdmin
-    }
-  }
-`;

packages/web/src/hooks/useRoles.ee.js

@@ -3,6 +3,7 @@ import api from 'helpers/api';
 
 export default function useRoles() {
   const query = useQuery({
+    staleTime: 0,
     queryKey: ['roles'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get('/v1/admin/roles', {