@strapi/admin 4.11.4 → 4.11.6

package/ee/admin/hooks/useLicenseLimits/useLicenseLimits.js

@@ -0,0 +1,44 @@
+import * as React from 'react';
+
+import { useFetchClient, useRBAC } from '@strapi/helper-plugin';
+import { useQuery } from 'react-query';
+import { useSelector } from 'react-redux';
+
+import { selectAdminPermissions } from '../../../../admin/src/pages/App/selectors';
+
+export function useLicenseLimits() {
+  const permissions = useSelector(selectAdminPermissions);
+  const { get } = useFetchClient();
+  const {
+    isLoading: isRBACLoading,
+    allowedActions: { canRead, canCreate, canUpdate, canDelete },
+  } = useRBAC(permissions.settings.users);
+  const hasPermissions = canRead && canCreate && canUpdate && canDelete;
+
+  const { data, isError, isLoading } = useQuery(
+    ['ee', 'license-limit-info'],
+    async () => {
+      const {
+        data: { data },
+      } = await get('/admin/license-limit-information');
+
+      return data;
+    },
+    {
+      enabled: !isRBACLoading && hasPermissions,
+    }
+  );
+
+  const license = data ?? {};
+
+  const getFeature = React.useCallback(
+    (name) => {
+      const feature = (license?.features ?? []).find((feature) => feature.name === name);
+
+      return feature?.options ?? {};
+    },
+    [license?.features]
+  );
+
+  return { license, getFeature, isError, isLoading };
+}

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

@@ -14,7 +14,7 @@ const DividerFull = styled(Divider)`
   flex: 1;
 `;
 
