@strapi/admin 4.11.2 → 4.11.4

package/ee/admin/pages/SettingsPage/pages/SingleSignOn/index.js

@@ -26,25 +26,25 @@ import {
 import { Check } from '@strapi/icons';
 import isEqual from 'lodash/isEqual';
 import { useIntl } from 'react-intl';
+import { useSelector } from 'react-redux';
 
 import { useRolesList, useSettingsForm } from '../../../../../../admin/src/hooks';
-import adminPermissions from '../../../../../../admin/src/permissions';
+import { selectAdminPermissions } from '../../../../../../admin/src/pages/App/selectors';
 import { getRequestUrl } from '../../../../../../admin/src/utils';
 
 import schema from './utils/schema';
 
-const ssoPermissions = {
-  ...adminPermissions.settings.sso,
-  readRoles: adminPermissions.settings.roles.read,
-};
-
 export const SingleSignOn = () => {
   const { formatMessage } = useIntl();
+  const permissions = useSelector(selectAdminPermissions);
 
   const {
     isLoading: isLoadingForPermissions,
     allowedActions: { canUpdate, canReadRoles },
-  } = useRBAC(ssoPermissions);
+  } = useRBAC({
+    ...permissions.settings.sso,
+    readRoles: permissions.settings.roles.read,
+  });
 
   const [
     { formErrors, initialData, isLoading, modifiedData, showHeaderButtonLoader },
@@ -247,10 +247,14 @@ export const SingleSignOn = () => {
   );
 };
 
-const ProtectedSSO = () => (
-  <CheckPagePermissions permissions={ssoPermissions.main}>
-    <SingleSignOn />
-  </CheckPagePermissions>
-);
+const ProtectedSSO = () => {
+  const permissions = useSelector(selectAdminPermissions);
+
+  return (
+    <CheckPagePermissions permissions={permissions.settings.sso.main}>
+      <SingleSignOn />
+    </CheckPagePermissions>
+  );
+};
 
 export default ProtectedSSO;

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/ModalForm/{utils/roleSettingsForm.js → constants.js}

@@ -1,6 +1,14 @@
-const form = window.strapi.features.isEnabled(window.strapi.features.SSO)
-  ? [
-      [
+export const FORM_INITIAL_VALUES = {
+  ...(window.strapi.features.isEnabled(window.strapi.features.SSO)
+    ? {
+        useSSORegistration: true,
+      }
+    : {}),
+};
+
+export const ROLE_LAYOUT = [
+  ...(window.strapi.features.isEnabled(window.strapi.features.SSO)
+    ? [
         {
           intlLabel: {
             id: 'Settings.permissions.users.form.sso',
@@ -17,8 +25,6 @@ const form = window.strapi.features.isEnabled(window.strapi.features.SSO)
             xs: 12,
           },
         },
-      ],
-    ]
-  : [];
-
-export default form;
+      ]
+    : []),
+];

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

@@ -2,22 +2,21 @@ import React from 'react';
 
 import EventTable from '../../../../../../../../../admin/src/pages/SettingsPage/pages/Webhooks/EditView/components/Events';
 
-// const events = {
-//   'review-workflows': ['workflows.updateEntryStage'],
-// };
+const events = {
+  'review-workflows': ['review-workflows.updateEntryStage'],
+};
 
-// TODO: extend this to support review workflow events once the BE logic is ready
-// const getHeaders = () => {
-//   return [{ id: 'review-workflows.updateEntryStage', defaultMessage: 'Stage Change' }];
-// };
+const getHeaders = () => {
+  return [{ id: 'review-workflows.updateEntryStage', defaultMessage: 'Stage Change' }];
+};
 
 export function EventTableEE() {
   return (
     <EventTable.Root>
       <EventTable.Headers />
       <EventTable.Body />
-      {/* <EventTable.Headers getHeaders={getHeaders} />
-        <EventTable.Body providedEvents={events} /> */}
+      <EventTable.Headers getHeaders={getHeaders} />
+      <EventTable.Body providedEvents={events} />
     </EventTable.Root>
   );
 }

package/ee/server/constants/webhookEvents.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  WORKFLOW_UPDATE_STAGE: 'review-workflows.updateEntryStage',
+};

