@strapi/content-manager 0.0.0-experimental.d954d57341a6623992a0d211daaec8e245c3517d → 0.0.0-experimental.e14656d3b8681880212c13260b9a2b340c182f2d
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +18 -3
- package/dist/_chunks/{ComponentConfigurationPage-WRPUXGd6.js → ComponentConfigurationPage-D_M8iBw5.js} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-WRPUXGd6.js.map → ComponentConfigurationPage-D_M8iBw5.js.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-gdUj_t-O.mjs → ComponentConfigurationPage-qemkOlnj.mjs} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-gdUj_t-O.mjs.map → ComponentConfigurationPage-qemkOlnj.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-C1vjMBgy.js → EditConfigurationPage-BePwPuHy.js} +3 -3
- package/dist/_chunks/{EditConfigurationPage-C1vjMBgy.js.map → EditConfigurationPage-BePwPuHy.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-BwuIPOJG.mjs → EditConfigurationPage-CjUrEewK.mjs} +3 -3
- package/dist/_chunks/{EditConfigurationPage-BwuIPOJG.mjs.map → EditConfigurationPage-CjUrEewK.mjs.map} +1 -1
- package/dist/_chunks/{EditViewPage-DbcGfyqK.js → EditViewPage-B-RJeiJD.js} +19 -8
- package/dist/_chunks/EditViewPage-B-RJeiJD.js.map +1 -0
- package/dist/_chunks/{EditViewPage-0MiFkXa8.mjs → EditViewPage-De8GyU8P.mjs} +19 -8
- package/dist/_chunks/EditViewPage-De8GyU8P.mjs.map +1 -0
- package/dist/_chunks/{Field-BG1xu38N.js → Field-dq8Tg1M_.js} +444 -86
- package/dist/_chunks/Field-dq8Tg1M_.js.map +1 -0
- package/dist/_chunks/{Field-BDMSCcy5.mjs → Field-pb2o8uBe.mjs} +446 -88
- package/dist/_chunks/Field-pb2o8uBe.mjs.map +1 -0
- package/dist/_chunks/{Form-9BnFyUjy.js → Form-DGIf4jQU.js} +26 -12
- package/dist/_chunks/Form-DGIf4jQU.js.map +1 -0
- package/dist/_chunks/{Form-CPVWavB8.mjs → Form-DJn0Dxha.mjs} +26 -12
- package/dist/_chunks/Form-DJn0Dxha.mjs.map +1 -0
- package/dist/_chunks/{History-BVpd8LP3.mjs → History-BowL3JKP.mjs} +44 -19
- package/dist/_chunks/History-BowL3JKP.mjs.map +1 -0
- package/dist/_chunks/{History-BWWxLt2Z.js → History-Dh2NEHnR.js} +44 -19
- package/dist/_chunks/History-Dh2NEHnR.js.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DozVMKcR.mjs → ListConfigurationPage-BpVOB-hn.mjs} +20 -8
- package/dist/_chunks/ListConfigurationPage-BpVOB-hn.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-6swzjdAZ.js → ListConfigurationPage-BxYCWz9e.js} +20 -8
- package/dist/_chunks/ListConfigurationPage-BxYCWz9e.js.map +1 -0
- package/dist/_chunks/{ListViewPage-BlzfjS2Q.js → ListViewPage-4XsciqHZ.js} +21 -7
- package/dist/_chunks/ListViewPage-4XsciqHZ.js.map +1 -0
- package/dist/_chunks/{ListViewPage-Ds0ulgfG.mjs → ListViewPage-CXFUjZQC.mjs} +22 -8
- package/dist/_chunks/ListViewPage-CXFUjZQC.mjs.map +1 -0
- package/dist/_chunks/{NoContentTypePage-D2nCCWEl.js → NoContentTypePage-C8OpoHeU.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-D2nCCWEl.js.map → NoContentTypePage-C8OpoHeU.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-BH11kaKt.mjs → NoContentTypePage-DuhOTp3x.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-BH11kaKt.mjs.map → NoContentTypePage-DuhOTp3x.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-BT2Tn0D_.mjs → NoPermissionsPage-DVz3mzDz.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-BT2Tn0D_.mjs.map → NoPermissionsPage-DVz3mzDz.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DN_JlsU2.js → NoPermissionsPage-y_r7DVA2.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DN_JlsU2.js.map → NoPermissionsPage-y_r7DVA2.js.map} +1 -1
- package/dist/_chunks/{Relations-Dnag3fhV.mjs → Relations-CVNLrn1Y.mjs} +4 -4
- package/dist/_chunks/Relations-CVNLrn1Y.mjs.map +1 -0
- package/dist/_chunks/{Relations-CcgFTcWo.js → Relations-DPFCAa7b.js} +4 -4
- package/dist/_chunks/Relations-DPFCAa7b.js.map +1 -0
- package/dist/_chunks/{en-Ux26r5pl.mjs → en-BrCTWlZv.mjs} +5 -4
- package/dist/_chunks/{en-Ux26r5pl.mjs.map → en-BrCTWlZv.mjs.map} +1 -1
- package/dist/_chunks/{en-fbKQxLGn.js → en-uOUIxfcQ.js} +5 -4
- package/dist/_chunks/{en-fbKQxLGn.js.map → en-uOUIxfcQ.js.map} +1 -1
- package/dist/_chunks/{index-CWpLBSt0.js → index-C3fJE-1-.js} +390 -169
- package/dist/_chunks/index-C3fJE-1-.js.map +1 -0
- package/dist/_chunks/{index-JNNNKUHs.mjs → index-DiMrfcfy.mjs} +397 -176
- package/dist/_chunks/index-DiMrfcfy.mjs.map +1 -0
- package/dist/_chunks/{layout--iHdZzRk.js → layout-C788OmNr.js} +23 -11
- package/dist/_chunks/layout-C788OmNr.js.map +1 -0
- package/dist/_chunks/{layout-DC503LnF.mjs → layout-ls3gxfpH.mjs} +25 -13
- package/dist/_chunks/layout-ls3gxfpH.mjs.map +1 -0
- package/dist/_chunks/{relations-CTje5t-a.mjs → relations-CLcOmGO0.mjs} +2 -2
- package/dist/_chunks/{relations-CTje5t-a.mjs.map → relations-CLcOmGO0.mjs.map} +1 -1
- package/dist/_chunks/{relations-BbHizA5K.js → relations-DYeotliT.js} +2 -2
- package/dist/_chunks/{relations-BbHizA5K.js.map → relations-DYeotliT.js.map} +1 -1
- package/dist/admin/index.js +1 -1
- package/dist/admin/index.mjs +1 -1
- package/dist/admin/src/history/index.d.ts +3 -0
- package/dist/admin/src/history/services/historyVersion.d.ts +1 -1
- package/dist/admin/src/index.d.ts +1 -0
- package/dist/admin/src/pages/EditView/components/DocumentActions.d.ts +1 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/utils/constants.d.ts +4 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/Relations.d.ts +20 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/EditorLayout.d.ts +2 -2
- package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/WysiwygFooter.d.ts +2 -2
- package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/WysiwygStyles.d.ts +10 -22
- package/dist/admin/src/services/api.d.ts +1 -1
- package/dist/admin/src/services/components.d.ts +2 -2
- package/dist/admin/src/services/contentTypes.d.ts +3 -3
- package/dist/admin/src/services/documents.d.ts +16 -16
- package/dist/admin/src/services/init.d.ts +1 -1
- package/dist/admin/src/services/relations.d.ts +2 -2
- package/dist/admin/src/services/uid.d.ts +3 -3
- package/dist/admin/src/utils/validation.d.ts +4 -1
- package/dist/server/index.js +166 -108
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +167 -109
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/controllers/collection-types.d.ts.map +1 -1
- package/dist/server/src/controllers/relations.d.ts.map +1 -1
- package/dist/server/src/controllers/uid.d.ts.map +1 -1
- package/dist/server/src/controllers/validation/dimensions.d.ts +4 -2
- package/dist/server/src/controllers/validation/dimensions.d.ts.map +1 -1
- package/dist/server/src/history/services/lifecycles.d.ts.map +1 -1
- package/dist/server/src/history/services/utils.d.ts +1 -1
- package/dist/server/src/history/services/utils.d.ts.map +1 -1
- package/dist/server/src/policies/hasPermissions.d.ts.map +1 -1
- package/dist/server/src/services/document-manager.d.ts.map +1 -1
- package/dist/server/src/services/document-metadata.d.ts.map +1 -1
- package/dist/server/src/services/permission-checker.d.ts.map +1 -1
- package/dist/server/src/services/utils/populate.d.ts.map +1 -1
- package/package.json +8 -8
- package/dist/_chunks/EditViewPage-0MiFkXa8.mjs.map +0 -1
- package/dist/_chunks/EditViewPage-DbcGfyqK.js.map +0 -1
- package/dist/_chunks/Field-BDMSCcy5.mjs.map +0 -1
- package/dist/_chunks/Field-BG1xu38N.js.map +0 -1
- package/dist/_chunks/Form-9BnFyUjy.js.map +0 -1
- package/dist/_chunks/Form-CPVWavB8.mjs.map +0 -1
- package/dist/_chunks/History-BVpd8LP3.mjs.map +0 -1
- package/dist/_chunks/History-BWWxLt2Z.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-6swzjdAZ.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-DozVMKcR.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-BlzfjS2Q.js.map +0 -1
- package/dist/_chunks/ListViewPage-Ds0ulgfG.mjs.map +0 -1
- package/dist/_chunks/Relations-CcgFTcWo.js.map +0 -1
- package/dist/_chunks/Relations-Dnag3fhV.mjs.map +0 -1
- package/dist/_chunks/index-CWpLBSt0.js.map +0 -1
- package/dist/_chunks/index-JNNNKUHs.mjs.map +0 -1
- package/dist/_chunks/layout--iHdZzRk.js.map +0 -1
- package/dist/_chunks/layout-DC503LnF.mjs.map +0 -1
@@ -2,15 +2,15 @@
|
|
2
2
|
const Icons = require("@strapi/icons");
|
3
3
|
const jsxRuntime = require("react/jsx-runtime");
|
4
4
|
const strapiAdmin = require("@strapi/admin/strapi-admin");
|
5
|
-
const qs = require("qs");
|
6
|
-
const reactIntl = require("react-intl");
|
7
|
-
const reactRouterDom = require("react-router-dom");
|
8
5
|
const React = require("react");
|
9
6
|
const designSystem = require("@strapi/design-system");
|
7
|
+
const reactIntl = require("react-intl");
|
8
|
+
const reactRouterDom = require("react-router-dom");
|
10
9
|
const styledComponents = require("styled-components");
|
11
10
|
const yup = require("yup");
|
12
11
|
const pipe = require("lodash/fp/pipe");
|
13
12
|
const dateFns = require("date-fns");
|
13
|
+
const qs = require("qs");
|
14
14
|
const toolkit = require("@reduxjs/toolkit");
|
15
15
|
const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
|
16
16
|
function _interopNamespace(e) {
|
@@ -70,42 +70,6 @@ const useInjectionZone = (area) => {
|
|
70
70
|
const [page, position] = area.split(".");
|
71
71
|
return contentManagerPlugin.getInjectedComponents(page, position);
|
72
72
|
};
|
73
|
-
const HistoryAction = ({ model, document }) => {
|
74
|
-
const { formatMessage } = reactIntl.useIntl();
|
75
|
-
const [{ query }] = strapiAdmin.useQueryParams();
|
76
|
-
const navigate = reactRouterDom.useNavigate();
|
77
|
-
const pluginsQueryParams = qs.stringify({ plugins: query.plugins }, { encode: false });
|
78
|
-
if (!window.strapi.features.isEnabled("cms-content-history")) {
|
79
|
-
return null;
|
80
|
-
}
|
81
|
-
return {
|
82
|
-
icon: /* @__PURE__ */ jsxRuntime.jsx(Icons.ClockCounterClockwise, {}),
|
83
|
-
label: formatMessage({
|
84
|
-
id: "content-manager.history.document-action",
|
85
|
-
defaultMessage: "Content History"
|
86
|
-
}),
|
87
|
-
onClick: () => navigate({ pathname: "history", search: pluginsQueryParams }),
|
88
|
-
disabled: (
|
89
|
-
/**
|
90
|
-
* The user is creating a new document.
|
91
|
-
* It hasn't been saved yet, so there's no history to go to
|
92
|
-
*/
|
93
|
-
!document || /**
|
94
|
-
* The document has been created but the current dimension has never been saved.
|
95
|
-
* For example, the user is creating a new locale in an existing document,
|
96
|
-
* so there's no history for the document in that locale
|
97
|
-
*/
|
98
|
-
!document.id || /**
|
99
|
-
* History is only available for content types created by the user.
|
100
|
-
* These have the `api::` prefix, as opposed to the ones created by Strapi or plugins,
|
101
|
-
* which start with `admin::` or `plugin::`
|
102
|
-
*/
|
103
|
-
!model.startsWith("api::")
|
104
|
-
),
|
105
|
-
position: "header"
|
106
|
-
};
|
107
|
-
};
|
108
|
-
HistoryAction.type = "history";
|
109
73
|
const ID = "id";
|
110
74
|
const CREATED_BY_ATTRIBUTE_NAME = "createdBy";
|
111
75
|
const UPDATED_BY_ATTRIBUTE_NAME = "updatedBy";
|
@@ -215,10 +179,12 @@ const contentManagerApi = strapiAdmin.adminApi.enhanceEndpoints({
|
|
215
179
|
"Document",
|
216
180
|
"InitialData",
|
217
181
|
"HistoryVersion",
|
218
|
-
"Relations"
|
182
|
+
"Relations",
|
183
|
+
"UidAvailability"
|
219
184
|
]
|
220
185
|
});
|
221
186
|
const documentApi = contentManagerApi.injectEndpoints({
|
187
|
+
overrideExisting: true,
|
222
188
|
endpoints: (builder) => ({
|
223
189
|
autoCloneDocument: builder.mutation({
|
224
190
|
query: ({ model, sourceId, query }) => ({
|
@@ -228,7 +194,12 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
228
194
|
params: query
|
229
195
|
}
|
230
196
|
}),
|
231
|
-
invalidatesTags: (_result,
|
197
|
+
invalidatesTags: (_result, error, { model }) => {
|
198
|
+
if (error) {
|
199
|
+
return [];
|
200
|
+
}
|
201
|
+
return [{ type: "Document", id: `${model}_LIST` }];
|
202
|
+
}
|
232
203
|
}),
|
233
204
|
cloneDocument: builder.mutation({
|
234
205
|
query: ({ model, sourceId, data, params }) => ({
|
@@ -239,7 +210,10 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
239
210
|
params
|
240
211
|
}
|
241
212
|
}),
|
242
|
-
invalidatesTags: (_result, _error, { model }) => [
|
213
|
+
invalidatesTags: (_result, _error, { model }) => [
|
214
|
+
{ type: "Document", id: `${model}_LIST` },
|
215
|
+
{ type: "UidAvailability", id: model }
|
216
|
+
]
|
243
217
|
}),
|
244
218
|
/**
|
245
219
|
* Creates a new collection-type document. This should ONLY be used for collection-types.
|
@@ -256,7 +230,8 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
256
230
|
}),
|
257
231
|
invalidatesTags: (result, _error, { model }) => [
|
258
232
|
{ type: "Document", id: `${model}_LIST` },
|
259
|
-
"Relations"
|
233
|
+
"Relations",
|
234
|
+
{ type: "UidAvailability", id: model }
|
260
235
|
]
|
261
236
|
}),
|
262
237
|
deleteDocument: builder.mutation({
|
@@ -297,7 +272,8 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
297
272
|
id: collectionType !== SINGLE_TYPES ? `${model}_${documentId}` : model
|
298
273
|
},
|
299
274
|
{ type: "Document", id: `${model}_LIST` },
|
300
|
-
"Relations"
|
275
|
+
"Relations",
|
276
|
+
{ type: "UidAvailability", id: model }
|
301
277
|
];
|
302
278
|
}
|
303
279
|
}),
|
@@ -315,6 +291,7 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
315
291
|
}),
|
316
292
|
providesTags: (result, _error, arg) => {
|
317
293
|
return [
|
294
|
+
{ type: "Document", id: `ALL_LIST` },
|
318
295
|
{ type: "Document", id: `${arg.model}_LIST` },
|
319
296
|
...result?.results.map(({ documentId }) => ({
|
320
297
|
type: "Document",
|
@@ -353,6 +330,11 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
353
330
|
{
|
354
331
|
type: "Document",
|
355
332
|
id: collectionType !== SINGLE_TYPES ? `${model}_${result && "documentId" in result ? result.documentId : documentId}` : model
|
333
|
+
},
|
334
|
+
// Make it easy to invalidate all individual documents queries for a model
|
335
|
+
{
|
336
|
+
type: "Document",
|
337
|
+
id: `${model}_ALL_ITEMS`
|
356
338
|
}
|
357
339
|
];
|
358
340
|
}
|
@@ -416,8 +398,21 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
416
398
|
type: "Document",
|
417
399
|
id: collectionType !== SINGLE_TYPES ? `${model}_${documentId}` : model
|
418
400
|
},
|
419
|
-
"Relations"
|
401
|
+
"Relations",
|
402
|
+
{ type: "UidAvailability", id: model }
|
420
403
|
];
|
404
|
+
},
|
405
|
+
async onQueryStarted({ data, ...patch }, { dispatch, queryFulfilled }) {
|
406
|
+
const patchResult = dispatch(
|
407
|
+
documentApi.util.updateQueryData("getDocument", patch, (draft) => {
|
408
|
+
Object.assign(draft.data, data);
|
409
|
+
})
|
410
|
+
);
|
411
|
+
try {
|
412
|
+
await queryFulfilled;
|
413
|
+
} catch {
|
414
|
+
patchResult.undo();
|
415
|
+
}
|
421
416
|
}
|
422
417
|
}),
|
423
418
|
unpublishDocument: builder.mutation({
|
@@ -487,7 +482,7 @@ const buildValidParams = (query) => {
|
|
487
482
|
const isBaseQueryError = (error) => {
|
488
483
|
return error.name !== void 0;
|
489
484
|
};
|
490
|
-
const createYupSchema = (attributes = {}, components = {}) => {
|
485
|
+
const createYupSchema = (attributes = {}, components = {}, options = { status: null }) => {
|
491
486
|
const createModelSchema = (attributes2) => yup__namespace.object().shape(
|
492
487
|
Object.entries(attributes2).reduce((acc, [name, attribute]) => {
|
493
488
|
if (DOCUMENT_META_FIELDS.includes(name)) {
|
@@ -500,7 +495,7 @@ const createYupSchema = (attributes = {}, components = {}) => {
|
|
500
495
|
addMinValidation,
|
501
496
|
addMaxValidation,
|
502
497
|
addRegexValidation
|
503
|
-
].map((fn) => fn(attribute));
|
498
|
+
].map((fn) => fn(attribute, options));
|
504
499
|
const transformSchema = pipe__default.default(...validations);
|
505
500
|
switch (attribute.type) {
|
506
501
|
case "component": {
|
@@ -601,6 +596,14 @@ const createAttributeSchema = (attribute) => {
|
|
601
596
|
if (!value || typeof value === "string" && value.length === 0) {
|
602
597
|
return true;
|
603
598
|
}
|
599
|
+
if (typeof value === "object") {
|
600
|
+
try {
|
601
|
+
JSON.stringify(value);
|
602
|
+
return true;
|
603
|
+
} catch (err) {
|
604
|
+
return false;
|
605
|
+
}
|
606
|
+
}
|
604
607
|
try {
|
605
608
|
JSON.parse(value);
|
606
609
|
return true;
|
@@ -619,13 +622,7 @@ const createAttributeSchema = (attribute) => {
|
|
619
622
|
return yup__namespace.mixed();
|
620
623
|
}
|
621
624
|
};
|
622
|
-
const
|
623
|
-
if (attribute.required) {
|
624
|
-
return schema.required({
|
625
|
-
id: strapiAdmin.translatedErrors.required.id,
|
626
|
-
defaultMessage: "This field is required."
|
627
|
-
});
|
628
|
-
}
|
625
|
+
const nullableSchema = (schema) => {
|
629
626
|
return schema?.nullable ? schema.nullable() : (
|
630
627
|
// In some cases '.nullable' will not be available on the schema.
|
631
628
|
// e.g. when the schema has been built using yup.lazy (e.g. for relations).
|
@@ -633,7 +630,22 @@ const addRequiredValidation = (attribute) => (schema) => {
|
|
633
630
|
schema
|
634
631
|
);
|
635
632
|
};
|
636
|
-
const
|
633
|
+
const addRequiredValidation = (attribute, options) => (schema) => {
|
634
|
+
if (options.status === "draft") {
|
635
|
+
return nullableSchema(schema);
|
636
|
+
}
|
637
|
+
if ((attribute.type === "component" && attribute.repeatable || attribute.type === "dynamiczone") && attribute.required && "min" in schema) {
|
638
|
+
return schema.min(1, strapiAdmin.translatedErrors.required);
|
639
|
+
}
|
640
|
+
if (attribute.required && attribute.type !== "relation") {
|
641
|
+
return schema.required(strapiAdmin.translatedErrors.required);
|
642
|
+
}
|
643
|
+
return nullableSchema(schema);
|
644
|
+
};
|
645
|
+
const addMinLengthValidation = (attribute, options) => (schema) => {
|
646
|
+
if (options.status === "draft") {
|
647
|
+
return schema;
|
648
|
+
}
|
637
649
|
if ("minLength" in attribute && attribute.minLength && Number.isInteger(attribute.minLength) && "min" in schema) {
|
638
650
|
return schema.min(attribute.minLength, {
|
639
651
|
...strapiAdmin.translatedErrors.minLength,
|
@@ -655,9 +667,31 @@ const addMaxLengthValidation = (attribute) => (schema) => {
|
|
655
667
|
}
|
656
668
|
return schema;
|
657
669
|
};
|
658
|
-
const addMinValidation = (attribute) => (schema) => {
|
670
|
+
const addMinValidation = (attribute, options) => (schema) => {
|
659
671
|
if ("min" in attribute) {
|
660
672
|
const min = toInteger(attribute.min);
|
673
|
+
if (attribute.type === "component" && attribute.repeatable || attribute.type === "dynamiczone") {
|
674
|
+
if (options.status !== "draft" && !attribute.required && "test" in schema && min) {
|
675
|
+
return schema.test(
|
676
|
+
"custom-min",
|
677
|
+
{
|
678
|
+
...strapiAdmin.translatedErrors.min,
|
679
|
+
values: {
|
680
|
+
min: attribute.min
|
681
|
+
}
|
682
|
+
},
|
683
|
+
(value) => {
|
684
|
+
if (!value) {
|
685
|
+
return true;
|
686
|
+
}
|
687
|
+
if (Array.isArray(value) && value.length === 0) {
|
688
|
+
return true;
|
689
|
+
}
|
690
|
+
return value.length >= min;
|
691
|
+
}
|
692
|
+
);
|
693
|
+
}
|
694
|
+
}
|
661
695
|
if ("min" in schema && min) {
|
662
696
|
return schema.min(min, {
|
663
697
|
...strapiAdmin.translatedErrors.min,
|
@@ -784,7 +818,10 @@ const useDocument = (args, opts) => {
|
|
784
818
|
isLoading: isLoadingDocument,
|
785
819
|
isFetching: isFetchingDocument,
|
786
820
|
error
|
787
|
-
} = useGetDocumentQuery(args,
|
821
|
+
} = useGetDocumentQuery(args, {
|
822
|
+
...opts,
|
823
|
+
skip: !args.documentId && args.collectionType !== SINGLE_TYPES || opts?.skip
|
824
|
+
});
|
788
825
|
const { components, schema, isLoading: isLoadingSchema } = useContentTypeSchema(args.model);
|
789
826
|
React__namespace.useEffect(() => {
|
790
827
|
if (error) {
|
@@ -870,6 +907,7 @@ const useDocumentActions = () => {
|
|
870
907
|
const { formatMessage } = reactIntl.useIntl();
|
871
908
|
const { trackUsage } = strapiAdmin.useTracking();
|
872
909
|
const { _unstableFormatAPIError: formatAPIError } = strapiAdmin.useAPIErrorHandler();
|
910
|
+
const navigate = reactRouterDom.useNavigate();
|
873
911
|
const [deleteDocument] = useDeleteDocumentMutation();
|
874
912
|
const _delete = React__namespace.useCallback(
|
875
913
|
async ({ collectionType, model, documentId, params }, trackerProperty) => {
|
@@ -1205,7 +1243,6 @@ const useDocumentActions = () => {
|
|
1205
1243
|
sourceId
|
1206
1244
|
});
|
1207
1245
|
if ("error" in res) {
|
1208
|
-
toggleNotification({ type: "danger", message: formatAPIError(res.error) });
|
1209
1246
|
return { error: res.error };
|
1210
1247
|
}
|
1211
1248
|
toggleNotification({
|
@@ -1224,7 +1261,7 @@ const useDocumentActions = () => {
|
|
1224
1261
|
throw err;
|
1225
1262
|
}
|
1226
1263
|
},
|
1227
|
-
[autoCloneDocument,
|
1264
|
+
[autoCloneDocument, formatMessage, toggleNotification]
|
1228
1265
|
);
|
1229
1266
|
const [cloneDocument] = useCloneDocumentMutation();
|
1230
1267
|
const clone = React__namespace.useCallback(
|
@@ -1250,6 +1287,7 @@ const useDocumentActions = () => {
|
|
1250
1287
|
defaultMessage: "Cloned document"
|
1251
1288
|
})
|
1252
1289
|
});
|
1290
|
+
navigate(`../../${res.data.data.documentId}`, { relative: "path" });
|
1253
1291
|
return res.data;
|
1254
1292
|
} catch (err) {
|
1255
1293
|
toggleNotification({
|
@@ -1260,7 +1298,7 @@ const useDocumentActions = () => {
|
|
1260
1298
|
throw err;
|
1261
1299
|
}
|
1262
1300
|
},
|
1263
|
-
[cloneDocument, trackUsage, toggleNotification, formatMessage, formatAPIError]
|
1301
|
+
[cloneDocument, trackUsage, toggleNotification, formatMessage, formatAPIError, navigate]
|
1264
1302
|
);
|
1265
1303
|
const [getDoc] = useLazyGetDocumentQuery();
|
1266
1304
|
const getDocument = React__namespace.useCallback(
|
@@ -1286,7 +1324,7 @@ const useDocumentActions = () => {
|
|
1286
1324
|
};
|
1287
1325
|
};
|
1288
1326
|
const ProtectedHistoryPage = React.lazy(
|
1289
|
-
() => Promise.resolve().then(() => require("./History-
|
1327
|
+
() => Promise.resolve().then(() => require("./History-Dh2NEHnR.js")).then((mod) => ({ default: mod.ProtectedHistoryPage }))
|
1290
1328
|
);
|
1291
1329
|
const routes$1 = [
|
1292
1330
|
{
|
@@ -1299,31 +1337,31 @@ const routes$1 = [
|
|
1299
1337
|
}
|
1300
1338
|
];
|
1301
1339
|
const ProtectedEditViewPage = React.lazy(
|
1302
|
-
() => Promise.resolve().then(() => require("./EditViewPage-
|
1340
|
+
() => Promise.resolve().then(() => require("./EditViewPage-B-RJeiJD.js")).then((mod) => ({ default: mod.ProtectedEditViewPage }))
|
1303
1341
|
);
|
1304
1342
|
const ProtectedListViewPage = React.lazy(
|
1305
|
-
() => Promise.resolve().then(() => require("./ListViewPage-
|
1343
|
+
() => Promise.resolve().then(() => require("./ListViewPage-4XsciqHZ.js")).then((mod) => ({ default: mod.ProtectedListViewPage }))
|
1306
1344
|
);
|
1307
1345
|
const ProtectedListConfiguration = React.lazy(
|
1308
|
-
() => Promise.resolve().then(() => require("./ListConfigurationPage-
|
1346
|
+
() => Promise.resolve().then(() => require("./ListConfigurationPage-BxYCWz9e.js")).then((mod) => ({
|
1309
1347
|
default: mod.ProtectedListConfiguration
|
1310
1348
|
}))
|
1311
1349
|
);
|
1312
1350
|
const ProtectedEditConfigurationPage = React.lazy(
|
1313
|
-
() => Promise.resolve().then(() => require("./EditConfigurationPage-
|
1351
|
+
() => Promise.resolve().then(() => require("./EditConfigurationPage-BePwPuHy.js")).then((mod) => ({
|
1314
1352
|
default: mod.ProtectedEditConfigurationPage
|
1315
1353
|
}))
|
1316
1354
|
);
|
1317
1355
|
const ProtectedComponentConfigurationPage = React.lazy(
|
1318
|
-
() => Promise.resolve().then(() => require("./ComponentConfigurationPage-
|
1356
|
+
() => Promise.resolve().then(() => require("./ComponentConfigurationPage-D_M8iBw5.js")).then((mod) => ({
|
1319
1357
|
default: mod.ProtectedComponentConfigurationPage
|
1320
1358
|
}))
|
1321
1359
|
);
|
1322
1360
|
const NoPermissions = React.lazy(
|
1323
|
-
() => Promise.resolve().then(() => require("./NoPermissionsPage-
|
1361
|
+
() => Promise.resolve().then(() => require("./NoPermissionsPage-y_r7DVA2.js")).then((mod) => ({ default: mod.NoPermissions }))
|
1324
1362
|
);
|
1325
1363
|
const NoContentType = React.lazy(
|
1326
|
-
() => Promise.resolve().then(() => require("./NoContentTypePage-
|
1364
|
+
() => Promise.resolve().then(() => require("./NoContentTypePage-C8OpoHeU.js")).then((mod) => ({ default: mod.NoContentType }))
|
1327
1365
|
);
|
1328
1366
|
const CollectionTypePages = () => {
|
1329
1367
|
const { collectionType } = reactRouterDom.useParams();
|
@@ -1437,12 +1475,14 @@ const DocumentActionButton = (action) => {
|
|
1437
1475
|
/* @__PURE__ */ jsxRuntime.jsx(
|
1438
1476
|
designSystem.Button,
|
1439
1477
|
{
|
1440
|
-
flex:
|
1478
|
+
flex: "auto",
|
1441
1479
|
startIcon: action.icon,
|
1442
1480
|
disabled: action.disabled,
|
1443
1481
|
onClick: handleClick(action),
|
1444
1482
|
justifyContent: "center",
|
1445
1483
|
variant: action.variant || "default",
|
1484
|
+
paddingTop: "7px",
|
1485
|
+
paddingBottom: "7px",
|
1446
1486
|
children: action.label
|
1447
1487
|
}
|
1448
1488
|
),
|
@@ -1450,7 +1490,7 @@ const DocumentActionButton = (action) => {
|
|
1450
1490
|
DocumentActionConfirmDialog,
|
1451
1491
|
{
|
1452
1492
|
...action.dialog,
|
1453
|
-
variant: action.variant,
|
1493
|
+
variant: action.dialog?.variant ?? action.variant,
|
1454
1494
|
isOpen: dialogId === action.id,
|
1455
1495
|
onClose: handleClose
|
1456
1496
|
}
|
@@ -1502,14 +1542,14 @@ const DocumentActionsMenu = ({
|
|
1502
1542
|
};
|
1503
1543
|
return /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Menu.Root, { open: isOpen, onOpenChange: setIsOpen, children: [
|
1504
1544
|
/* @__PURE__ */ jsxRuntime.jsxs(
|
1505
|
-
|
1545
|
+
StyledMoreButton,
|
1506
1546
|
{
|
1507
1547
|
disabled: isDisabled,
|
1508
1548
|
size: "S",
|
1509
1549
|
endIcon: null,
|
1510
|
-
paddingTop: "
|
1511
|
-
paddingLeft: "
|
1512
|
-
paddingRight: "
|
1550
|
+
paddingTop: "4px",
|
1551
|
+
paddingLeft: "7px",
|
1552
|
+
paddingRight: "7px",
|
1513
1553
|
variant,
|
1514
1554
|
children: [
|
1515
1555
|
/* @__PURE__ */ jsxRuntime.jsx(Icons.More, { "aria-hidden": true, focusable: false }),
|
@@ -1529,10 +1569,25 @@ const DocumentActionsMenu = ({
|
|
1529
1569
|
onSelect: handleClick(action),
|
1530
1570
|
display: "block",
|
1531
1571
|
children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { justifyContent: "space-between", gap: 4, children: [
|
1532
|
-
/* @__PURE__ */ jsxRuntime.jsxs(
|
1533
|
-
|
1534
|
-
|
1535
|
-
|
1572
|
+
/* @__PURE__ */ jsxRuntime.jsxs(
|
1573
|
+
designSystem.Flex,
|
1574
|
+
{
|
1575
|
+
color: !action.disabled ? convertActionVariantToColor(action.variant) : "inherit",
|
1576
|
+
gap: 2,
|
1577
|
+
tag: "span",
|
1578
|
+
children: [
|
1579
|
+
/* @__PURE__ */ jsxRuntime.jsx(
|
1580
|
+
designSystem.Flex,
|
1581
|
+
{
|
1582
|
+
tag: "span",
|
1583
|
+
color: !action.disabled ? convertActionVariantToIconColor(action.variant) : "inherit",
|
1584
|
+
children: action.icon
|
1585
|
+
}
|
1586
|
+
),
|
1587
|
+
action.label
|
1588
|
+
]
|
1589
|
+
}
|
1590
|
+
),
|
1536
1591
|
action.id.startsWith("HistoryAction") && /* @__PURE__ */ jsxRuntime.jsx(
|
1537
1592
|
designSystem.Flex,
|
1538
1593
|
{
|
@@ -1591,6 +1646,23 @@ const convertActionVariantToColor = (variant = "secondary") => {
|
|
1591
1646
|
return "primary600";
|
1592
1647
|
}
|
1593
1648
|
};
|
1649
|
+
const convertActionVariantToIconColor = (variant = "secondary") => {
|
1650
|
+
switch (variant) {
|
1651
|
+
case "danger":
|
1652
|
+
return "danger600";
|
1653
|
+
case "secondary":
|
1654
|
+
return "neutral500";
|
1655
|
+
case "success":
|
1656
|
+
return "success600";
|
1657
|
+
default:
|
1658
|
+
return "primary600";
|
1659
|
+
}
|
1660
|
+
};
|
1661
|
+
const StyledMoreButton = styledComponents.styled(designSystem.Menu.Trigger)`
|
1662
|
+
& > span {
|
1663
|
+
display: flex;
|
1664
|
+
}
|
1665
|
+
`;
|
1594
1666
|
const DocumentActionConfirmDialog = ({
|
1595
1667
|
onClose,
|
1596
1668
|
onCancel,
|
@@ -1660,13 +1732,17 @@ const PublishAction$1 = ({
|
|
1660
1732
|
const navigate = reactRouterDom.useNavigate();
|
1661
1733
|
const { toggleNotification } = strapiAdmin.useNotification();
|
1662
1734
|
const { _unstableFormatValidationErrors: formatValidationErrors } = strapiAdmin.useAPIErrorHandler();
|
1735
|
+
const isListView = reactRouterDom.useMatch(LIST_PATH) !== null;
|
1663
1736
|
const isCloning = reactRouterDom.useMatch(CLONE_PATH) !== null;
|
1664
1737
|
const { formatMessage } = reactIntl.useIntl();
|
1665
|
-
const { canPublish
|
1666
|
-
"PublishAction",
|
1667
|
-
({ canPublish: canPublish2, canCreate: canCreate2, canUpdate: canUpdate2 }) => ({ canPublish: canPublish2, canCreate: canCreate2, canUpdate: canUpdate2 })
|
1668
|
-
);
|
1738
|
+
const canPublish = useDocumentRBAC("PublishAction", ({ canPublish: canPublish2 }) => canPublish2);
|
1669
1739
|
const { publish } = useDocumentActions();
|
1740
|
+
const [
|
1741
|
+
countDraftRelations,
|
1742
|
+
{ isLoading: isLoadingDraftRelations, isError: isErrorDraftRelations }
|
1743
|
+
] = useLazyGetDraftRelationCountQuery();
|
1744
|
+
const [localCountOfDraftRelations, setLocalCountOfDraftRelations] = React__namespace.useState(0);
|
1745
|
+
const [serverCountOfDraftRelations, setServerCountOfDraftRelations] = React__namespace.useState(0);
|
1670
1746
|
const [{ query, rawQuery }] = strapiAdmin.useQueryParams();
|
1671
1747
|
const params = React__namespace.useMemo(() => buildValidParams(query), [query]);
|
1672
1748
|
const modified = strapiAdmin.useForm("PublishAction", ({ modified: modified2 }) => modified2);
|
@@ -1675,10 +1751,101 @@ const PublishAction$1 = ({
|
|
1675
1751
|
const validate = strapiAdmin.useForm("PublishAction", (state) => state.validate);
|
1676
1752
|
const setErrors = strapiAdmin.useForm("PublishAction", (state) => state.setErrors);
|
1677
1753
|
const formValues = strapiAdmin.useForm("PublishAction", ({ values }) => values);
|
1754
|
+
React__namespace.useEffect(() => {
|
1755
|
+
if (isErrorDraftRelations) {
|
1756
|
+
toggleNotification({
|
1757
|
+
type: "danger",
|
1758
|
+
message: formatMessage({
|
1759
|
+
id: getTranslation("error.records.fetch-draft-relatons"),
|
1760
|
+
defaultMessage: "An error occurred while fetching draft relations on this document."
|
1761
|
+
})
|
1762
|
+
});
|
1763
|
+
}
|
1764
|
+
}, [isErrorDraftRelations, toggleNotification, formatMessage]);
|
1765
|
+
React__namespace.useEffect(() => {
|
1766
|
+
const localDraftRelations = /* @__PURE__ */ new Set();
|
1767
|
+
const extractDraftRelations = (data) => {
|
1768
|
+
const relations = data.connect || [];
|
1769
|
+
relations.forEach((relation) => {
|
1770
|
+
if (relation.status === "draft") {
|
1771
|
+
localDraftRelations.add(relation.id);
|
1772
|
+
}
|
1773
|
+
});
|
1774
|
+
};
|
1775
|
+
const traverseAndExtract = (data) => {
|
1776
|
+
Object.entries(data).forEach(([key, value]) => {
|
1777
|
+
if (key === "connect" && Array.isArray(value)) {
|
1778
|
+
extractDraftRelations({ connect: value });
|
1779
|
+
} else if (typeof value === "object" && value !== null) {
|
1780
|
+
traverseAndExtract(value);
|
1781
|
+
}
|
1782
|
+
});
|
1783
|
+
};
|
1784
|
+
if (!documentId || modified) {
|
1785
|
+
traverseAndExtract(formValues);
|
1786
|
+
setLocalCountOfDraftRelations(localDraftRelations.size);
|
1787
|
+
}
|
1788
|
+
}, [documentId, modified, formValues, setLocalCountOfDraftRelations]);
|
1789
|
+
React__namespace.useEffect(() => {
|
1790
|
+
if (documentId && !isListView) {
|
1791
|
+
const fetchDraftRelationsCount = async () => {
|
1792
|
+
const { data, error } = await countDraftRelations({
|
1793
|
+
collectionType,
|
1794
|
+
model,
|
1795
|
+
documentId,
|
1796
|
+
params
|
1797
|
+
});
|
1798
|
+
if (error) {
|
1799
|
+
throw error;
|
1800
|
+
}
|
1801
|
+
if (data) {
|
1802
|
+
setServerCountOfDraftRelations(data.data);
|
1803
|
+
}
|
1804
|
+
};
|
1805
|
+
fetchDraftRelationsCount();
|
1806
|
+
}
|
1807
|
+
}, [isListView, documentId, countDraftRelations, collectionType, model, params]);
|
1678
1808
|
const isDocumentPublished = (document?.[PUBLISHED_AT_ATTRIBUTE_NAME] || meta?.availableStatus.some((doc) => doc[PUBLISHED_AT_ATTRIBUTE_NAME] !== null)) && document?.status !== "modified";
|
1679
1809
|
if (!schema?.options?.draftAndPublish) {
|
1680
1810
|
return null;
|
1681
1811
|
}
|
1812
|
+
const performPublish = async () => {
|
1813
|
+
setSubmitting(true);
|
1814
|
+
try {
|
1815
|
+
const { errors } = await validate();
|
1816
|
+
if (errors) {
|
1817
|
+
toggleNotification({
|
1818
|
+
type: "danger",
|
1819
|
+
message: formatMessage({
|
1820
|
+
id: "content-manager.validation.error",
|
1821
|
+
defaultMessage: "There are validation errors in your document. Please fix them before saving."
|
1822
|
+
})
|
1823
|
+
});
|
1824
|
+
return;
|
1825
|
+
}
|
1826
|
+
const res = await publish(
|
1827
|
+
{
|
1828
|
+
collectionType,
|
1829
|
+
model,
|
1830
|
+
documentId,
|
1831
|
+
params
|
1832
|
+
},
|
1833
|
+
formValues
|
1834
|
+
);
|
1835
|
+
if ("data" in res && collectionType !== SINGLE_TYPES) {
|
1836
|
+
navigate({
|
1837
|
+
pathname: `../${collectionType}/${model}/${res.data.documentId}`,
|
1838
|
+
search: rawQuery
|
1839
|
+
});
|
1840
|
+
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1841
|
+
setErrors(formatValidationErrors(res.error));
|
1842
|
+
}
|
1843
|
+
} finally {
|
1844
|
+
setSubmitting(false);
|
1845
|
+
}
|
1846
|
+
};
|
1847
|
+
const totalDraftRelations = localCountOfDraftRelations + serverCountOfDraftRelations;
|
1848
|
+
const hasDraftRelations = totalDraftRelations > 0;
|
1682
1849
|
return {
|
1683
1850
|
/**
|
1684
1851
|
* Disabled when:
|
@@ -1688,49 +1855,39 @@ const PublishAction$1 = ({
|
|
1688
1855
|
* - the document is already published & not modified
|
1689
1856
|
* - the document is being created & not modified
|
1690
1857
|
* - the user doesn't have the permission to publish
|
1691
|
-
* - the user doesn't have the permission to create a new document
|
1692
|
-
* - the user doesn't have the permission to update the document
|
1693
1858
|
*/
|
1694
|
-
disabled: isCloning || isSubmitting || activeTab === "published" || !modified && isDocumentPublished || !modified && !document?.documentId || !canPublish
|
1859
|
+
disabled: isCloning || isSubmitting || isLoadingDraftRelations || activeTab === "published" || !modified && isDocumentPublished || !modified && !document?.documentId || !canPublish,
|
1695
1860
|
label: formatMessage({
|
1696
1861
|
id: "app.utils.publish",
|
1697
1862
|
defaultMessage: "Publish"
|
1698
1863
|
}),
|
1699
1864
|
onClick: async () => {
|
1700
|
-
|
1701
|
-
|
1702
|
-
|
1703
|
-
|
1704
|
-
|
1705
|
-
|
1706
|
-
|
1707
|
-
|
1708
|
-
|
1709
|
-
|
1710
|
-
|
1711
|
-
|
1712
|
-
|
1713
|
-
|
1714
|
-
|
1715
|
-
|
1716
|
-
|
1717
|
-
|
1718
|
-
|
1719
|
-
|
1720
|
-
formValues
|
1721
|
-
);
|
1722
|
-
if ("data" in res && collectionType !== SINGLE_TYPES) {
|
1723
|
-
navigate({
|
1724
|
-
pathname: `../${collectionType}/${model}/${res.data.documentId}`,
|
1725
|
-
search: rawQuery
|
1726
|
-
});
|
1727
|
-
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1728
|
-
setErrors(formatValidationErrors(res.error));
|
1865
|
+
if (hasDraftRelations) {
|
1866
|
+
return;
|
1867
|
+
}
|
1868
|
+
await performPublish();
|
1869
|
+
},
|
1870
|
+
dialog: hasDraftRelations ? {
|
1871
|
+
type: "dialog",
|
1872
|
+
variant: "danger",
|
1873
|
+
footer: null,
|
1874
|
+
title: formatMessage({
|
1875
|
+
id: getTranslation(`popUpwarning.warning.bulk-has-draft-relations.title`),
|
1876
|
+
defaultMessage: "Confirmation"
|
1877
|
+
}),
|
1878
|
+
content: formatMessage(
|
1879
|
+
{
|
1880
|
+
id: getTranslation(`popUpwarning.warning.bulk-has-draft-relations.message`),
|
1881
|
+
defaultMessage: "This entry is related to {count, plural, one {# draft entry} other {# draft entries}}. Publishing it could leave broken links in your app."
|
1882
|
+
},
|
1883
|
+
{
|
1884
|
+
count: totalDraftRelations
|
1729
1885
|
}
|
1730
|
-
|
1731
|
-
|
1886
|
+
),
|
1887
|
+
onConfirm: async () => {
|
1888
|
+
await performPublish();
|
1732
1889
|
}
|
1733
|
-
}
|
1890
|
+
} : void 0
|
1734
1891
|
};
|
1735
1892
|
};
|
1736
1893
|
PublishAction$1.type = "publish";
|
@@ -1746,10 +1903,6 @@ const UpdateAction = ({
|
|
1746
1903
|
const cloneMatch = reactRouterDom.useMatch(CLONE_PATH);
|
1747
1904
|
const isCloning = cloneMatch !== null;
|
1748
1905
|
const { formatMessage } = reactIntl.useIntl();
|
1749
|
-
const { canCreate, canUpdate } = useDocumentRBAC("UpdateAction", ({ canCreate: canCreate2, canUpdate: canUpdate2 }) => ({
|
1750
|
-
canCreate: canCreate2,
|
1751
|
-
canUpdate: canUpdate2
|
1752
|
-
}));
|
1753
1906
|
const { create, update, clone } = useDocumentActions();
|
1754
1907
|
const [{ query, rawQuery }] = strapiAdmin.useQueryParams();
|
1755
1908
|
const params = React__namespace.useMemo(() => buildValidParams(query), [query]);
|
@@ -1766,10 +1919,8 @@ const UpdateAction = ({
|
|
1766
1919
|
* - the form is submitting
|
1767
1920
|
* - the document is not modified & we're not cloning (you can save a clone entity straight away)
|
1768
1921
|
* - the active tab is the published tab
|
1769
|
-
* - the user doesn't have the permission to create a new document
|
1770
|
-
* - the user doesn't have the permission to update the document
|
1771
1922
|
*/
|
1772
|
-
disabled: isSubmitting || !modified && !isCloning || activeTab === "published"
|
1923
|
+
disabled: isSubmitting || !modified && !isCloning || activeTab === "published",
|
1773
1924
|
label: formatMessage({
|
1774
1925
|
id: "content-manager.containers.Edit.save",
|
1775
1926
|
defaultMessage: "Save"
|
@@ -1777,16 +1928,18 @@ const UpdateAction = ({
|
|
1777
1928
|
onClick: async () => {
|
1778
1929
|
setSubmitting(true);
|
1779
1930
|
try {
|
1780
|
-
|
1781
|
-
|
1782
|
-
|
1783
|
-
|
1784
|
-
|
1785
|
-
|
1786
|
-
|
1787
|
-
|
1788
|
-
|
1789
|
-
|
1931
|
+
if (activeTab !== "draft") {
|
1932
|
+
const { errors } = await validate();
|
1933
|
+
if (errors) {
|
1934
|
+
toggleNotification({
|
1935
|
+
type: "danger",
|
1936
|
+
message: formatMessage({
|
1937
|
+
id: "content-manager.validation.error",
|
1938
|
+
defaultMessage: "There are validation errors in your document. Please fix them before saving."
|
1939
|
+
})
|
1940
|
+
});
|
1941
|
+
return;
|
1942
|
+
}
|
1790
1943
|
}
|
1791
1944
|
if (isCloning) {
|
1792
1945
|
const res = await clone(
|
@@ -1798,10 +1951,13 @@ const UpdateAction = ({
|
|
1798
1951
|
document
|
1799
1952
|
);
|
1800
1953
|
if ("data" in res) {
|
1801
|
-
navigate(
|
1802
|
-
|
1803
|
-
|
1804
|
-
|
1954
|
+
navigate(
|
1955
|
+
{
|
1956
|
+
pathname: `../${res.data.documentId}`,
|
1957
|
+
search: rawQuery
|
1958
|
+
},
|
1959
|
+
{ relative: "path" }
|
1960
|
+
);
|
1805
1961
|
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1806
1962
|
setErrors(formatValidationErrors(res.error));
|
1807
1963
|
}
|
@@ -1829,10 +1985,13 @@ const UpdateAction = ({
|
|
1829
1985
|
document
|
1830
1986
|
);
|
1831
1987
|
if ("data" in res && collectionType !== SINGLE_TYPES) {
|
1832
|
-
navigate(
|
1833
|
-
|
1834
|
-
|
1835
|
-
|
1988
|
+
navigate(
|
1989
|
+
{
|
1990
|
+
pathname: `../${res.data.documentId}`,
|
1991
|
+
search: rawQuery
|
1992
|
+
},
|
1993
|
+
{ replace: true, relative: "path" }
|
1994
|
+
);
|
1836
1995
|
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1837
1996
|
setErrors(formatValidationErrors(res.error));
|
1838
1997
|
}
|
@@ -2078,23 +2237,13 @@ const Header = ({ isCreating, status, title: documentTitle = "Untitled" }) => {
|
|
2078
2237
|
id: "content-manager.containers.edit.title.new",
|
2079
2238
|
defaultMessage: "Create an entry"
|
2080
2239
|
}) : documentTitle;
|
2081
|
-
return /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { direction: "column", alignItems: "flex-start", paddingTop:
|
2240
|
+
return /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { direction: "column", alignItems: "flex-start", paddingTop: 6, paddingBottom: 4, gap: 2, children: [
|
2082
2241
|
/* @__PURE__ */ jsxRuntime.jsx(strapiAdmin.BackButton, {}),
|
2083
|
-
/* @__PURE__ */ jsxRuntime.jsxs(
|
2084
|
-
designSystem.
|
2085
|
-
{
|
2086
|
-
|
2087
|
-
|
2088
|
-
paddingTop: 1,
|
2089
|
-
gap: "80px",
|
2090
|
-
alignItems: "flex-start",
|
2091
|
-
children: [
|
2092
|
-
/* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "alpha", tag: "h1", children: title }),
|
2093
|
-
/* @__PURE__ */ jsxRuntime.jsx(HeaderToolbar, {})
|
2094
|
-
]
|
2095
|
-
}
|
2096
|
-
),
|
2097
|
-
status ? /* @__PURE__ */ jsxRuntime.jsx(DocumentStatus, { status: isCloning ? "draft" : status }) : null
|
2242
|
+
/* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { width: "100%", justifyContent: "space-between", gap: "80px", alignItems: "flex-start", children: [
|
2243
|
+
/* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "alpha", tag: "h1", children: title }),
|
2244
|
+
/* @__PURE__ */ jsxRuntime.jsx(HeaderToolbar, {})
|
2245
|
+
] }),
|
2246
|
+
status ? /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { marginTop: 1, children: /* @__PURE__ */ jsxRuntime.jsx(DocumentStatus, { status: isCloning ? "draft" : status }) }) : null
|
2098
2247
|
] });
|
2099
2248
|
};
|
2100
2249
|
const HeaderToolbar = () => {
|
@@ -2785,7 +2934,7 @@ const ConfirmBulkActionDialog = ({
|
|
2785
2934
|
endAction
|
2786
2935
|
}) => {
|
2787
2936
|
const { formatMessage } = reactIntl.useIntl();
|
2788
|
-
return /* @__PURE__ */ jsxRuntime.jsx(designSystem.Dialog.Root, {
|
2937
|
+
return /* @__PURE__ */ jsxRuntime.jsx(designSystem.Dialog.Root, { open: isOpen, children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Dialog.Content, { children: [
|
2789
2938
|
/* @__PURE__ */ jsxRuntime.jsx(designSystem.Dialog.Header, { children: formatMessage({
|
2790
2939
|
id: "app.components.ConfirmDialog.title",
|
2791
2940
|
defaultMessage: "Confirmation"
|
@@ -2906,7 +3055,14 @@ const formatErrorMessages = (errors, parentKey, formatMessage) => {
|
|
2906
3055
|
)
|
2907
3056
|
);
|
2908
3057
|
} else {
|
2909
|
-
messages.push(
|
3058
|
+
messages.push(
|
3059
|
+
...formatErrorMessages(
|
3060
|
+
// @ts-expect-error TODO: check why value is not compatible with FormErrors
|
3061
|
+
value,
|
3062
|
+
currentKey,
|
3063
|
+
formatMessage
|
3064
|
+
)
|
3065
|
+
);
|
2910
3066
|
}
|
2911
3067
|
} else {
|
2912
3068
|
messages.push(
|
@@ -3067,7 +3223,13 @@ const SelectedEntriesModalContent = ({
|
|
3067
3223
|
);
|
3068
3224
|
const { rows, validationErrors } = React__namespace.useMemo(() => {
|
3069
3225
|
if (data.length > 0 && schema) {
|
3070
|
-
const validate = createYupSchema(
|
3226
|
+
const validate = createYupSchema(
|
3227
|
+
schema.attributes,
|
3228
|
+
components,
|
3229
|
+
// Since this is the "Publish" action, the validation
|
3230
|
+
// schema must enforce the rules for published entities
|
3231
|
+
{ status: "published" }
|
3232
|
+
);
|
3071
3233
|
const validationErrors2 = {};
|
3072
3234
|
const rows2 = data.map((entry) => {
|
3073
3235
|
try {
|
@@ -3417,7 +3579,7 @@ const TableActions = ({ document }) => {
|
|
3417
3579
|
strapiAdmin.DescriptionComponentRenderer,
|
3418
3580
|
{
|
3419
3581
|
props,
|
3420
|
-
descriptions: plugins["content-manager"].apis.getDocumentActions(),
|
3582
|
+
descriptions: plugins["content-manager"].apis.getDocumentActions().filter((action) => action.name !== "PublishAction"),
|
3421
3583
|
children: (actions2) => {
|
3422
3584
|
const tableRowActions = actions2.filter((action) => {
|
3423
3585
|
const positions = Array.isArray(action.position) ? action.position : [action.position];
|
@@ -3528,7 +3690,7 @@ const CloneAction = ({ model, documentId }) => {
|
|
3528
3690
|
}),
|
3529
3691
|
content: /* @__PURE__ */ jsxRuntime.jsx(AutoCloneFailureModalBody, { prohibitedFields }),
|
3530
3692
|
footer: ({ onClose }) => {
|
3531
|
-
return /* @__PURE__ */ jsxRuntime.jsxs(designSystem.
|
3693
|
+
return /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Modal.Footer, { children: [
|
3532
3694
|
/* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { onClick: onClose, variant: "tertiary", children: formatMessage({
|
3533
3695
|
id: "cancel",
|
3534
3696
|
defaultMessage: "Cancel"
|
@@ -3569,8 +3731,7 @@ class ContentManagerPlugin {
|
|
3569
3731
|
documentActions = [
|
3570
3732
|
...DEFAULT_ACTIONS,
|
3571
3733
|
...DEFAULT_TABLE_ROW_ACTIONS,
|
3572
|
-
...DEFAULT_HEADER_ACTIONS
|
3573
|
-
HistoryAction
|
3734
|
+
...DEFAULT_HEADER_ACTIONS
|
3574
3735
|
];
|
3575
3736
|
editViewSidePanels = [ActionsPanel];
|
3576
3737
|
headerActions = [];
|
@@ -3659,6 +3820,52 @@ const getPrintableType = (value) => {
|
|
3659
3820
|
}
|
3660
3821
|
return nativeType;
|
3661
3822
|
};
|
3823
|
+
const HistoryAction = ({ model, document }) => {
|
3824
|
+
const { formatMessage } = reactIntl.useIntl();
|
3825
|
+
const [{ query }] = strapiAdmin.useQueryParams();
|
3826
|
+
const navigate = reactRouterDom.useNavigate();
|
3827
|
+
const pluginsQueryParams = qs.stringify({ plugins: query.plugins }, { encode: false });
|
3828
|
+
if (!window.strapi.features.isEnabled("cms-content-history")) {
|
3829
|
+
return null;
|
3830
|
+
}
|
3831
|
+
return {
|
3832
|
+
icon: /* @__PURE__ */ jsxRuntime.jsx(Icons.ClockCounterClockwise, {}),
|
3833
|
+
label: formatMessage({
|
3834
|
+
id: "content-manager.history.document-action",
|
3835
|
+
defaultMessage: "Content History"
|
3836
|
+
}),
|
3837
|
+
onClick: () => navigate({ pathname: "history", search: pluginsQueryParams }),
|
3838
|
+
disabled: (
|
3839
|
+
/**
|
3840
|
+
* The user is creating a new document.
|
3841
|
+
* It hasn't been saved yet, so there's no history to go to
|
3842
|
+
*/
|
3843
|
+
!document || /**
|
3844
|
+
* The document has been created but the current dimension has never been saved.
|
3845
|
+
* For example, the user is creating a new locale in an existing document,
|
3846
|
+
* so there's no history for the document in that locale
|
3847
|
+
*/
|
3848
|
+
!document.id || /**
|
3849
|
+
* History is only available for content types created by the user.
|
3850
|
+
* These have the `api::` prefix, as opposed to the ones created by Strapi or plugins,
|
3851
|
+
* which start with `admin::` or `plugin::`
|
3852
|
+
*/
|
3853
|
+
!model.startsWith("api::")
|
3854
|
+
),
|
3855
|
+
position: "header"
|
3856
|
+
};
|
3857
|
+
};
|
3858
|
+
HistoryAction.type = "history";
|
3859
|
+
const historyAdmin = {
|
3860
|
+
bootstrap(app) {
|
3861
|
+
const { addDocumentAction } = app.getPlugin("content-manager").apis;
|
3862
|
+
addDocumentAction((actions2) => {
|
3863
|
+
const indexOfDeleteAction = actions2.findIndex((action) => action.type === "delete");
|
3864
|
+
actions2.splice(indexOfDeleteAction, 0, HistoryAction);
|
3865
|
+
return actions2;
|
3866
|
+
});
|
3867
|
+
}
|
3868
|
+
};
|
3662
3869
|
const initialState = {
|
3663
3870
|
collectionTypeLinks: [],
|
3664
3871
|
components: [],
|
@@ -3709,15 +3916,29 @@ const index = {
|
|
3709
3916
|
defaultMessage: "Content Manager"
|
3710
3917
|
},
|
3711
3918
|
permissions: [],
|
3712
|
-
Component: () => Promise.resolve().then(() => require("./layout--iHdZzRk.js")).then((mod) => ({ default: mod.Layout })),
|
3713
3919
|
position: 1
|
3714
3920
|
});
|
3921
|
+
app.router.addRoute({
|
3922
|
+
path: "content-manager/*",
|
3923
|
+
lazy: async () => {
|
3924
|
+
const { Layout } = await Promise.resolve().then(() => require("./layout-C788OmNr.js"));
|
3925
|
+
return {
|
3926
|
+
Component: Layout
|
3927
|
+
};
|
3928
|
+
},
|
3929
|
+
children: routes
|
3930
|
+
});
|
3715
3931
|
app.registerPlugin(cm.config);
|
3716
3932
|
},
|
3933
|
+
bootstrap(app) {
|
3934
|
+
if (typeof historyAdmin.bootstrap === "function") {
|
3935
|
+
historyAdmin.bootstrap(app);
|
3936
|
+
}
|
3937
|
+
},
|
3717
3938
|
async registerTrads({ locales }) {
|
3718
3939
|
const importedTrads = await Promise.all(
|
3719
3940
|
locales.map((locale) => {
|
3720
|
-
return __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/ar.json": () => Promise.resolve().then(() => require("./ar-BUUWXIYu.js")), "./translations/ca.json": () => Promise.resolve().then(() => require("./ca-Cmk45QO6.js")), "./translations/cs.json": () => Promise.resolve().then(() => require("./cs-CkJy6B2v.js")), "./translations/de.json": () => Promise.resolve().then(() => require("./de-CCEmbAah.js")), "./translations/en.json": () => Promise.resolve().then(() => require("./en-
|
3941
|
+
return __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/ar.json": () => Promise.resolve().then(() => require("./ar-BUUWXIYu.js")), "./translations/ca.json": () => Promise.resolve().then(() => require("./ca-Cmk45QO6.js")), "./translations/cs.json": () => Promise.resolve().then(() => require("./cs-CkJy6B2v.js")), "./translations/de.json": () => Promise.resolve().then(() => require("./de-CCEmbAah.js")), "./translations/en.json": () => Promise.resolve().then(() => require("./en-uOUIxfcQ.js")), "./translations/es.json": () => Promise.resolve().then(() => require("./es-EUonQTon.js")), "./translations/eu.json": () => Promise.resolve().then(() => require("./eu-VDH-3ovk.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-B7kGGg3E.js")), "./translations/gu.json": () => Promise.resolve().then(() => require("./gu-BRmF601H.js")), "./translations/hi.json": () => Promise.resolve().then(() => require("./hi-CCJBptSq.js")), "./translations/hu.json": () => Promise.resolve().then(() => require("./hu-sNV_yLYy.js")), "./translations/id.json": () => Promise.resolve().then(() => require("./id-B5Ser98A.js")), "./translations/it.json": () => Promise.resolve().then(() => require("./it-DkBIs7vD.js")), "./translations/ja.json": () => Promise.resolve().then(() => require("./ja-CcFe8diO.js")), "./translations/ko.json": () => Promise.resolve().then(() => require("./ko-woFZPmLk.js")), "./translations/ml.json": () => Promise.resolve().then(() => require("./ml-C2W8N8k1.js")), "./translations/ms.json": () => Promise.resolve().then(() => require("./ms-BuFotyP_.js")), "./translations/nl.json": () => Promise.resolve().then(() => require("./nl-bbEOHChV.js")), "./translations/pl.json": () => Promise.resolve().then(() => require("./pl-uzwG-hk7.js")), "./translations/pt-BR.json": () => Promise.resolve().then(() => require("./pt-BR-BiOz37D9.js")), "./translations/pt.json": () => Promise.resolve().then(() => require("./pt-CeXQuq50.js")), "./translations/ru.json": () => Promise.resolve().then(() => require("./ru-BT3ybNny.js")), "./translations/sa.json": () => Promise.resolve().then(() => require("./sa-CcvkYInH.js")), "./translations/sk.json": () => Promise.resolve().then(() => require("./sk-CvY09Xjv.js")), "./translations/sv.json": () => Promise.resolve().then(() => require("./sv-MYDuzgvT.js")), "./translations/th.json": () => Promise.resolve().then(() => require("./th-D9_GfAjc.js")), "./translations/tr.json": () => Promise.resolve().then(() => require("./tr-D9UH-O_R.js")), "./translations/uk.json": () => Promise.resolve().then(() => require("./uk-C8EiqJY7.js")), "./translations/vi.json": () => Promise.resolve().then(() => require("./vi-CJlYDheJ.js")), "./translations/zh-Hans.json": () => Promise.resolve().then(() => require("./zh-Hans-9kOncHGw.js")), "./translations/zh.json": () => Promise.resolve().then(() => require("./zh-CQQfszqR.js")) }), `./translations/${locale}.json`).then(({ default: data }) => {
|
3721
3942
|
return {
|
3722
3943
|
data: prefixPluginTranslations(data, PLUGIN_ID),
|
3723
3944
|
locale
|
@@ -3735,6 +3956,7 @@ const index = {
|
|
3735
3956
|
};
|
3736
3957
|
exports.ATTRIBUTE_TYPES_THAT_CANNOT_BE_MAIN_FIELD = ATTRIBUTE_TYPES_THAT_CANNOT_BE_MAIN_FIELD;
|
3737
3958
|
exports.BulkActionsRenderer = BulkActionsRenderer;
|
3959
|
+
exports.CLONE_PATH = CLONE_PATH;
|
3738
3960
|
exports.COLLECTION_TYPES = COLLECTION_TYPES;
|
3739
3961
|
exports.CREATOR_FIELDS = CREATOR_FIELDS;
|
3740
3962
|
exports.DEFAULT_SETTINGS = DEFAULT_SETTINGS;
|
@@ -3761,7 +3983,6 @@ exports.getDisplayName = getDisplayName;
|
|
3761
3983
|
exports.getMainField = getMainField;
|
3762
3984
|
exports.getTranslation = getTranslation;
|
3763
3985
|
exports.index = index;
|
3764
|
-
exports.routes = routes;
|
3765
3986
|
exports.setInitialData = setInitialData;
|
3766
3987
|
exports.useContentTypeSchema = useContentTypeSchema;
|
3767
3988
|
exports.useDoc = useDoc;
|
@@ -3775,4 +3996,4 @@ exports.useGetAllDocumentsQuery = useGetAllDocumentsQuery;
|
|
3775
3996
|
exports.useGetContentTypeConfigurationQuery = useGetContentTypeConfigurationQuery;
|
3776
3997
|
exports.useGetInitialDataQuery = useGetInitialDataQuery;
|
3777
3998
|
exports.useUpdateContentTypeConfigurationMutation = useUpdateContentTypeConfigurationMutation;
|
3778
|
-
//# sourceMappingURL=index-
|
3999
|
+
//# sourceMappingURL=index-C3fJE-1-.js.map
|