@strapi/admin 4.11.3 → 4.11.5

package/ee/admin/hooks/useLicenseLimitNotification/index.js

@@ -19,18 +19,18 @@ const BILLING_SELF_HOSTED_URL = 'https://strapi.io/billing/request-seats';
 
 const useLicenseLimitNotification = () => {
   const { formatMessage } = useIntl();
-  let { license } = useLicenseLimits();
+  let { license, isError, isLoading } = useLicenseLimits();
   const toggleNotification = useNotification();
   const { pathname } = useLocation();
 
+  const { enforcementUserCount, permittedSeats, licenseLimitStatus, isHostedOnStrapiCloud } =
+    license;
+
   useEffect(() => {
-    if (!license?.data) {
+    if (isError || isLoading) {
       return;
     }
 
-    const { enforcementUserCount, permittedSeats, licenseLimitStatus, isHostedOnStrapiCloud } =
-      license?.data ?? {};
-
     const shouldDisplayNotification =
       !isNil(permittedSeats) &&
       !window.sessionStorage.getItem(`${STORAGE_KEY_PREFIX}-${pathname}`) &&
@@ -84,7 +84,18 @@ const useLicenseLimitNotification = () => {
         },
       });
     }
-  }, [toggleNotification, license.data, pathname, formatMessage]);
+  }, [
+    toggleNotification,
+    license,
+    pathname,
+    formatMessage,
+    isLoading,
+    permittedSeats,
+    licenseLimitStatus,
+    enforcementUserCount,
+    isHostedOnStrapiCloud,
+    isError,
+  ]);
 };
 
 export default useLicenseLimitNotification;

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

@@ -1,34 +1,3 @@
-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';
-
-const useLicenseLimits = () => {
-  const permissions = useSelector(selectAdminPermissions);
-  const rbac = useRBAC(permissions.settings.users);
-
-  const {
-    isLoading: isRBACLoading,
-    allowedActions: { canRead, canCreate, canUpdate, canDelete },
-  } = rbac;
-
-  const isRBACAllowed = canRead && canCreate && canUpdate && canDelete;
-
-  const { get } = useFetchClient();
-  const fetchLicenseLimitInfo = async () => {
-    const {
-      data: { data },
-    } = await get('/admin/license-limit-information');
-
-    return data;
-  };
-
-  const license = useQuery(['ee', 'license-limit-info'], fetchLicenseLimitInfo, {
-    enabled: !isRBACLoading && isRBACAllowed,
-  });
-
-  return { license };
-};
+import { useLicenseLimits } from './useLicenseLimits';
 
 export default useLicenseLimits;

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/SettingsPage/pages/ApplicationInfosPage/components/AdminSeatInfo/index.js

@@ -13,11 +13,13 @@ const BILLING_SELF_HOSTED_URL = 'https://strapi.io/billing/request-seats';
 
 const AdminSeatInfo = () => {
   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;
   }
 

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/AuditLogs/ListView/index.js

