@strapi/admin 4.11.0-beta.1 → 4.11.0-exp.9xg4-3qfm-9w8f.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.11.0-beta.1",
+  "version": "4.11.0-exp.9xg4-3qfm-9w8f.1",
   "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.0-beta.1",
-    "@strapi/data-transfer": "4.11.0-beta.1",
-    "@strapi/design-system": "0.0.0-3cf3ff39",
-    "@strapi/helper-plugin": "4.11.0-beta.1",
-    "@strapi/icons": "0.0.0-3cf3ff39",
-    "@strapi/permissions": "4.11.0-beta.1",
-    "@strapi/provider-audit-logs-local": "4.11.0-beta.1",
-    "@strapi/typescript-utils": "4.11.0-beta.1",
-    "@strapi/utils": "4.11.0-beta.1",
+    "@strapi/babel-plugin-switch-ee-ce": "4.11.0-exp.9xg4-3qfm-9w8f.1",
+    "@strapi/data-transfer": "4.11.0-exp.9xg4-3qfm-9w8f.1",
+    "@strapi/design-system": "1.7.10",
+    "@strapi/helper-plugin": "4.11.0-exp.9xg4-3qfm-9w8f.1",
+    "@strapi/icons": "1.7.10",
+    "@strapi/permissions": "4.11.0-exp.9xg4-3qfm-9w8f.1",
+    "@strapi/provider-audit-logs-local": "4.11.0-exp.9xg4-3qfm-9w8f.1",
+    "@strapi/typescript-utils": "4.11.0-exp.9xg4-3qfm-9w8f.1",
+    "@strapi/utils": "4.11.0-exp.9xg4-3qfm-9w8f.1",
     "axios": "1.4.0",
     "babel-loader": "^9.1.2",
     "babel-plugin-styled-components": "2.1.1",
@@ -80,7 +80,6 @@
     "fs-extra": "10.0.0",
     "highlight.js": "^10.4.1",
     "history": "^4.9.0",
-    "hoist-non-react-statics": "^3.3.0",
     "html-loader": "^4.2.0",
     "html-webpack-plugin": "5.5.0",
     "immer": "9.0.19",
@@ -107,16 +106,16 @@
     "p-map": "4.0.0",
     "passport-local": "1.0.0",
     "pluralize": "8.0.0",
-    "prop-types": "^15.7.2",
+    "prop-types": "^15.8.1",
     "qs": "6.11.1",
-    "react": "^17.0.2",
+    "react": "^18.2.0",
     "react-dnd": "15.1.2",
     "react-dnd-html5-backend": "15.1.3",
-    "react-dom": "^17.0.2",
+    "react-dom": "^18.2.0",
     "react-error-boundary": "3.1.4",
     "react-helmet": "^6.1.0",
     "react-intl": "6.4.1",
-    "react-is": "^17.0.2",
+    "react-is": "^18.2.0",
     "react-query": "3.39.3",
     "react-redux": "8.0.5",
     "react-refresh": "0.14.0",
@@ -139,9 +138,8 @@
     "yup": "^0.32.9"
   },
   "devDependencies": {
-    "@testing-library/dom": "8.20.0",
-    "@testing-library/react": "12.1.4",
-    "@testing-library/react-hooks": "8.0.1",
+    "@testing-library/dom": "9.2.0",
+    "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
     "duplicate-dependencies-webpack-plugin": "^1.0.2",
     "glob": "8.0.3",
@@ -165,5 +163,5 @@
       }
     }
   },
-  "gitHead": "a5fa3bd7e1c4680dd350580620d383612597d25d"
+  "gitHead": "54c4fa25b2706612f85aaf103f54c071c281f23b"
 }

