@strapi/admin 4.10.2 → 4.10.4

package/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/ReviewWorkflowsStageEE.js

@@ -3,10 +3,21 @@ import PropTypes from 'prop-types';
 import { Box, Flex, Typography } from '@strapi/design-system';
 import { pxToRem } from '@strapi/helper-plugin';
 
+import { getStageColorByHex } from '../../../../../pages/SettingsPage/pages/ReviewWorkflows/utils/colors';
+
 export function ReviewWorkflowsStageEE({ color, name }) {
+  const { themeColorName } = getStageColorByHex(color);
+
   return (
     <Flex alignItems="center" gap={2} maxWidth={pxToRem(300)}>
-      <Box height={2} background={color} hasRadius shrink={0} width={2} />
+      <Box
+        height={2}
+        background={color}
+        borderColor={themeColorName === 'neutral0' ? 'neutral150' : 'transparent'}
+        hasRadius
+        shrink={0}
+        width={2}
+      />
 
       <Typography fontWeight="regular" textColor="neutral700" ellipsis>
         {name}

package/ee/admin/content-manager/pages/EditView/InformationBox/InformationBoxEE.js

@@ -63,7 +63,10 @@ export function InformationBoxEE() {
       onSuccess() {
         toggleNotification({
           type: 'success',
-          message: { id: 'notification.success.saved', defaultMessage: 'Saved' },
+          message: {
+            id: 'content-manager.reviewWorkflows.stage.notification.saved',
+            defaultMessage: 'Success: Review stage updated',
+          },
         });
       },
     }

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js

@@ -20,6 +20,7 @@ import {
 } from '@strapi/design-system';
 import { ReactSelect, useTracking } from '@strapi/helper-plugin';
 import { Drag, Trash } from '@strapi/icons';
+import { getEmptyImage } from 'react-dnd-html5-backend';
 
 import { deleteStage, updateStagePosition, updateStage } from '../../../actions';
 import { getAvailableStageColors } from '../../../utils/colors';
@@ -144,9 +145,8 @@ export function Stage({
   const [isOpen, setIsOpen] = React.useState(isOpenDefault);
   const [nameField, nameMeta] = useField(`stages.${index}.name`);
   const [colorField, colorMeta] = useField(`stages.${index}.color`);
-  const [{ handlerId, isDragging, handleKeyDown }, stageRef, dropRef, dragRef] = useDragAndDrop(
-    canReorder,
-    {
+  const [{ handlerId, isDragging, handleKeyDown }, stageRef, dropRef, dragRef, dragPreviewRef] =
+    useDragAndDrop(canReorder, {
       index,
       item: {
         name: nameField.value,
@@ -156,8 +156,7 @@ export function Stage({
       onMoveItem: handleMoveStage,
       onCancel: handleCancelDragStage,
       type: DRAG_DROP_TYPES.STAGE,
-    }
-  );
+    });
 
   const composedRef = composeRefs(stageRef, dropRef);
 
@@ -176,6 +175,10 @@ export function Stage({
   // the admin API
   const colorValue = colorOptions.find(({ value }) => value === colorField.value.toUpperCase());
 
+  React.useEffect(() => {
+    dragPreviewRef(getEmptyImage(), { captureDraggingState: false });
+  }, [dragPreviewRef, index]);
+
   return (
     <Box ref={composedRef}>
       {liveText && <VisuallyHidden aria-live="assertive">{liveText}</VisuallyHidden>}
@@ -200,7 +203,7 @@ export function Stage({
             title={nameField.value}
             togglePosition="left"
             action={
-              <>
+              <Flex>
                 {canDelete && (
                   <IconButton
                     background="transparent"
@@ -231,7 +234,7 @@ export function Stage({
                 >
                   <Drag />
                 </IconButton>
-              </>
+              </Flex>
             }
           />
           <AccordionContent padding={6} background="neutral0" hasRadius>

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/OptionColor/OptionColor.js

@@ -3,13 +3,23 @@ import PropTypes from 'prop-types';
 import { components } from 'react-select';
 import { Flex, Typography } from '@strapi/design-system';
 
+import { getStageColorByHex } from '../../../../../utils/colors';
+
 export function OptionColor({ children, ...props }) {
   const { color } = props.data;
+  const { themeColorName } = getStageColorByHex(color);
 
   return (
     <components.Option {...props}>
       <Flex alignItems="center" gap={2}>
-        <Flex height={2} background={color} hasRadius shrink={0} width={2} />
+        <Flex
+          height={2}
+          background={color}
+          borderColor={themeColorName === 'neutral0' ? 'neutral150' : 'transparent'}
+          hasRadius
+          shrink={0}
+          width={2}
+        />
 
         <Typography textColor="neutral800" ellipsis>
           {children}

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/components/SingleValueColor/SingleValueColor.js

@@ -3,13 +3,26 @@ import PropTypes from 'prop-types';
 import { components } from 'react-select';
 import { Flex, Typography } from '@strapi/design-system';
 
+import { getStageColorByHex } from '../../../../../utils/colors';
+
 export function SingleValueColor({ children, ...props }) {
   const { color } = props.data;
+  // in case an entity was not assigned to a stage (which displays an error)
+  // there is no color to display and we have to make sure the component does
+  // not crash
+  const { themeColorName } = color ? getStageColorByHex(color) : {};
 
   return (
     <components.SingleValue {...props}>
       <Flex alignItems="center" gap={2}>
-        <Flex height={2} background={color} hasRadius shrink={0} width={2} />
+        <Flex
+          height={2}
+          background={color}
+          borderColor={themeColorName === 'neutral0' ? 'neutral150' : 'transparent'}
+          hasRadius
+          shrink={0}
+          width={2}
+        />
 
         <Typography textColor="neutral800" ellipsis>
           {children}

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/colors.js

@@ -3,10 +3,16 @@ import { lightTheme } from '@strapi/design-system';
 import { STAGE_COLORS } from '../constants';
 
 export function getStageColorByHex(hex) {
+  if (!hex) {
+    return null;
+  }
+
   // there are multiple colors with the same hex code in the design tokens. In order to find
   // the correct one we have to find all matching colors and then check, which ones are usable
   // for stages.
-  const themeColors = Object.entries(lightTheme.colors).filter(([, value]) => value === hex);
+  const themeColors = Object.entries(lightTheme.colors).filter(
+    ([, value]) => value.toUpperCase() === hex.toUpperCase()
+  );
   const themeColorName = themeColors.reduce((acc, [name]) => {
     if (STAGE_COLORS?.[name]) {
       acc = name;

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

@@ -0,0 +1,43 @@
+'use strict';
+
+const { enableFeatureMiddleware } = require('./utils');
+
+module.exports = {
+  type: 'admin',
+  routes: [
+    {
+      method: 'GET',
+      path: '/audit-logs',
+      handler: 'auditLogs.findMany',
+      config: {
+        middlewares: [enableFeatureMiddleware('audit-logs')],
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          {
+            name: 'admin::hasPermissions',
+            config: {
+              actions: ['admin::audit-logs.read'],
+            },
+          },
+        ],
+      },
+    },
+    {
+      method: 'GET',
+      path: '/audit-logs/:id',
+      handler: 'auditLogs.findOne',
+      config: {
+        middlewares: [enableFeatureMiddleware('audit-logs')],
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          {
+            name: 'admin::hasPermissions',
+            config: {
+              actions: ['admin::audit-logs.read'],
+            },
+          },
+        ],
+      },
+    },
+  ],
+};

package/ee/server/routes/index.js

@@ -1,229 +1,8 @@
 'use strict';
 
-const { features } = require('@strapi/strapi/lib/utils/ee');
-
-const enableFeatureMiddleware = (featureName) => (ctx, next) => {
-  if (features.isEnabled(featureName)) {
-    return next();
-  }
-
-  ctx.status = 404;
+module.exports = {
+  sso: require('./sso'),
+  'license-limit': require('./license-limit'),
+  'audit-logs': require('./audit-logs'),
+  'review-workflows': require('./review-workflows'),
 };
-
-module.exports = [
-  // SSO
-  {
-    method: 'GET',
-    path: '/providers',
-    handler: 'authentication.getProviders',
-    config: {
-      middlewares: [enableFeatureMiddleware('sso')],
-      auth: false,
-    },
-  },
-  {
-    method: 'GET',
-    path: '/connect/:provider',
-    handler: 'authentication.providerLogin',
-    config: {
-      middlewares: [enableFeatureMiddleware('sso')],
-      auth: false,
-    },
-  },
-  {
-    method: 'POST',
-    path: '/connect/:provider',
-    handler: 'authentication.providerLogin',
-    config: {
-      middlewares: [enableFeatureMiddleware('sso')],
-      auth: false,
-    },
-  },
-  {
-    method: 'GET',
-    path: '/providers/options',
-    handler: 'authentication.getProviderLoginOptions',
-    config: {
-      middlewares: [enableFeatureMiddleware('sso')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', config: { actions: ['admin::provider-login.read'] } },
-      ],
-    },
-  },
-  {
-    method: 'PUT',
-    path: '/providers/options',
-    handler: 'authentication.updateProviderLoginOptions',
-    config: {
-      middlewares: [enableFeatureMiddleware('sso')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        { name: 'admin::hasPermissions', config: { actions: ['admin::provider-login.update'] } },
-      ],
-    },
-  },
-
-  // Audit logs
-  {
-    method: 'GET',
-    path: '/audit-logs',
-    handler: 'auditLogs.findMany',
-    config: {
-      middlewares: [enableFeatureMiddleware('audit-logs')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::audit-logs.read'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'GET',
-    path: '/audit-logs/:id',
-    handler: 'auditLogs.findOne',
-    config: {
-      middlewares: [enableFeatureMiddleware('audit-logs')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::audit-logs.read'],
-          },
-        },
-      ],
-    },
-  },
-
-  // License limit infos
-  {
-    method: 'GET',
-    path: '/license-limit-information',
-    handler: 'admin.licenseLimitInformation',
-    config: {
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: [
-              'admin::users.create',
-              'admin::users.read',
-              'admin::users.update',
-              'admin::users.delete',
-            ],
-          },
-        },
-      ],
-    },
-  },
-
-  // Review workflow
-  {
-    method: 'GET',
-    path: '/review-workflows/workflows',
-    handler: 'workflows.find',
-    config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::review-workflows.read'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'GET',
-    path: '/review-workflows/workflows/:id',
-    handler: 'workflows.findById',
-    config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::review-workflows.read'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'GET',
-    path: '/review-workflows/workflows/:workflow_id/stages',
-    handler: 'stages.find',
-    config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::review-workflows.read'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'PUT',
-    path: '/review-workflows/workflows/:workflow_id/stages',
-    handler: 'stages.replace',
-    config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::review-workflows.read'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'GET',
-    path: '/review-workflows/workflows/:workflow_id/stages/:id',
-    handler: 'stages.findById',
-    config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::review-workflows.read'],
-          },
-        },
-      ],
-    },
-  },
-  {
-    method: 'PUT',
-    path: '/content-manager/(collection|single)-types/:model_uid/:id/stage',
-    handler: 'stages.updateEntity',
-    config: {
-      middlewares: [enableFeatureMiddleware('review-workflows')],
-      policies: [
-        'admin::isAuthenticatedAdmin',
-        {
-          name: 'admin::hasPermissions',
-          config: {
-            actions: ['admin::review-workflows.read'],
-          },
-        },
-      ],
-    },
-  },
-];

package/ee/server/routes/license-limit.js

@@ -0,0 +1,29 @@
+'use strict';
+
+module.exports = {
+  type: 'admin',
+  routes: [
+    // License limit infos
+    {
+      method: 'GET',
+      path: '/license-limit-information',
+      handler: 'admin.licenseLimitInformation',
+      config: {
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          {
+            name: 'admin::hasPermissions',
+            config: {
+              actions: [
+                'admin::users.create',
+                'admin::users.read',
+                'admin::users.update',
+                'admin::users.delete',
+              ],
+            },
+          },
+        ],
+      },
+    },
+  ],
+};

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

@@ -0,0 +1,112 @@
+'use strict';
+
+const { enableFeatureMiddleware } = require('./utils');
+
+module.exports = {
+  type: 'admin',
+  routes: [
+    // Review workflow
+    {
+      method: 'GET',
+      path: '/review-workflows/workflows',
+      handler: 'workflows.find',
+      config: {
+        middlewares: [enableFeatureMiddleware('review-workflows')],
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          {
+            name: 'admin::hasPermissions',
+            config: {
+              actions: ['admin::review-workflows.read'],
+            },
+          },
+        ],
+      },
+    },
+    {
+      method: 'GET',
+      path: '/review-workflows/workflows/:id',
+      handler: 'workflows.findById',
+      config: {
+        middlewares: [enableFeatureMiddleware('review-workflows')],
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          {
+            name: 'admin::hasPermissions',
+            config: {
+              actions: ['admin::review-workflows.read'],
+            },
+          },
+        ],
+      },
+    },
+    {
+      method: 'GET',
+      path: '/review-workflows/workflows/:workflow_id/stages',
+      handler: 'stages.find',
+      config: {
+        middlewares: [enableFeatureMiddleware('review-workflows')],
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          {
+            name: 'admin::hasPermissions',
+            config: {
+              actions: ['admin::review-workflows.read'],
+            },
+          },
+        ],
+      },
+    },
+    {
+      method: 'PUT',
+      path: '/review-workflows/workflows/:workflow_id/stages',
+      handler: 'stages.replace',
+      config: {
+        middlewares: [enableFeatureMiddleware('review-workflows')],
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          {
+            name: 'admin::hasPermissions',
+            config: {
+              actions: ['admin::review-workflows.read'],
+            },
+          },
+        ],
+      },
+    },
+    {
+      method: 'GET',
+      path: '/review-workflows/workflows/:workflow_id/stages/:id',
+      handler: 'stages.findById',
+      config: {
+        middlewares: [enableFeatureMiddleware('review-workflows')],
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          {
+            name: 'admin::hasPermissions',
+            config: {
+              actions: ['admin::review-workflows.read'],
+            },
+          },
+        ],
+      },
+    },
+    {
+      method: 'PUT',
+      path: '/content-manager/(collection|single)-types/:model_uid/:id/stage',
+      handler: 'stages.updateEntity',
+      config: {
+        middlewares: [enableFeatureMiddleware('review-workflows')],
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          {
+            name: 'admin::hasPermissions',
+            config: {
+              actions: ['admin::review-workflows.read'],
+            },
+          },
+        ],
+      },
+    },
+  ],
+};

package/ee/server/routes/sso.js

@@ -0,0 +1,60 @@
+'use strict';
+
+const { enableFeatureMiddleware } = require('./utils');
+
+module.exports = {
+  type: 'admin',
+  routes: [
+    {
+      method: 'GET',
+      path: '/providers',
+      handler: 'authentication.getProviders',
+      config: {
+        middlewares: [enableFeatureMiddleware('sso')],
+        auth: false,
+      },
+    },
+    {
+      method: 'GET',
+      path: '/connect/:provider',
+      handler: 'authentication.providerLogin',
+      config: {
+        middlewares: [enableFeatureMiddleware('sso')],
+        auth: false,
+      },
+    },
+    {
+      method: 'POST',
+      path: '/connect/:provider',
+      handler: 'authentication.providerLogin',
+      config: {
+        middlewares: [enableFeatureMiddleware('sso')],
+        auth: false,
+      },
+    },
+    {
+      method: 'GET',
+      path: '/providers/options',
+      handler: 'authentication.getProviderLoginOptions',
+      config: {
+        middlewares: [enableFeatureMiddleware('sso')],
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          { name: 'admin::hasPermissions', config: { actions: ['admin::provider-login.read'] } },
+        ],
+      },
+    },
+    {
+      method: 'PUT',
+      path: '/providers/options',
+      handler: 'authentication.updateProviderLoginOptions',
+      config: {
+        middlewares: [enableFeatureMiddleware('sso')],
+        policies: [
+          'admin::isAuthenticatedAdmin',
+          { name: 'admin::hasPermissions', config: { actions: ['admin::provider-login.update'] } },
+        ],
+      },
+    },
+  ],
+};

package/ee/server/routes/utils.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const { features } = require('@strapi/strapi/lib/utils/ee');
+
+const enableFeatureMiddleware = (featureName) => (ctx, next) => {
+  if (features.isEnabled(featureName)) {
+    return next();
+  }
+
+  ctx.status = 404;
+};
+
+module.exports = {
+  enableFeatureMiddleware,
+};