@strapi/admin 4.12.5 → 4.12.6

package/ee/admin/pages/AuthPage/components/Providers/index.js

@@ -11,7 +11,7 @@ import UnauthenticatedLayout, {
   Column,
   LayoutContent,
 } from '../../../../../../admin/src/layouts/UnauthenticatedLayout';
-import { useAuthProviders } from '../../../../hooks';
+import { useAuthProviders } from '../../../../hooks/useAuthProviders';
 
 import SSOProviders from './SSOProviders';
 
@@ -20,17 +20,20 @@ const DividerFull = styled(Divider)`
 `;
 
 const Providers = () => {
-  const ssoEnabled = window.strapi.features.isEnabled(window.strapi.features.SSO);
-
   const { push } = useHistory();
   const { formatMessage } = useIntl();
-  const { isLoading, data: providers } = useAuthProviders({ ssoEnabled });
+  const { isLoading, providers } = useAuthProviders({
+    enabled: window.strapi.features.isEnabled(window.strapi.features.SSO),
+  });
 
   const handleClick = () => {
     push('/auth/login');
   };
 
-  if (!ssoEnabled || (!isLoading && providers.length === 0)) {
+  if (
+    !window.strapi.features.isEnabled(window.strapi.features.SSO) ||
+    (!isLoading && providers.length === 0)
+  ) {
     return <Redirect to="/auth/login" />;
   }
 

package/ee/admin/pages/HomePage/index.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 
 // eslint-disable-next-line import/no-cycle
 import { HomePageCE } from '../../../../admin/src/pages/HomePage';
-import { useLicenseLimitNotification } from '../../hooks';
+import { useLicenseLimitNotification } from '../../hooks/useLicenseLimitNotification';
 
 export function HomePageEE() {
   useLicenseLimitNotification();

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

@@ -1,16 +1,15 @@
-export const ROUTES_EE = [
+import * as React from 'react';
+
+export const SETTINGS_ROUTES_EE = [
   ...(window.strapi.features.isEnabled(window.strapi.features.AUDIT_LOGS)
     ? [
         {
-          async Component() {
-            const component = await import(
+          component: React.lazy(() =>
+            import(
               /* webpackChunkName: "audit-logs-settings-page" */ './pages/AuditLogs/ProtectedListPage'
-            );
-
-            return component;
-          },
-          to: '/settings/audit-logs',
-          exact: true,
+            )
+          ),
+          path: '/settings/audit-logs',
         },
       ]
     : []),
@@ -18,39 +17,30 @@ export const ROUTES_EE = [
   ...(window.strapi.features.isEnabled(window.strapi.features.REVIEW_WORKFLOWS)
     ? [
         {
-          async Component() {
-            const component = await import(
+          component: React.lazy(() =>
+            import(
               /* webpackChunkName: "review-workflows-settings-list-view" */ './pages/ReviewWorkflows/pages/ListView'
-            );
-
-            return component;
-          },
-          to: '/settings/review-workflows',
-          exact: true,
+            )
+          ),
+          path: '/settings/review-workflows',
         },
 
         {
-          async Component() {
-            const component = await import(
+          component: React.lazy(() =>
+            import(
               /* webpackChunkName: "review-workflows-settings-create-view" */ './pages/ReviewWorkflows/pages/CreateView'
-            );
-
-            return component;
-          },
-          to: '/settings/review-workflows/create',
-          exact: true,
+            )
+          ),
+          path: '/settings/review-workflows/create',
         },
 
         {
-          async Component() {
-            const component = await import(
+          component: React.lazy(() =>
+            import(
               /* webpackChunkName: "review-workflows-settings-edit-view" */ './pages/ReviewWorkflows/pages/EditView'
-            );
-
-            return component;
-          },
-          to: '/settings/review-workflows/:workflowId',
-          exact: true,
+            )
+          ),
+          path: '/settings/review-workflows/:workflowId',
         },
       ]
     : []),
@@ -58,15 +48,10 @@ export const ROUTES_EE = [
   ...(window.strapi.features.isEnabled(window.strapi.features.SSO)
     ? [
         {
-          async Component() {
-            const component = await import(
-              /* webpackChunkName: "sso-settings-page" */ './pages/SingleSignOn'
-            );
-
-            return component;
-          },
-          to: '/settings/single-sign-on',
-          exact: true,
+          component: React.lazy(() =>
+            import(/* webpackChunkName: "sso-settings-page" */ './pages/SingleSignOn')
+          ),
+          path: '/settings/single-sign-on',
         },
       ]
     : []),

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

@@ -17,7 +17,7 @@ import { useHistory } from 'react-router-dom';
 
 import { useContentTypes } from '../../../../../../../../admin/src/hooks/useContentTypes';
 import { useInjectReducer } from '../../../../../../../../admin/src/hooks/useInjectReducer';
-import { useLicenseLimits } from '../../../../../../hooks';
+import { useLicenseLimits } from '../../../../../../hooks/useLicenseLimits';
 import { addStage, resetWorkflow } from '../../actions';
 import * as Layout from '../../components/Layout';
 import * as LimitsModal from '../../components/LimitsModal';

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

@@ -19,7 +19,7 @@ import { useParams } from 'react-router-dom';
 import { useContentTypes } from '../../../../../../../../admin/src/hooks/useContentTypes';
 import { useInjectReducer } from '../../../../../../../../admin/src/hooks/useInjectReducer';
 import { selectAdminPermissions } from '../../../../../../../../admin/src/pages/App/selectors';
-import { useLicenseLimits } from '../../../../../../hooks';
+import { useLicenseLimits } from '../../../../../../hooks/useLicenseLimits';
 import { resetWorkflow, setWorkflow } from '../../actions';
 import * as Layout from '../../components/Layout';
 import * as LimitsModal from '../../components/LimitsModal';

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

@@ -35,7 +35,7 @@ import styled from 'styled-components';
 
 import { useContentTypes } from '../../../../../../../../admin/src/hooks/useContentTypes';
 import { selectAdminPermissions } from '../../../../../../../../admin/src/pages/App/selectors';
-import { useLicenseLimits } from '../../../../../../hooks';
+import { useLicenseLimits } from '../../../../../../hooks/useLicenseLimits';
 import * as Layout from '../../components/Layout';
 import * as LimitsModal from '../../components/LimitsModal';
 import { CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME } from '../../constants';

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

@@ -6,7 +6,7 @@ import isNil from 'lodash/isNil';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 
-import { useLicenseLimits } from '../../../../../../hooks';
+import { useLicenseLimits } from '../../../../../../hooks/useLicenseLimits';
 
 export const CreateActionEE = ({ onClick }) => {
   const { formatMessage } = useIntl();

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

@@ -2,7 +2,7 @@ import * as React from 'react';
 
 // eslint-disable-next-line import/no-cycle
 import { UserListPageCE } from '../../../../../../../admin/src/pages/SettingsPage/pages/Users/ListPage';
-import { useLicenseLimitNotification } from '../../../../../hooks';
+import { useLicenseLimitNotification } from '../../../../../hooks/useLicenseLimitNotification';
 
 function UserListPageEE() {
   useLicenseLimitNotification();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.12.5",
+  "version": "4.12.6",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -42,14 +42,14 @@
   "dependencies": {
     "@casl/ability": "^5.4.3",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/data-transfer": "4.12.5",
+    "@strapi/data-transfer": "4.12.6",
     "@strapi/design-system": "1.9.0",
-    "@strapi/helper-plugin": "4.12.5",
+    "@strapi/helper-plugin": "4.12.6",
     "@strapi/icons": "1.9.0",
-    "@strapi/permissions": "4.12.5",
-    "@strapi/provider-audit-logs-local": "4.12.5",
-    "@strapi/typescript-utils": "4.12.5",
-    "@strapi/utils": "4.12.5",
+    "@strapi/permissions": "4.12.6",
+    "@strapi/provider-audit-logs-local": "4.12.6",
+    "@strapi/typescript-utils": "4.12.6",
+    "@strapi/utils": "4.12.6",
     "axios": "1.4.0",
     "bcryptjs": "2.4.3",
     "browserslist": "^4.17.3",
@@ -154,5 +154,5 @@
       }
     }
   },
-  "gitHead": "c1935e70041b440f2a78178c4a9fda79b722d1ab"
+  "gitHead": "9bb6ba1e0d07c65423e99075438262540a042d76"
 }

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

@@ -1,118 +0,0 @@
-import React, { useEffect, useState } from 'react';
-
-import {
-  AppInfoProvider,
-  auth,
-  LoadingIndicatorPage,
-  useGuidedTour,
-  useNotification,
-} from '@strapi/helper-plugin';
-import get from 'lodash/get';
-import { useQueries } from 'react-query';
-//  TODO: DS add loader
-
-import packageJSON from '../../../../package.json';
-import { useConfigurations } from '../../hooks';
-import { getFullName, hashAdminUserEmail } from '../../utils';
-import PluginsInitializer from '../PluginsInitializer';
-import RBACProvider from '../RBACProvider';
-
-import {
-  fetchAppInfo,
-  fetchCurrentUserPermissions,
-  fetchStrapiLatestRelease,
-  fetchUserRoles,
-} from './utils/api';
-import checkLatestStrapiVersion from './utils/checkLatestStrapiVersion';
-
-const strapiVersion = packageJSON.version;
-
-const AuthenticatedApp = () => {
-  const { setGuidedTourVisibility } = useGuidedTour();
-  const toggleNotification = useNotification();
-  const userInfo = auth.getUserInfo();
-  const userName = get(userInfo, 'username') || getFullName(userInfo.firstname, userInfo.lastname);
-  const [userDisplayName, setUserDisplayName] = useState(userName);
-  const [userId, setUserId] = useState(null);
-  const { showReleaseNotification } = useConfigurations();
-  const [
-    { data: appInfos, status },
-    { data: tagName, isLoading },
-    { data: permissions, status: fetchPermissionsStatus, refetch, isFetching },
-    { data: userRoles },
-  ] = useQueries([
-    { queryKey: 'app-infos', queryFn: fetchAppInfo },
-    {
-      queryKey: 'strapi-release',
-      queryFn: () => fetchStrapiLatestRelease(toggleNotification),
-      enabled: showReleaseNotification,
-      initialData: strapiVersion,
-    },
-    {
-      queryKey: 'admin-users-permission',
-      queryFn: fetchCurrentUserPermissions,
-      initialData: [],
-    },
-    {
-      queryKey: 'user-roles',
-      queryFn: fetchUserRoles,
-    },
-  ]);
-
-  const shouldUpdateStrapi = checkLatestStrapiVersion(strapiVersion, tagName);
-
-  /**
-   * TODO: does this actually need to be an effect?
-   */
-  useEffect(() => {
-    if (userRoles) {
-      const isUserSuperAdmin = userRoles.find(({ code }) => code === 'strapi-super-admin');
-
-      if (isUserSuperAdmin && appInfos?.autoReload) {
-        setGuidedTourVisibility(true);
-      }
-    }
-  }, [userRoles, appInfos, setGuidedTourVisibility]);
-
-  useEffect(() => {
-    const getUserId = async () => {
-      const userId = await hashAdminUserEmail(userInfo);
-      setUserId(userId);
-    };
-
-    getUserId();
-  }, [userInfo]);
-
-  // We don't need to wait for the release query to be fetched before rendering the plugins
-  // however, we need the appInfos and the permissions
-  const shouldShowNotDependentQueriesLoader =
-    isFetching || status === 'loading' || fetchPermissionsStatus === 'loading';
-
-  const shouldShowLoader = isLoading || shouldShowNotDependentQueriesLoader;
-
-  if (shouldShowLoader) {
-    return <LoadingIndicatorPage />;
-  }
-
-  // TODO: add error state
-  if (status === 'error') {
-    return <div>error...</div>;
-  }
-
-  return (
-    <AppInfoProvider
-      {...appInfos}
-      userId={userId}
-      latestStrapiReleaseTag={tagName}
-      setUserDisplayName={setUserDisplayName}
-      shouldUpdateStrapi={shouldUpdateStrapi}
-      userDisplayName={userDisplayName}
-    >
-      <RBACProvider permissions={permissions} refetchPermissions={refetch}>
-        <PluginsInitializer />
-      </RBACProvider>
-    </AppInfoProvider>
-  );
-};
-
-export default AuthenticatedApp;

package/admin/src/components/AuthenticatedApp/utils/api.js

@@ -1,85 +0,0 @@
-import { getFetchClient } from '@strapi/helper-plugin';
-
-import packageJSON from '../../../../../package.json';
-
-import checkLatestStrapiVersion from './checkLatestStrapiVersion';
-
-const strapiVersion = packageJSON.version;
-const showUpdateNotif = !JSON.parse(localStorage.getItem('STRAPI_UPDATE_NOTIF'));
-const { get } = getFetchClient();
-
-const fetchStrapiLatestRelease = async (toggleNotification) => {
-  try {
-    const res = await fetch('https://api.github.com/repos/strapi/strapi/releases/latest');
-
-    if (!res.ok) {
-      throw new Error('Failed to fetch latest Strapi version.');
-    }
-    const { tag_name } = await res.json();
-    const shouldUpdateStrapi = checkLatestStrapiVersion(strapiVersion, tag_name);
-
-    if (shouldUpdateStrapi && showUpdateNotif) {
-      toggleNotification({
-        type: 'info',
-        message: { id: 'notification.version.update.message' },
-        link: {
-          url: `https://github.com/strapi/strapi/releases/tag/${tag_name}`,
-          label: {
-            id: 'global.see-more',
-          },
-        },
-        blockTransition: true,
-        onClose: () => localStorage.setItem('STRAPI_UPDATE_NOTIF', true),
-      });
-    }
-
-    return tag_name;
-  } catch (err) {
-    // Don't throw an error
-    return strapiVersion;
-  }
-};
-
-const fetchAppInfo = async () => {
-  try {
-    const { data, headers } = await get('/admin/information');
-
-    if (!headers['content-type'].includes('application/json')) {
-      throw new Error('Not found');
-    }
-
-    return data.data;
-  } catch (error) {
-    throw new Error(error);
-  }
-};
-
-const fetchCurrentUserPermissions = async () => {
-  try {
-    const { data, headers } = await get('/admin/users/me/permissions');
-
-    if (!headers['content-type'].includes('application/json')) {
-      throw new Error('Not found');
-    }
-
-    return data.data;
-  } catch (err) {
-    throw new Error(err);
-  }
-};
-
-const fetchUserRoles = async () => {
-  try {
-    const {
-      data: {
-        data: { roles },
-      },
-    } = await get('/admin/users/me');
-
-    return roles;
-  } catch (err) {
-    throw new Error(err);
-  }
-};
-
-export { fetchAppInfo, fetchCurrentUserPermissions, fetchStrapiLatestRelease, fetchUserRoles };

package/admin/src/components/AuthenticatedApp/utils/checkLatestStrapiVersion.js

@@ -1,11 +0,0 @@
-import semver from 'semver';
-
-const checkLatestStrapiVersion = (currentPackageVersion, latestPublishedVersion) => {
-  if (!semver.valid(currentPackageVersion) || !semver.valid(latestPublishedVersion)) {
-    return false;
-  }
-
-  return semver.lt(currentPackageVersion, latestPublishedVersion);
-};
-
-export default checkLatestStrapiVersion;

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/layouts/AppLayout/index.js

@@ -1,33 +0,0 @@
-import React from 'react';
-
-import { Box, Flex, SkipToContent } from '@strapi/design-system';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import styled from 'styled-components';
-
-const FlexBox = styled(Box)`
-  flex: 1;
-`;
-
-const AppLayout = ({ children, sideNav }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <Box background="neutral100">
-      <SkipToContent>
-        {formatMessage({ id: 'skipToContent', defaultMessage: 'Skip to content' })}
-      </SkipToContent>
-      <Flex alignItems="flex-start">
-        {sideNav}
-        <FlexBox>{children}</FlexBox>
-      </Flex>
-    </Box>
-  );
-};
-
-AppLayout.propTypes = {
-  children: PropTypes.node.isRequired,
-  sideNav: PropTypes.node.isRequired,
-};
-
-export default AppLayout;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/api.js

@@ -1,23 +0,0 @@
-import { getFetchClient } from '@strapi/helper-plugin';
-
-import prefixAllUrls from './prefixAllUrls';
-
-const fetchProjectSettings = async () => {
-  const { get } = getFetchClient();
-  const { data } = await get('/admin/project-settings');
-
-  return prefixAllUrls(data);
-};
-
-const postProjectSettings = async (body) => {
-  const { post } = getFetchClient();
-  const { data } = await post('/admin/project-settings', body, {
-    headers: {
-      'Content-Type': 'multipart/form-data',
-    },
-  });
-
-  return prefixAllUrls(data);
-};
-
-export { fetchProjectSettings, postProjectSettings };

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/utils/prefixAllUrls.js

@@ -1,17 +0,0 @@
-import { prefixFileUrlWithBackendUrl } from '@strapi/helper-plugin';
-import transform from 'lodash/transform';
-
-const prefixAllUrls = (data) =>
-  transform(
-    data,
-    (result, value, key) => {
-      if (value && value.url) {
-        result[key] = { ...value, url: prefixFileUrlWithBackendUrl(value.url) };
-      } else {
-        result[key] = value;
-      }
-    },
-    {}
-  );
-
-export default prefixAllUrls;

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

@@ -1,11 +0,0 @@
-import flatMap from 'lodash/flatMap';
-
-import { createRoute } from '../../../utils';
-
-const createSectionsRoutes = (settings) => {
-  const allLinks = flatMap(settings, (section) => section.links);
-
-  return allLinks.map((link) => createRoute(link.Component, link.to, link.exact || false));
-};
-
-export default createSectionsRoutes;

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

@@ -1,5 +0,0 @@
-const getSectionsToDisplay = (menu) => {
-  return menu.filter((section) => !section.links.every((link) => link.isDisplayed === false));
-};
-
-export default getSectionsToDisplay;

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

@@ -1,2 +0,0 @@
-export { default as createSectionsRoutes } from './createSectionsRoutes';
-export { default as getSectionsToDisplay } from './getSectionsToDisplay';