Merge remote-tracking branch 'upstream/develop' into develop

nilsingwersen · Oct 16, 2024 · e9a6b5d · e9a6b5d
2 parents dd8ae1b + c823b10
commit e9a6b5d
Show file tree

Hide file tree

Showing 75 changed files with 586 additions and 399 deletions.
diff --git a/.github/actions/check-pr-status/package.json b/.github/actions/check-pr-status/package.json
@@ -1,6 +1,6 @@
 {
   "name": "check-pr-status",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "private": true,
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/lerna.json b/lerna.json
@@ -1,4 +1,4 @@
 {
-  "version": "5.0.6",
+  "version": "5.1.0",
   "npmClient": "yarn"
 }
diff --git a/packages/admin-test-utils/package.json b/packages/admin-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin-test-utils",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "private": true,
   "description": "Test utilities for the Strapi administration panel",
   "license": "MIT",

diff --git a/packages/cli/cloud/package.json b/packages/cli/cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/cloud-cli",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Commands to interact with the Strapi Cloud",
   "keywords": [
     "strapi",

diff --git a/packages/cli/create-strapi-app/package.json b/packages/cli/create-strapi-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-strapi-app",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Generate a new Strapi application.",
   "keywords": [
     "create-strapi-app",

diff --git a/packages/cli/create-strapi/package.json b/packages/cli/create-strapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-strapi",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Generate a new Strapi application.",
   "keywords": [
     "create-strapi",

diff --git a/packages/core/admin/admin/src/index.ts b/packages/core/admin/admin/src/index.ts
@@ -47,6 +47,7 @@ export { useQueryParams } from './hooks/useQueryParams';
 export { useFetchClient } from './hooks/useFetchClient';
 export { useFocusInputField } from './hooks/useFocusInputField';
 export { useRBAC } from './hooks/useRBAC';
+export { useClipboard } from './hooks/useClipboard';
 export { useAdminUsers } from './services/users';
 
 /**

diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",

diff --git a/packages/core/content-manager/admin/src/preview/components/PreviewSidePanel.tsx b/packages/core/content-manager/admin/src/preview/components/PreviewSidePanel.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 
-import { Button } from '@strapi/design-system';
+import { useClipboard, useNotification } from '@strapi/admin/strapi-admin';
+import { Button, Flex, IconButton } from '@strapi/design-system';
+import { Link as LinkIcon } from '@strapi/icons';
 import { UID } from '@strapi/types';
 import { useIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
@@ -11,6 +13,8 @@ import type { PanelComponent } from '@strapi/content-manager/strapi-admin';
 
 const PreviewSidePanel: PanelComponent = ({ model, documentId, document }) => {
   const { formatMessage } = useIntl();
+  const { toggleNotification } = useNotification();
+  const { copy } = useClipboard();
   const { data, error } = useGetPreviewUrlQuery({
     params: {
       contentType: model as UID.ContentType,
@@ -26,15 +30,40 @@ const PreviewSidePanel: PanelComponent = ({ model, documentId, document }) => {
     return null;
   }
 
+  const { url } = data.data;
+
+  const handleCopyLink = () => {
+    copy(url);
+    toggleNotification({
+      message: formatMessage({
+        id: 'content-manager.preview.copy.success',
+        defaultMessage: 'Copied preview link',
+      }),
+      type: 'success',
+    });
+  };
+
   return {
     title: formatMessage({ id: 'content-manager.preview.panel.title', defaultMessage: 'Preview' }),
     content: (
-      <Button variant="tertiary" fullWidth tag={Link} to={data.data.url} target="_blank">
-        {formatMessage({
-          id: 'content-manager.preview.panel.button',
-          defaultMessage: 'Open preview',
-        })}
-      </Button>
+      <Flex gap={2} width="100%">
+        <Button variant="tertiary" tag={Link} to={url} target="_blank" flex="auto">
+          {formatMessage({
+            id: 'content-manager.preview.panel.button',
+            defaultMessage: 'Open preview',
+          })}
+        </Button>
+        <IconButton
+          type="button"
+          label={formatMessage({
+            id: 'preview.copy.label',
+            defaultMessage: 'Copy preview link',
+          })}
+          onClick={handleCopyLink}
+        >
+          <LinkIcon />
+        </IconButton>
+      </Flex>
     ),
   };
 };

diff --git a/packages/core/content-manager/admin/src/preview/index.ts b/packages/core/content-manager/admin/src/preview/index.ts
@@ -3,6 +3,7 @@
 import { PreviewSidePanel } from './components/PreviewSidePanel';
 import { FEATURE_ID } from './constants';
 
+import type { ContentManagerPlugin } from '../content-manager';
 import type { PluginDefinition } from '@strapi/admin/strapi-admin';
 
 const previewAdmin = {
@@ -12,14 +13,10 @@ const previewAdmin = {
       return;
     }
 
-    const contentManagerPluginApis = app.getPlugin('content-manager').apis;
+    const contentManagerPluginApis = app.getPlugin('content-manager')
+      .apis as ContentManagerPlugin['config']['apis'];
 
-    if (
-      'addEditViewSidePanel' in contentManagerPluginApis &&
-      typeof contentManagerPluginApis.addEditViewSidePanel === 'function'
-    ) {
-      contentManagerPluginApis.addEditViewSidePanel([PreviewSidePanel]);
-    }
+    contentManagerPluginApis.addEditViewSidePanel([PreviewSidePanel]);
   },
 } satisfies Partial<PluginDefinition>;
 

diff --git a/packages/core/content-manager/admin/src/translations/en.json b/packages/core/content-manager/admin/src/translations/en.json
@@ -233,6 +233,8 @@
   "popover.display-relations.label": "Display relations",
   "preview.panel.title": "Preview",
   "preview.panel.button": "Open preview",
+  "preview.copy.label": "Copy preview link",
+  "preview.copy.success": "Copied preview link",
   "relation.add": "Add relation",
   "relation.disconnect": "Remove",
   "relation.error-adding-relation": "An error occurred while trying to add the relation.",

diff --git a/packages/core/content-manager/package.json b/packages/core/content-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/content-manager",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "A powerful UI to easily manage your data.",
   "repository": {
     "type": "git",

diff --git a/packages/core/content-releases/package.json b/packages/core/content-releases/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/content-releases",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Strapi plugin for organizing and releasing content",
   "repository": {
     "type": "git",

diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/content-type-builder",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Create and manage content types",
   "repository": {
     "type": "git",

diff --git a/packages/core/core/package.json b/packages/core/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/core",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Core of Strapi",
   "homepage": "https://strapi.io",
   "bugs": {

diff --git a/packages/core/data-transfer/package.json b/packages/core/data-transfer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/data-transfer",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Data transfer capabilities for Strapi",
   "keywords": [
     "strapi",

diff --git a/packages/core/database/package.json b/packages/core/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "bugs": {

diff --git a/packages/core/database/src/query/helpers/where.ts b/packages/core/database/src/query/helpers/where.ts
@@ -451,7 +451,7 @@ const applyWhere = (qb: Knex.QueryBuilder, where: Where) => {
 
 const fieldLowerFn = (qb: Knex.QueryBuilder) => {
   // Postgres requires string to be passed
-  if (qb.client.config.client === 'postgres') {
+  if (qb.client.dialect === 'postgresql') {
     return 'LOWER(CAST(?? AS VARCHAR))';
   }
 

diff --git a/packages/core/email/package.json b/packages/core/email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/email",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Easily configure your Strapi application to send emails.",
   "repository": {
     "type": "git",

diff --git a/packages/core/permissions/package.json b/packages/core/permissions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/permissions",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Strapi's permission layer.",
   "repository": {
     "type": "git",

diff --git a/packages/core/review-workflows/package.json b/packages/core/review-workflows/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/review-workflows",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Review workflows for your content",
   "repository": {
     "type": "git",

diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",

diff --git a/packages/core/types/package.json b/packages/core/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/types",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Shared typescript types for Strapi internal use",
   "keywords": [
     "strapi"

diff --git a/packages/core/upload/admin/src/components/CopyLinkButton/index.jsx b/packages/core/upload/admin/src/components/CopyLinkButton/index.jsx
@@ -1,12 +1,11 @@
 import React from 'react';
 
-import { useNotification } from '@strapi/admin/strapi-admin';
+import { useNotification, useClipboard } from '@strapi/admin/strapi-admin';
 import { IconButton } from '@strapi/design-system';
 import { Link as LinkIcon } from '@strapi/icons';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 
-import { useClipboard } from '../../hooks/useClipboard';
 import { getTrad } from '../../utils';
 
 export const CopyLinkButton = ({ url }) => {

diff --git a/packages/core/upload/admin/src/hooks/tests/useClipboard.test.ts b/packages/core/upload/admin/src/hooks/tests/useClipboard.test.ts
diff --git a/packages/core/upload/admin/src/hooks/useClipboard.ts b/packages/core/upload/admin/src/hooks/useClipboard.ts
diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/upload",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Makes it easy to upload images and files to your Strapi Application.",
   "license": "SEE LICENSE IN LICENSE",
   "author": {

diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Shared utilities for the Strapi packages",
   "keywords": [
     "strapi",

diff --git a/packages/generators/generators/package.json b/packages/generators/generators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generators",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Interactive API generator.",
   "keywords": [
     "strapi",

diff --git a/packages/plugins/cloud/package.json b/packages/plugins/cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-cloud",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Instructions to deploy your local project to Strapi Cloud",
   "license": "MIT",
   "author": {

diff --git a/packages/plugins/color-picker/package.json b/packages/plugins/color-picker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-color-picker",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Strapi maintained Custom Fields",
   "repository": {
     "type": "git",

diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-documentation",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.",
   "repository": {
     "type": "git",

diff --git a/packages/plugins/graphql/package.json b/packages/plugins/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-graphql",
-  "version": "5.0.6",
+  "version": "5.1.0",
   "description": "Adds GraphQL endpoint with default API methods.",
   "repository": {
     "type": "git",