package/server/controllers/webhooks.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const { yup, webhook: webhookUtils, validateYupSchema } = require('@strapi/utils');
+const { yup, validateYupSchema } = require('@strapi/utils');
 
 const urlRegex =
   /^(?:([a-z0-9+.-]+):\/\/)(?:\S+(?::\S*)?@)?(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9_]-*)*[a-z\u00a1-\uffff0-9_]+)(?:\.(?:[a-z\u00a1-\uffff0-9_]-*)*[a-z\u00a1-\uffff0-9_]+)*\.?)(?::\d{2,5})?(?:[/?#]\S*)?$/;
@@ -23,7 +23,7 @@ const webhookValidator = yup
         )
         .required();
     }),
-    events: yup.array().of(yup.string().oneOf(_.values(webhookUtils.webhookEvents)).required()),
+    events: yup.array().of(yup.string()).required(),
   })
   .noUnknown();
 
@@ -111,10 +111,10 @@ module.exports = {
     for (const id of ids) {
       const webhook = await strapi.webhookStore.findWebhook(id);
 
-      if (!webhook) continue;
-
-      await strapi.webhookStore.deleteWebhook(id);
-      strapi.webhookRunner.remove(webhook);
+      if (webhook) {
+        await strapi.webhookStore.deleteWebhook(id);
+        strapi.webhookRunner.remove(webhook);
+      }
     }
 
     ctx.send({ data: ids });

package/admin/src/content-manager/components/DynamicTable/BulkActionsBar/index.js

@@ -1,307 +0,0 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import { Button, Dialog, DialogBody, DialogFooter, Flex, Typography } from '@strapi/design-system';
-import { Check, ExclamationMarkCircle, Trash } from '@strapi/icons';
-import { useIntl } from 'react-intl';
-import { useSelector } from 'react-redux';
-import { useTracking } from '@strapi/helper-plugin';
-import { getTrad } from '../../../utils';
-import InjectionZoneList from '../../InjectionZoneList';
-import { listViewDomain } from '../../../pages/ListView/selectors';
-
-const ConfirmBulkActionDialog = ({ onToggleDialog, isOpen, dialogBody, endAction }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <Dialog
-      onClose={onToggleDialog}
-      title={formatMessage({
-        id: 'app.components.ConfirmDialog.title',
-        defaultMessage: 'Confirmation',
-      })}
-      labelledBy="confirmation"
-      describedBy="confirm-description"
-      isOpen={isOpen}
-    >
-      <DialogBody icon={<ExclamationMarkCircle />}>
-        <Flex direction="column" alignItems="stretch" gap={2}>
-          {dialogBody}
-        </Flex>
-      </DialogBody>
-      <DialogFooter
-        startAction={
-          <Button onClick={onToggleDialog} variant="tertiary">
-            {formatMessage({
-              id: 'app.components.Button.cancel',
-              defaultMessage: 'Cancel',
-            })}
-          </Button>
-        }
-        endAction={endAction}
-      />
-    </Dialog>
-  );
-};
-
-ConfirmBulkActionDialog.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  onToggleDialog: PropTypes.func.isRequired,
-  dialogBody: PropTypes.node.isRequired,
-  endAction: PropTypes.node.isRequired,
-};
-
-const confirmDialogsPropTypes = {
-  isConfirmButtonLoading: PropTypes.bool.isRequired,
-  isOpen: PropTypes.bool.isRequired,
-  onConfirm: PropTypes.func.isRequired,
-  onToggleDialog: PropTypes.func.isRequired,
-};
-
-const ConfirmDialogPublishAll = ({ isOpen, onToggleDialog, isConfirmButtonLoading, onConfirm }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <ConfirmBulkActionDialog
-      isOpen={isOpen}
-      onToggleDialog={onToggleDialog}
-      dialogBody={
-        <>
-          <Typography id="confirm-description" textAlign="center">
-            {formatMessage({
-              id: getTrad('popUpWarning.bodyMessage.contentType.publish.all'),
-              defaultMessage: 'Are you sure you want to publish these entries?',
-            })}
-          </Typography>
-          <InjectionZoneList area="contentManager.listView.publishModalAdditionalInfos" />
-        </>
-      }
-      endAction={
-        <Button
-          onClick={onConfirm}
-          variant="secondary"
-          startIcon={<Check />}
-          loading={isConfirmButtonLoading}
-        >
-          {formatMessage({
-            id: 'app.utils.publish',
-            defaultMessage: 'Publish',
-          })}
-        </Button>
-      }
-    />
-  );
-};
-
-ConfirmDialogPublishAll.propTypes = confirmDialogsPropTypes;
-
-const ConfirmDialogUnpublishAll = ({
-  isOpen,
-  onToggleDialog,
-  isConfirmButtonLoading,
-  onConfirm,
-}) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <ConfirmBulkActionDialog
-      isOpen={isOpen}
-      onToggleDialog={onToggleDialog}
-      dialogBody={
-        <>
-          <Typography id="confirm-description" textAlign="center">
-            {formatMessage({
-              id: getTrad('popUpWarning.bodyMessage.contentType.unpublish.all'),
-              defaultMessage: 'Are you sure you want to unpublish these entries?',
-            })}
-          </Typography>
-          <InjectionZoneList area="contentManager.listView.unpublishModalAdditionalInfos" />
-        </>
-      }
-      endAction={
-        <Button
-          onClick={onConfirm}
-          variant="secondary"
-          startIcon={<Check />}
-          loading={isConfirmButtonLoading}
-        >
-          {formatMessage({
-            id: 'app.utils.unpublish',
-            defaultMessage: 'Unpublish',
-          })}
-        </Button>
-      }
-    />
-  );
-};
-
-ConfirmDialogUnpublishAll.propTypes = confirmDialogsPropTypes;
-
-const ConfirmDialogDeleteAll = ({ isOpen, onToggleDialog, isConfirmButtonLoading, onConfirm }) => {
-  const { formatMessage } = useIntl();
-
-  return (
-    <ConfirmBulkActionDialog
-      isOpen={isOpen}
-      onToggleDialog={onToggleDialog}
-      dialogBody={
-        <>
-          <Typography id="confirm-description" textAlign="center">
-            {formatMessage({
-              id: getTrad('popUpWarning.bodyMessage.contentType.delete.all'),
-              defaultMessage: 'Are you sure you want to delete these entries?',
-            })}
-          </Typography>
-          <InjectionZoneList area="contentManager.listView.deleteModalAdditionalInfos" />
-        </>
-      }
-      endAction={
-        <Button
-          onClick={onConfirm}
-          variant="danger-light"
-          startIcon={<Trash />}
-          id="confirm-delete"
-          loading={isConfirmButtonLoading}
-        >
-          {formatMessage({
-            id: 'app.components.Button.confirm',
-            defaultMessage: 'Confirm',
-          })}
-        </Button>
-      }
-    />
-  );
-};
-
-ConfirmDialogDeleteAll.propTypes = confirmDialogsPropTypes;
-
-const BulkActionsBar = ({
-  showPublish,
-  showDelete,
-  onConfirmDeleteAll,
-  onConfirmPublishAll,
-  onConfirmUnpublishAll,
-  selectedEntries,
-  clearSelectedEntries,
-}) => {
-  const { formatMessage } = useIntl();
-  const { trackUsage } = useTracking();
-  const { data } = useSelector(listViewDomain());
-
-  const [isConfirmButtonLoading, setIsConfirmButtonLoading] = useState(false);
-  const [dialogToOpen, setDialogToOpen] = useState(null);
-
-  // Filters for Bulk actions
-  const selectedEntriesObjects = data.filter((entry) => selectedEntries.includes(entry.id));
-  const publishButtonIsShown =
-    showPublish && selectedEntriesObjects.some((entry) => !entry.publishedAt);
-  const unpublishButtonIsShown =
-    showPublish && selectedEntriesObjects.some((entry) => entry.publishedAt);
-
-  const toggleDeleteModal = () => {
-    if (dialogToOpen === 'delete') {
-      setDialogToOpen(null);
-    } else {
-      setDialogToOpen('delete');
-      trackUsage('willBulkDeleteEntries');
-    }
-  };
-
-  const togglePublishModal = () => {
-    if (dialogToOpen === 'publish') {
-      setDialogToOpen(null);
-    } else {
-      setDialogToOpen('publish');
-      trackUsage('willBulkPublishEntries');
-    }
-  };
-
-  const toggleUnpublishModal = () => {
-    if (dialogToOpen === 'unpublish') {
-      setDialogToOpen(null);
-    } else {
-      setDialogToOpen('unpublish');
-      trackUsage('willBulkUnpublishEntries');
-    }
-  };
-
-  const handleBulkAction = async (confirmAction, toggleModal) => {
-    try {
-      setIsConfirmButtonLoading(true);
-      await confirmAction(selectedEntries);
-      setIsConfirmButtonLoading(false);
-      toggleModal();
-      clearSelectedEntries();
-    } catch (error) {
-      setIsConfirmButtonLoading(false);
-      toggleModal();
-    }
-  };
-
-  const handleBulkDelete = () => handleBulkAction(onConfirmDeleteAll, toggleDeleteModal);
-  const handleBulkPublish = () => handleBulkAction(onConfirmPublishAll, togglePublishModal);
-  const handleBulkUnpublish = () => handleBulkAction(onConfirmUnpublishAll, toggleUnpublishModal);
-
-  return (
-    <>
-      {publishButtonIsShown && (
-        <>
-          <Button variant="tertiary" onClick={togglePublishModal}>
-            {formatMessage({ id: 'app.utils.publish', defaultMessage: 'Publish' })}
-          </Button>
-          <ConfirmDialogPublishAll
-            isOpen={dialogToOpen === 'publish'}
-            onToggleDialog={togglePublishModal}
-            isConfirmButtonLoading={isConfirmButtonLoading}
-            onConfirm={handleBulkPublish}
-          />
-        </>
-      )}
-      {unpublishButtonIsShown && (
-        <>
-          <Button variant="tertiary" onClick={toggleUnpublishModal}>
-            {formatMessage({ id: 'app.utils.unpublish', defaultMessage: 'Unpublish' })}
-          </Button>
-          <ConfirmDialogUnpublishAll
-            isOpen={dialogToOpen === 'unpublish'}
-            onToggleDialog={toggleUnpublishModal}
-            isConfirmButtonLoading={isConfirmButtonLoading}
-            onConfirm={handleBulkUnpublish}
-          />
-        </>
-      )}
-      {showDelete && (
-        <>
-          <Button variant="danger-light" onClick={toggleDeleteModal}>
-            {formatMessage({ id: 'global.delete', defaultMessage: 'Delete' })}
-          </Button>
-          <ConfirmDialogDeleteAll
-            isOpen={dialogToOpen === 'delete'}
-            onToggleDialog={toggleDeleteModal}
-            isConfirmButtonLoading={isConfirmButtonLoading}
-            onConfirm={handleBulkDelete}
-          />
-        </>
-      )}
-    </>
-  );
-};
-
-BulkActionsBar.defaultProps = {
-  showPublish: false,
-  showDelete: false,
-  onConfirmDeleteAll() {},
-  onConfirmPublishAll() {},
-  onConfirmUnpublishAll() {},
-};
-
-BulkActionsBar.propTypes = {
-  showPublish: PropTypes.bool,
-  showDelete: PropTypes.bool,
-  onConfirmDeleteAll: PropTypes.func,
-  onConfirmPublishAll: PropTypes.func,
-  onConfirmUnpublishAll: PropTypes.func,
-  selectedEntries: PropTypes.array.isRequired,
-  clearSelectedEntries: PropTypes.func.isRequired,
-};
-
-export default BulkActionsBar;