diff --git a/.github/filters.yaml b/.github/filters.yaml index b9c85700865..0737475aa89 100644 --- a/.github/filters.yaml +++ b/.github/filters.yaml @@ -7,6 +7,7 @@ backend: - 'packages/{utils,generators,cli,providers}/**' - 'packages/core/*/{lib,bin,ee,src}/**' - 'packages/core/database/**' + - 'yarn.lock' frontend: - '.github/actions/yarn-nm-install/*.yml' - '.github/workflows/**' @@ -15,6 +16,7 @@ frontend: - 'packages/**/admin/ee/admin/**' - 'packages/**/strapi-admin.js' - 'packages/admin-test-utils/**' + - 'yarn.lock' api: - 'tests/api/**' e2e: diff --git a/docs/yarn.lock b/docs/yarn.lock index bcabc09a94a..3e6de62acc3 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -4584,10 +4584,10 @@ __metadata: languageName: node linkType: hard -"cookie@npm:0.6.0": - version: 0.6.0 - resolution: "cookie@npm:0.6.0" - checksum: 10c0/f2318b31af7a31b4ddb4a678d024514df5e705f9be5909a192d7f116cfb6d45cbacf96a473fa733faa95050e7cff26e7832bb3ef94751592f1387b71c8956686 +"cookie@npm:0.7.1": + version: 0.7.1 + resolution: "cookie@npm:0.7.1" + checksum: 10c0/5de60c67a410e7c8dc8a46a4b72eb0fe925871d057c9a5d2c0e8145c4270a4f81076de83410c4d397179744b478e33cd80ccbcc457abf40a9409ad27dcd21dde languageName: node linkType: hard @@ -6071,15 +6071,15 @@ __metadata: linkType: hard "express@npm:^4.17.3": - version: 4.21.0 - resolution: "express@npm:4.21.0" + version: 4.21.1 + resolution: "express@npm:4.21.1" dependencies: accepts: "npm:~1.3.8" array-flatten: "npm:1.1.1" body-parser: "npm:1.20.3" content-disposition: "npm:0.5.4" content-type: "npm:~1.0.4" - cookie: "npm:0.6.0" + cookie: "npm:0.7.1" cookie-signature: "npm:1.0.6" debug: "npm:2.6.9" depd: "npm:2.0.0" @@ -6105,7 +6105,7 @@ __metadata: type-is: "npm:~1.6.18" utils-merge: "npm:1.0.1" vary: "npm:~1.1.2" - checksum: 10c0/4cf7ca328f3fdeb720f30ccb2ea7708bfa7d345f9cc460b64a82bf1b2c91e5b5852ba15a9a11b2a165d6089acf83457fc477dc904d59cd71ed34c7a91762c6cc + checksum: 10c0/0c287867e5f6129d3def1edd9b63103a53c40d4dc8628839d4b6827e35eb8f0de5a4656f9d85f4457eba584f9871ebb2ad26c750b36bd75d9bbb8bcebdc4892c languageName: node linkType: hard diff --git a/package.json b/package.json index cc3e8e3af2f..523a4799337 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "lint-staged": "15.2.10", "lodash": "4.17.21", "nx": "18.2.2", - "plop": "2.7.6", + "plop": "4.0.1", "prettier": "3.3.3", "prettier-2": "npm:prettier@^2", "qs": "6.11.1", diff --git a/packages/core/admin/admin/src/features/Tracking.tsx b/packages/core/admin/admin/src/features/Tracking.tsx index 8ff5dea914f..df6f4eba433 100644 --- a/packages/core/admin/admin/src/features/Tracking.tsx +++ b/packages/core/admin/admin/src/features/Tracking.tsx @@ -186,6 +186,7 @@ interface EventWithoutProperties { | 'willSaveComponent' | 'willSaveContentType' | 'willSaveContentTypeLayout' + | 'willOpenPreview' | 'didEditFieldNameOnContentType' | 'didCreateRelease'; properties?: never; diff --git a/packages/core/content-manager/admin/src/preview/components/PreviewSidePanel.tsx b/packages/core/content-manager/admin/src/preview/components/PreviewSidePanel.tsx index 7897f8dcda6..09be0e96812 100644 --- 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,6 @@ import * as React from 'react'; -import { useClipboard, useNotification } from '@strapi/admin/strapi-admin'; +import { useClipboard, useNotification, useTracking } 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'; @@ -15,6 +15,7 @@ const PreviewSidePanel: PanelComponent = ({ model, documentId, document }) => { const { formatMessage } = useIntl(); const { toggleNotification } = useNotification(); const { copy } = useClipboard(); + const { trackUsage } = useTracking(); const { data, error } = useGetPreviewUrlQuery({ params: { contentType: model as UID.ContentType, @@ -43,11 +44,22 @@ const PreviewSidePanel: PanelComponent = ({ model, documentId, document }) => { }); }; + const handleClick = () => { + trackUsage('willOpenPreview'); + }; + return { title: formatMessage({ id: 'content-manager.preview.panel.title', defaultMessage: 'Preview' }), content: ( -