-const Login = (loginProps) => {
+export const LoginEE = (loginProps) => {
   const ssoEnabled = window.strapi.features.isEnabled(window.strapi.features.SSO);
   const { isLoading, data: providers } = useAuthProviders({ ssoEnabled });
   const { formatMessage } = useIntl();
@@ -49,17 +49,15 @@ const Login = (loginProps) => {
   );
 };
 
-Login.defaultProps = {
+LoginEE.defaultProps = {
   onSubmit: (e) => e.preventDefault(),
   requestError: null,
 };
 
-Login.propTypes = {
+LoginEE.propTypes = {
   formErrors: PropTypes.object.isRequired,
   modifiedData: PropTypes.object.isRequired,
   onChange: PropTypes.func.isRequired,
   onSubmit: PropTypes.func,
   requestError: PropTypes.object,
 };
-
-export default Login;

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

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

package/ee/admin/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js

@@ -11,13 +11,15 @@ import { useLicenseLimits } from '../../../../../../hooks';
 const BILLING_STRAPI_CLOUD_URL = 'https://cloud.strapi.io/profile/billing';
 const BILLING_SELF_HOSTED_URL = 'https://strapi.io/billing/request-seats';
 
-const AdminSeatInfo = () => {
+export const AdminSeatInfoEE = () => {
   const { formatMessage } = useIntl();
-  const { license } = useLicenseLimits();
-  const { licenseLimitStatus, enforcementUserCount, permittedSeats, isHostedOnStrapiCloud } =
-    license?.data ?? {};
+  const {
+    license: { licenseLimitStatus, enforcementUserCount, permittedSeats, isHostedOnStrapiCloud },
+    isError,
+    isLoading,
+  } = useLicenseLimits();
 
-  if (!permittedSeats) {
+  if (isError || isLoading || !permittedSeats) {
     return null;
   }
 
@@ -86,5 +88,3 @@ const AdminSeatInfo = () => {
     </GridItem>
   );
 };
-
-export default AdminSeatInfo;

package/ee/admin/pages/SettingsPage/pages/AuditLogs/ListView/hooks/useAuditLogsData.js

@@ -1,4 +1,4 @@
-import { useFetchClient, useNotification } from '@strapi/helper-plugin';
+import { useFetchClient, useNotification, useQueryParams } from '@strapi/helper-plugin';
 import { useQuery } from 'react-query';
 import { useLocation } from 'react-router-dom';
 
@@ -8,6 +8,7 @@ const useAuditLogsData = ({ canReadAuditLogs, canReadUsers }) => {
   const { get } = useFetchClient();
   const { search } = useLocation();
   const toggleNotification = useNotification();
+  const [{ query }] = useQueryParams();
 
   const queryOptions = {
     keepPreviousData: true,
@@ -35,9 +36,10 @@ const useAuditLogsData = ({ canReadAuditLogs, canReadUsers }) => {
     isError: isAuditLogsError,
   } = useQuery(
     ['auditLogs', search],
-    async ({ queryKey }) => {
-      const search = queryKey[1];
-      const { data } = await get(`/admin/audit-logs${search}`);
+    async () => {
+      const { data } = await get(`/admin/audit-logs`, {
+        params: query,
+      });
 
       return data;
     },

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

@@ -1,5 +1,4 @@
 import { useFetchClient } from '@strapi/helper-plugin';
-import { stringify } from 'qs';
 import { useQuery } from 'react-query';
 
 export function useReviewWorkflows(params = {}) {
@@ -9,7 +8,6 @@ export function useReviewWorkflows(params = {}) {
   };
 
   const { get } = useFetchClient();
-  const queryString = stringify({ ...defaultQueryParams, ...queryParams }, { encode: false });
 
   const { data, isLoading, status, refetch } = useQuery(
     ['review-workflows', 'workflows', id],
@@ -17,9 +15,9 @@ export function useReviewWorkflows(params = {}) {
       try {
         const {
           data: { data },
-        } = await get(
-          `/admin/review-workflows/workflows/${id}${queryString ? `?${queryString}` : ''}`
-        );
+        } = await get(`/admin/review-workflows/workflows/${id}`, {
+          params: { ...defaultQueryParams, ...queryParams },
+        });
 
         return data;
       } catch (err) {

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

@@ -8,10 +8,17 @@ import { useIntl } from 'react-intl';
 
 import { useLicenseLimits } from '../../../../../../hooks';
 
-const CreateAction = ({ onClick }) => {
+export const CreateActionEE = ({ onClick }) => {
   const { formatMessage } = useIntl();
-  const { license } = useLicenseLimits();
-  const { permittedSeats, shouldStopCreate } = license?.data ?? {};
+  const {
+    license: { permittedSeats, shouldStopCreate },
+    isError,
+    isLoading,
+  } = useLicenseLimits();
+
+  if (isError || isLoading) {
+    return null;
+  }
 
   return (
     <Flex gap={2}>
@@ -47,8 +54,6 @@ const CreateAction = ({ onClick }) => {
   );
 };
 
-CreateAction.propTypes = {
+CreateActionEE.propTypes = {
   onClick: PropTypes.func.isRequired,
 };
-
-export default CreateAction;

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

@@ -0,0 +1,13 @@
+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';
+
+function UserListPageEE() {
+  useLicenseLimitNotification();
+
+  return <UserListPageCE />;
+}
+
+export { UserListPageEE };

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

@@ -7,7 +7,7 @@ import basename from '../../../../../../../../admin/src/core/utils/basename';
 import MagicLinkWrapper from '../../../../../../../../admin/src/pages/SettingsPage/pages/Users/components/MagicLink/MagicLinkWrapper';
 
 // FIXME replace with parts compo when ready
-const MagicLink = ({ registrationToken }) => {
+export const MagicLinkEE = ({ registrationToken }) => {
   const { formatMessage } = useIntl();
 
   if (registrationToken) {
@@ -34,12 +34,10 @@ const MagicLink = ({ registrationToken }) => {
   );
 };
 
-MagicLink.defaultProps = {
+MagicLinkEE.defaultProps = {
   registrationToken: '',
 };
 
-MagicLink.propTypes = {
+MagicLinkEE.propTypes = {
   registrationToken: PropTypes.string,
 };
-
-export default MagicLink;

package/ee/admin/pages/SettingsPage/pages/Webhooks/EditView/components/EventTable/index.js

@@ -1,3 +1 @@
-import { EventTableEE } from './EventTableEE';
-
-export default EventTableEE;
+export * from './EventTableEE';

package/index.js

@@ -30,12 +30,6 @@ async function build({ appDir, buildDestDir, env, forceBuild, optimize, options,
   const entry = path.resolve(cacheDir, 'admin', 'src');
   const dest = path.resolve(buildDestDir, 'build');
 
-  // Roots for the @strapi/babel-plugin-switch-ee-ce
-  const roots = {
-    eeRoot: path.resolve(cacheDir, 'ee', 'admin'),
-    ceRoot: path.resolve(cacheDir, 'admin', 'src'),
-  };
-
   const pluginsPath = Object.keys(plugins).map((pluginName) => plugins[pluginName].pathToPlugin);
 
   // Either use the tsconfig file from the generated app or the one inside the .cache folder
@@ -53,7 +47,6 @@ async function build({ appDir, buildDestDir, env, forceBuild, optimize, options,
     optimize,
     options,
     pluginsPath,
-    roots,
     tsConfigFilePath,
   });
 
@@ -105,12 +98,6 @@ async function watchAdmin({ appDir, browser, buildDestDir, host, options, plugin
   const dest = path.join(buildDestDir, 'build');
   const env = 'development';
 
-  // Roots for the @strapi/babel-plugin-switch-ee-ce
-  const roots = {
-    eeRoot: path.resolve(cacheDir, 'ee', 'admin'),
-    ceRoot: path.resolve(cacheDir, 'admin', 'src'),
-  };
-
   const pluginsPath = Object.keys(plugins).map((pluginName) => plugins[pluginName].pathToPlugin);
 
   // Either use the tsconfig file from the generated app or the one inside the .cache folder
@@ -127,7 +114,6 @@ async function watchAdmin({ appDir, browser, buildDestDir, host, options, plugin
     env,
     options,
     pluginsPath,
-    roots,
     devServer: {
       port,
       client: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.11.4",
+  "version": "4.11.6",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -40,26 +40,17 @@
     "lint": "run -T eslint ."
   },
   "dependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-transform-runtime": "^7.19.6",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/runtime": "^7.20.13",
     "@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.4",
-    "@strapi/data-transfer": "4.11.4",
-    "@strapi/design-system": "1.8.1",
-    "@strapi/helper-plugin": "4.11.4",
-    "@strapi/icons": "1.8.1",
-    "@strapi/permissions": "4.11.4",
-    "@strapi/provider-audit-logs-local": "4.11.4",
-    "@strapi/typescript-utils": "4.11.4",
-    "@strapi/utils": "4.11.4",
+    "@strapi/data-transfer": "4.11.6",
+    "@strapi/design-system": "1.8.2",
+    "@strapi/helper-plugin": "4.11.6",
+    "@strapi/icons": "1.8.2",
+    "@strapi/permissions": "4.11.6",
+    "@strapi/provider-audit-logs-local": "4.11.6",
+    "@strapi/typescript-utils": "4.11.6",
+    "@strapi/utils": "4.11.6",
     "axios": "1.4.0",
-    "babel-loader": "^9.1.2",
-    "babel-plugin-styled-components": "2.1.1",
     "bcryptjs": "2.4.3",
     "browserslist": "^4.17.3",
     "browserslist-to-esbuild": "1.2.0",
@@ -117,7 +108,7 @@
     "react-intl": "6.4.1",
     "react-is": "^18.2.0",
     "react-query": "3.39.3",
-    "react-redux": "8.0.5",
+    "react-redux": "8.1.1",
     "react-refresh": "0.14.0",
     "react-router-dom": "5.3.4",
     "react-select": "5.7.0",
@@ -131,7 +122,7 @@
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
     "typescript": "5.1.3",
-    "webpack": "^5.86.0",
+    "webpack": "^5.88.1",
     "webpack-cli": "^5.1.0",
     "webpack-dev-server": "^4.15.0",
     "webpackbar": "^5.0.2",
@@ -163,5 +154,5 @@
       }
     }
   },
-  "gitHead": "8d325a695386ab9b578b360bf768cfa25173050f"
+  "gitHead": "9d78b84e38df437a7247fc5a66b872b55d59ed88"
 }

package/webpack.alias.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const path = require('path');
 const findRoot = require('find-root');
 
 const aliasExactMatch = [
@@ -38,6 +37,4 @@ module.exports = {
     acc[`${moduleName}$`] = findRoot(require.resolve(moduleName));
     return acc;
   }, {}),
-
-  ee_else_ce: path.resolve(__dirname),
 };

package/webpack.config.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const path = require('path');
-const fse = require('fs-extra');
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const ForkTsCheckerPlugin = require('fork-ts-checker-webpack-plugin');
@@ -16,8 +15,6 @@ const alias = require('./webpack.alias');
 const getClientEnvironment = require('./env');
 const createPluginsExcludePath = require('./utils/create-plugins-exclude-path');
 
-const EE_REGEX = /from.* ['"]ee_else_ce\//;
-
 module.exports = ({
   cacheDir,
   dest,
@@ -30,10 +27,6 @@ module.exports = ({
     adminPath: '/admin/',
     features: [],
   },
-  roots = {
-    eeRoot: './ee/admin',
-    ceRoot: './admin/src',
-  },
   tsConfigFilePath,
 }) => {
   const isProduction = env === 'production';
@@ -99,74 +92,7 @@ module.exports = ({
         },
         {
           test: /\.m?jsx?$/,
-          include: cacheDir,
-          oneOf: [
-            // Use babel-loader for files that distinct the ee and ce code
-            // These files have an import Something from 'ee_else_ce/
-            {
-              test(filePath) {
-                if (!filePath) {
-                  return false;
-                }
-
-                try {
-                  const fileContent = fse.readFileSync(filePath).toString();
-
-                  if (fileContent.match(/from.* ['"]ee_else_ce\//)) {
-                    return true;
-                  }
-
-                  return EE_REGEX.test(fileContent);
-                } catch (e) {
-                  return false;
-                }
-              },
-              use: {
-                loader: require.resolve('babel-loader'),
-                options: {
-                  cacheDirectory: true,
-                  cacheCompression: isProduction,
-                  compact: isProduction,
-                  presets: [
-                    require.resolve('@babel/preset-env'),
-                    require.resolve('@babel/preset-react'),
-                  ],
-                  plugins: [
-                    [
-                      require.resolve('@strapi/babel-plugin-switch-ee-ce'),
-                      {
-                        // Imported this tells the custom plugin where to look for the ee folder
-                        roots,
-                      },
-                    ],
-
-                    [
-                      require.resolve('@babel/plugin-transform-runtime'),
-                      {
-                        helpers: true,
-                        regenerator: true,
-                      },
-                    ],
-                    [require.resolve('babel-plugin-styled-components'), { pure: true }],
-                  ],
-                },
-              },
-            },
-            // Use esbuild-loader for the other files
-            {
-              use: {
-                loader: require.resolve('esbuild-loader'),
-                options: {
-                  loader: 'jsx',
-                  target: buildTarget,
-                },
-              },
-            },
-          ],
-        },
-        {
-          test: /\.m?jsx?$/,
-          include: pluginsPath,
+          include: [cacheDir, ...pluginsPath],
           use: {
             loader: require.resolve('esbuild-loader'),
             options: {

package/admin/src/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js

@@ -1,2 +0,0 @@
-// Overwritten in EE
-export default () => null;

package/admin/src/content-manager/pages/ListView/utils/buildQueryString.js

@@ -1,36 +0,0 @@
-import set from 'lodash/set';
-import { stringify } from 'qs';
-
-import createPluginsFilter from './createPluginsFilter';
-
-/**
- * Creates a valid query string from an object of queryParams
- * This includes:
- * - a filters clause
- * - plugin options
- */
-const buildQueryString = (queryParams = {}) => {
-  /**
-   * Extracting pluginOptions from the query since we don't want them to be part
-   * of the url
-   */
-  const {
-    plugins: _,
-    _q: query,
-    ...otherQueryParams
-  } = {
-    ...queryParams,
-    ...createPluginsFilter(queryParams.plugins),
-  };
-
-  if (query) {
-    set(otherQueryParams, `_q`, encodeURIComponent(query));
-  }
-
-  return `${stringify(otherQueryParams, {
-    encode: false,
-    addQueryPrefix: true,
-  })}`;
-};
-
-export default buildQueryString;

package/admin/src/content-manager/pages/ListView/utils/createPluginsFilter.js

@@ -1,4 +0,0 @@
-const createPluginsFilter = (obj) =>
-  Object.values(obj || {}).reduce((acc, current) => Object.assign(acc, current), {});
-
-export default createPluginsFilter;

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

@@ -1,3 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-
-export { default as getUID } from './unique-identifier';

package/admin/src/pages/App/utils/unique-identifier.js

@@ -1,12 +0,0 @@
-import FingerprintJS from '@fingerprintjs/fingerprintjs';
-
-const getUniqueIdentifier = async () => {
-  const fp = await FingerprintJS.load();
-  const result = await fp.get();
-
-  const deviceId = `web-fingerprint-${result.visitorId}`;
-
-  return deviceId;
-};
-
-export default getUniqueIdentifier;

package/admin/src/pages/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js

@@ -1,5 +0,0 @@
-const AdminSeatInfo = () => {
-  return null;
-};
-
-export default AdminSeatInfo;

package/build/1386.3b2aa6a7.chunk.js

@@ -1,3 +0,0 @@
-"use strict";(self.webpackChunk_strapi_admin=self.webpackChunk_strapi_admin||[]).push([[1386],{91386:function(O,s,e){e.r(s),e.d(s,{FORMS:function(){return L}});var t=e(32735),v=e(9026),E=e(27649),l=e(72850),a=e(49372),o=e(87933),g=e(23866),h=e(41415),f=e(19565),p=e(67879),i=e(53038),x=e(8471),C=e(10190),r=e(954),Z=e(58414),P=e(33205);const d=(0,x.ZP)(v.i)`
-  flex: 1;
-`;var y=()=>{const m=window.strapi.features.isEnabled(window.strapi.features.SSO),{push:S}=(0,i.k6)(),{formatMessage:n}=(0,p.Z)(),{isLoading:c,data:u}=(0,Z.pl)({ssoEnabled:m}),A=()=>{S("/auth/login")};return!m||!c&&u.length===0?t.createElement(i.l_,{to:"/auth/login"}):t.createElement(r.ZP,null,t.createElement(E.o,null,t.createElement(r.bU,null,t.createElement(r.sg,null,t.createElement(C.Z,null),t.createElement(l.x,{paddingTop:6,paddingBottom:1},t.createElement(a.Z,{as:"h1",variant:"alpha"},n({id:"Auth.form.welcome.title"}))),t.createElement(l.x,{paddingBottom:7},t.createElement(a.Z,{variant:"epsilon",textColor:"neutral600"},n({id:"Auth.login.sso.subtitle"})))),t.createElement(o.k,{direction:"column",alignItems:"stretch",gap:7},c?t.createElement(o.k,{justifyContent:"center"},t.createElement(g.a,null,n({id:"Auth.login.sso.loading"}))):t.createElement(P.Z,{providers:u}),t.createElement(o.k,null,t.createElement(d,null),t.createElement(l.x,{paddingLeft:3,paddingRight:3},t.createElement(a.Z,{variant:"sigma",textColor:"neutral600"},n({id:"or"}))),t.createElement(d,null)),t.createElement(h.z,{fullWidth:!0,size:"L",onClick:A},n({id:"Auth.form.button.login.strapi"})))),t.createElement(o.k,{justifyContent:"center"},t.createElement(l.x,{paddingTop:4},t.createElement(f.rU,{to:"/auth/forgot-password"},t.createElement(a.Z,{variant:"pi"},n({id:"Auth.link.forgot-password"})))))))};const L={providers:{Component:y,endPoint:null,fieldsToDisable:[],fieldsToOmit:[],schema:null,inputsPrefix:""}}}}]);