@strapi/plugin-users-permissions 4.11.2 → 4.11.4

package/admin/src/{permissions.js → constants.js}

@@ -1,4 +1,4 @@
-const pluginPermissions = {
+export const PERMISSIONS = {
   // Roles
   accessRoles: [
     { action: 'plugin::users-permissions.roles.create', subject: null },
@@ -27,5 +27,3 @@ const pluginPermissions = {
   readProviders: [{ action: 'plugin::users-permissions.providers.read', subject: null }],
   updateProviders: [{ action: 'plugin::users-permissions.providers.update', subject: null }],
 };
-
-export default pluginPermissions;

package/admin/src/index.js

@@ -8,7 +8,7 @@ import { prefixPluginTranslations } from '@strapi/helper-plugin';
 
 import pluginPkg from '../../package.json';
 
-import pluginPermissions from './permissions';
+import { PERMISSIONS } from './constants';
 import pluginId from './pluginId';
 import getTrad from './utils/getTrad';
 
@@ -40,7 +40,7 @@ export default {
 
             return component;
           },
-          permissions: pluginPermissions.accessRoles,
+          permissions: PERMISSIONS.accessRoles,
         },
         {
           intlLabel: {
@@ -56,7 +56,7 @@ export default {
 
             return component;
           },
-          permissions: pluginPermissions.readProviders,
+          permissions: PERMISSIONS.readProviders,
         },
         {
           intlLabel: {
@@ -72,7 +72,7 @@ export default {
 
             return component;
           },
-          permissions: pluginPermissions.readEmailTemplates,
+          permissions: PERMISSIONS.readEmailTemplates,
         },
         {
           intlLabel: {
@@ -88,7 +88,7 @@ export default {
 
             return component;
           },
-          permissions: pluginPermissions.readAdvancedSettings,
+          permissions: PERMISSIONS.readAdvancedSettings,
         },
       ]
     );

package/admin/src/pages/AdvancedSettings/index.js

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 
 import {
   Box,
@@ -30,7 +30,7 @@ import { Formik } from 'formik';
 import { useIntl } from 'react-intl';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 
-import pluginPermissions from '../../permissions';
+import { PERMISSIONS } from '../../constants';
 import { getTrad } from '../../utils';
 
 import { fetchData, putAdvancedSettings } from './utils/api';
@@ -38,7 +38,7 @@ import layout from './utils/layout';
 import schema from './utils/schema';
 
 const ProtectedAdvancedSettingsPage = () => (
-  <CheckPagePermissions permissions={pluginPermissions.readAdvancedSettings}>
+  <CheckPagePermissions permissions={PERMISSIONS.readAdvancedSettings}>
     <AdvancedSettingsPage />
   </CheckPagePermissions>
 );
@@ -51,14 +51,10 @@ const AdvancedSettingsPage = () => {
   const queryClient = useQueryClient();
   useFocusWhenNavigate();
 
-  const updatePermissions = useMemo(
-    () => ({ update: pluginPermissions.updateAdvancedSettings }),
-    []
-  );
   const {
     isLoading: isLoadingForPermissions,
     allowedActions: { canUpdate },
-  } = useRBAC(updatePermissions);
+  } = useRBAC({ update: PERMISSIONS.updateAdvancedSettings });
 
   const { status: isLoadingData, data } = useQuery('advanced', () => fetchData(), {
     onSuccess() {
@@ -146,7 +142,7 @@ const AdvancedSettingsPage = () => {
         validationSchema={schema}
         enableReinitialize
       >
-        {({ errors, values, handleChange, isSubmitting }) => {
+        {({ errors, values, handleChange, isSubmitting, dirty }) => {
           return (
             <Form>
               <HeaderLayout
@@ -158,7 +154,7 @@ const AdvancedSettingsPage = () => {
                   <Button
                     loading={isSubmitting}
                     type="submit"
-                    disabled={!canUpdate}
+                    disabled={canUpdate ? !dirty : !canUpdate}
                     startIcon={<Check />}
                     size="S"
                   >

package/admin/src/pages/EmailTemplates/index.js

@@ -1,4 +1,4 @@
-import React, { useMemo, useRef, useState } from 'react';
+import React, { useRef, useState } from 'react';
 
 import { ContentLayout, HeaderLayout, Main, useNotifyAT } from '@strapi/design-system';
 import {
@@ -14,7 +14,7 @@ import {
 import { useIntl } from 'react-intl';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 
-import pluginPermissions from '../../permissions';
+import { PERMISSIONS } from '../../constants';
 import { getTrad } from '../../utils';
 
 import EmailForm from './components/EmailForm';
@@ -22,7 +22,7 @@ import EmailTable from './components/EmailTable';
 import { fetchData, putEmailTemplate } from './utils/api';
 
 const ProtectedEmailTemplatesPage = () => (
-  <CheckPagePermissions permissions={pluginPermissions.readEmailTemplates}>
+  <CheckPagePermissions permissions={PERMISSIONS.readEmailTemplates}>
     <EmailTemplatesPage />
   </CheckPagePermissions>
 );
@@ -40,14 +40,10 @@ const EmailTemplatesPage = () => {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [templateToEdit, setTemplateToEdit] = useState(null);
 
-  const updatePermissions = useMemo(() => {
-    return { update: pluginPermissions.updateEmailTemplates };
-  }, []);
-
   const {
     isLoading: isLoadingForPermissions,
     allowedActions: { canUpdate },
-  } = useRBAC(updatePermissions);
+  } = useRBAC({ update: PERMISSIONS.updateEmailTemplates });
 
   const { status: isLoadingData, data } = useQuery('email-templates', () => fetchData(), {
     onSuccess() {

package/admin/src/pages/Providers/index.js

@@ -35,7 +35,7 @@ import { useIntl } from 'react-intl';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 
 import FormModal from '../../components/FormModal';
-import pluginPermissions from '../../permissions';
+import { PERMISSIONS } from '../../constants';
 import { getTrad } from '../../utils';
 
 import { fetchData, putProvider } from './utils/api';
@@ -55,14 +55,10 @@ export const ProvidersPage = () => {
   const toggleNotification = useNotification();
   const { lockApp, unlockApp } = useOverlayBlocker();
 
-  const updatePermissions = useMemo(() => {
-    return { update: pluginPermissions.updateProviders };
-  }, []);
-
   const {
     isLoading: isLoadingForPermissions,
     allowedActions: { canUpdate },
-  } = useRBAC(updatePermissions);
+  } = useRBAC({ update: PERMISSIONS.updateProviders });
 
   const {
     isLoading: isLoadingForData,
@@ -267,7 +263,7 @@ export const ProvidersPage = () => {
 };
 
 const ProtectedProvidersPage = () => (
-  <CheckPagePermissions permissions={pluginPermissions.readProviders}>
+  <CheckPagePermissions permissions={PERMISSIONS.readProviders}>
     <ProvidersPage />
   </CheckPagePermissions>
 );

package/admin/src/pages/Roles/ListPage/index.js

@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import React, { useState } from 'react';
 
 import {
   ActionLayout,
@@ -33,10 +33,10 @@ import {
 } from '@strapi/helper-plugin';
 import { Plus } from '@strapi/icons';
 import { useIntl } from 'react-intl';
-import { useMutation, useQuery, useQueryClient } from 'react-query';
+import { useMutation, useQuery } from 'react-query';
 import { useHistory } from 'react-router-dom';
 
-import permissions from '../../../permissions';
+import { PERMISSIONS } from '../../../constants';
 import pluginId from '../../../pluginId';
 import { getTrad } from '../../../utils';
 
@@ -56,26 +56,21 @@ const RoleListPage = () => {
   const [roleToDelete, setRoleToDelete] = useState();
   useFocusWhenNavigate();
 
-  const queryClient = useQueryClient();
-
-  const updatePermissions = useMemo(() => {
-    return {
-      create: permissions.createRole,
-      read: permissions.readRoles,
-      update: permissions.updateRole,
-      delete: permissions.deleteRole,
-    };
-  }, []);
-
   const {
     isLoading: isLoadingForPermissions,
     allowedActions: { canRead, canDelete },
-  } = useRBAC(updatePermissions);
+  } = useRBAC({
+    create: PERMISSIONS.createRole,
+    read: PERMISSIONS.readRoles,
+    update: PERMISSIONS.updateRole,
+    delete: PERMISSIONS.deleteRole,
+  });
 
   const {
     isLoading: isLoadingForData,
     data: { roles },
     isFetching,
+    refetch,
   } = useQuery('get-roles', () => fetchData(toggleNotification, notifyStatus), {
     initialData: {},
     enabled: canRead,
@@ -121,7 +116,7 @@ const RoleListPage = () => {
 
   const deleteMutation = useMutation((id) => deleteData(id, toggleNotification), {
     async onSuccess() {
-      await queryClient.invalidateQueries('get-roles');
+      await refetch();
     },
   });
 
@@ -157,7 +152,7 @@ const RoleListPage = () => {
             defaultMessage: 'List of roles',
           })}
           primaryAction={
-            <CheckPermissions permissions={permissions.createRole}>
+            <CheckPermissions permissions={PERMISSIONS.createRole}>
               <Button onClick={handleNewRoleClick} startIcon={<Plus />} size="S">
                 {formatMessage({
                   id: getTrad('List.button.roles'),
@@ -220,7 +215,7 @@ const RoleListPage = () => {
               <TableBody
                 sortedRoles={sortedRoles}
                 canDelete={canDelete}
-                permissions={permissions}
+                permissions={PERMISSIONS}
                 setRoleToDelete={setRoleToDelete}
                 onDelete={[showConfirmDelete, setShowConfirmDelete]}
               />

package/admin/src/pages/Roles/ProtectedCreatePage.js

@@ -2,12 +2,12 @@ import React from 'react';
 
 import { CheckPagePermissions } from '@strapi/helper-plugin';
 
-import pluginPermissions from '../../permissions';
+import { PERMISSIONS } from '../../constants';
 
 import RolesCreatePage from './CreatePage';
 
 const ProtectedRolesCreatePage = () => (
-  <CheckPagePermissions permissions={pluginPermissions.createRole}>
+  <CheckPagePermissions permissions={PERMISSIONS.createRole}>
     <RolesCreatePage />
   </CheckPagePermissions>
 );

package/admin/src/pages/Roles/ProtectedEditPage.js

@@ -2,12 +2,12 @@ import React from 'react';
 
 import { CheckPagePermissions } from '@strapi/helper-plugin';
 
-import pluginPermissions from '../../permissions';
+import { PERMISSIONS } from '../../constants';
 
 import RolesEditPage from './EditPage';
 
 const ProtectedRolesEditPage = () => (
-  <CheckPagePermissions permissions={pluginPermissions.updateRole}>
+  <CheckPagePermissions permissions={PERMISSIONS.updateRole}>
     <RolesEditPage />
   </CheckPagePermissions>
 );

package/admin/src/pages/Roles/ProtectedListPage.js

@@ -2,13 +2,13 @@ import React from 'react';
 
 import { CheckPagePermissions } from '@strapi/helper-plugin';
 
-import pluginPermissions from '../../permissions';
+import { PERMISSIONS } from '../../constants';
 
 import RolesListPage from './ListPage';
 
 const ProtectedRolesListPage = () => {
   return (
-    <CheckPagePermissions permissions={pluginPermissions.accessRoles}>
+    <CheckPagePermissions permissions={PERMISSIONS.accessRoles}>
       <RolesListPage />
     </CheckPagePermissions>
   );

package/admin/src/pages/Roles/index.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { AnErrorOccurred, CheckPagePermissions } from '@strapi/helper-plugin';
 import { Route, Switch } from 'react-router-dom';
 
-import pluginPermissions from '../../permissions';
+import { PERMISSIONS } from '../../constants';
 import pluginId from '../../pluginId';
 
 import ProtectedRolesCreatePage from './ProtectedCreatePage';
@@ -12,7 +12,7 @@ import ProtectedRolesListPage from './ProtectedListPage';
 
 const Roles = () => {
   return (
-    <CheckPagePermissions permissions={pluginPermissions.accessRoles}>
+    <CheckPagePermissions permissions={PERMISSIONS.accessRoles}>
       <Switch>
         <Route
           path={`/settings/${pluginId}/roles/new`}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.11.2",
+  "version": "4.11.4",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -29,10 +29,10 @@
     "lint": "run -T eslint ."
   },
   "dependencies": {
-    "@strapi/design-system": "1.8.0",
-    "@strapi/helper-plugin": "4.11.2",
-    "@strapi/icons": "1.8.0",
-    "@strapi/utils": "4.11.2",
+    "@strapi/design-system": "1.8.1",
+    "@strapi/helper-plugin": "4.11.4",
+    "@strapi/icons": "1.8.1",
+    "@strapi/utils": "4.11.4",
     "bcryptjs": "2.4.3",
     "formik": "2.4.0",
     "grant-koa": "5.4.8",
@@ -77,5 +77,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "6f7c815c2bbe41dda7d77136eb8df736c028ff67"
+  "gitHead": "8d325a695386ab9b578b360bf768cfa25173050f"
 }