@@ -33,17 +33,12 @@ const ListView = () => {
   const { formatMessage } = useIntl();
   const permissions = useSelector(selectAdminPermissions);
 
-  // TODO: this is necessary because otherwise we run into an
-  // infinite rendering loop
-  const permissionsMemoized = React.useMemo(() => {
-    return {
-      ...permissions.settings.auditLogs,
-      readUsers: permissions.settings.users.read,
-    };
-  }, [permissions.settings.auditLogs, permissions.settings.users.read]);
   const {
     allowedActions: { canRead: canReadAuditLogs, canReadUsers },
-  } = useRBAC(permissionsMemoized);
+  } = useRBAC({
+    ...permissions.settings.auditLogs,
+    readUsers: permissions.settings.users.read,
+  });
 
   const [{ query }, setQuery] = useQueryParams();
   const { auditLogs, users, isLoading, hasError } = useAuditLogsData({

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

@@ -38,18 +38,13 @@ export const SingleSignOn = () => {
   const { formatMessage } = useIntl();
   const permissions = useSelector(selectAdminPermissions);
 
-  // TODO: this is necessary because otherwise we run into an
-  // infinite rendering loop
-  const permissionsMemoized = React.useMemo(() => {
-    return {
-      ...permissions.settings.sso,
-      readRoles: permissions.settings.roles.read,
-    };
-  }, [permissions.settings.roles.read, permissions.settings.sso]);
   const {
     isLoading: isLoadingForPermissions,
     allowedActions: { canUpdate, canReadRoles },
-  } = useRBAC(permissionsMemoized);
+  } = useRBAC({
+    ...permissions.settings.sso,
+    readRoles: permissions.settings.roles.read,
+  });
 
   const [
     { formErrors, initialData, isLoading, modifiedData, showHeaderButtonLoader },

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

@@ -10,8 +10,15 @@ import { useLicenseLimits } from '../../../../../../hooks';
 
 const CreateAction = ({ 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}>

package/ee/server/services/review-workflows/entity-service-decorator.js

@@ -69,22 +69,31 @@ const decorator = (service) => ({
     const previousStage = await getEntityStage(uid, entityId);
 
     const updatedEntity = await service.update.call(this, uid, entityId, { ...opts, data });
-    if (
-      previousStage?.workflow?.id &&
-      previousStage?.id &&
-      previousStage.id !== data[ENTITY_STAGE_ATTRIBUTE]
-    ) {
-      const webhookPayload = {
-        entityId,
+    const updatedStage = updatedEntity[ENTITY_STAGE_ATTRIBUTE];
+
+    if (previousStage?.id && previousStage.id !== updatedStage.id) {
+      const model = strapi.getModel(uid);
+
+      strapi.eventHub.emit(WORKFLOW_UPDATE_STAGE, {
+        model: model.modelName,
+        uid: model.uid,
+        entity: {
+          id: entityId,
+        },
         workflow: {
           id: previousStage.workflow.id,
           stages: {
-            from: previousStage.id,
-            to: data[ENTITY_STAGE_ATTRIBUTE],
+            from: {
+              id: previousStage.id,
+              name: previousStage.name,
+            },
+            to: {
+              id: updatedStage.id,
+              name: updatedStage.name,
+            },
           },
         },
-      };
-      await strapi.entityService.emitEvent(uid, WORKFLOW_UPDATE_STAGE, webhookPayload);
+      });
     }
 
     return updatedEntity;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.11.3",
+  "version": "4.11.5",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -46,17 +46,16 @@
     "@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.3",
-    "@strapi/data-transfer": "4.11.3",
-    "@strapi/design-system": "1.8.0",
-    "@strapi/helper-plugin": "4.11.3",
-    "@strapi/icons": "1.8.0",
-    "@strapi/permissions": "4.11.3",
-    "@strapi/provider-audit-logs-local": "4.11.3",
-    "@strapi/typescript-utils": "4.11.3",
-    "@strapi/utils": "4.11.3",
+    "@strapi/babel-plugin-switch-ee-ce": "4.11.5",
+    "@strapi/data-transfer": "4.11.5",
+    "@strapi/design-system": "1.8.1",
+    "@strapi/helper-plugin": "4.11.5",
+    "@strapi/icons": "1.8.1",
+    "@strapi/permissions": "4.11.5",
+    "@strapi/provider-audit-logs-local": "4.11.5",
+    "@strapi/typescript-utils": "4.11.5",
+    "@strapi/utils": "4.11.5",
     "axios": "1.4.0",
     "babel-loader": "^9.1.2",
     "babel-plugin-styled-components": "2.1.1",
@@ -117,7 +116,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 +130,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",
@@ -145,7 +144,7 @@
     "glob": "8.0.3",
     "msw": "1.2.1",
     "speed-measure-webpack-plugin": "1.5.0",
-    "webpack-bundle-analyzer": "^4.8.0"
+    "webpack-bundle-analyzer": "^4.9.0"
   },
   "peerDependencies": {
     "@strapi/strapi": "^4.3.4"
@@ -163,5 +162,5 @@
       }
     }
   },
-  "gitHead": "aac28413ada24fb8fff55c2908343cc3b8a2a3e0"
+  "gitHead": "7bdef3d27843c78666c85f30dc2f1bcf4d6b805e"
 }

package/server/content-types/User.js

@@ -99,4 +99,14 @@ module.exports = {
       searchable: false,
     },
   },
+  config: {
+    attributes: {
+      resetPasswordToken: {
+        hidden: true,
+      },
+      registrationToken: {
+        hidden: true,
+      },
+    },
+  },
 };

package/server/strategies/api-token.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { castArray, isNil } = require('lodash/fp');
+const { differenceInHours, parseISO } = require('date-fns');
 const { UnauthorizedError, ForbiddenError } = require('@strapi/utils').errors;
 const constants = require('../services/constants');
 const { getService } = require('../utils');
@@ -53,11 +54,14 @@ const authenticate = async (ctx) => {
     }
   }
 
