@strapi/admin 4.14.4 → 4.14.6

package/build/{webhook-list-page.c88a382b.chunk.js → webhook-list-page.f57285ca.chunk.js}

@@ -1,4 +1,4 @@
-"use strict";(self.webpackChunk_strapi_admin=self.webpackChunk_strapi_admin||[]).push([[4121],{80290:function(R,h,t){t.r(h),t.d(h,{default:function(){return ue}});var e=t(32735),s=t(61489),c=t(15062),u=t(30305),g=t(36150),L=t(99226),S=t(95162),D=t(64092),P=t(95181),l=t(8365),C=t(91779),j=t(56932),U=t(77981),_=t(23699),ee=t(22116),te=t(41013),K=t(45037),i=t(27947),V=t(96669),ne=t(99320),ae=t(1690),k=t(84642),E=t(74512),F=t(8471);const w=F.ZP.div`
+"use strict";(self.webpackChunk_strapi_admin=self.webpackChunk_strapi_admin||[]).push([[4121],{80290:function(R,h,t){t.r(h),t.d(h,{default:function(){return ue}});var e=t(32735),s=t(59407),c=t(15062),u=t(30305),g=t(36150),L=t(99226),S=t(95162),D=t(64092),P=t(95181),l=t(8365),C=t(91779),j=t(56932),U=t(77981),_=t(23699),ee=t(22116),te=t(41013),K=t(45037),i=t(27947),V=t(96669),ne=t(99320),ae=t(1690),k=t(84642),E=t(74512),F=t(8471);const w=F.ZP.div`
   background: ${({theme:o})=>o.colors.danger500};
   border: none;
   border-radius: 16px;

package/jest.config.front.js

@@ -4,4 +4,8 @@ module.exports = {
   preset: '../../../jest-preset.front.js',
   collectCoverageFrom: ['<rootDir>/packages/core/admin/admin/**/*.js'],
   displayName: 'Core admin',
+  moduleNameMapper: {
+    '^@tests/(.*)$': '<rootDir>/admin/tests/$1',
+  },
+  setupFilesAfterEnv: ['./admin/tests/setup.ts'],
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.14.4",
+  "version": "4.14.6",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -23,35 +23,36 @@
   "scripts": {
     "analyze:bundle": "ANALYZE_BUNDLE=true webpack --config webpack.config.dev.js",
     "analyze:deps": "ANALYZE_DEPS=true webpack serve --config webpack.config.dev.js --progress profile",
+    "build": "rimraf build && node ./scripts/build.js",
+    "build:measure": "rimraf build && cross-env MEASURE_BUILD_SPEED=true node ./scripts/build.js",
     "create:plugin-file": "node ./scripts/create-dev-plugins-file.js",
     "develop": "yarn create:plugin-file && yarn develop:webpack",
     "develop:webpack": "cross-env NODE_ENV=development webpack serve --config webpack.config.dev.js --progress profile",
+    "lint": "run -T eslint .",
     "prepublishOnly": "yarn build",
-    "build": "rimraf build && node ./scripts/build.js",
-    "build:measure": "rimraf build && cross-env MEASURE_BUILD_SPEED=true node ./scripts/build.js",
     "test": "echo \"no tests yet\"",
-    "test:unit": "run -T jest",
-    "test:unit:watch": "run -T jest --watch",
     "test:front": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js",
-    "test:front:watch": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
     "test:front:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js",
-    "test:front:watch:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll",
     "test:front:ce:cov": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js --coverage",
+    "test:front:watch": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
+    "test:front:watch:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll",
     "test:ts:front": "run -T tsc -p admin/tsconfig.json",
-    "lint": "run -T eslint ."
+    "test:unit": "run -T jest",
+    "test:unit:watch": "run -T jest --watch"
   },
   "dependencies": {
     "@casl/ability": "6.5.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
     "@radix-ui/react-toolbar": "1.0.4",
-    "@strapi/data-transfer": "4.14.4",
-    "@strapi/design-system": "1.12.0",
-    "@strapi/helper-plugin": "4.14.4",
-    "@strapi/icons": "1.12.0",
-    "@strapi/permissions": "4.14.4",
-    "@strapi/provider-audit-logs-local": "4.14.4",
-    "@strapi/typescript-utils": "4.14.4",
-    "@strapi/utils": "4.14.4",
+    "@strapi/data-transfer": "4.14.6",
+    "@strapi/design-system": "1.12.2",
+    "@strapi/helper-plugin": "4.14.6",
+    "@strapi/icons": "1.12.2",
+    "@strapi/permissions": "4.14.6",
+    "@strapi/provider-audit-logs-local": "4.14.6",
+    "@strapi/types": "4.14.6",
+    "@strapi/typescript-utils": "4.14.6",
+    "@strapi/utils": "4.14.6",
     "axios": "1.5.0",
     "bcryptjs": "2.4.3",
     "browserslist": "^4.22.1",
@@ -134,6 +135,7 @@
     "yup": "0.32.9"
   },
   "devDependencies": {
+    "@strapi/admin-test-utils": "4.14.6",
     "@testing-library/dom": "9.2.0",
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
@@ -159,9 +161,13 @@
       }
     },
     "implicitDependencies": [
+      "@strapi/plugin-email",
+      "@strapi/plugin-content-manager",
+      "@strapi/plugin-content-type-builder",
+      "@strapi/plugin-upload",
       "!@strapi/data-transfer",
       "!@strapi/strapi"
     ]
   },
-  "gitHead": "fbd6e3e3014b1c5eee1d7bb8d65e273318662656"
+  "gitHead": "574e25daf919a547554c96eb3697759634ccbd6b"
 }

package/scripts/build.js

@@ -15,7 +15,7 @@ const smp = new SpeedMeasurePlugin();
 const buildAdmin = async () => {
   const entry = path.join(__dirname, '..', 'admin', 'src');
   const dest = path.join(__dirname, '..', 'build');
-  const tsConfigFilePath = path.join(__dirname, '..', 'admin', 'tsconfig.json');
+  const tsConfigFilePath = path.join(__dirname, '..', 'admin', 'tsconfig.build.json');
 
   /**
    * We _always_ install these FE plugins, they're considered "core"

package/server/controllers/admin.js

@@ -26,11 +26,12 @@ module.exports = {
   // When removing this we need to update the /admin/src/index.js file
   // where we set the strapi.window.isEE value
   async getProjectType() {
+    const flags = strapi.config.get('admin.flags', {});
     // FIXME
     try {
-      return { data: { isEE: strapi.EE, features: ee.features.list() } };
+      return { data: { isEE: strapi.EE, features: ee.features.list(), flags } };
     } catch (err) {
-      return { data: { isEE: false, features: [] } };
+      return { data: { isEE: false, features: [], flags } };
     }
   },
 

package/shared/entities.ts

@@ -0,0 +1,33 @@
+import type { Entity as TEntity } from '@strapi/types';
+
+export interface Entity {
+  id: TEntity.ID;
+  createdAt: string;
+  updatedAt: string;
+}
+
+/**
+ * TODO: is there a way to infer this from the content-type schema?
+ * TODO: define content-type schema for a role.
+ */
+export interface RoleEntity extends Entity {
+  name: string;
+  code: string;
+  description?: string;
+  usersCount?: number;
+}
+
+/**
+ * TODO: is there a way to infer this from the content-type schema?
+ * TODO: define content-type schema for a user.
+ */
+export interface UserEntity extends Entity {
+  firstname: string;
+  lastname?: string;
+  username: null | string;
+  email: string;
+  isActive: boolean;
+  blocked: boolean;
+  preferedLanguage: null | string;
+  roles: RoleEntity[];
+}

package/shared/permissions.ts

@@ -0,0 +1,52 @@
+type Condition = {
+    id: string;
+    displayName: string;
+    category: string;
+}
+
+type Permission = {
+    action: string;
+    displayName: string;
+    plugin: string;
+    subCategory: string;
+}
+
+type ContentTypePermission = {
+    actionId: string;
+    applyToProperties: string[];
+    label: string;
+    subjects: string[];
+}
+
+type ContentTypeSubject = {
+    uid: string;
+    label: string;
+    properties: ContentTypeSubjectProperties[];
+};
+
+type ContentTypeSubjectPropertyChild = {
+    label: string;
+    value: string;
+    required?: boolean;
+}
+
+type ContentTypeSubjectProperties = {
+    label: string;
+    value: string;
+    children: ContentTypeSubjectPropertyChild[];
+}
+
+type ContentTypePermissions = {
+    actions: ContentTypePermission[];
+    subjects: ContentTypeSubject[];
+}
+
+export interface RolePermissions {
+    conditions: Condition[];
+    sections: {
+        plugins: Permission[];
+        settings: Permission[];
+        singleTypes: ContentTypePermissions;
+        collectionTypes: ContentTypePermissions;
+    }
+}

package/admin/src/components/ConfigurationsProvider/index.js

@@ -1,66 +0,0 @@
-import React, { useCallback, useMemo, useReducer } from 'react';
-
-import PropTypes from 'prop-types';
-
-import { ConfigurationsContext } from '../../contexts';
-
-import reducer, { initialState } from './reducer';
-
-const ConfigurationsProvider = ({
-  children,
-  authLogo: defaultAuthLogo,
-  menuLogo: defaultMenuLogo,
-  showReleaseNotification,
-  showTutorials,
-}) => {
-  const [{ menuLogo, authLogo }, dispatch] = useReducer(reducer, initialState);
-
-  const updateProjectSettings = useCallback(
-    ({ menuLogo, authLogo }) => {
-      return dispatch({
-        type: 'UPDATE_PROJECT_SETTINGS',
-        values: {
-          menuLogo: menuLogo || defaultMenuLogo,
-          authLogo: authLogo || defaultAuthLogo,
-        },
-      });
-    },
-    [defaultAuthLogo, defaultMenuLogo]
-  );
-
-  const configurationValue = useMemo(() => {
-    return {
-      logos: {
-        menu: { custom: menuLogo, default: defaultMenuLogo },
-        auth: { custom: authLogo, default: defaultAuthLogo },
-      },
-      updateProjectSettings,
-      showReleaseNotification,
-      showTutorials,
-    };
-  }, [
-    menuLogo,
-    defaultMenuLogo,
-    authLogo,
-    defaultAuthLogo,
-    updateProjectSettings,
-    showReleaseNotification,
-    showTutorials,
-  ]);
-
-  return (
-    <ConfigurationsContext.Provider value={configurationValue}>
-      {children}
-    </ConfigurationsContext.Provider>
-  );
-};
-
-ConfigurationsProvider.propTypes = {
-  authLogo: PropTypes.string.isRequired,
-  children: PropTypes.element.isRequired,
-  menuLogo: PropTypes.string.isRequired,
-  showReleaseNotification: PropTypes.bool.isRequired,
-  showTutorials: PropTypes.bool.isRequired,
-};
-
-export default ConfigurationsProvider;

package/admin/src/components/ConfigurationsProvider/reducer.js

@@ -1,29 +0,0 @@
-/* eslint-disable consistent-return */
-/*
- *
- * ConfigurationsProvider reducer
- *
- */
-
-import produce from 'immer';
-
-const initialState = {
-  menuLogo: null,
-  authLogo: null,
-};
-
-const reducer = (state = initialState, action) =>
-  produce(state, (draftState) => {
-    switch (action.type) {
-      case 'UPDATE_PROJECT_SETTINGS': {
-        Object.assign(draftState, action.values);
-        break;
-      }
-      default: {
-        return draftState;
-      }
-    }
-  });
-
-export default reducer;
-export { initialState };

package/admin/src/components/LanguageProvider/index.js

@@ -1,54 +0,0 @@
-/*
- *
- * LanguageProvider
- *
- * this component connects the redux state language locale to the
- * IntlProvider component and i18n messages (loaded from `app/translations`)
- */
-
-import React, { useEffect, useReducer } from 'react';
-
-import defaultsDeep from 'lodash/defaultsDeep';
-import PropTypes from 'prop-types';
-import { IntlProvider } from 'react-intl';
-
-import LocalesProvider from '../LocalesProvider';
-
-import init from './init';
-import reducer, { initialState } from './reducer';
-import localStorageKey from './utils/localStorageKey';
-
-const LanguageProvider = ({ children, localeNames, messages }) => {
-  const [{ locale }, dispatch] = useReducer(reducer, initialState, () => init(localeNames));
-
-  useEffect(() => {
-    // Set user language in local storage.
-    window.localStorage.setItem(localStorageKey, locale);
-    document.documentElement.setAttribute('lang', locale);
-  }, [locale]);
-
-  const changeLocale = (locale) => {
-    dispatch({
-      type: 'CHANGE_LOCALE',
-      locale,
-    });
-  };
-
-  const appMessages = defaultsDeep(messages[locale], messages.en);
-
-  return (
-    <IntlProvider locale={locale} defaultLocale="en" messages={appMessages} textComponent="span">
-      <LocalesProvider changeLocale={changeLocale} localeNames={localeNames}>
-        {children}
-      </LocalesProvider>
-    </IntlProvider>
-  );
-};
-
-LanguageProvider.propTypes = {
-  children: PropTypes.element.isRequired,
-  localeNames: PropTypes.objectOf(PropTypes.string).isRequired,
-  messages: PropTypes.object.isRequired,
-};
-
-export default LanguageProvider;

package/admin/src/components/LanguageProvider/init.js

@@ -1,13 +0,0 @@
-import localStorageKey from './utils/localStorageKey';
-
-const init = (localeNames) => {
-  const languageFromLocaleStorage = window.localStorage.getItem(localStorageKey);
-  const appLanguage = localeNames[languageFromLocaleStorage] ? languageFromLocaleStorage : 'en';
-
-  return {
-    locale: appLanguage,
-    localeNames,
-  };
-};
-
-export default init;

package/admin/src/components/LanguageProvider/reducer.js

@@ -1,30 +0,0 @@
-/*
- *
- * LanguageProvider reducer
- *
- */
-
-const initialState = {
-  localeNames: { en: 'English' },
-  locale: 'en',
-};
-
-const languageProviderReducer = (state = initialState, action) => {
-  switch (action.type) {
-    case 'CHANGE_LOCALE': {
-      const { locale } = action;
-
-      if (!state.localeNames[locale]) {
-        return state;
-      }
-
-      return { ...state, locale };
-    }
-    default: {
-      return state;
-    }
-  }
-};
-
-export default languageProviderReducer;
-export { initialState };

package/admin/src/components/LanguageProvider/utils/localStorageKey.js

@@ -1,3 +0,0 @@
-const localStorageKey = 'strapi-admin-language';
-
-export default localStorageKey;

package/admin/src/components/LocalesProvider/context.js

@@ -1,5 +0,0 @@
-import { createContext } from 'react';
-
-const LocalesProviderContext = createContext();
-
-export default LocalesProviderContext;

package/admin/src/components/LocalesProvider/index.js

@@ -1,21 +0,0 @@
-import React from 'react';
-
-import PropTypes from 'prop-types';
-
-import LocalesProviderContext from './context';
-
-const LocalesProvider = ({ changeLocale, children, localeNames }) => {
-  return (
-    <LocalesProviderContext.Provider value={{ changeLocale, localeNames }}>
-      {children}
-    </LocalesProviderContext.Provider>
-  );
-};
-
-LocalesProvider.propTypes = {
-  changeLocale: PropTypes.func.isRequired,
-  children: PropTypes.element.isRequired,
-  localeNames: PropTypes.object.isRequired,
-};
-
-export default LocalesProvider;

package/admin/src/components/LocalesProvider/useLocalesProvider.js

@@ -1,11 +0,0 @@
-import { useContext } from 'react';
-
-import LocalesProviderContext from './context';
-
-const useLocalesProvider = () => {
-  const { changeLocale, localeNames, messages } = useContext(LocalesProviderContext);
-
-  return { changeLocale, localeNames, messages };
-};
-
-export default useLocalesProvider;

package/admin/src/components/NpsSurvey/hooks/useNpsSurveySettings.js

@@ -1,17 +0,0 @@
-import { usePersistentState } from '@strapi/helper-plugin';
-
-// Exported to make it available during admin user registration.
-// Because we only enable the NPS for users who subscribe to the newsletter when signing up
-export function useNpsSurveySettings() {
-  const [npsSurveySettings, setNpsSurveySettings] = usePersistentState(
-    'STRAPI_NPS_SURVEY_SETTINGS',
-    {
-      enabled: true,
-      lastResponseDate: null,
-      firstDismissalDate: null,
-      lastDismissalDate: null,
-    }
-  );
-
-  return { npsSurveySettings, setNpsSurveySettings };
-}

package/admin/src/components/PluginsInitializer/index.js

@@ -1,68 +0,0 @@
-import React, { useReducer, useRef } from 'react';
-
-import { LoadingIndicatorPage, useStrapiApp } from '@strapi/helper-plugin';
-
-import Admin from '../../pages/Admin';
-
-import init from './init';
-import reducer, { initialState } from './reducer';
-
-const PluginsInitializer = () => {
-  const { plugins: appPlugins } = useStrapiApp();
-  const [{ plugins }, dispatch] = useReducer(reducer, initialState, () => init(appPlugins));
-  const setPlugin = useRef((pluginId) => {
-    dispatch({ type: 'SET_PLUGIN_READY', pluginId });
-  });
-
-  const hasApluginNotReady = Object.keys(plugins).some(
-    (plugin) => plugins[plugin].isReady === false
-  );
-
-  /**
-   *
-   * I have spent some time trying to understand what is happening here, and wanted to
-   * leave that knowledge for my future me:
-   *
-   * `initializer` is an undocumented property of the `registerPlugin` API. At the time
-   * of writing it seems only to be used by the i18n plugin.
-   *
-   * How does it work?
-   *
-   * Every plugin that has an `initializer` component defined, receives the
-   * `setPlugin` function as a component prop. In the case of i18n the plugin fetches locales
-   * first and calls `setPlugin` with `pluginId` once they are loaded, which then triggers the
-   * reducer of the admin app defined above.
-   *
-   * Once all plugins are set to `isReady: true` the app renders.
-   *
-   * This API is used to block rendering of the admin app. We should remove that in v5 completely
-   * and make sure plugins can inject data into the global store before they are initialized, to avoid
-   * having a new prop-callback based communication channel between plugins and the core admin app.
-   *
-   */
-
-  if (hasApluginNotReady) {
-    const initializers = Object.keys(plugins).reduce((acc, current) => {
-      const InitializerComponent = plugins[current].initializer;
-
-      if (InitializerComponent) {
-        const key = plugins[current].pluginId;
-
-        acc.push(<InitializerComponent key={key} setPlugin={setPlugin.current} />);
-      }
-
-      return acc;
-    }, []);
-
-    return (
-      <>
-        {initializers}
-        <LoadingIndicatorPage />
-      </>
-    );
-  }
-
-  return <Admin />;
-};
-
-export default PluginsInitializer;

package/admin/src/components/PluginsInitializer/init.js

@@ -1,11 +0,0 @@
-const init = (plugins) => {
-  return {
-    plugins: Object.keys(plugins).reduce((acc, current) => {
-      acc[current] = { ...plugins[current] };
-
-      return acc;
-    }, {}),
-  };
-};
-
-export default init;

package/admin/src/components/PluginsInitializer/reducer.js

@@ -1,22 +0,0 @@
-import produce from 'immer';
-import set from 'lodash/set';
-
-const initialState = {
-  plugins: null,
-};
-
-const reducer = (state = initialState, action) =>
-  /* eslint-disable-next-line consistent-return */
-  produce(state, (draftState) => {
-    switch (action.type) {
-      case 'SET_PLUGIN_READY': {
-        set(draftState, ['plugins', action.pluginId, 'isReady'], true);
-        break;
-      }
-      default:
-        return draftState;
-    }
-  });
-
-export { initialState };
-export default reducer;

package/admin/src/contexts/Admin/index.js

@@ -1,5 +0,0 @@
-import { createContext } from 'react';
-
-const AdminContext = createContext({});
-
-export default AdminContext;

package/admin/src/contexts/MarketPlace/index.js

@@ -1,18 +0,0 @@
-import React, { createContext, useContext } from 'react';
-
-import PropTypes from 'prop-types';
-
-const MarketPlaceContext = createContext({});
-
-const MarketPlaceContextProvider = ({ children, ...rest }) => {
-  return <MarketPlaceContext.Provider value={rest}>{children}</MarketPlaceContext.Provider>;
-};
-
-const useMarketPlaceContext = () => useContext(MarketPlaceContext);
-
-MarketPlaceContextProvider.propTypes = {
-  children: PropTypes.node.isRequired,
-  downloadPlugin: PropTypes.func.isRequired,
-};
-
-export { MarketPlaceContext, MarketPlaceContextProvider, useMarketPlaceContext };

package/admin/src/contexts/PermisssionsDataManagerContext/index.js

@@ -1,5 +0,0 @@
-import { createContext } from 'react';
-
-const PermissionsDataManagerContext = createContext({});
-
-export default PermissionsDataManagerContext;

package/admin/src/contexts/index.js

@@ -1,3 +0,0 @@
-export { default as AdminContext } from './Admin';
-export { ConfigurationsContext } from './configuration';
-export { default as PermissionsDataManagerContext } from './PermisssionsDataManagerContext';

package/admin/src/hooks/useAdminRoles/__mocks__/index.js

@@ -1,5 +0,0 @@
-export const useAdminRoles = jest.fn().mockReturnValue({
-  roles: [],
-  isLoading: false,
-  isError: false,
-});

package/admin/src/hooks/useAdminUsers/index.js

@@ -1 +0,0 @@
-export * from './useAdminUsers';