@strapi/admin 4.15.0-alpha.0 → 4.15.0

package/ee/server/controllers/user.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // eslint-disable-next-line node/no-extraneous-require
-const ee = require('@strapi/strapi/dist/utils/ee').default;
+const ee = require('@strapi/strapi/dist/utils/ee');
 const _ = require('lodash');
 const { pick, isNil } = require('lodash/fp');
 const { ApplicationError, ForbiddenError } = require('@strapi/utils').errors;

package/ee/server/destroy.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { features } = require('@strapi/strapi/dist/utils/ee').default;
+const { features } = require('@strapi/strapi/dist/utils/ee');
 const executeCEDestroy = require('../../server/destroy');
 
 module.exports = async ({ strapi }) => {

package/ee/server/register.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { features } = require('@strapi/strapi/dist/utils/ee').default;
+const { features } = require('@strapi/strapi/dist/utils/ee');
 const executeCERegister = require('../../server/register');
 const migrateAuditLogsTable = require('./migrations/audit-logs-table');
 const migrateReviewWorkflowStagesColor = require('./migrations/review-workflows-stages-color');

package/ee/server/routes/utils.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { features } = require('@strapi/strapi/dist/utils/ee').default;
+const { features } = require('@strapi/strapi/dist/utils/ee');
 
 const enableFeatureMiddleware = (featureName) => (ctx, next) => {
   if (features.isEnabled(featureName)) {

package/ee/server/services/audit-logs.js

@@ -2,7 +2,7 @@
 
 const localProvider = require('@strapi/provider-audit-logs-local');
 const { scheduleJob } = require('node-schedule');
-const { features } = require('@strapi/strapi/dist/utils/ee').default;
+const { features } = require('@strapi/strapi/dist/utils/ee');
 
 const DEFAULT_RETENTION_DAYS = 90;
 

package/ee/server/services/passport/sso.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const ee = require('@strapi/strapi/dist/utils/ee').default;
+const ee = require('@strapi/strapi/dist/utils/ee');
 const { authEventsMapper } = require('../../../../server/services/passport');
 const createProviderRegistry = require('./provider-registry');
 

package/ee/server/services/passport.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // eslint-disable-next-line node/no-extraneous-require
-const { features } = require('@strapi/strapi/dist/utils/ee').default;
+const { features } = require('@strapi/strapi/dist/utils/ee');
 
 const { UnauthorizedError } = require('@strapi/utils').errors;
 const createLocalStrategy = require('../../../server/services/passport/local-strategy');

package/ee/server/services/seat-enforcement.js

@@ -1,7 +1,7 @@
 'use strict';
 
 // eslint-disable-next-line node/no-extraneous-require
-const ee = require('@strapi/strapi/dist/utils/ee').default;
+const ee = require('@strapi/strapi/dist/utils/ee');
 const { take, drop, map, prop, pick, reverse, isNil } = require('lodash/fp');
 const { getService } = require('../../../server/utils');
 const { SUPER_ADMIN_CODE } = require('../../../server/services/constants');

package/ee/server/utils/sso-lock.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { features } = require('@strapi/strapi/dist/utils/ee').default;
+const { features } = require('@strapi/strapi/dist/utils/ee');
 const { isEmpty } = require('lodash/fp');
 
 const isSsoLocked = async (user) => {

package/ee/server/validation/role.js

@@ -2,7 +2,7 @@
 
 const { yup, validateYupSchema } = require('@strapi/utils');
 // eslint-disable-next-line node/no-extraneous-require
-const { features } = require('@strapi/strapi/dist/utils/ee').default;
+const { features } = require('@strapi/strapi/dist/utils/ee');
 
 const roleCreateSchema = yup
   .object()

package/ee/server/validation/user.js

@@ -2,7 +2,7 @@
 
 const { yup, validateYupSchema } = require('@strapi/utils');
 // eslint-disable-next-line node/no-extraneous-require
-const { features } = require('@strapi/strapi/dist/utils/ee').default;
+const { features } = require('@strapi/strapi/dist/utils/ee');
 const { schemas } = require('../../../server/validation/user');
 
 const ssoUserCreationInputExtension = yup

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.15.0-alpha.0",
+  "version": "4.15.0",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -23,34 +23,37 @@
   "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",
-    "lint": "run -T eslint ."
+    "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",
+    "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.15.0-alpha.0",
-    "@strapi/design-system": "1.11.0",
-    "@strapi/helper-plugin": "4.15.0-alpha.0",
-    "@strapi/icons": "1.11.0",
-    "@strapi/permissions": "4.15.0-alpha.0",
-    "@strapi/provider-audit-logs-local": "4.15.0-alpha.0",
-    "@strapi/typescript-utils": "4.15.0-alpha.0",
-    "@strapi/utils": "4.15.0-alpha.0",
+    "@reduxjs/toolkit": "1.9.7",
+    "@strapi/data-transfer": "4.15.0",
+    "@strapi/design-system": "1.13.0",
+    "@strapi/helper-plugin": "4.15.0",
+    "@strapi/icons": "1.13.0",
+    "@strapi/permissions": "4.15.0",
+    "@strapi/provider-audit-logs-local": "4.15.0",
+    "@strapi/types": "4.15.0",
+    "@strapi/typescript-utils": "4.15.0",
+    "@strapi/utils": "4.15.0",
     "axios": "1.5.0",
     "bcryptjs": "2.4.3",
     "browserslist": "^4.22.1",
@@ -66,7 +69,7 @@
     "execa": "5.1.1",
     "fast-deep-equal": "3.1.3",
     "find-root": "1.1.0",
-    "fork-ts-checker-webpack-plugin": "7.3.0",
+    "fork-ts-checker-webpack-plugin": "8.0.0",
     "formik": "2.4.0",
     "fractional-indexing": "3.2.0",
     "fs-extra": "10.0.0",
@@ -114,8 +117,6 @@
     "react-router-dom": "5.3.4",
     "react-select": "5.7.0",
     "react-window": "1.8.8",
-    "redux": "^4.2.1",
-    "reselect": "4.1.7",
     "rimraf": "3.0.2",
     "sanitize-html": "2.11.0",
     "semver": "7.5.4",
@@ -133,6 +134,7 @@
     "yup": "0.32.9"
   },
   "devDependencies": {
+    "@strapi/admin-test-utils": "4.15.0",
     "@testing-library/dom": "9.2.0",
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
@@ -146,21 +148,25 @@
     "@strapi/strapi": "^4.3.4"
   },
   "engines": {
-    "node": ">=16.0.0 <=20.x.x",
+    "node": ">=18.0.0 <=20.x.x",
     "npm": ">=6.0.0"
   },
   "nx": {
     "targets": {
       "build": {
         "outputs": [
-          "./build"
+          "{projectRoot}/build"
         ]
       }
     },
     "implicitDependencies": [
+      "@strapi/plugin-email",
+      "@strapi/plugin-content-manager",
+      "@strapi/plugin-content-type-builder",
+      "@strapi/plugin-upload",
       "!@strapi/data-transfer",
       "!@strapi/strapi"
     ]
   },
-  "gitHead": "682a070df9ef90f2aa6966666488e066d61831e2"
+  "gitHead": "6e44e1e68db5153e485e61bdc03f42efb0311406"
 }

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', 'src', 'tsconfig.json');
+  const tsConfigFilePath = path.join(__dirname, '..', 'admin', 'tsconfig.build.json');
 
   /**
    * We _always_ install these FE plugins, they're considered "core"
@@ -94,7 +94,11 @@ const buildAdmin = async () => {
                 return acc + error.message;
               }
 
-              return acc + error.join('\n\n');
+              if (Array.isArray(error)) {
+                return acc + error.join('\n\n');
+              }
+
+              return acc + error;
             }, '')
           )
         );

package/server/controllers/admin.js

@@ -8,7 +8,7 @@ const { exists } = require('fs-extra');
 const { env } = require('@strapi/utils');
 const { isUsingTypeScript } = require('@strapi/typescript-utils');
 // eslint-disable-next-line node/no-extraneous-require
-const ee = require('@strapi/strapi/dist/utils/ee').default;
+const ee = require('@strapi/strapi/dist/utils/ee');
 
 const {
   validateUpdateProjectSettings,
@@ -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/shared/schema.ts

@@ -0,0 +1,9 @@
+import { Schema } from '@strapi/types';
+
+export interface ContentType extends Schema.ContentType {
+    isDisplayed: boolean;
+}
+
+export interface Component extends Schema.Component {
+    isDisplayed: boolean;
+}

package/webpack.config.js

@@ -91,6 +91,7 @@ module.exports = ({
           options: {
             loader: 'tsx',
             target: buildTarget,
+            jsx: 'automatic',
           },
         },
         {

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

@@ -1,120 +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 NpsSurvey from '../NpsSurvey';
-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}>
-        <NpsSurvey />
-        <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/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;