-  // update lastUsedAt
-  await strapi.query('admin::api-token').update({
-    where: { id: apiToken.id },
-    data: { lastUsedAt: currentDate },
-  });
+  // update lastUsedAt if the token has not been used in the last hour
+  const hoursSinceLastUsed = differenceInHours(currentDate, parseISO(apiToken.lastUsedAt));
+  if (hoursSinceLastUsed >= 1) {
+    await strapi.query('admin::api-token').update({
+      where: { id: apiToken.id },
+      data: { lastUsedAt: currentDate },
+    });
+  }
 
   if (apiToken.type === constants.API_TOKEN_TYPE.CUSTOM) {
     const ability = await strapi.contentAPI.permissions.engine.generateAbility(

package/server/strategies/data-transfer.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { differenceInHours, parseISO } = require('date-fns');
 const {
   errors: { UnauthorizedError, ForbiddenError },
 } = require('@strapi/utils');
@@ -52,11 +53,14 @@ const authenticate = async (ctx) => {
     }
   }
 
-  // Update token metadata
-  await strapi.query('admin::transfer-token').update({
-    where: { id: transferToken.id },
-    data: { lastUsedAt: currentDate },
-  });
+  // Update token metadata if the token has not been used in the last hour
+  const hoursSinceLastUsed = differenceInHours(currentDate, parseISO(transferToken.lastUsedAt));
+  if (hoursSinceLastUsed >= 1) {
+    await strapi.query('admin::api-token').update({
+      where: { id: transferToken.id },
+      data: { lastUsedAt: currentDate },
+    });
+  }
 
   // Generate an ability based on the token permissions
   const ability = await getService('transfer').permission.engine.generateAbility(

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/components/RelationInput/components/Relation.js

@@ -1,53 +0,0 @@
-import React from 'react';
-
-import { Flex } from '@strapi/design-system';
-import PropTypes from 'prop-types';
-
-export const Relation = ({
-  children,
-  loadMore,
-  search,
-  totalNumberOfRelations,
-  size,
-  ...props
-}) => {
-  return (
-    <>
-      <Flex
-        paddingBottom={totalNumberOfRelations > 0 ? 3 : 0}
-        gap={2}
-        justifyContent="space-between"
-        alignItems="end"
-        wrap="wrap"
-      >
-        <Flex
-          direction="column"
-          alignItems="stretch"
-          basis={size <= 6 ? '100%' : '70%'}
-          gap={1}
-          {...props}
-        >
-          {search}
-        </Flex>
-
-        {loadMore}
-      </Flex>
-
-      {children}
-    </>
-  );
-};
-
-Relation.defaultProps = {
-  search: undefined,
-  loadMore: undefined,
-  totalNumberOfRelations: 0,
-};
-
-Relation.propTypes = {
-  children: PropTypes.node.isRequired,
-  search: PropTypes.node,
-  loadMore: PropTypes.node,
-  size: PropTypes.number.isRequired,
-  totalNumberOfRelations: PropTypes.number,
-};

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;