@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
@@ -1,17 +1,17 @@
|
|
1
|
-
import {
|
1
|
+
import { CrossCircle, More, WarningCircle, ListPlus, Pencil, Trash, Check, CheckCircle, ArrowsCounterClockwise, ChevronRight, Duplicate, ClockCounterClockwise, Feather } from "@strapi/icons";
|
2
2
|
import { jsx, Fragment, jsxs } from "react/jsx-runtime";
|
3
|
-
import { useStrapiApp,
|
4
|
-
import { stringify } from "qs";
|
5
|
-
import { useIntl } from "react-intl";
|
6
|
-
import { useNavigate, useParams, Navigate, useMatch, useLocation, Link, NavLink } from "react-router-dom";
|
3
|
+
import { useStrapiApp, createContext, useAuth, useRBAC, Page, adminApi, translatedErrors, useNotification, useAPIErrorHandler, getYupValidationErrors, useQueryParams, useTracking, useForm, BackButton, DescriptionComponentRenderer, useTable, Table } from "@strapi/admin/strapi-admin";
|
7
4
|
import * as React from "react";
|
8
5
|
import { lazy } from "react";
|
9
|
-
import {
|
6
|
+
import { Menu, Button, VisuallyHidden, Flex, Typography, Dialog, Modal, Radio, Status, Box, SingleSelect, SingleSelectOption, Loader, IconButton, Tooltip, LinkButton } from "@strapi/design-system";
|
7
|
+
import { useIntl } from "react-intl";
|
8
|
+
import { useParams, useNavigate, Navigate, useMatch, useLocation, Link, NavLink } from "react-router-dom";
|
10
9
|
import { styled } from "styled-components";
|
11
10
|
import * as yup from "yup";
|
12
11
|
import { ValidationError } from "yup";
|
13
12
|
import pipe from "lodash/fp/pipe";
|
14
13
|
import { intervalToDuration, isPast } from "date-fns";
|
14
|
+
import { stringify } from "qs";
|
15
15
|
import { createSlice, combineReducers } from "@reduxjs/toolkit";
|
16
16
|
const __variableDynamicImportRuntimeHelper = (glob, path) => {
|
17
17
|
const v = glob[path];
|
@@ -49,42 +49,6 @@ const useInjectionZone = (area) => {
|
|
49
49
|
const [page, position] = area.split(".");
|
50
50
|
return contentManagerPlugin.getInjectedComponents(page, position);
|
51
51
|
};
|
52
|
-
const HistoryAction = ({ model, document }) => {
|
53
|
-
const { formatMessage } = useIntl();
|
54
|
-
const [{ query }] = useQueryParams();
|
55
|
-
const navigate = useNavigate();
|
56
|
-
const pluginsQueryParams = stringify({ plugins: query.plugins }, { encode: false });
|
57
|
-
if (!window.strapi.features.isEnabled("cms-content-history")) {
|
58
|
-
return null;
|
59
|
-
}
|
60
|
-
return {
|
61
|
-
icon: /* @__PURE__ */ jsx(ClockCounterClockwise, {}),
|
62
|
-
label: formatMessage({
|
63
|
-
id: "content-manager.history.document-action",
|
64
|
-
defaultMessage: "Content History"
|
65
|
-
}),
|
66
|
-
onClick: () => navigate({ pathname: "history", search: pluginsQueryParams }),
|
67
|
-
disabled: (
|
68
|
-
/**
|
69
|
-
* The user is creating a new document.
|
70
|
-
* It hasn't been saved yet, so there's no history to go to
|
71
|
-
*/
|
72
|
-
!document || /**
|
73
|
-
* The document has been created but the current dimension has never been saved.
|
74
|
-
* For example, the user is creating a new locale in an existing document,
|
75
|
-
* so there's no history for the document in that locale
|
76
|
-
*/
|
77
|
-
!document.id || /**
|
78
|
-
* History is only available for content types created by the user.
|
79
|
-
* These have the `api::` prefix, as opposed to the ones created by Strapi or plugins,
|
80
|
-
* which start with `admin::` or `plugin::`
|
81
|
-
*/
|
82
|
-
!model.startsWith("api::")
|
83
|
-
),
|
84
|
-
position: "header"
|
85
|
-
};
|
86
|
-
};
|
87
|
-
HistoryAction.type = "history";
|
88
52
|
const ID = "id";
|
89
53
|
const CREATED_BY_ATTRIBUTE_NAME = "createdBy";
|
90
54
|
const UPDATED_BY_ATTRIBUTE_NAME = "updatedBy";
|
@@ -194,10 +158,12 @@ const contentManagerApi = adminApi.enhanceEndpoints({
|
|
194
158
|
"Document",
|
195
159
|
"InitialData",
|
196
160
|
"HistoryVersion",
|
197
|
-
"Relations"
|
161
|
+
"Relations",
|
162
|
+
"UidAvailability"
|
198
163
|
]
|
199
164
|
});
|
200
165
|
const documentApi = contentManagerApi.injectEndpoints({
|
166
|
+
overrideExisting: true,
|
201
167
|
endpoints: (builder) => ({
|
202
168
|
autoCloneDocument: builder.mutation({
|
203
169
|
query: ({ model, sourceId, query }) => ({
|
@@ -207,7 +173,12 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
207
173
|
params: query
|
208
174
|
}
|
209
175
|
}),
|
210
|
-
invalidatesTags: (_result,
|
176
|
+
invalidatesTags: (_result, error, { model }) => {
|
177
|
+
if (error) {
|
178
|
+
return [];
|
179
|
+
}
|
180
|
+
return [{ type: "Document", id: `${model}_LIST` }];
|
181
|
+
}
|
211
182
|
}),
|
212
183
|
cloneDocument: builder.mutation({
|
213
184
|
query: ({ model, sourceId, data, params }) => ({
|
@@ -218,7 +189,10 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
218
189
|
params
|
219
190
|
}
|
220
191
|
}),
|
221
|
-
invalidatesTags: (_result, _error, { model }) => [
|
192
|
+
invalidatesTags: (_result, _error, { model }) => [
|
193
|
+
{ type: "Document", id: `${model}_LIST` },
|
194
|
+
{ type: "UidAvailability", id: model }
|
195
|
+
]
|
222
196
|
}),
|
223
197
|
/**
|
224
198
|
* Creates a new collection-type document. This should ONLY be used for collection-types.
|
@@ -235,7 +209,8 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
235
209
|
}),
|
236
210
|
invalidatesTags: (result, _error, { model }) => [
|
237
211
|
{ type: "Document", id: `${model}_LIST` },
|
238
|
-
"Relations"
|
212
|
+
"Relations",
|
213
|
+
{ type: "UidAvailability", id: model }
|
239
214
|
]
|
240
215
|
}),
|
241
216
|
deleteDocument: builder.mutation({
|
@@ -276,7 +251,8 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
276
251
|
id: collectionType !== SINGLE_TYPES ? `${model}_${documentId}` : model
|
277
252
|
},
|
278
253
|
{ type: "Document", id: `${model}_LIST` },
|
279
|
-
"Relations"
|
254
|
+
"Relations",
|
255
|
+
{ type: "UidAvailability", id: model }
|
280
256
|
];
|
281
257
|
}
|
282
258
|
}),
|
@@ -294,6 +270,7 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
294
270
|
}),
|
295
271
|
providesTags: (result, _error, arg) => {
|
296
272
|
return [
|
273
|
+
{ type: "Document", id: `ALL_LIST` },
|
297
274
|
{ type: "Document", id: `${arg.model}_LIST` },
|
298
275
|
...result?.results.map(({ documentId }) => ({
|
299
276
|
type: "Document",
|
@@ -332,6 +309,11 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
332
309
|
{
|
333
310
|
type: "Document",
|
334
311
|
id: collectionType !== SINGLE_TYPES ? `${model}_${result && "documentId" in result ? result.documentId : documentId}` : model
|
312
|
+
},
|
313
|
+
// Make it easy to invalidate all individual documents queries for a model
|
314
|
+
{
|
315
|
+
type: "Document",
|
316
|
+
id: `${model}_ALL_ITEMS`
|
335
317
|
}
|
336
318
|
];
|
337
319
|
}
|
@@ -395,8 +377,21 @@ const documentApi = contentManagerApi.injectEndpoints({
|
|
395
377
|
type: "Document",
|
396
378
|
id: collectionType !== SINGLE_TYPES ? `${model}_${documentId}` : model
|
397
379
|
},
|
398
|
-
"Relations"
|
380
|
+
"Relations",
|
381
|
+
{ type: "UidAvailability", id: model }
|
399
382
|
];
|
383
|
+
},
|
384
|
+
async onQueryStarted({ data, ...patch }, { dispatch, queryFulfilled }) {
|
385
|
+
const patchResult = dispatch(
|
386
|
+
documentApi.util.updateQueryData("getDocument", patch, (draft) => {
|
387
|
+
Object.assign(draft.data, data);
|
388
|
+
})
|
389
|
+
);
|
390
|
+
try {
|
391
|
+
await queryFulfilled;
|
392
|
+
} catch {
|
393
|
+
patchResult.undo();
|
394
|
+
}
|
400
395
|
}
|
401
396
|
}),
|
402
397
|
unpublishDocument: builder.mutation({
|
@@ -466,7 +461,7 @@ const buildValidParams = (query) => {
|
|
466
461
|
const isBaseQueryError = (error) => {
|
467
462
|
return error.name !== void 0;
|
468
463
|
};
|
469
|
-
const createYupSchema = (attributes = {}, components = {}) => {
|
464
|
+
const createYupSchema = (attributes = {}, components = {}, options = { status: null }) => {
|
470
465
|
const createModelSchema = (attributes2) => yup.object().shape(
|
471
466
|
Object.entries(attributes2).reduce((acc, [name, attribute]) => {
|
472
467
|
if (DOCUMENT_META_FIELDS.includes(name)) {
|
@@ -479,7 +474,7 @@ const createYupSchema = (attributes = {}, components = {}) => {
|
|
479
474
|
addMinValidation,
|
480
475
|
addMaxValidation,
|
481
476
|
addRegexValidation
|
482
|
-
].map((fn) => fn(attribute));
|
477
|
+
].map((fn) => fn(attribute, options));
|
483
478
|
const transformSchema = pipe(...validations);
|
484
479
|
switch (attribute.type) {
|
485
480
|
case "component": {
|
@@ -580,6 +575,14 @@ const createAttributeSchema = (attribute) => {
|
|
580
575
|
if (!value || typeof value === "string" && value.length === 0) {
|
581
576
|
return true;
|
582
577
|
}
|
578
|
+
if (typeof value === "object") {
|
579
|
+
try {
|
580
|
+
JSON.stringify(value);
|
581
|
+
return true;
|
582
|
+
} catch (err) {
|
583
|
+
return false;
|
584
|
+
}
|
585
|
+
}
|
583
586
|
try {
|
584
587
|
JSON.parse(value);
|
585
588
|
return true;
|
@@ -598,13 +601,7 @@ const createAttributeSchema = (attribute) => {
|
|
598
601
|
return yup.mixed();
|
599
602
|
}
|
600
603
|
};
|
601
|
-
const
|
602
|
-
if (attribute.required) {
|
603
|
-
return schema.required({
|
604
|
-
id: translatedErrors.required.id,
|
605
|
-
defaultMessage: "This field is required."
|
606
|
-
});
|
607
|
-
}
|
604
|
+
const nullableSchema = (schema) => {
|
608
605
|
return schema?.nullable ? schema.nullable() : (
|
609
606
|
// In some cases '.nullable' will not be available on the schema.
|
610
607
|
// e.g. when the schema has been built using yup.lazy (e.g. for relations).
|
@@ -612,7 +609,22 @@ const addRequiredValidation = (attribute) => (schema) => {
|
|
612
609
|
schema
|
613
610
|
);
|
614
611
|
};
|
615
|
-
const
|
612
|
+
const addRequiredValidation = (attribute, options) => (schema) => {
|
613
|
+
if (options.status === "draft") {
|
614
|
+
return nullableSchema(schema);
|
615
|
+
}
|
616
|
+
if ((attribute.type === "component" && attribute.repeatable || attribute.type === "dynamiczone") && attribute.required && "min" in schema) {
|
617
|
+
return schema.min(1, translatedErrors.required);
|
618
|
+
}
|
619
|
+
if (attribute.required && attribute.type !== "relation") {
|
620
|
+
return schema.required(translatedErrors.required);
|
621
|
+
}
|
622
|
+
return nullableSchema(schema);
|
623
|
+
};
|
624
|
+
const addMinLengthValidation = (attribute, options) => (schema) => {
|
625
|
+
if (options.status === "draft") {
|
626
|
+
return schema;
|
627
|
+
}
|
616
628
|
if ("minLength" in attribute && attribute.minLength && Number.isInteger(attribute.minLength) && "min" in schema) {
|
617
629
|
return schema.min(attribute.minLength, {
|
618
630
|
...translatedErrors.minLength,
|
@@ -634,9 +646,31 @@ const addMaxLengthValidation = (attribute) => (schema) => {
|
|
634
646
|
}
|
635
647
|
return schema;
|
636
648
|
};
|
637
|
-
const addMinValidation = (attribute) => (schema) => {
|
649
|
+
const addMinValidation = (attribute, options) => (schema) => {
|
638
650
|
if ("min" in attribute) {
|
639
651
|
const min = toInteger(attribute.min);
|
652
|
+
if (attribute.type === "component" && attribute.repeatable || attribute.type === "dynamiczone") {
|
653
|
+
if (options.status !== "draft" && !attribute.required && "test" in schema && min) {
|
654
|
+
return schema.test(
|
655
|
+
"custom-min",
|
656
|
+
{
|
657
|
+
...translatedErrors.min,
|
658
|
+
values: {
|
659
|
+
min: attribute.min
|
660
|
+
}
|
661
|
+
},
|
662
|
+
(value) => {
|
663
|
+
if (!value) {
|
664
|
+
return true;
|
665
|
+
}
|
666
|
+
if (Array.isArray(value) && value.length === 0) {
|
667
|
+
return true;
|
668
|
+
}
|
669
|
+
return value.length >= min;
|
670
|
+
}
|
671
|
+
);
|
672
|
+
}
|
673
|
+
}
|
640
674
|
if ("min" in schema && min) {
|
641
675
|
return schema.min(min, {
|
642
676
|
...translatedErrors.min,
|
@@ -763,7 +797,10 @@ const useDocument = (args, opts) => {
|
|
763
797
|
isLoading: isLoadingDocument,
|
764
798
|
isFetching: isFetchingDocument,
|
765
799
|
error
|
766
|
-
} = useGetDocumentQuery(args,
|
800
|
+
} = useGetDocumentQuery(args, {
|
801
|
+
...opts,
|
802
|
+
skip: !args.documentId && args.collectionType !== SINGLE_TYPES || opts?.skip
|
803
|
+
});
|
767
804
|
const { components, schema, isLoading: isLoadingSchema } = useContentTypeSchema(args.model);
|
768
805
|
React.useEffect(() => {
|
769
806
|
if (error) {
|
@@ -849,6 +886,7 @@ const useDocumentActions = () => {
|
|
849
886
|
const { formatMessage } = useIntl();
|
850
887
|
const { trackUsage } = useTracking();
|
851
888
|
const { _unstableFormatAPIError: formatAPIError } = useAPIErrorHandler();
|
889
|
+
const navigate = useNavigate();
|
852
890
|
const [deleteDocument] = useDeleteDocumentMutation();
|
853
891
|
const _delete = React.useCallback(
|
854
892
|
async ({ collectionType, model, documentId, params }, trackerProperty) => {
|
@@ -1184,7 +1222,6 @@ const useDocumentActions = () => {
|
|
1184
1222
|
sourceId
|
1185
1223
|
});
|
1186
1224
|
if ("error" in res) {
|
1187
|
-
toggleNotification({ type: "danger", message: formatAPIError(res.error) });
|
1188
1225
|
return { error: res.error };
|
1189
1226
|
}
|
1190
1227
|
toggleNotification({
|
@@ -1203,7 +1240,7 @@ const useDocumentActions = () => {
|
|
1203
1240
|
throw err;
|
1204
1241
|
}
|
1205
1242
|
},
|
1206
|
-
[autoCloneDocument,
|
1243
|
+
[autoCloneDocument, formatMessage, toggleNotification]
|
1207
1244
|
);
|
1208
1245
|
const [cloneDocument] = useCloneDocumentMutation();
|
1209
1246
|
const clone = React.useCallback(
|
@@ -1229,6 +1266,7 @@ const useDocumentActions = () => {
|
|
1229
1266
|
defaultMessage: "Cloned document"
|
1230
1267
|
})
|
1231
1268
|
});
|
1269
|
+
navigate(`../../${res.data.data.documentId}`, { relative: "path" });
|
1232
1270
|
return res.data;
|
1233
1271
|
} catch (err) {
|
1234
1272
|
toggleNotification({
|
@@ -1239,7 +1277,7 @@ const useDocumentActions = () => {
|
|
1239
1277
|
throw err;
|
1240
1278
|
}
|
1241
1279
|
},
|
1242
|
-
[cloneDocument, trackUsage, toggleNotification, formatMessage, formatAPIError]
|
1280
|
+
[cloneDocument, trackUsage, toggleNotification, formatMessage, formatAPIError, navigate]
|
1243
1281
|
);
|
1244
1282
|
const [getDoc] = useLazyGetDocumentQuery();
|
1245
1283
|
const getDocument = React.useCallback(
|
@@ -1265,7 +1303,7 @@ const useDocumentActions = () => {
|
|
1265
1303
|
};
|
1266
1304
|
};
|
1267
1305
|
const ProtectedHistoryPage = lazy(
|
1268
|
-
() => import("./History-
|
1306
|
+
() => import("./History-BowL3JKP.mjs").then((mod) => ({ default: mod.ProtectedHistoryPage }))
|
1269
1307
|
);
|
1270
1308
|
const routes$1 = [
|
1271
1309
|
{
|
@@ -1278,31 +1316,31 @@ const routes$1 = [
|
|
1278
1316
|
}
|
1279
1317
|
];
|
1280
1318
|
const ProtectedEditViewPage = lazy(
|
1281
|
-
() => import("./EditViewPage-
|
1319
|
+
() => import("./EditViewPage-De8GyU8P.mjs").then((mod) => ({ default: mod.ProtectedEditViewPage }))
|
1282
1320
|
);
|
1283
1321
|
const ProtectedListViewPage = lazy(
|
1284
|
-
() => import("./ListViewPage-
|
1322
|
+
() => import("./ListViewPage-CXFUjZQC.mjs").then((mod) => ({ default: mod.ProtectedListViewPage }))
|
1285
1323
|
);
|
1286
1324
|
const ProtectedListConfiguration = lazy(
|
1287
|
-
() => import("./ListConfigurationPage-
|
1325
|
+
() => import("./ListConfigurationPage-BpVOB-hn.mjs").then((mod) => ({
|
1288
1326
|
default: mod.ProtectedListConfiguration
|
1289
1327
|
}))
|
1290
1328
|
);
|
1291
1329
|
const ProtectedEditConfigurationPage = lazy(
|
1292
|
-
() => import("./EditConfigurationPage-
|
1330
|
+
() => import("./EditConfigurationPage-CjUrEewK.mjs").then((mod) => ({
|
1293
1331
|
default: mod.ProtectedEditConfigurationPage
|
1294
1332
|
}))
|
1295
1333
|
);
|
1296
1334
|
const ProtectedComponentConfigurationPage = lazy(
|
1297
|
-
() => import("./ComponentConfigurationPage-
|
1335
|
+
() => import("./ComponentConfigurationPage-qemkOlnj.mjs").then((mod) => ({
|
1298
1336
|
default: mod.ProtectedComponentConfigurationPage
|
1299
1337
|
}))
|
1300
1338
|
);
|
1301
1339
|
const NoPermissions = lazy(
|
1302
|
-
() => import("./NoPermissionsPage-
|
1340
|
+
() => import("./NoPermissionsPage-DVz3mzDz.mjs").then((mod) => ({ default: mod.NoPermissions }))
|
1303
1341
|
);
|
1304
1342
|
const NoContentType = lazy(
|
1305
|
-
() => import("./NoContentTypePage-
|
1343
|
+
() => import("./NoContentTypePage-DuhOTp3x.mjs").then((mod) => ({ default: mod.NoContentType }))
|
1306
1344
|
);
|
1307
1345
|
const CollectionTypePages = () => {
|
1308
1346
|
const { collectionType } = useParams();
|
@@ -1416,12 +1454,14 @@ const DocumentActionButton = (action) => {
|
|
1416
1454
|
/* @__PURE__ */ jsx(
|
1417
1455
|
Button,
|
1418
1456
|
{
|
1419
|
-
flex:
|
1457
|
+
flex: "auto",
|
1420
1458
|
startIcon: action.icon,
|
1421
1459
|
disabled: action.disabled,
|
1422
1460
|
onClick: handleClick(action),
|
1423
1461
|
justifyContent: "center",
|
1424
1462
|
variant: action.variant || "default",
|
1463
|
+
paddingTop: "7px",
|
1464
|
+
paddingBottom: "7px",
|
1425
1465
|
children: action.label
|
1426
1466
|
}
|
1427
1467
|
),
|
@@ -1429,7 +1469,7 @@ const DocumentActionButton = (action) => {
|
|
1429
1469
|
DocumentActionConfirmDialog,
|
1430
1470
|
{
|
1431
1471
|
...action.dialog,
|
1432
|
-
variant: action.variant,
|
1472
|
+
variant: action.dialog?.variant ?? action.variant,
|
1433
1473
|
isOpen: dialogId === action.id,
|
1434
1474
|
onClose: handleClose
|
1435
1475
|
}
|
@@ -1481,14 +1521,14 @@ const DocumentActionsMenu = ({
|
|
1481
1521
|
};
|
1482
1522
|
return /* @__PURE__ */ jsxs(Menu.Root, { open: isOpen, onOpenChange: setIsOpen, children: [
|
1483
1523
|
/* @__PURE__ */ jsxs(
|
1484
|
-
|
1524
|
+
StyledMoreButton,
|
1485
1525
|
{
|
1486
1526
|
disabled: isDisabled,
|
1487
1527
|
size: "S",
|
1488
1528
|
endIcon: null,
|
1489
|
-
paddingTop: "
|
1490
|
-
paddingLeft: "
|
1491
|
-
paddingRight: "
|
1529
|
+
paddingTop: "4px",
|
1530
|
+
paddingLeft: "7px",
|
1531
|
+
paddingRight: "7px",
|
1492
1532
|
variant,
|
1493
1533
|
children: [
|
1494
1534
|
/* @__PURE__ */ jsx(More, { "aria-hidden": true, focusable: false }),
|
@@ -1508,10 +1548,25 @@ const DocumentActionsMenu = ({
|
|
1508
1548
|
onSelect: handleClick(action),
|
1509
1549
|
display: "block",
|
1510
1550
|
children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "space-between", gap: 4, children: [
|
1511
|
-
/* @__PURE__ */ jsxs(
|
1512
|
-
|
1513
|
-
|
1514
|
-
|
1551
|
+
/* @__PURE__ */ jsxs(
|
1552
|
+
Flex,
|
1553
|
+
{
|
1554
|
+
color: !action.disabled ? convertActionVariantToColor(action.variant) : "inherit",
|
1555
|
+
gap: 2,
|
1556
|
+
tag: "span",
|
1557
|
+
children: [
|
1558
|
+
/* @__PURE__ */ jsx(
|
1559
|
+
Flex,
|
1560
|
+
{
|
1561
|
+
tag: "span",
|
1562
|
+
color: !action.disabled ? convertActionVariantToIconColor(action.variant) : "inherit",
|
1563
|
+
children: action.icon
|
1564
|
+
}
|
1565
|
+
),
|
1566
|
+
action.label
|
1567
|
+
]
|
1568
|
+
}
|
1569
|
+
),
|
1515
1570
|
action.id.startsWith("HistoryAction") && /* @__PURE__ */ jsx(
|
1516
1571
|
Flex,
|
1517
1572
|
{
|
@@ -1570,6 +1625,23 @@ const convertActionVariantToColor = (variant = "secondary") => {
|
|
1570
1625
|
return "primary600";
|
1571
1626
|
}
|
1572
1627
|
};
|
1628
|
+
const convertActionVariantToIconColor = (variant = "secondary") => {
|
1629
|
+
switch (variant) {
|
1630
|
+
case "danger":
|
1631
|
+
return "danger600";
|
1632
|
+
case "secondary":
|
1633
|
+
return "neutral500";
|
1634
|
+
case "success":
|
1635
|
+
return "success600";
|
1636
|
+
default:
|
1637
|
+
return "primary600";
|
1638
|
+
}
|
1639
|
+
};
|
1640
|
+
const StyledMoreButton = styled(Menu.Trigger)`
|
1641
|
+
& > span {
|
1642
|
+
display: flex;
|
1643
|
+
}
|
1644
|
+
`;
|
1573
1645
|
const DocumentActionConfirmDialog = ({
|
1574
1646
|
onClose,
|
1575
1647
|
onCancel,
|
@@ -1639,13 +1711,17 @@ const PublishAction$1 = ({
|
|
1639
1711
|
const navigate = useNavigate();
|
1640
1712
|
const { toggleNotification } = useNotification();
|
1641
1713
|
const { _unstableFormatValidationErrors: formatValidationErrors } = useAPIErrorHandler();
|
1714
|
+
const isListView = useMatch(LIST_PATH) !== null;
|
1642
1715
|
const isCloning = useMatch(CLONE_PATH) !== null;
|
1643
1716
|
const { formatMessage } = useIntl();
|
1644
|
-
const { canPublish
|
1645
|
-
"PublishAction",
|
1646
|
-
({ canPublish: canPublish2, canCreate: canCreate2, canUpdate: canUpdate2 }) => ({ canPublish: canPublish2, canCreate: canCreate2, canUpdate: canUpdate2 })
|
1647
|
-
);
|
1717
|
+
const canPublish = useDocumentRBAC("PublishAction", ({ canPublish: canPublish2 }) => canPublish2);
|
1648
1718
|
const { publish } = useDocumentActions();
|
1719
|
+
const [
|
1720
|
+
countDraftRelations,
|
1721
|
+
{ isLoading: isLoadingDraftRelations, isError: isErrorDraftRelations }
|
1722
|
+
] = useLazyGetDraftRelationCountQuery();
|
1723
|
+
const [localCountOfDraftRelations, setLocalCountOfDraftRelations] = React.useState(0);
|
1724
|
+
const [serverCountOfDraftRelations, setServerCountOfDraftRelations] = React.useState(0);
|
1649
1725
|
const [{ query, rawQuery }] = useQueryParams();
|
1650
1726
|
const params = React.useMemo(() => buildValidParams(query), [query]);
|
1651
1727
|
const modified = useForm("PublishAction", ({ modified: modified2 }) => modified2);
|
@@ -1654,10 +1730,101 @@ const PublishAction$1 = ({
|
|
1654
1730
|
const validate = useForm("PublishAction", (state) => state.validate);
|
1655
1731
|
const setErrors = useForm("PublishAction", (state) => state.setErrors);
|
1656
1732
|
const formValues = useForm("PublishAction", ({ values }) => values);
|
1733
|
+
React.useEffect(() => {
|
1734
|
+
if (isErrorDraftRelations) {
|
1735
|
+
toggleNotification({
|
1736
|
+
type: "danger",
|
1737
|
+
message: formatMessage({
|
1738
|
+
id: getTranslation("error.records.fetch-draft-relatons"),
|
1739
|
+
defaultMessage: "An error occurred while fetching draft relations on this document."
|
1740
|
+
})
|
1741
|
+
});
|
1742
|
+
}
|
1743
|
+
}, [isErrorDraftRelations, toggleNotification, formatMessage]);
|
1744
|
+
React.useEffect(() => {
|
1745
|
+
const localDraftRelations = /* @__PURE__ */ new Set();
|
1746
|
+
const extractDraftRelations = (data) => {
|
1747
|
+
const relations = data.connect || [];
|
1748
|
+
relations.forEach((relation) => {
|
1749
|
+
if (relation.status === "draft") {
|
1750
|
+
localDraftRelations.add(relation.id);
|
1751
|
+
}
|
1752
|
+
});
|
1753
|
+
};
|
1754
|
+
const traverseAndExtract = (data) => {
|
1755
|
+
Object.entries(data).forEach(([key, value]) => {
|
1756
|
+
if (key === "connect" && Array.isArray(value)) {
|
1757
|
+
extractDraftRelations({ connect: value });
|
1758
|
+
} else if (typeof value === "object" && value !== null) {
|
1759
|
+
traverseAndExtract(value);
|
1760
|
+
}
|
1761
|
+
});
|
1762
|
+
};
|
1763
|
+
if (!documentId || modified) {
|
1764
|
+
traverseAndExtract(formValues);
|
1765
|
+
setLocalCountOfDraftRelations(localDraftRelations.size);
|
1766
|
+
}
|
1767
|
+
}, [documentId, modified, formValues, setLocalCountOfDraftRelations]);
|
1768
|
+
React.useEffect(() => {
|
1769
|
+
if (documentId && !isListView) {
|
1770
|
+
const fetchDraftRelationsCount = async () => {
|
1771
|
+
const { data, error } = await countDraftRelations({
|
1772
|
+
collectionType,
|
1773
|
+
model,
|
1774
|
+
documentId,
|
1775
|
+
params
|
1776
|
+
});
|
1777
|
+
if (error) {
|
1778
|
+
throw error;
|
1779
|
+
}
|
1780
|
+
if (data) {
|
1781
|
+
setServerCountOfDraftRelations(data.data);
|
1782
|
+
}
|
1783
|
+
};
|
1784
|
+
fetchDraftRelationsCount();
|
1785
|
+
}
|
1786
|
+
}, [isListView, documentId, countDraftRelations, collectionType, model, params]);
|
1657
1787
|
const isDocumentPublished = (document?.[PUBLISHED_AT_ATTRIBUTE_NAME] || meta?.availableStatus.some((doc) => doc[PUBLISHED_AT_ATTRIBUTE_NAME] !== null)) && document?.status !== "modified";
|
1658
1788
|
if (!schema?.options?.draftAndPublish) {
|
1659
1789
|
return null;
|
1660
1790
|
}
|
1791
|
+
const performPublish = async () => {
|
1792
|
+
setSubmitting(true);
|
1793
|
+
try {
|
1794
|
+
const { errors } = await validate();
|
1795
|
+
if (errors) {
|
1796
|
+
toggleNotification({
|
1797
|
+
type: "danger",
|
1798
|
+
message: formatMessage({
|
1799
|
+
id: "content-manager.validation.error",
|
1800
|
+
defaultMessage: "There are validation errors in your document. Please fix them before saving."
|
1801
|
+
})
|
1802
|
+
});
|
1803
|
+
return;
|
1804
|
+
}
|
1805
|
+
const res = await publish(
|
1806
|
+
{
|
1807
|
+
collectionType,
|
1808
|
+
model,
|
1809
|
+
documentId,
|
1810
|
+
params
|
1811
|
+
},
|
1812
|
+
formValues
|
1813
|
+
);
|
1814
|
+
if ("data" in res && collectionType !== SINGLE_TYPES) {
|
1815
|
+
navigate({
|
1816
|
+
pathname: `../${collectionType}/${model}/${res.data.documentId}`,
|
1817
|
+
search: rawQuery
|
1818
|
+
});
|
1819
|
+
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1820
|
+
setErrors(formatValidationErrors(res.error));
|
1821
|
+
}
|
1822
|
+
} finally {
|
1823
|
+
setSubmitting(false);
|
1824
|
+
}
|
1825
|
+
};
|
1826
|
+
const totalDraftRelations = localCountOfDraftRelations + serverCountOfDraftRelations;
|
1827
|
+
const hasDraftRelations = totalDraftRelations > 0;
|
1661
1828
|
return {
|
1662
1829
|
/**
|
1663
1830
|
* Disabled when:
|
@@ -1667,49 +1834,39 @@ const PublishAction$1 = ({
|
|
1667
1834
|
* - the document is already published & not modified
|
1668
1835
|
* - the document is being created & not modified
|
1669
1836
|
* - the user doesn't have the permission to publish
|
1670
|
-
* - the user doesn't have the permission to create a new document
|
1671
|
-
* - the user doesn't have the permission to update the document
|
1672
1837
|
*/
|
1673
|
-
disabled: isCloning || isSubmitting || activeTab === "published" || !modified && isDocumentPublished || !modified && !document?.documentId || !canPublish
|
1838
|
+
disabled: isCloning || isSubmitting || isLoadingDraftRelations || activeTab === "published" || !modified && isDocumentPublished || !modified && !document?.documentId || !canPublish,
|
1674
1839
|
label: formatMessage({
|
1675
1840
|
id: "app.utils.publish",
|
1676
1841
|
defaultMessage: "Publish"
|
1677
1842
|
}),
|
1678
1843
|
onClick: async () => {
|
1679
|
-
|
1680
|
-
|
1681
|
-
|
1682
|
-
|
1683
|
-
|
1684
|
-
|
1685
|
-
|
1686
|
-
|
1687
|
-
|
1688
|
-
|
1689
|
-
|
1690
|
-
|
1691
|
-
|
1692
|
-
|
1693
|
-
|
1694
|
-
|
1695
|
-
|
1696
|
-
|
1697
|
-
|
1698
|
-
|
1699
|
-
formValues
|
1700
|
-
);
|
1701
|
-
if ("data" in res && collectionType !== SINGLE_TYPES) {
|
1702
|
-
navigate({
|
1703
|
-
pathname: `../${collectionType}/${model}/${res.data.documentId}`,
|
1704
|
-
search: rawQuery
|
1705
|
-
});
|
1706
|
-
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1707
|
-
setErrors(formatValidationErrors(res.error));
|
1844
|
+
if (hasDraftRelations) {
|
1845
|
+
return;
|
1846
|
+
}
|
1847
|
+
await performPublish();
|
1848
|
+
},
|
1849
|
+
dialog: hasDraftRelations ? {
|
1850
|
+
type: "dialog",
|
1851
|
+
variant: "danger",
|
1852
|
+
footer: null,
|
1853
|
+
title: formatMessage({
|
1854
|
+
id: getTranslation(`popUpwarning.warning.bulk-has-draft-relations.title`),
|
1855
|
+
defaultMessage: "Confirmation"
|
1856
|
+
}),
|
1857
|
+
content: formatMessage(
|
1858
|
+
{
|
1859
|
+
id: getTranslation(`popUpwarning.warning.bulk-has-draft-relations.message`),
|
1860
|
+
defaultMessage: "This entry is related to {count, plural, one {# draft entry} other {# draft entries}}. Publishing it could leave broken links in your app."
|
1861
|
+
},
|
1862
|
+
{
|
1863
|
+
count: totalDraftRelations
|
1708
1864
|
}
|
1709
|
-
|
1710
|
-
|
1865
|
+
),
|
1866
|
+
onConfirm: async () => {
|
1867
|
+
await performPublish();
|
1711
1868
|
}
|
1712
|
-
}
|
1869
|
+
} : void 0
|
1713
1870
|
};
|
1714
1871
|
};
|
1715
1872
|
PublishAction$1.type = "publish";
|
@@ -1725,10 +1882,6 @@ const UpdateAction = ({
|
|
1725
1882
|
const cloneMatch = useMatch(CLONE_PATH);
|
1726
1883
|
const isCloning = cloneMatch !== null;
|
1727
1884
|
const { formatMessage } = useIntl();
|
1728
|
-
const { canCreate, canUpdate } = useDocumentRBAC("UpdateAction", ({ canCreate: canCreate2, canUpdate: canUpdate2 }) => ({
|
1729
|
-
canCreate: canCreate2,
|
1730
|
-
canUpdate: canUpdate2
|
1731
|
-
}));
|
1732
1885
|
const { create, update, clone } = useDocumentActions();
|
1733
1886
|
const [{ query, rawQuery }] = useQueryParams();
|
1734
1887
|
const params = React.useMemo(() => buildValidParams(query), [query]);
|
@@ -1745,10 +1898,8 @@ const UpdateAction = ({
|
|
1745
1898
|
* - the form is submitting
|
1746
1899
|
* - the document is not modified & we're not cloning (you can save a clone entity straight away)
|
1747
1900
|
* - the active tab is the published tab
|
1748
|
-
* - the user doesn't have the permission to create a new document
|
1749
|
-
* - the user doesn't have the permission to update the document
|
1750
1901
|
*/
|
1751
|
-
disabled: isSubmitting || !modified && !isCloning || activeTab === "published"
|
1902
|
+
disabled: isSubmitting || !modified && !isCloning || activeTab === "published",
|
1752
1903
|
label: formatMessage({
|
1753
1904
|
id: "content-manager.containers.Edit.save",
|
1754
1905
|
defaultMessage: "Save"
|
@@ -1756,16 +1907,18 @@ const UpdateAction = ({
|
|
1756
1907
|
onClick: async () => {
|
1757
1908
|
setSubmitting(true);
|
1758
1909
|
try {
|
1759
|
-
|
1760
|
-
|
1761
|
-
|
1762
|
-
|
1763
|
-
|
1764
|
-
|
1765
|
-
|
1766
|
-
|
1767
|
-
|
1768
|
-
|
1910
|
+
if (activeTab !== "draft") {
|
1911
|
+
const { errors } = await validate();
|
1912
|
+
if (errors) {
|
1913
|
+
toggleNotification({
|
1914
|
+
type: "danger",
|
1915
|
+
message: formatMessage({
|
1916
|
+
id: "content-manager.validation.error",
|
1917
|
+
defaultMessage: "There are validation errors in your document. Please fix them before saving."
|
1918
|
+
})
|
1919
|
+
});
|
1920
|
+
return;
|
1921
|
+
}
|
1769
1922
|
}
|
1770
1923
|
if (isCloning) {
|
1771
1924
|
const res = await clone(
|
@@ -1777,10 +1930,13 @@ const UpdateAction = ({
|
|
1777
1930
|
document
|
1778
1931
|
);
|
1779
1932
|
if ("data" in res) {
|
1780
|
-
navigate(
|
1781
|
-
|
1782
|
-
|
1783
|
-
|
1933
|
+
navigate(
|
1934
|
+
{
|
1935
|
+
pathname: `../${res.data.documentId}`,
|
1936
|
+
search: rawQuery
|
1937
|
+
},
|
1938
|
+
{ relative: "path" }
|
1939
|
+
);
|
1784
1940
|
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1785
1941
|
setErrors(formatValidationErrors(res.error));
|
1786
1942
|
}
|
@@ -1808,10 +1964,13 @@ const UpdateAction = ({
|
|
1808
1964
|
document
|
1809
1965
|
);
|
1810
1966
|
if ("data" in res && collectionType !== SINGLE_TYPES) {
|
1811
|
-
navigate(
|
1812
|
-
|
1813
|
-
|
1814
|
-
|
1967
|
+
navigate(
|
1968
|
+
{
|
1969
|
+
pathname: `../${res.data.documentId}`,
|
1970
|
+
search: rawQuery
|
1971
|
+
},
|
1972
|
+
{ replace: true, relative: "path" }
|
1973
|
+
);
|
1815
1974
|
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1816
1975
|
setErrors(formatValidationErrors(res.error));
|
1817
1976
|
}
|
@@ -2057,23 +2216,13 @@ const Header = ({ isCreating, status, title: documentTitle = "Untitled" }) => {
|
|
2057
2216
|
id: "content-manager.containers.edit.title.new",
|
2058
2217
|
defaultMessage: "Create an entry"
|
2059
2218
|
}) : documentTitle;
|
2060
|
-
return /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "flex-start", paddingTop:
|
2219
|
+
return /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "flex-start", paddingTop: 6, paddingBottom: 4, gap: 2, children: [
|
2061
2220
|
/* @__PURE__ */ jsx(BackButton, {}),
|
2062
|
-
/* @__PURE__ */ jsxs(
|
2063
|
-
|
2064
|
-
{
|
2065
|
-
|
2066
|
-
|
2067
|
-
paddingTop: 1,
|
2068
|
-
gap: "80px",
|
2069
|
-
alignItems: "flex-start",
|
2070
|
-
children: [
|
2071
|
-
/* @__PURE__ */ jsx(Typography, { variant: "alpha", tag: "h1", children: title }),
|
2072
|
-
/* @__PURE__ */ jsx(HeaderToolbar, {})
|
2073
|
-
]
|
2074
|
-
}
|
2075
|
-
),
|
2076
|
-
status ? /* @__PURE__ */ jsx(DocumentStatus, { status: isCloning ? "draft" : status }) : null
|
2221
|
+
/* @__PURE__ */ jsxs(Flex, { width: "100%", justifyContent: "space-between", gap: "80px", alignItems: "flex-start", children: [
|
2222
|
+
/* @__PURE__ */ jsx(Typography, { variant: "alpha", tag: "h1", children: title }),
|
2223
|
+
/* @__PURE__ */ jsx(HeaderToolbar, {})
|
2224
|
+
] }),
|
2225
|
+
status ? /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(DocumentStatus, { status: isCloning ? "draft" : status }) }) : null
|
2077
2226
|
] });
|
2078
2227
|
};
|
2079
2228
|
const HeaderToolbar = () => {
|
@@ -2764,7 +2913,7 @@ const ConfirmBulkActionDialog = ({
|
|
2764
2913
|
endAction
|
2765
2914
|
}) => {
|
2766
2915
|
const { formatMessage } = useIntl();
|
2767
|
-
return /* @__PURE__ */ jsx(Dialog.Root, {
|
2916
|
+
return /* @__PURE__ */ jsx(Dialog.Root, { open: isOpen, children: /* @__PURE__ */ jsxs(Dialog.Content, { children: [
|
2768
2917
|
/* @__PURE__ */ jsx(Dialog.Header, { children: formatMessage({
|
2769
2918
|
id: "app.components.ConfirmDialog.title",
|
2770
2919
|
defaultMessage: "Confirmation"
|
@@ -2885,7 +3034,14 @@ const formatErrorMessages = (errors, parentKey, formatMessage) => {
|
|
2885
3034
|
)
|
2886
3035
|
);
|
2887
3036
|
} else {
|
2888
|
-
messages.push(
|
3037
|
+
messages.push(
|
3038
|
+
...formatErrorMessages(
|
3039
|
+
// @ts-expect-error TODO: check why value is not compatible with FormErrors
|
3040
|
+
value,
|
3041
|
+
currentKey,
|
3042
|
+
formatMessage
|
3043
|
+
)
|
3044
|
+
);
|
2889
3045
|
}
|
2890
3046
|
} else {
|
2891
3047
|
messages.push(
|
@@ -3046,7 +3202,13 @@ const SelectedEntriesModalContent = ({
|
|
3046
3202
|
);
|
3047
3203
|
const { rows, validationErrors } = React.useMemo(() => {
|
3048
3204
|
if (data.length > 0 && schema) {
|
3049
|
-
const validate = createYupSchema(
|
3205
|
+
const validate = createYupSchema(
|
3206
|
+
schema.attributes,
|
3207
|
+
components,
|
3208
|
+
// Since this is the "Publish" action, the validation
|
3209
|
+
// schema must enforce the rules for published entities
|
3210
|
+
{ status: "published" }
|
3211
|
+
);
|
3050
3212
|
const validationErrors2 = {};
|
3051
3213
|
const rows2 = data.map((entry) => {
|
3052
3214
|
try {
|
@@ -3396,7 +3558,7 @@ const TableActions = ({ document }) => {
|
|
3396
3558
|
DescriptionComponentRenderer,
|
3397
3559
|
{
|
3398
3560
|
props,
|
3399
|
-
descriptions: plugins["content-manager"].apis.getDocumentActions(),
|
3561
|
+
descriptions: plugins["content-manager"].apis.getDocumentActions().filter((action) => action.name !== "PublishAction"),
|
3400
3562
|
children: (actions2) => {
|
3401
3563
|
const tableRowActions = actions2.filter((action) => {
|
3402
3564
|
const positions = Array.isArray(action.position) ? action.position : [action.position];
|
@@ -3507,7 +3669,7 @@ const CloneAction = ({ model, documentId }) => {
|
|
3507
3669
|
}),
|
3508
3670
|
content: /* @__PURE__ */ jsx(AutoCloneFailureModalBody, { prohibitedFields }),
|
3509
3671
|
footer: ({ onClose }) => {
|
3510
|
-
return /* @__PURE__ */ jsxs(
|
3672
|
+
return /* @__PURE__ */ jsxs(Modal.Footer, { children: [
|
3511
3673
|
/* @__PURE__ */ jsx(Button, { onClick: onClose, variant: "tertiary", children: formatMessage({
|
3512
3674
|
id: "cancel",
|
3513
3675
|
defaultMessage: "Cancel"
|
@@ -3548,8 +3710,7 @@ class ContentManagerPlugin {
|
|
3548
3710
|
documentActions = [
|
3549
3711
|
...DEFAULT_ACTIONS,
|
3550
3712
|
...DEFAULT_TABLE_ROW_ACTIONS,
|
3551
|
-
...DEFAULT_HEADER_ACTIONS
|
3552
|
-
HistoryAction
|
3713
|
+
...DEFAULT_HEADER_ACTIONS
|
3553
3714
|
];
|
3554
3715
|
editViewSidePanels = [ActionsPanel];
|
3555
3716
|
headerActions = [];
|
@@ -3638,6 +3799,52 @@ const getPrintableType = (value) => {
|
|
3638
3799
|
}
|
3639
3800
|
return nativeType;
|
3640
3801
|
};
|
3802
|
+
const HistoryAction = ({ model, document }) => {
|
3803
|
+
const { formatMessage } = useIntl();
|
3804
|
+
const [{ query }] = useQueryParams();
|
3805
|
+
const navigate = useNavigate();
|
3806
|
+
const pluginsQueryParams = stringify({ plugins: query.plugins }, { encode: false });
|
3807
|
+
if (!window.strapi.features.isEnabled("cms-content-history")) {
|
3808
|
+
return null;
|
3809
|
+
}
|
3810
|
+
return {
|
3811
|
+
icon: /* @__PURE__ */ jsx(ClockCounterClockwise, {}),
|
3812
|
+
label: formatMessage({
|
3813
|
+
id: "content-manager.history.document-action",
|
3814
|
+
defaultMessage: "Content History"
|
3815
|
+
}),
|
3816
|
+
onClick: () => navigate({ pathname: "history", search: pluginsQueryParams }),
|
3817
|
+
disabled: (
|
3818
|
+
/**
|
3819
|
+
* The user is creating a new document.
|
3820
|
+
* It hasn't been saved yet, so there's no history to go to
|
3821
|
+
*/
|
3822
|
+
!document || /**
|
3823
|
+
* The document has been created but the current dimension has never been saved.
|
3824
|
+
* For example, the user is creating a new locale in an existing document,
|
3825
|
+
* so there's no history for the document in that locale
|
3826
|
+
*/
|
3827
|
+
!document.id || /**
|
3828
|
+
* History is only available for content types created by the user.
|
3829
|
+
* These have the `api::` prefix, as opposed to the ones created by Strapi or plugins,
|
3830
|
+
* which start with `admin::` or `plugin::`
|
3831
|
+
*/
|
3832
|
+
!model.startsWith("api::")
|
3833
|
+
),
|
3834
|
+
position: "header"
|
3835
|
+
};
|
3836
|
+
};
|
3837
|
+
HistoryAction.type = "history";
|
3838
|
+
const historyAdmin = {
|
3839
|
+
bootstrap(app) {
|
3840
|
+
const { addDocumentAction } = app.getPlugin("content-manager").apis;
|
3841
|
+
addDocumentAction((actions2) => {
|
3842
|
+
const indexOfDeleteAction = actions2.findIndex((action) => action.type === "delete");
|
3843
|
+
actions2.splice(indexOfDeleteAction, 0, HistoryAction);
|
3844
|
+
return actions2;
|
3845
|
+
});
|
3846
|
+
}
|
3847
|
+
};
|
3641
3848
|
const initialState = {
|
3642
3849
|
collectionTypeLinks: [],
|
3643
3850
|
components: [],
|
@@ -3688,15 +3895,29 @@ const index = {
|
|
3688
3895
|
defaultMessage: "Content Manager"
|
3689
3896
|
},
|
3690
3897
|
permissions: [],
|
3691
|
-
Component: () => import("./layout-DC503LnF.mjs").then((mod) => ({ default: mod.Layout })),
|
3692
3898
|
position: 1
|
3693
3899
|
});
|
3900
|
+
app.router.addRoute({
|
3901
|
+
path: "content-manager/*",
|
3902
|
+
lazy: async () => {
|
3903
|
+
const { Layout } = await import("./layout-ls3gxfpH.mjs");
|
3904
|
+
return {
|
3905
|
+
Component: Layout
|
3906
|
+
};
|
3907
|
+
},
|
3908
|
+
children: routes
|
3909
|
+
});
|
3694
3910
|
app.registerPlugin(cm.config);
|
3695
3911
|
},
|
3912
|
+
bootstrap(app) {
|
3913
|
+
if (typeof historyAdmin.bootstrap === "function") {
|
3914
|
+
historyAdmin.bootstrap(app);
|
3915
|
+
}
|
3916
|
+
},
|
3696
3917
|
async registerTrads({ locales }) {
|
3697
3918
|
const importedTrads = await Promise.all(
|
3698
3919
|
locales.map((locale) => {
|
3699
|
-
return __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/ar.json": () => import("./ar-CCEVvqGG.mjs"), "./translations/ca.json": () => import("./ca-5U32ON2v.mjs"), "./translations/cs.json": () => import("./cs-CM2aBUar.mjs"), "./translations/de.json": () => import("./de-C72KDNOl.mjs"), "./translations/en.json": () => import("./en-
|
3920
|
+
return __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/ar.json": () => import("./ar-CCEVvqGG.mjs"), "./translations/ca.json": () => import("./ca-5U32ON2v.mjs"), "./translations/cs.json": () => import("./cs-CM2aBUar.mjs"), "./translations/de.json": () => import("./de-C72KDNOl.mjs"), "./translations/en.json": () => import("./en-BrCTWlZv.mjs"), "./translations/es.json": () => import("./es-CeXiYflN.mjs"), "./translations/eu.json": () => import("./eu-CdALomew.mjs"), "./translations/fr.json": () => import("./fr-CD9VFbPM.mjs"), "./translations/gu.json": () => import("./gu-CNpaMDpH.mjs"), "./translations/hi.json": () => import("./hi-Dwvd04m3.mjs"), "./translations/hu.json": () => import("./hu-CeYvaaO0.mjs"), "./translations/id.json": () => import("./id-BtwA9WJT.mjs"), "./translations/it.json": () => import("./it-BrVPqaf1.mjs"), "./translations/ja.json": () => import("./ja-CtsUxOvk.mjs"), "./translations/ko.json": () => import("./ko-HVQRlfUI.mjs"), "./translations/ml.json": () => import("./ml-BihZwQit.mjs"), "./translations/ms.json": () => import("./ms-m_WjyWx7.mjs"), "./translations/nl.json": () => import("./nl-D4R9gHx5.mjs"), "./translations/pl.json": () => import("./pl-sbx9mSt_.mjs"), "./translations/pt-BR.json": () => import("./pt-BR-C71iDxnh.mjs"), "./translations/pt.json": () => import("./pt-BsaFvS8-.mjs"), "./translations/ru.json": () => import("./ru-BE6A4Exp.mjs"), "./translations/sa.json": () => import("./sa-Dag0k-Z8.mjs"), "./translations/sk.json": () => import("./sk-BFg-R8qJ.mjs"), "./translations/sv.json": () => import("./sv-CUnfWGsh.mjs"), "./translations/th.json": () => import("./th-BqbI8lIT.mjs"), "./translations/tr.json": () => import("./tr-CgeK3wJM.mjs"), "./translations/uk.json": () => import("./uk-CR-zDhAY.mjs"), "./translations/vi.json": () => import("./vi-DUXIk_fw.mjs"), "./translations/zh-Hans.json": () => import("./zh-Hans-BPQcRIyH.mjs"), "./translations/zh.json": () => import("./zh-BWZspA60.mjs") }), `./translations/${locale}.json`).then(({ default: data }) => {
|
3700
3921
|
return {
|
3701
3922
|
data: prefixPluginTranslations(data, PLUGIN_ID),
|
3702
3923
|
locale
|
@@ -3742,11 +3963,11 @@ export {
|
|
3742
3963
|
PERMISSIONS as k,
|
3743
3964
|
DocumentRBAC as l,
|
3744
3965
|
DOCUMENT_META_FIELDS as m,
|
3745
|
-
|
3746
|
-
|
3747
|
-
|
3748
|
-
|
3749
|
-
|
3966
|
+
CLONE_PATH as n,
|
3967
|
+
useDocLayout as o,
|
3968
|
+
useGetContentTypeConfigurationQuery as p,
|
3969
|
+
CREATOR_FIELDS as q,
|
3970
|
+
getMainField as r,
|
3750
3971
|
setInitialData as s,
|
3751
3972
|
getDisplayName as t,
|
3752
3973
|
useContentTypeSchema as u,
|
@@ -3756,4 +3977,4 @@ export {
|
|
3756
3977
|
capitalise as y,
|
3757
3978
|
useUpdateContentTypeConfigurationMutation as z
|
3758
3979
|
};
|
3759
|
-
//# sourceMappingURL=index-
|
3980
|
+
//# sourceMappingURL=index-DiMrfcfy.mjs.map
|