package/ee/server/controllers/workflows/stages/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { ApplicationError } = require('@strapi/utils/lib/errors');
+const { ApplicationError } = require('@strapi/utils').errors;
 const { getService } = require('../../../utils');
 const { hasReviewWorkflow } = require('../../../utils/review-workflows');
 const {

package/ee/server/services/passport.js

@@ -3,7 +3,7 @@
 // eslint-disable-next-line node/no-extraneous-require
 const { features } = require('@strapi/strapi/lib/utils/ee');
 
-const { UnauthorizedError } = require('@strapi/utils/lib/errors');
+const { UnauthorizedError } = require('@strapi/utils').errors;
 const createLocalStrategy = require('../../../server/services/passport/local-strategy');
 const sso = require('./passport/sso');
 const { isSsoLocked } = require('../utils/sso-lock');

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

@@ -2,6 +2,7 @@
 
 const { isNil, isNull } = require('lodash/fp');
 const { ENTITY_STAGE_ATTRIBUTE } = require('../../constants/workflows');
+const { WORKFLOW_UPDATE_STAGE } = require('../../constants/webhookEvents');
 const { hasReviewWorkflow, getDefaultWorkflow } = require('../../utils/review-workflows');
 
 /**
@@ -17,6 +18,25 @@ const getDataWithStage = async (data) => {
   return data;
 };
 
+/**
+ * Get the stage information of an entity
+ * @param {String} uid
+ * @param {Number} id
+ * @returns {Object}
+ */
+const getEntityStage = async (uid, id) => {
+  const entity = await strapi.entityService.findOne(uid, id, {
+    populate: {
+      [ENTITY_STAGE_ATTRIBUTE]: {
+        populate: {
+          workflow: true,
+        },
+      },
+    },
+  });
+  return entity?.[ENTITY_STAGE_ATTRIBUTE] ?? {};
+};
+
 /**
  * Decorates the entity service with RW business logic
  * @param {object} service - entity service
@@ -43,9 +63,40 @@ const decorator = (service) => ({
     const data = { ...opts.data };
     if (isNull(data[ENTITY_STAGE_ATTRIBUTE])) {
       delete data[ENTITY_STAGE_ATTRIBUTE];
+      return service.update.call(this, uid, entityId, { ...opts, data });
+    }
+
+    const previousStage = await getEntityStage(uid, entityId);
+
+    const updatedEntity = await service.update.call(this, uid, entityId, { ...opts, data });
+    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: {
+              id: previousStage.id,
+              name: previousStage.name,
+            },
+            to: {
+              id: updatedStage.id,
+              name: updatedStage.name,
+            },
+          },
+        },
+      });
     }
 
-    return service.update.call(this, uid, entityId, { ...opts, data });
+    return updatedEntity;
   },
 });
 

package/ee/server/services/review-workflows/review-workflows.js

@@ -11,6 +11,7 @@ const { ENTITY_STAGE_ATTRIBUTE } = require('../../constants/workflows');
 
 const { getDefaultWorkflow } = require('../../utils/review-workflows');
 const { persistTables, removePersistedTablesWithSuffix } = require('../../utils/persisted-tables');
+const webhookEvents = require('../../constants/webhookEvents');
 
 async function initDefaultWorkflow({ workflowsService, stagesService, strapi }) {
   const wfCount = await workflowsService.count();
@@ -109,7 +110,9 @@ function persistStagesJoinTables({ strapi }) {
 }
 
 const registerWebhookEvents = async ({ strapi }) =>
-  strapi.webhookStore.addAllowedEvent('WORKFLOW_UPDATE_STAGE', 'workflow.updateEntryStage');
+  Object.entries(webhookEvents).forEach(([eventKey, event]) =>
+    strapi.webhookStore.addAllowedEvent(eventKey, event)
+  );
 
 module.exports = ({ strapi }) => {
   const workflowsService = getService('workflows', { strapi });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.11.2",
+  "version": "4.11.4",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -48,15 +48,15 @@
     "@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.2",
-    "@strapi/data-transfer": "4.11.2",
-    "@strapi/design-system": "1.8.0",
-    "@strapi/helper-plugin": "4.11.2",
-    "@strapi/icons": "1.8.0",
-    "@strapi/permissions": "4.11.2",
-    "@strapi/provider-audit-logs-local": "4.11.2",
-    "@strapi/typescript-utils": "4.11.2",
-    "@strapi/utils": "4.11.2",
+    "@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",
     "axios": "1.4.0",
     "babel-loader": "^9.1.2",
     "babel-plugin-styled-components": "2.1.1",
@@ -145,7 +145,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 +163,5 @@
       }
     }
   },
-  "gitHead": "6f7c815c2bbe41dda7d77136eb8df736c028ff67"
+  "gitHead": "8d325a695386ab9b578b360bf768cfa25173050f"
 }

package/server/content-types/User.js

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

package/server/services/permission/permissions-manager/sanitize.js

@@ -20,7 +20,7 @@ const {
 } = require('lodash/fp');
 
 const { contentTypes, traverseEntity, sanitize, pipeAsync, traverse } = require('@strapi/utils');
-const { removePassword } = require('@strapi/utils/lib/sanitize/visitors');
+const { removePassword } = require('@strapi/utils').sanitize.visitors;
 const { ADMIN_USER_ALLOWED_FIELDS } = require('../../../domain/user');
 
 const {

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

@@ -1,163 +0,0 @@
-import React, { useMemo } from 'react';
-
-import { DynamicTable as Table, useStrapiApp } from '@strapi/helper-plugin';
-import getReviewWorkflowsColumn from 'ee_else_ce/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn';
-import PropTypes from 'prop-types';
-import { useIntl } from 'react-intl';
-import { useSelector } from 'react-redux';
-
-import { INJECT_COLUMN_IN_TABLE } from '../../../exposedHooks';
-import { selectDisplayedHeaders } from '../../pages/ListView/selectors';
-import { getTrad } from '../../utils';
-
-import BulkActionsBar from './BulkActionsBar';
-import { PublicationState } from './CellContent/PublicationState/PublicationState';
-import ConfirmDialogDelete from './ConfirmDialogDelete';
-import TableRows from './TableRows';
-
-const DynamicTable = ({
-  canCreate,
-  canDelete,
-  canPublish,
-  contentTypeName,
-  action,
-  isBulkable,
-  isLoading,
-  onConfirmDelete,
-  onConfirmDeleteAll,
-  onConfirmPublishAll,
-  onConfirmUnpublishAll,
-  layout,
-  rows,
-}) => {
-  const { runHookWaterfall } = useStrapiApp();
-  const hasDraftAndPublish = layout.contentType.options?.draftAndPublish ?? false;
-  const { formatMessage } = useIntl();
-  const displayedHeaders = useSelector(selectDisplayedHeaders);
-
-  const tableHeaders = useMemo(() => {
-    const headers = runHookWaterfall(INJECT_COLUMN_IN_TABLE, {
-      displayedHeaders,
-      layout,
-    });
-
-    const formattedHeaders = headers.displayedHeaders.map((header) => {
-      const { fieldSchema, metadatas, name } = header;
-
-      return {
-        ...header,
-        metadatas: {
-          ...metadatas,
-          label: formatMessage({
-            id: getTrad(`containers.ListPage.table-headers.${name}`),
-            defaultMessage: metadatas.label,
-          }),
-        },
-        name: fieldSchema.type === 'relation' ? `${name}.${metadatas.mainField.name}` : name,
-      };
-    });
-
-    if (hasDraftAndPublish) {
-      formattedHeaders.push({
-        key: '__published_at_temp_key__',
-        name: 'publishedAt',
-        fieldSchema: {
-          type: 'custom',
-        },
-        metadatas: {
-          label: formatMessage({
-            id: getTrad(`containers.ListPage.table-headers.publishedAt`),
-            defaultMessage: 'publishedAt',
-          }),
-          searchable: false,
-          sortable: true,
-        },
-        cellFormatter({ publishedAt }) {
-          return <PublicationState isPublished={!!publishedAt} />;
-        },
-      });
-    }
-
-    // this should not exist. Ideally we would use registerHook() similar to what has been done
-    // in the i18n plugin. In order to do that review-workflows should have been a plugin. In
-    // a future iteration we need to find a better pattern.
-
-    // In CE this will return null - in EE a column definition including the custom formatting component.
-    const reviewWorkflowColumn = getReviewWorkflowsColumn(layout);
-
-    if (reviewWorkflowColumn) {
-      formattedHeaders.push(reviewWorkflowColumn);
-    }
-
-    return formattedHeaders;
-  }, [runHookWaterfall, displayedHeaders, layout, hasDraftAndPublish, formatMessage]);
-
-  return (
-    <Table
-      components={{ ConfirmDialogDelete }}
-      contentType={contentTypeName}
-      action={action}
-      isLoading={isLoading}
-      headers={tableHeaders}
-      onConfirmDelete={onConfirmDelete}
-      onOpenDeleteAllModalTrackedEvent="willBulkDeleteEntries"
-      rows={rows}
-      withBulkActions
-      withMainAction={(canDelete || canPublish) && isBulkable}
-      renderBulkActionsBar={({ selectedEntries, clearSelectedEntries }) => (
-        <BulkActionsBar
-          showPublish={canPublish && hasDraftAndPublish}
-          showDelete={canDelete}
-          onConfirmDeleteAll={onConfirmDeleteAll}
-          onConfirmPublishAll={onConfirmPublishAll}
-          onConfirmUnpublishAll={onConfirmUnpublishAll}
-          selectedEntries={selectedEntries}
-          clearSelectedEntries={clearSelectedEntries}
-        />
-      )}
-    >
-      <TableRows
-        canCreate={canCreate}
-        canDelete={canDelete}
-        contentType={layout.contentType}
-        headers={tableHeaders}
-        rows={rows}
-        withBulkActions
-        withMainAction={canDelete && isBulkable}
-      />
-    </Table>
-  );
-};
-
-DynamicTable.defaultProps = {
-  action: undefined,
-};
-
-DynamicTable.propTypes = {
-  canCreate: PropTypes.bool.isRequired,
-  canDelete: PropTypes.bool.isRequired,
-  canPublish: PropTypes.bool.isRequired,
-  contentTypeName: PropTypes.string.isRequired,
-  action: PropTypes.node,
-  isBulkable: PropTypes.bool.isRequired,
-  isLoading: PropTypes.bool.isRequired,
-  layout: PropTypes.exact({
-    components: PropTypes.object.isRequired,
-    contentType: PropTypes.shape({
-      attributes: PropTypes.object.isRequired,
-      metadatas: PropTypes.object.isRequired,
-      layouts: PropTypes.shape({
-        list: PropTypes.array.isRequired,
-      }).isRequired,
-      options: PropTypes.object.isRequired,
-      settings: PropTypes.object.isRequired,
-    }).isRequired,
-  }).isRequired,
-  onConfirmDelete: PropTypes.func.isRequired,
-  onConfirmDeleteAll: PropTypes.func.isRequired,
-  onConfirmPublishAll: PropTypes.func.isRequired,
-  onConfirmUnpublishAll: PropTypes.func.isRequired,
-  rows: PropTypes.array.isRequired,
-};
-
-export default DynamicTable;

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/FieldPicker/utils/getAllAllowedHeader.js

@@ -1,17 +0,0 @@
-import { checkIfAttributeIsDisplayable } from '../../../../utils';
-
-const getAllAllowedHeaders = (attributes) => {
-  const allowedAttributes = Object.keys(attributes).reduce((acc, current) => {
-    const attribute = attributes[current];
-
-    if (checkIfAttributeIsDisplayable(attribute)) {
-      acc.push(current);
-    }
-
-    return acc;
-  }, []);
-
-  return allowedAttributes.sort();
-};
-
-export default getAllAllowedHeaders;

package/admin/src/content-manager/pages/ListView/PaginationFooter/index.js

@@ -1,35 +0,0 @@
-import React from 'react';
-
-import { Box, Flex } from '@strapi/design-system';
-import { PageSizeURLQuery, PaginationURLQuery } from '@strapi/helper-plugin';
-import PropTypes from 'prop-types';
-
-const PaginationFooter = ({ pagination }) => {
-  return (
-    <Box paddingTop={4}>
-      <Flex alignItems="flex-end" justifyContent="space-between">
-        <PageSizeURLQuery trackedEvent="willChangeNumberOfEntriesPerPage" />
-        <PaginationURLQuery pagination={pagination} />
-      </Flex>
-    </Box>
-  );
-};
-
-PaginationFooter.defaultProps = {
-  pagination: {
-    pageCount: 0,
-    pageSize: 10,
-    total: 0,
-  },
-};
-
-PaginationFooter.propTypes = {
-  pagination: PropTypes.shape({
-    page: PropTypes.number,
-    pageCount: PropTypes.number,
-    pageSize: PropTypes.number,
-    total: PropTypes.number,
-  }),
-};
-
-export default PaginationFooter;