@strapi/admin 4.11.1-beta.2 → 4.11.2

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/ReviewWorkflows.js

@@ -1,9 +1,6 @@
 import React, { useEffect, useState } from 'react';
-import { FormikProvider, useFormik, Form } from 'formik';
-import { useIntl } from 'react-intl';
-import { useSelector, useDispatch } from 'react-redux';
-import { useMutation } from 'react-query';
 
+import { Button, ContentLayout, HeaderLayout, Layout, Loader, Main } from '@strapi/design-system';
 import {
   CheckPagePermissions,
   ConfirmDialog,
@@ -13,19 +10,23 @@ import {
   useNotification,
   useTracking,
 } from '@strapi/helper-plugin';
-import { Button, ContentLayout, HeaderLayout, Layout, Loader, Main } from '@strapi/design-system';
 import { Check } from '@strapi/icons';
+import { Form, FormikProvider, useFormik } from 'formik';
+import { useIntl } from 'react-intl';
+import { useMutation } from 'react-query';
+import { useDispatch, useSelector } from 'react-redux';
 
-import { Stages } from './components/Stages';
-import { reducer, initialState } from './reducer';
-import { REDUX_NAMESPACE, DRAG_DROP_TYPES } from './constants';
+import { DragLayer } from '../../../../../../admin/src/components/DragLayer';
 import { useInjectReducer } from '../../../../../../admin/src/hooks/useInjectReducer';
-import { useReviewWorkflows } from './hooks/useReviewWorkflows';
-import { setWorkflows } from './actions';
-import { getWorkflowValidationSchema } from './utils/getWorkflowValidationSchema';
 import adminPermissions from '../../../../../../admin/src/permissions';
+
+import { setWorkflows } from './actions';
 import { StageDragPreview } from './components/StageDragPreview';
-import { DragLayer } from '../../../../../../admin/src/components/DragLayer';
+import { Stages } from './components/Stages';
+import { DRAG_DROP_TYPES, REDUX_NAMESPACE } from './constants';
+import { useReviewWorkflows } from './hooks/useReviewWorkflows';
+import { initialState, reducer } from './reducer';
+import { getWorkflowValidationSchema } from './utils/getWorkflowValidationSchema';
 
 function renderDragLayerItem({ type, item }) {
   switch (type) {

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/actions/index.js

@@ -1,7 +1,7 @@
 import {
-  ACTION_SET_WORKFLOWS,
-  ACTION_DELETE_STAGE,
   ACTION_ADD_STAGE,
+  ACTION_DELETE_STAGE,
+  ACTION_SET_WORKFLOWS,
   ACTION_UPDATE_STAGE,
   ACTION_UPDATE_STAGE_POSITION,
 } from '../constants';

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/AddStage/AddStage.js

@@ -1,9 +1,9 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import styled from 'styled-components';
 
 import { Box, Flex, Typography } from '@strapi/design-system';
 import { PlusCircle } from '@strapi/icons';
+import PropTypes from 'prop-types';
+import styled from 'styled-components';
 
 const StyledAddIcon = styled(PlusCircle)`
   > circle {

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/StageDragPreview/StageDragPreview.js

@@ -1,9 +1,10 @@
 import * as React from 'react';
-import PropTypes from 'prop-types';
-import styled from 'styled-components';
+
 import { Flex, Typography } from '@strapi/design-system';
-import { CarretDown } from '@strapi/icons';
 import { pxToRem } from '@strapi/helper-plugin';
+import { CarretDown } from '@strapi/icons';
+import PropTypes from 'prop-types';
+import styled from 'styled-components';
 
 const Toggle = styled(Flex)`
   svg path {

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js

@@ -1,31 +1,32 @@
 import * as React from 'react';
-import PropTypes from 'prop-types';
-import { useField } from 'formik';
-import { useIntl } from 'react-intl';
-import { useDispatch } from 'react-redux';
+
 import {
   Accordion,
-  AccordionToggle,
   AccordionContent,
+  AccordionToggle,
   Box,
   Flex,
   Grid,
   GridItem,
   IconButton,
-  TextInput,
-  VisuallyHidden,
   SingleSelect,
   SingleSelectOption,
+  TextInput,
+  VisuallyHidden,
 } from '@strapi/design-system';
 import { useTracking } from '@strapi/helper-plugin';
 import { Drag, Trash } from '@strapi/icons';
+import { useField } from 'formik';
+import PropTypes from 'prop-types';
 import { getEmptyImage } from 'react-dnd-html5-backend';
+import { useIntl } from 'react-intl';
+import { useDispatch } from 'react-redux';
 
-import { deleteStage, updateStagePosition, updateStage } from '../../../actions';
-import { getAvailableStageColors, getStageColorByHex } from '../../../utils/colors';
 import { useDragAndDrop } from '../../../../../../../../../admin/src/content-manager/hooks';
 import { composeRefs } from '../../../../../../../../../admin/src/content-manager/utils';
+import { deleteStage, updateStage, updateStagePosition } from '../../../actions';
 import { DRAG_DROP_TYPES } from '../../../constants';
+import { getAvailableStageColors, getStageColorByHex } from '../../../utils/colors';
 
 const AVAILABLE_COLORS = getAvailableStageColors();
 

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stages.js

@@ -1,13 +1,15 @@
 import React from 'react';
+
+import { Box, Flex } from '@strapi/design-system';
+import { useTracking } from '@strapi/helper-plugin';
 import PropTypes from 'prop-types';
-import styled from 'styled-components';
 import { useIntl } from 'react-intl';
 import { useDispatch } from 'react-redux';
-import { Box, Flex } from '@strapi/design-system';
-import { useTracking } from '@strapi/helper-plugin';
+import styled from 'styled-components';
 
 import { addStage } from '../../actions';
 import { AddStage } from '../AddStage';
+
 import { Stage } from './Stage';
 
 const StagesContainer = styled(Box)`

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/hooks/useReviewWorkflows.js

@@ -1,6 +1,6 @@
-import { useQuery } from 'react-query';
 import { useFetchClient } from '@strapi/helper-plugin';
 import { stringify } from 'qs';
+import { useQuery } from 'react-query';
 
 export function useReviewWorkflows(params = {}) {
   const { id = '', ...queryParams } = params;

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/index.js

@@ -2,9 +2,9 @@ import { current, produce } from 'immer';
 import isEqual from 'lodash/isEqual';
 
 import {
-  ACTION_SET_WORKFLOWS,
-  ACTION_DELETE_STAGE,
   ACTION_ADD_STAGE,
+  ACTION_DELETE_STAGE,
+  ACTION_SET_WORKFLOWS,
   ACTION_UPDATE_STAGE,
   ACTION_UPDATE_STAGE_POSITION,
   STAGE_COLOR_DEFAULT,

package/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js

@@ -1,33 +1,36 @@
 import React, { useEffect } from 'react';
+
 import {
-  CheckPagePermissions,
-  SettingsPageTitle,
-  useRBAC,
-  LoadingIndicatorPage,
-  useFocusWhenNavigate,
-} from '@strapi/helper-plugin';
-import { Check } from '@strapi/icons';
-import {
+  Button,
   ContentLayout,
+  Flex,
+  Grid,
+  GridItem,
   HeaderLayout,
   Layout,
-  Button,
   Main,
-  Typography,
-  ToggleInput,
-  Select,
-  Option,
-  Grid,
-  GridItem,
-  Flex,
   MultiSelect,
   MultiSelectOption,
+  Option,
+  Select,
+  ToggleInput,
+  Typography,
 } from '@strapi/design-system';
-import { useIntl } from 'react-intl';
+import {
+  CheckPagePermissions,
+  LoadingIndicatorPage,
+  SettingsPageTitle,
+  useFocusWhenNavigate,
+  useRBAC,
+} from '@strapi/helper-plugin';
+import { Check } from '@strapi/icons';
 import isEqual from 'lodash/isEqual';
-import { getRequestUrl } from '../../../../../../admin/src/utils';
+import { useIntl } from 'react-intl';
+
 import { useRolesList, useSettingsForm } from '../../../../../../admin/src/hooks';
 import adminPermissions from '../../../../../../admin/src/permissions';
+import { getRequestUrl } from '../../../../../../admin/src/utils';
+
 import schema from './utils/schema';
 
 const ssoPermissions = {

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js

@@ -1,9 +1,11 @@
 import React from 'react';
-import { useIntl } from 'react-intl';
-import PropTypes from 'prop-types';
-import { Flex, Button, Tooltip, Icon } from '@strapi/design-system';
+
+import { Button, Flex, Icon, Tooltip } from '@strapi/design-system';
 import { Envelop, ExclamationMarkCircle } from '@strapi/icons';
 import isNil from 'lodash/isNil';
+import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+
 import { useLicenseLimits } from '../../../../../../hooks';
 
 const CreateAction = ({ onClick }) => {

package/ee/admin/pages/SettingsPage/pages/Users/components/MagicLink/index.js

@@ -1,6 +1,8 @@
 import React from 'react';
-import { useIntl } from 'react-intl';
+
 import PropTypes from 'prop-types';
+import { useIntl } from 'react-intl';
+
 import basename from '../../../../../../../../admin/src/core/utils/basename';
 import MagicLinkWrapper from '../../../../../../../../admin/src/pages/SettingsPage/pages/Users/components/MagicLink/MagicLinkWrapper';
 

package/ee/server/utils/persisted-tables.js

@@ -59,49 +59,36 @@ async function addPersistTables({ strapi }, tableNames) {
 }
 
 /**
- * Remove tables name from the reserved tables in core store
+ * Get all reserved table names from the core store
  * @param {Object} ctx
  * @param {Strapi} ctx.strapi
- * @param {Array<string>} tableNames
- * @return {Promise<void>}
+ * @param {RegExp} regex
+ * @returns {Promise<string[]>}
  */
-async function removePersistedTables({ strapi }, tableNames) {
-  const persistedTables = await getPersistedTables({ strapi });
-
-  // Get new tables to be persisted, remove tables if they already were persisted
-  const newPersistedTables = differenceWith(
-    (t1, t2) => t1.name === t2,
-    persistedTables,
-    tableNames
-  );
 
-  if (newPersistedTables.length === persistedTables.length) {
-    return;
-  }
-
-  await strapi.store.set({
+async function getPersistedTables({ strapi }) {
+  const persistedTables = await strapi.store.get({
     type: 'core',
     key: 'persisted_tables',
-    value: newPersistedTables,
   });
+
+  return (persistedTables || []).map(transformTableName);
 }
 
 /**
- * Get all reserved table names from the core store
+ * Set all reserved table names in the core store
  * @param {Object} ctx
  * @param {Strapi} ctx.strapi
- * @returns {Promise<string[]>}
+ * @param {Array<string|{ table: string; dependsOn?: Array<{ table: string;}> }>} tableNames
+ * @returns {Promise<void>}
  */
-
-async function getPersistedTables({ strapi }) {
-  const persistedTables = await strapi.store.get({
+async function setPersistedTables({ strapi }, tableNames) {
+  await strapi.store.set({
     type: 'core',
     key: 'persisted_tables',
+    value: tableNames,
   });
-
-  return (persistedTables || []).map(transformTableName);
 }
-
 /**
  * Add all table names that start with a prefix to the reserved tables in
  * core store
@@ -123,11 +110,17 @@ const persistTablesWithPrefix = async (tableNamePrefix) => {
  */
 const removePersistedTablesWithSuffix = async (tableNameSuffix) => {
   const tableNameRegex = new RegExp(`.*${tableNameSuffix}$`);
-  const tableNames = await findTables({ strapi }, tableNameRegex);
-  if (!tableNames.length) {
+  const persistedTables = await getPersistedTables({ strapi });
+
+  const filteredPersistedTables = persistedTables.filter((table) => {
+    return !tableNameRegex.test(table.name);
+  });
+
+  if (filteredPersistedTables.length === persistedTables.length) {
     return;
   }
-  await removePersistedTables({ strapi }, tableNames);
+
+  await setPersistedTables({ strapi }, filteredPersistedTables);
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.11.1-beta.2",
+  "version": "4.11.2",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -48,15 +48,15 @@
     "@casl/ability": "^5.4.3",
     "@fingerprintjs/fingerprintjs": "3.4.1",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/babel-plugin-switch-ee-ce": "4.11.1-beta.2",
-    "@strapi/data-transfer": "4.11.1-beta.2",
+    "@strapi/babel-plugin-switch-ee-ce": "4.11.2",
+    "@strapi/data-transfer": "4.11.2",
     "@strapi/design-system": "1.8.0",
-    "@strapi/helper-plugin": "4.11.1-beta.2",
+    "@strapi/helper-plugin": "4.11.2",
     "@strapi/icons": "1.8.0",
-    "@strapi/permissions": "4.11.1-beta.2",
-    "@strapi/provider-audit-logs-local": "4.11.1-beta.2",
-    "@strapi/typescript-utils": "4.11.1-beta.2",
-    "@strapi/utils": "4.11.1-beta.2",
+    "@strapi/permissions": "4.11.2",
+    "@strapi/provider-audit-logs-local": "4.11.2",
+    "@strapi/typescript-utils": "4.11.2",
+    "@strapi/utils": "4.11.2",
     "axios": "1.4.0",
     "babel-loader": "^9.1.2",
     "babel-plugin-styled-components": "2.1.1",
@@ -163,5 +163,5 @@
       }
     }
   },
-  "gitHead": "0b01fbf9cc6729527d823c9c36c0065d660965c1"
+  "gitHead": "6f7c815c2bbe41dda7d77136eb8df736c028ff67"
 }

package/server/strategies/api-token.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { castArray, isNil, isEmpty } = require('lodash/fp');
+const { castArray, isNil } = require('lodash/fp');
 const { UnauthorizedError, ForbiddenError } = require('@strapi/utils').errors;
 const constants = require('../services/constants');
 const { getService } = require('../utils');
@@ -78,13 +78,6 @@ const authenticate = async (ctx) => {
 const verify = (auth, config) => {
   const { credentials: apiToken, ability } = auth;
 
-  strapi.telemetry.send('didReceiveAPIRequest', {
-    eventProperties: {
-      authenticationMethod: auth?.strategy?.name || 'api-token',
-      isAuthenticated: !isEmpty(apiToken),
-    },
-  });
-
   if (!apiToken) {
     throw new UnauthorizedError('Token not found');
   }

package/admin/src/hooks/useSettingsMenu/init.js

@@ -1,34 +0,0 @@
-import omit from 'lodash/omit';
-import sortLinks from './utils/sortLinks';
-import formatLinks from './utils/formatLinks';
-import adminLinks from './utils/adminLinks';
-import globalLinks from './utils/globalLinks';
-
-const init = (initialState, { settings, shouldUpdateStrapi }) => {
-  // Retrieve the links that will be injected into the global section
-  const pluginsGlobalLinks = settings.global.links;
-  // Sort the links by name
-  const sortedGlobalLinks = sortLinks([...pluginsGlobalLinks, ...globalLinks]).map((link) => ({
-    ...link,
-    hasNotification: link.id === '000-application-infos' && shouldUpdateStrapi,
-  }));
-
-  const otherSections = Object.values(omit(settings, 'global'));
-
-  const menu = [
-    {
-      ...settings.global,
-      links: sortedGlobalLinks,
-    },
-    {
-      id: 'permissions',
-      intlLabel: { id: 'Settings.permissions', defaultMessage: 'Administration Panel' },
-      links: adminLinks,
-    },
-    ...otherSections,
-  ];
-
-  return { ...initialState, menu: formatLinks(menu) };
-};
-
-export default init;

package/admin/src/hooks/useSettingsMenu/reducer.js

@@ -1,41 +0,0 @@
-import produce from 'immer';
-import set from 'lodash/set';
-
-const initialState = {
-  menu: [],
-  isLoading: true,
-};
-
-const reducer = (state, action) =>
-  // eslint-disable-next-line consistent-return
-  produce(state, (draftState) => {
-    switch (action.type) {
-      case 'CHECK_PERMISSIONS_SUCCEEDED': {
-        action.data.forEach((checkedPermissions) => {
-          if (checkedPermissions.hasPermission) {
-            set(
-              draftState,
-              ['menu', ...checkedPermissions.path.split('.'), 'isDisplayed'],
-              checkedPermissions.hasPermission
-            );
-          }
-        });
-
-        // Remove the not needed links in each section
-        draftState.menu.forEach((section, sectionIndex) => {
-          draftState.menu[sectionIndex].links = section.links.filter(
-            (link) => link.isDisplayed === true
-          );
-        });
-
-        draftState.isLoading = false;
-        break;
-      }
-
-      default:
-        return draftState;
-    }
-  });
-
-export default reducer;
-export { initialState };

package/admin/src/hooks/useSettingsMenu/utils/adminLinks.js

@@ -1,4 +0,0 @@
-import customAdminLinks from 'ee_else_ce/hooks/useSettingsMenu/utils/customAdminLinks';
-import defaultAdminLinks from './defaultAdminLinks';
-
-export default [...customAdminLinks, ...defaultAdminLinks];

package/admin/src/hooks/useSettingsMenu/utils/customAdminLinks.js

@@ -1 +0,0 @@
-export default [];

package/admin/src/hooks/useSettingsMenu/utils/customGlobalLinks.js

@@ -1 +0,0 @@
-export default [];

package/admin/src/hooks/useSettingsMenu/utils/defaultAdminLinks.js

@@ -1,21 +0,0 @@
-import adminPermissions from '../../../permissions';
-
-const defaultAdminLinks = [
-  {
-    intlLabel: { id: 'global.roles', defaultMessage: 'Roles' },
-    to: '/settings/roles',
-    id: 'roles',
-    isDisplayed: false,
-    permissions: adminPermissions.settings.roles.main,
-  },
-  {
-    intlLabel: { id: 'global.users' },
-    // Init the search params directly
-    to: '/settings/users?pageSize=10&page=1&sort=firstname',
-    id: 'users',
-    isDisplayed: false,
-    permissions: adminPermissions.settings.users.main,
-  },
-];
-
-export default defaultAdminLinks;

package/admin/src/hooks/useSettingsMenu/utils/defaultGlobalLinks.js

@@ -1,34 +0,0 @@
-import adminPermissions from '../../../permissions';
-
-const defaultGlobalLinks = [
-  {
-    intlLabel: { id: 'Settings.application.title', defaultMessage: 'Overview' },
-    to: '/settings/application-infos',
-    id: '000-application-infos',
-    isDisplayed: false,
-    permissions: [],
-  },
-  {
-    intlLabel: { id: 'Settings.webhooks.title', defaultMessage: 'Webhooks' },
-    to: '/settings/webhooks',
-    id: 'webhooks',
-    isDisplayed: false,
-    permissions: adminPermissions.settings.webhooks.main,
-  },
-  {
-    intlLabel: { id: 'Settings.apiTokens.title', defaultMessage: 'API Tokens' },
-    to: '/settings/api-tokens?sort=name:ASC',
-    id: 'api-tokens',
-    isDisplayed: false,
-    permissions: adminPermissions.settings['api-tokens'].main,
-  },
-  {
-    intlLabel: { id: 'Settings.transferTokens.title', defaultMessage: 'Transfer Tokens' },
-    to: '/settings/transfer-tokens?sort=name:ASC',
-    id: 'transfer-tokens',
-    isDisplayed: false,
-    permissions: adminPermissions.settings['transfer-tokens'].main,
-  },
-];
-
-export default defaultGlobalLinks;

package/admin/src/hooks/useSettingsMenu/utils/globalLinks.js

@@ -1,4 +0,0 @@
-import customGlobalLinks from 'ee_else_ce/hooks/useSettingsMenu/utils/customGlobalLinks';
-import defaultGlobalLinks from './defaultGlobalLinks';
-
-export default [...defaultGlobalLinks, ...customGlobalLinks];

package/admin/src/pages/App/utils/customRoutes.js

@@ -1,3 +0,0 @@
-const customRoutes = [];
-
-export default customRoutes;

package/admin/src/pages/App/utils/defaultRoutes.js

@@ -1,3 +0,0 @@
-const defaultRoutes = [];
-
-export default defaultRoutes;

package/admin/src/pages/App/utils/routes.js

@@ -1,4 +0,0 @@
-import customRoutes from 'ee_else_ce/pages/App/utils/customRoutes';
-import defaultRoutes from './defaultRoutes';
-
-export default [...customRoutes, ...defaultRoutes];

package/admin/src/pages/SettingsPage/utils/customRoutes.js

@@ -1,3 +0,0 @@
-const customRoutes = [];
-
-export default customRoutes;

package/admin/src/pages/SettingsPage/utils/routes.js

@@ -1,5 +0,0 @@
-// This file makes it easier to make the difference between the ee and ce version
-import customRoutes from 'ee_else_ce/pages/SettingsPage/utils/customRoutes';
-import defaultRoutes from './defaultRoutes';
-
-export default [...customRoutes, ...defaultRoutes];