295 Commits

Author SHA1 Message Date
markkaylor
395a47681f
chore: test e2e history version can be restored (#20401)
* chore: test e2e history version can be restored

* fix: use save and wait for save alerts with findAndClose

* fix: add missing await

---------

Co-authored-by: Rémi de Juvigny <remi.dejuvigny@strapi.io>
2024-06-11 05:35:34 -04:00
Ben Irvin
df8bac0784
test: fix some broken e2e tests (#20485) 2024-06-11 11:18:50 +02:00
markkaylor
d3775ccc16
Merge pull request #20458 from strapi/chore/merge-develop-to-v5-main
chore: merge develop into v5/main
2024-06-07 17:29:48 +02:00
Mark Kaylor
896e24a2ea fix: skip ctb tests 2024-06-07 16:20:11 +02:00
Mark Kaylor
4293686486 fix: broken e2e tests 2024-06-07 11:09:15 +02:00
Alexandre Bodin
6c6d15ada7 chore: update tests 2024-06-06 17:05:20 +02:00
Alexandre Bodin
799c526386 enhancement: rework cli UX 2024-06-06 17:04:38 +02:00
Mark Kaylor
94657d7e77 Merge branch 'develop' of github.com:strapi/strapi into chore/merge-develop-to-v5-main 2024-06-06 17:03:30 +02:00
Jean-Sébastien Herbaux
adb9db5660
Fix: Query Validation in Files' Admin API (#20389)
Co-authored-by: Ben Irvin <ben.irvin@strapi.io>
2024-06-05 15:47:11 +02:00
Rémi de Juvigny
dd3311938a
fix: prevent duplicate history versions on publish (#20415)
* fix: prevent duplicate history versions on publish

* fix: build failing

* chore: fix e2e tests
2024-06-04 08:28:29 -04:00
Ben Irvin
b87c442c30
test: fix ctb edit collection type (#20426) 2024-06-04 10:02:31 +02:00
Fernando Chavez
8f5f6b58d5 chore(content-releases: skip api tests until releases is migrated to v5 2024-05-31 14:53:19 +02:00
Convly
33413bf56c fix: style 2024-05-30 13:34:00 +02:00
Convly
51ac889697 Merge branch 'v5/main' of github.com:strapi/strapi into v5/main 2024-05-30 13:12:39 +02:00
Convly
481550a0d4 Merge branch 'refs/heads/develop' into v5/main
# Conflicts:
#	.github/actions/check-pr-status/package.json
#	docs/docs/docs/01-core/admin/05-features/authentication.md
#	docs/docusaurus.config.js
#	docs/yarn.lock
#	examples/getstarted/package.json
#	examples/kitchensink-ts/package.json
#	examples/kitchensink/package.json
#	examples/plugins/workspace-plugin/package.json
#	lerna.json
#	package.json
#	packages/admin-test-utils/package.json
#	packages/cli/create-strapi-app/package.json
#	packages/cli/create-strapi-starter/package.json
#	packages/cli/create-strapi/package.json
#	packages/core/admin/admin/src/App.tsx
#	packages/core/admin/admin/src/components/AuthenticatedApp.tsx
#	packages/core/admin/admin/src/components/Context.tsx
#	packages/core/admin/admin/src/components/LeftMenu.tsx
#	packages/core/admin/admin/src/components/PrivateRoute.tsx
#	packages/core/admin/admin/src/content-manager/pages/ListSettingsView/index.jsx
#	packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActions/PublishAction.tsx
#	packages/core/admin/admin/src/content-manager/pages/ListView/components/TableCells/CellContent.tsx
#	packages/core/admin/admin/src/features/Configuration.tsx
#	packages/core/admin/admin/src/index.ts
#	packages/core/admin/admin/src/pages/ProfilePage.tsx
#	packages/core/admin/admin/src/pages/UseCasePage.tsx
#	packages/core/admin/ee/server/src/services/metrics.ts
#	packages/core/admin/package.json
#	packages/core/admin/server/src/bootstrap.ts
#	packages/core/content-manager/package.json
#	packages/core/content-releases/admin/src/components/CMReleasesContainer.tsx
#	packages/core/content-releases/admin/src/components/ReleaseListCell.tsx
#	packages/core/content-releases/admin/src/index.ts
#	packages/core/content-releases/admin/src/pages/ReleaseDetailsPage.tsx
#	packages/core/content-releases/admin/src/pages/tests/ReleaseDetailsPage.test.tsx
#	packages/core/content-releases/admin/src/services/release.ts
#	packages/core/content-releases/package.json
#	packages/core/content-releases/server/src/controllers/release.ts
#	packages/core/content-type-builder/package.json
#	packages/core/core/.gitignore
#	packages/core/data-transfer/package.json
#	packages/core/database/package.json
#	packages/core/database/src/query/helpers/populate/apply.ts
#	packages/core/email/package.json
#	packages/core/helper-plugin/package.json
#	packages/core/permissions/package.json
#	packages/core/strapi/package.json
#	packages/core/types/package.json
#	packages/core/upload/admin/src/components/AssetDialog/BrowseStep/tests/__snapshots__/index.test.jsx.snap
#	packages/core/upload/admin/src/pages/App/ConfigureTheView/components/tests/__snapshots__/Settings.test.jsx.snap
#	packages/core/upload/admin/src/pages/App/ConfigureTheView/tests/__snapshots__/ConfigureTheView.test.jsx.snap
#	packages/core/upload/package.json
#	packages/core/upload/server/services/provider.js
#	packages/core/upload/server/services/upload.js
#	packages/core/upload/server/src/services/image-manipulation.ts
#	packages/core/upload/server/tsconfig.eslint.json
#	packages/core/utils/package.json
#	packages/generators/app/package.json
#	packages/generators/app/src/utils/db-client-dependencies.ts
#	packages/generators/generators/package.json
#	packages/plugins/cloud/package.json
#	packages/plugins/color-picker/package.json
#	packages/plugins/documentation/package.json
#	packages/plugins/graphql/package.json
#	packages/plugins/i18n/admin/src/components/LocaleListCell.tsx
#	packages/plugins/i18n/admin/src/contentReleasesHooks/releaseDetailsView.ts
#	packages/plugins/i18n/admin/src/index.ts
#	packages/plugins/i18n/package.json
#	packages/plugins/sentry/package.json
#	packages/plugins/users-permissions/package.json
#	packages/providers/email-amazon-ses/package.json
#	packages/providers/email-mailgun/package.json
#	packages/providers/email-nodemailer/package.json
#	packages/providers/email-sendgrid/package.json
#	packages/providers/email-sendmail/package.json
#	packages/providers/upload-aws-s3/package.json
#	packages/providers/upload-cloudinary/package.json
#	packages/providers/upload-local/package.json
#	packages/utils/api-tests/package.json
#	packages/utils/eslint-config-custom/package.json
#	packages/utils/logger/package.json
#	packages/utils/tsconfig/package.json
#	packages/utils/typescript/package.json
#	packages/utils/upgrade/LICENSE
#	packages/utils/upgrade/bin/upgrade.js
#	packages/utils/upgrade/package.json
#	packages/utils/upgrade/packup.config.ts
#	scripts/front/package.json
#	tests/e2e/constants.ts
#	tests/e2e/tests/content-releases/releases-page.spec.ts
#	yarn.lock
2024-05-30 13:12:27 +02:00
markkaylor
6049796485
fix(content-manager): remove i18n search params when navigating (#20382) 2024-05-30 09:24:35 +02:00
Rémi de Juvigny
826f263c58
fix: add clone actions to history (#20387)
* fix: clone action not appearing in history

* chore: add api tests
2024-05-29 09:09:54 -04:00
Madhuri Sandbhor
be0adb1bd8
enhancement: bulk publish migration to v5 (#20255)
* fix: added bulk actions

* chore: migrate bulk publish & unpublish to v5

* chore: change findLocales type to accept arrays

* chore: fix lint error

* chore: migrate bulkDelete to v5 (#20161)

* chore: migrate bulkDelete to v5

* chore: change findLocales type to accept strings array

* fix: docs prettier styles

* chore: remove console.log

* enhancement: migrate countManyDraftRelations to v5

* feat: bulk delete with locale selection option

* fix: bulk unpublish working without locale support

* test: e2e tests updated

* fix: documents api change, deleteMany tags updated, test skipped

* chore: renaming

* test: reverting e2e tests for delete action changes

* feat: publish action changes

* fix: reverting publish action changes

* fix: hide add to release as its not ready to be migrated

* fix: error message updated

* fix: tests updated for useDocumentAction

* fix: updated request params

* fix: publish action added

* fix: publish action changes with documentId

* fix: reverting wrong commit message

Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>

* fix: comments updated

* chore: renaming

* chore: add type to bulk action actions (#20256)

* chore: actionType renamed to just type

* fix: added missing import

* test: fixed

* fix(content-manager): edit entry button on bulk publish modal

* fix: validationError message type is not as expected

* fix: ts error

* only fetch entries when modal is opened

* fix(content-releases): use status to show the published instead of publishedAt

---------

Co-authored-by: Fernando Chavez <fernando.chavez@strapi.io>
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
2024-05-28 14:23:09 +02:00
Bassel Kanso
e4b2a92811
Merge pull request #20172 from strapi/v5/remove-root-level-nested-params
Remove root level nested params
2024-05-28 10:56:21 +03:00
Rémi de Juvigny
79490c1229
chore: adds and fixes e2e for content history (#20098)
* chore: add e2e test for unknown relation

* chore: add single type test

* chore: fix history e2e tests

* fix: releases matching two fields

* chore: await success notifications
2024-05-27 11:23:55 -04:00
Bassel Kanso
c35ac771c5
Update tests/api/core/strapi/api/populate/sanitize.test.api.js
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
2024-05-27 16:42:12 +03:00
Bassel Kanso
4fe3c1b4c4 fix: populate syntax in media test
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
2024-05-27 16:40:15 +03:00
markkaylor
f75e3c6d67
chore(audit-logs): migrate audit logs to v5 (#20251) 2024-05-27 09:30:23 +02:00
Bassel Kanso
a31bbe7211 Merge branch 'v5/main' into v5/remove-root-level-nested-params 2024-05-22 13:13:56 +03:00
Ben Irvin
5277eaf60c
fix(ctb): validate pluralName and collectionName correctly (#20347) 2024-05-22 09:59:58 +02:00
Josh
5ff7024fc8
chore: update DS to 2.0.0-beta.4 (#20301) 2024-05-20 10:42:44 +01:00
Ben Irvin
48a7b1e909
chore: sync e2e tests with v5 branch (#20334) 2024-05-20 11:15:57 +02:00
Ben Irvin
7d9787cb7c
chore(test): change utils to .ts (#20333) 2024-05-20 11:15:33 +02:00
Bassel Kanso
58ab115ac3 fix: update and remove tests that are using deprectated populate api for DZ 2024-05-20 11:27:56 +03:00
Josh
a3960e1ee5
chore: update react&react-dom to 18.3 (#20316)
* chore: update react&react-dom to 18.3

* chore: TS fix

* chore: update testing packages

* chore: fix lint
2024-05-17 16:00:38 +01:00
Jamie Howard
8c5105d949
Publish multiple locales (#20258)
* fix: date comparison

* feat(core): document service publish multiple locales (#20046)

* feat(core): document service (un)publish multiple locales

* fix(core): cleanup locale param types

* feat(content-manager): wip - multiple locale support

* Count draft relations across locales (#20116)

* feat(content-manager): publish multiple locales from CM route

* feat(core): multiple locales in document service discard draft

* feat(content-manager): use bulkpublish for locale publish

* feat(content-manager): use query from bulkpublish locales

* feat(content-manager): publishMany

* feat(content-manager): api test for bulk locale + document publish

* chore(content-manager): fix for build

* fix(core): avoid * in locale data

* chore(content-manager): pr amends and validation improvement

* feat(content-manager): use transaction in document manager publish many

* feat(core): throw when a non string locale is provided and not supported

* fix(core): doc service find many

* chore: clean up

* feat(content-manager): Select fields that require validation in availablelocales (#20156)

* feat(content-manager): wip - select more fields in availablelocales

* feat(content-manager): wip available locales using entity traversal

* feat(content-manager): wip test available locales returns fields with validation

* feat(content-manager): test available locales returns fields with validation

* fix(content-manager): ensure sensitive info not exposed in available statuses

* fix(content-manager): sanitize document metadata available status

* fix(content-manager): sanitize document metadata available status at controller level

* fix(content-manager): populate only for validatable fields

* chore: clean up

* chore: clean up

* chore: clean up

* fix(content-manager): build issues

* fix(content-manager): allow null locales

* fix(content-manager): history service (#20185)

* fix(content-manager): history service

* chore(content-manager): clean up

* fix: pr feedback

* chore: update actions deps

* chore: update utility deps

* chore: upgrade sentry

* chore: upgrade graphql-tools

* fix: http-errors ugprade

* chore: add fs-extra types where needed

* docs(typescript): type system cheat sheet

* chore!: remove deprecated verbose option from ts:generate-types

* chore: clean up

fix(content-manager) correctly count bulk publish results

* fix(content-manager): pr feedback and test improvements

* feat(i18n): bulk locale publish modal in CM edit view (#20069)

* feat(i18n): wip bulk locale publish modal

* fix(i18n): wip - fe bulk locale publish

* feat(content-manager): multi locale publish, integrate with backend and add basic e2e test

* feat(i18n): wip - display validation errors in bulk locale modal

* chore: clean up

* chore(i18n): design system changes

* feat(i18n): display correct status after publish and clean up error messaging

* feat(i18n): access onclose from modal body

* fix(i18n): selected locale change

* fix(i18n): locale table state

* fix(i18n): edit view e2e test

* chore(content-manager): validation tweak wip

* feat(i18n): cover validation cases in i18n e2e tests

* chore: clean up

* fix(i18n): edit view more document actions disabled state

* chore: feedback

* fix(i18n): send all params to publish many

* fix(i18n): place bulk locale publish 3rd in array

* fix(content-manager): validation error extraction

* fix(content-manager): pr feedback

* fix: build

* chore(content-manager): simplify exports

* chore(i18n): revert package

---------

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
Co-authored-by: Ben Irvin <ben.irvin@strapi.io>

* fix(i18n): disable publish button after bulk locale publish

* fix(content-manager): ce e2e fix

* chore: typography

* fix(i18n): e2e edit view test

* fix: wip date comparison

* fix: wip date comparison

* fix(content-manager): simplify date comparison

* fix: clean up metadata api test

* chore: update api tests

* fix: draft versions must be ahead of published to be considered modified

* fix: published modified calculation

* fix: clean up

* fix: simplify draft and publish comparison

* chore: clean up

* fix: flaky fe tests

* fix: pr feedback

* fix(i18n): error message extraction in bulk locale modal

* chore: remove old publish action

* chore: pr feedback

* chore: refactor error types & validation messages

* chore: use anchor link for locale changes

* chore: fix releases

* fix: clean up

* chore: snapshot

---------

Co-authored-by: Marc-Roig <marc12info@gmail.com>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
Co-authored-by: Ben Irvin <ben.irvin@strapi.io>
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
2024-05-10 18:20:35 +01:00
Marc Roig
521cd3f8cd
fix: improve CM modified date comparison (#19898)
* fix: date comparison

* fix(content-manager): simplify date comparison

* fix: clean up metadata api test

* fix: draft versions must be ahead of published to be considered modified

* fix: published modified calculation

* fix: clean up

* fix: simplify draft and publish comparison

* chore: clean up

* fix: flaky fe tests

* fix: pr feedback

---------

Co-authored-by: Jamie Howard <jamie.howard@strapi.io>
2024-05-09 19:19:18 +02:00
Madhuri Sandbhor
e1b9d9adee
enhancement(CM): bulk delete and unpublish migration to v5 (#20235)
* fix: added bulk actions

* chore: migrate bulk publish & unpublish to v5

* chore: change findLocales type to accept arrays

* chore: fix lint error

* chore: migrate bulkDelete to v5 (#20161)

* chore: migrate bulkDelete to v5

* chore: change findLocales type to accept strings array

* fix: docs prettier styles

* chore: remove console.log

* enhancement: migrate countManyDraftRelations to v5

* feat: bulk delete with locale selection option

* fix: bulk unpublish working without locale support

* test: e2e tests updated

* fix: documents api change, deleteMany tags updated, test skipped

* chore: renaming

* test: reverting e2e tests for delete action changes

* fix: reverting publish action changes

* fix: hide add to release as its not ready to be migrated

* fix: error message updated

* fix: tests updated for useDocumentAction

* fix: updated request params

* fix: reverting wrong commit message

Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>

* fix: comments updated

* chore: renaming

* chore: add type to bulk action actions (#20256)

* chore: actionType renamed to just type

* fix: dont show unpublish button on contentTypes without draft and publish

* fix: set a fixed width for FieldActionWrapper on UID input

---------

Co-authored-by: Fernando Chavez <fernando.chavez@strapi.io>
Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
2024-05-09 12:35:48 +02:00
Bassel Kanso
3bc72930fa Merge branch 'v5/main' into v5/replace-axios 2024-05-08 12:00:18 +03:00
Fernando Chávez
3fdf1a575b
enhancement: migrate bulk publish & unpublish to v5 (#20184)
* chore: migrate bulk publish & unpublish to v5

* chore: change findLocales type to accept arrays

* chore: fix lint error

* chore: migrate bulkDelete to v5 (#20161)

* chore: migrate bulkDelete to v5

* chore: change findLocales type to accept strings array

* fix: docs prettier styles

* chore: remove console.log

* enhancement: migrate countManyDraftRelations to v5

* only publish not published entries

* use strapi query directly on bulkPublish

* fix api tests for bulk publish

* apply jamie feedback
2024-05-07 16:58:56 +02:00
Josh
b7c62568a8
chore!: update styled-components to 6 & update DS to 2.0.0-beta.3 (#20260)
* chore: update styled-components to 6

* chore: update admin

* chore: update CM

* chore: update ctb

* chore: update other plugin packages

* chore: update content-releases

* chore: update user-permissions

* chore: update upload

* chore: update fields to be dot notation

* chore: update tests

* chore: update yarn.lock

* chore: update snapshots

* chore: update deps

* chore: update snapshots

* fix: left menu

* test: add label prop to NavLink test

* chore: PR tweaks
2024-05-07 14:01:26 +01:00
Ben Irvin
7a6d9a2b0e
enhancement!: validate input in content API create and update controllers
Co-authored-by: Jean-Sébastien Herbaux <Convly@users.noreply.github.com>
2024-05-07 11:22:22 +02:00
Bassel Kanso
0e5c0a66e7
Merge branch 'v5/main' into v5/remove-root-level-nested-params 2024-05-06 23:15:32 +03:00
Bassel Kanso
ab41b2e7ac Merge branch 'v5/main' into v5/replace-axios 2024-05-06 21:48:47 +03:00
Marc Roig
8e9b152292
fix: document service find many pagination (#20178) 2024-05-06 14:52:48 +02:00
Marc Roig
01187db536
feat: discard drafts when enabling draft and publish on ct (#20257)
* feat: discard drafts when enabling draft and publish on ct

* fix: migration tests
2024-05-06 11:42:41 +02:00
markkaylor
e60ec18292
chore(history): refactor restore and add tests for relations (#20179) 2024-05-06 10:54:07 +02:00
Marc Roig
823c409265
feat: run rbac api tests (#20252)
* feat: run rbac condition tests

* fix: omit documentId when creating an article
2024-05-03 14:15:21 +02:00
Marc Roig
23fa63efeb
feat: webhooks (#20129)
* feat: webhooks

* feat: ignore entry.publish findOne

* chore: type entry

* feat: refactor publication methods to not trigger entry.delete webhook (#20136)

* feat: refactor publication methods

* fix: remove unnecessary chain op in db query

* feat: emit document. as webhook

* feat: register  legacy events

* feat: only trigger entry webhooks

* feat: rename webhook to event

* feat: event manager

* fix: repository

* feat: webhook tests

* fix: api tests

* fix: non localized fields api test

* fix: refactor event hub

* fix: eventhub type

* fix: event hub unit test

* fix: remove all subscribers

* fix: webhook api test
2024-05-03 11:41:42 +02:00
Marc Roig
43f3d25660
feat: draft and publish api tests (#20150)
* feat: refactor test in transaction util

* fix: remove dp tests

* fix: failing api test

* feat: test structure

* feat: update doc service api tests

* fix: test invalid locale param
2024-05-03 09:17:16 +02:00
Marc Roig
ca6c7c80ec
release: 4.24.1 to develop (#20248)
* fix(admin): if were in EE mode wait for the EE routes to be loaded before rendering (#20238)

* fix: issue 20138 (#20240)

* v4.24.1

---------

Co-authored-by: Josh <37798644+joshuaellis@users.noreply.github.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
2024-05-02 17:14:54 +02:00
Bassel Kanso
0ca752ad99
Merge branch 'v5/main' into v5/replace-axios 2024-05-02 10:52:23 +03:00
Bassel Kanso
d696828dfe chore: fix transfer token e2e test 2024-05-02 01:43:39 +03:00
markkaylor
4a26739ee0
fix(history): handle sanitization when fetching versions (#20212)
Co-authored-by: Rémi de Juvigny <remi.dejuvigny@strapi.io>
2024-04-30 11:33:06 +02:00
Josh
5d000fb33c
chore: upgrade to DS 2.0.0-beta.2 (#20151) 2024-04-25 16:17:23 +01:00