@strapi/content-manager 0.0.0-experimental.d954d57341a6623992a0d211daaec8e245c3517d → 0.0.0-experimental.da85533897155e719d784f0271223c866d2f69ab
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-gdUj_t-O.mjs → ComponentConfigurationPage-9lRmRdIr.mjs} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-gdUj_t-O.mjs.map → ComponentConfigurationPage-9lRmRdIr.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-WRPUXGd6.js → ComponentConfigurationPage-DyDkPajU.js} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-WRPUXGd6.js.map → ComponentConfigurationPage-DyDkPajU.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-BwuIPOJG.mjs → EditConfigurationPage-Bk893vVY.mjs} +3 -3
- package/dist/_chunks/{EditConfigurationPage-BwuIPOJG.mjs.map → EditConfigurationPage-Bk893vVY.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-C1vjMBgy.js → EditConfigurationPage-DValmA0m.js} +3 -3
- package/dist/_chunks/{EditConfigurationPage-C1vjMBgy.js.map → EditConfigurationPage-DValmA0m.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-0MiFkXa8.mjs → EditViewPage-DiNFdFqP.mjs} +19 -8
- package/dist/_chunks/EditViewPage-DiNFdFqP.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-DbcGfyqK.js → EditViewPage-Dk7Eaft4.js} +19 -8
- package/dist/_chunks/EditViewPage-Dk7Eaft4.js.map +1 -0
- package/dist/_chunks/{Field-BG1xu38N.js → Field-DH2OaqUP.js} +458 -128
- package/dist/_chunks/Field-DH2OaqUP.js.map +1 -0
- package/dist/_chunks/{Field-BDMSCcy5.mjs → Field-Dv_HTFTa.mjs} +460 -130
- package/dist/_chunks/Field-Dv_HTFTa.mjs.map +1 -0
- package/dist/_chunks/{Form-9BnFyUjy.js → Form-B_dUDizM.js} +26 -12
- package/dist/_chunks/Form-B_dUDizM.js.map +1 -0
- package/dist/_chunks/{Form-CPVWavB8.mjs → Form-Dy6P4HgH.mjs} +26 -12
- package/dist/_chunks/Form-Dy6P4HgH.mjs.map +1 -0
- package/dist/_chunks/{History-BWWxLt2Z.js → History-BT4w83Oa.js} +44 -19
- package/dist/_chunks/History-BT4w83Oa.js.map +1 -0
- package/dist/_chunks/{History-BVpd8LP3.mjs → History-DrwsD1Vc.mjs} +44 -19
- package/dist/_chunks/History-DrwsD1Vc.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DozVMKcR.mjs → ListConfigurationPage-BxIP0jRy.mjs} +20 -8
- package/dist/_chunks/ListConfigurationPage-BxIP0jRy.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-6swzjdAZ.js → ListConfigurationPage-CuYrMcW3.js} +20 -8
- package/dist/_chunks/ListConfigurationPage-CuYrMcW3.js.map +1 -0
- package/dist/_chunks/{ListViewPage-Ds0ulgfG.mjs → ListViewPage-5a1vw-OK.mjs} +40 -34
- package/dist/_chunks/ListViewPage-5a1vw-OK.mjs.map +1 -0
- package/dist/_chunks/{ListViewPage-BlzfjS2Q.js → ListViewPage-BvpwNur7.js} +38 -32
- package/dist/_chunks/ListViewPage-BvpwNur7.js.map +1 -0
- package/dist/_chunks/{NoContentTypePage-BH11kaKt.mjs → NoContentTypePage-Bm6tRcd3.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-BH11kaKt.mjs.map → NoContentTypePage-Bm6tRcd3.mjs.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-D2nCCWEl.js → NoContentTypePage-UqEiWKkM.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-D2nCCWEl.js.map → NoContentTypePage-UqEiWKkM.js.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-BT2Tn0D_.mjs → NoPermissionsPage-BHPqn_tQ.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-BT2Tn0D_.mjs.map → NoPermissionsPage-BHPqn_tQ.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DN_JlsU2.js → NoPermissionsPage-C_vGRo8Q.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DN_JlsU2.js.map → NoPermissionsPage-C_vGRo8Q.js.map} +1 -1
- package/dist/_chunks/{Relations-Dnag3fhV.mjs → Relations-C7fPyh5P.mjs} +4 -4
- package/dist/_chunks/Relations-C7fPyh5P.mjs.map +1 -0
- package/dist/_chunks/{Relations-CcgFTcWo.js → Relations-CznVF6LS.js} +4 -4
- package/dist/_chunks/Relations-CznVF6LS.js.map +1 -0
- package/dist/_chunks/{en-Ux26r5pl.mjs → en-CbaIuYoB.mjs} +6 -5
- package/dist/_chunks/{en-Ux26r5pl.mjs.map → en-CbaIuYoB.mjs.map} +1 -1
- package/dist/_chunks/{en-fbKQxLGn.js → en-otD_UBJi.js} +6 -5
- package/dist/_chunks/{en-fbKQxLGn.js.map → en-otD_UBJi.js.map} +1 -1
- package/dist/_chunks/{index-JNNNKUHs.mjs → index-BJ6uTqLL.mjs} +395 -179
- package/dist/_chunks/index-BJ6uTqLL.mjs.map +1 -0
- package/dist/_chunks/{index-CWpLBSt0.js → index-D9UmmBcM.js} +388 -172
- package/dist/_chunks/index-D9UmmBcM.js.map +1 -0
- package/dist/_chunks/{layout--iHdZzRk.js → layout-kfu5Wtix.js} +23 -11
- package/dist/_chunks/layout-kfu5Wtix.js.map +1 -0
- package/dist/_chunks/{layout-DC503LnF.mjs → layout-uomiIGbG.mjs} +25 -13
- package/dist/_chunks/layout-uomiIGbG.mjs.map +1 -0
- package/dist/_chunks/{relations-BbHizA5K.js → relations-DKENrxko.js} +2 -2
- package/dist/_chunks/{relations-BbHizA5K.js.map → relations-DKENrxko.js.map} +1 -1
- package/dist/_chunks/{relations-CTje5t-a.mjs → relations-DiDufGSA.mjs} +2 -2
- package/dist/_chunks/{relations-CTje5t-a.mjs.map → relations-DiDufGSA.mjs.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 +4 -48
- 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 +178 -109
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +179 -110
- 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/history.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 +2 -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 { Button, Menu, VisuallyHidden, Flex, Typography, Dialog, Modal, Radio, Status, SingleSelect, SingleSelectOption,
|
6
|
+
import { Button, Menu, 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-DrwsD1Vc.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-DiNFdFqP.mjs").then((mod) => ({ default: mod.ProtectedEditViewPage }))
|
1282
1320
|
);
|
1283
1321
|
const ProtectedListViewPage = lazy(
|
1284
|
-
() => import("./ListViewPage-
|
1322
|
+
() => import("./ListViewPage-5a1vw-OK.mjs").then((mod) => ({ default: mod.ProtectedListViewPage }))
|
1285
1323
|
);
|
1286
1324
|
const ProtectedListConfiguration = lazy(
|
1287
|
-
() => import("./ListConfigurationPage-
|
1325
|
+
() => import("./ListConfigurationPage-BxIP0jRy.mjs").then((mod) => ({
|
1288
1326
|
default: mod.ProtectedListConfiguration
|
1289
1327
|
}))
|
1290
1328
|
);
|
1291
1329
|
const ProtectedEditConfigurationPage = lazy(
|
1292
|
-
() => import("./EditConfigurationPage-
|
1330
|
+
() => import("./EditConfigurationPage-Bk893vVY.mjs").then((mod) => ({
|
1293
1331
|
default: mod.ProtectedEditConfigurationPage
|
1294
1332
|
}))
|
1295
1333
|
);
|
1296
1334
|
const ProtectedComponentConfigurationPage = lazy(
|
1297
|
-
() => import("./ComponentConfigurationPage-
|
1335
|
+
() => import("./ComponentConfigurationPage-9lRmRdIr.mjs").then((mod) => ({
|
1298
1336
|
default: mod.ProtectedComponentConfigurationPage
|
1299
1337
|
}))
|
1300
1338
|
);
|
1301
1339
|
const NoPermissions = lazy(
|
1302
|
-
() => import("./NoPermissionsPage-
|
1340
|
+
() => import("./NoPermissionsPage-BHPqn_tQ.mjs").then((mod) => ({ default: mod.NoPermissions }))
|
1303
1341
|
);
|
1304
1342
|
const NoContentType = lazy(
|
1305
|
-
() => import("./NoContentTypePage-
|
1343
|
+
() => import("./NoContentTypePage-Bm6tRcd3.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
|
}
|
@@ -1486,9 +1526,9 @@ const DocumentActionsMenu = ({
|
|
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,18 @@ 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
|
+
};
|
1573
1640
|
const DocumentActionConfirmDialog = ({
|
1574
1641
|
onClose,
|
1575
1642
|
onCancel,
|
@@ -1639,13 +1706,17 @@ const PublishAction$1 = ({
|
|
1639
1706
|
const navigate = useNavigate();
|
1640
1707
|
const { toggleNotification } = useNotification();
|
1641
1708
|
const { _unstableFormatValidationErrors: formatValidationErrors } = useAPIErrorHandler();
|
1709
|
+
const isListView = useMatch(LIST_PATH) !== null;
|
1642
1710
|
const isCloning = useMatch(CLONE_PATH) !== null;
|
1643
1711
|
const { formatMessage } = useIntl();
|
1644
|
-
const { canPublish
|
1645
|
-
"PublishAction",
|
1646
|
-
({ canPublish: canPublish2, canCreate: canCreate2, canUpdate: canUpdate2 }) => ({ canPublish: canPublish2, canCreate: canCreate2, canUpdate: canUpdate2 })
|
1647
|
-
);
|
1712
|
+
const canPublish = useDocumentRBAC("PublishAction", ({ canPublish: canPublish2 }) => canPublish2);
|
1648
1713
|
const { publish } = useDocumentActions();
|
1714
|
+
const [
|
1715
|
+
countDraftRelations,
|
1716
|
+
{ isLoading: isLoadingDraftRelations, isError: isErrorDraftRelations }
|
1717
|
+
] = useLazyGetDraftRelationCountQuery();
|
1718
|
+
const [localCountOfDraftRelations, setLocalCountOfDraftRelations] = React.useState(0);
|
1719
|
+
const [serverCountOfDraftRelations, setServerCountOfDraftRelations] = React.useState(0);
|
1649
1720
|
const [{ query, rawQuery }] = useQueryParams();
|
1650
1721
|
const params = React.useMemo(() => buildValidParams(query), [query]);
|
1651
1722
|
const modified = useForm("PublishAction", ({ modified: modified2 }) => modified2);
|
@@ -1654,10 +1725,102 @@ const PublishAction$1 = ({
|
|
1654
1725
|
const validate = useForm("PublishAction", (state) => state.validate);
|
1655
1726
|
const setErrors = useForm("PublishAction", (state) => state.setErrors);
|
1656
1727
|
const formValues = useForm("PublishAction", ({ values }) => values);
|
1728
|
+
React.useEffect(() => {
|
1729
|
+
if (isErrorDraftRelations) {
|
1730
|
+
toggleNotification({
|
1731
|
+
type: "danger",
|
1732
|
+
message: formatMessage({
|
1733
|
+
id: getTranslation("error.records.fetch-draft-relatons"),
|
1734
|
+
defaultMessage: "An error occurred while fetching draft relations on this document."
|
1735
|
+
})
|
1736
|
+
});
|
1737
|
+
}
|
1738
|
+
}, [isErrorDraftRelations, toggleNotification, formatMessage]);
|
1739
|
+
React.useEffect(() => {
|
1740
|
+
const localDraftRelations = /* @__PURE__ */ new Set();
|
1741
|
+
const extractDraftRelations = (data) => {
|
1742
|
+
const relations = data.connect || [];
|
1743
|
+
relations.forEach((relation) => {
|
1744
|
+
if (relation.status === "draft") {
|
1745
|
+
localDraftRelations.add(relation.id);
|
1746
|
+
}
|
1747
|
+
});
|
1748
|
+
};
|
1749
|
+
const traverseAndExtract = (data) => {
|
1750
|
+
Object.entries(data).forEach(([key, value]) => {
|
1751
|
+
if (key === "connect" && Array.isArray(value)) {
|
1752
|
+
extractDraftRelations({ connect: value });
|
1753
|
+
} else if (typeof value === "object" && value !== null) {
|
1754
|
+
traverseAndExtract(value);
|
1755
|
+
}
|
1756
|
+
});
|
1757
|
+
};
|
1758
|
+
if (!documentId || modified) {
|
1759
|
+
traverseAndExtract(formValues);
|
1760
|
+
setLocalCountOfDraftRelations(localDraftRelations.size);
|
1761
|
+
}
|
1762
|
+
}, [documentId, modified, formValues, setLocalCountOfDraftRelations]);
|
1763
|
+
React.useEffect(() => {
|
1764
|
+
if (documentId && !isListView) {
|
1765
|
+
const fetchDraftRelationsCount = async () => {
|
1766
|
+
const { data, error } = await countDraftRelations({
|
1767
|
+
collectionType,
|
1768
|
+
model,
|
1769
|
+
documentId,
|
1770
|
+
params
|
1771
|
+
});
|
1772
|
+
if (error) {
|
1773
|
+
throw error;
|
1774
|
+
}
|
1775
|
+
if (data) {
|
1776
|
+
setServerCountOfDraftRelations(data.data);
|
1777
|
+
}
|
1778
|
+
};
|
1779
|
+
fetchDraftRelationsCount();
|
1780
|
+
}
|
1781
|
+
}, [isListView, documentId, countDraftRelations, collectionType, model, params]);
|
1657
1782
|
const isDocumentPublished = (document?.[PUBLISHED_AT_ATTRIBUTE_NAME] || meta?.availableStatus.some((doc) => doc[PUBLISHED_AT_ATTRIBUTE_NAME] !== null)) && document?.status !== "modified";
|
1658
1783
|
if (!schema?.options?.draftAndPublish) {
|
1659
1784
|
return null;
|
1660
1785
|
}
|
1786
|
+
const performPublish = async () => {
|
1787
|
+
setSubmitting(true);
|
1788
|
+
try {
|
1789
|
+
const { errors } = await validate();
|
1790
|
+
if (errors) {
|
1791
|
+
toggleNotification({
|
1792
|
+
type: "danger",
|
1793
|
+
message: formatMessage({
|
1794
|
+
id: "content-manager.validation.error",
|
1795
|
+
defaultMessage: "There are validation errors in your document. Please fix them before saving."
|
1796
|
+
})
|
1797
|
+
});
|
1798
|
+
return;
|
1799
|
+
}
|
1800
|
+
const res = await publish(
|
1801
|
+
{
|
1802
|
+
collectionType,
|
1803
|
+
model,
|
1804
|
+
documentId,
|
1805
|
+
params
|
1806
|
+
},
|
1807
|
+
formValues
|
1808
|
+
);
|
1809
|
+
if ("data" in res && collectionType !== SINGLE_TYPES) {
|
1810
|
+
navigate({
|
1811
|
+
pathname: `../${collectionType}/${model}/${res.data.documentId}`,
|
1812
|
+
search: rawQuery
|
1813
|
+
});
|
1814
|
+
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1815
|
+
setErrors(formatValidationErrors(res.error));
|
1816
|
+
}
|
1817
|
+
} finally {
|
1818
|
+
setSubmitting(false);
|
1819
|
+
}
|
1820
|
+
};
|
1821
|
+
const totalDraftRelations = localCountOfDraftRelations + serverCountOfDraftRelations;
|
1822
|
+
const enableDraftRelationsCount = false;
|
1823
|
+
const hasDraftRelations = enableDraftRelationsCount;
|
1661
1824
|
return {
|
1662
1825
|
/**
|
1663
1826
|
* Disabled when:
|
@@ -1667,49 +1830,36 @@ const PublishAction$1 = ({
|
|
1667
1830
|
* - the document is already published & not modified
|
1668
1831
|
* - the document is being created & not modified
|
1669
1832
|
* - 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
1833
|
*/
|
1673
|
-
disabled: isCloning || isSubmitting || activeTab === "published" || !modified && isDocumentPublished || !modified && !document?.documentId || !canPublish
|
1834
|
+
disabled: isCloning || isSubmitting || isLoadingDraftRelations || activeTab === "published" || !modified && isDocumentPublished || !modified && !document?.documentId || !canPublish,
|
1674
1835
|
label: formatMessage({
|
1675
1836
|
id: "app.utils.publish",
|
1676
1837
|
defaultMessage: "Publish"
|
1677
1838
|
}),
|
1678
1839
|
onClick: async () => {
|
1679
|
-
|
1680
|
-
|
1681
|
-
|
1682
|
-
|
1683
|
-
|
1684
|
-
|
1685
|
-
|
1686
|
-
|
1687
|
-
|
1688
|
-
|
1689
|
-
|
1690
|
-
|
1691
|
-
|
1692
|
-
|
1693
|
-
|
1694
|
-
|
1695
|
-
|
1696
|
-
documentId,
|
1697
|
-
params
|
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));
|
1840
|
+
await performPublish();
|
1841
|
+
},
|
1842
|
+
dialog: hasDraftRelations ? {
|
1843
|
+
type: "dialog",
|
1844
|
+
variant: "danger",
|
1845
|
+
footer: null,
|
1846
|
+
title: formatMessage({
|
1847
|
+
id: getTranslation(`popUpwarning.warning.bulk-has-draft-relations.title`),
|
1848
|
+
defaultMessage: "Confirmation"
|
1849
|
+
}),
|
1850
|
+
content: formatMessage(
|
1851
|
+
{
|
1852
|
+
id: getTranslation(`popUpwarning.warning.bulk-has-draft-relations.message`),
|
1853
|
+
defaultMessage: "This entry is related to {count, plural, one {# draft entry} other {# draft entries}}. Publishing it could leave broken links in your app."
|
1854
|
+
},
|
1855
|
+
{
|
1856
|
+
count: totalDraftRelations
|
1708
1857
|
}
|
1709
|
-
|
1710
|
-
|
1858
|
+
),
|
1859
|
+
onConfirm: async () => {
|
1860
|
+
await performPublish();
|
1711
1861
|
}
|
1712
|
-
}
|
1862
|
+
} : void 0
|
1713
1863
|
};
|
1714
1864
|
};
|
1715
1865
|
PublishAction$1.type = "publish";
|
@@ -1725,10 +1875,6 @@ const UpdateAction = ({
|
|
1725
1875
|
const cloneMatch = useMatch(CLONE_PATH);
|
1726
1876
|
const isCloning = cloneMatch !== null;
|
1727
1877
|
const { formatMessage } = useIntl();
|
1728
|
-
const { canCreate, canUpdate } = useDocumentRBAC("UpdateAction", ({ canCreate: canCreate2, canUpdate: canUpdate2 }) => ({
|
1729
|
-
canCreate: canCreate2,
|
1730
|
-
canUpdate: canUpdate2
|
1731
|
-
}));
|
1732
1878
|
const { create, update, clone } = useDocumentActions();
|
1733
1879
|
const [{ query, rawQuery }] = useQueryParams();
|
1734
1880
|
const params = React.useMemo(() => buildValidParams(query), [query]);
|
@@ -1745,10 +1891,8 @@ const UpdateAction = ({
|
|
1745
1891
|
* - the form is submitting
|
1746
1892
|
* - the document is not modified & we're not cloning (you can save a clone entity straight away)
|
1747
1893
|
* - 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
1894
|
*/
|
1751
|
-
disabled: isSubmitting || !modified && !isCloning || activeTab === "published"
|
1895
|
+
disabled: isSubmitting || !modified && !isCloning || activeTab === "published",
|
1752
1896
|
label: formatMessage({
|
1753
1897
|
id: "content-manager.containers.Edit.save",
|
1754
1898
|
defaultMessage: "Save"
|
@@ -1756,16 +1900,18 @@ const UpdateAction = ({
|
|
1756
1900
|
onClick: async () => {
|
1757
1901
|
setSubmitting(true);
|
1758
1902
|
try {
|
1759
|
-
|
1760
|
-
|
1761
|
-
|
1762
|
-
|
1763
|
-
|
1764
|
-
|
1765
|
-
|
1766
|
-
|
1767
|
-
|
1768
|
-
|
1903
|
+
if (activeTab !== "draft") {
|
1904
|
+
const { errors } = await validate();
|
1905
|
+
if (errors) {
|
1906
|
+
toggleNotification({
|
1907
|
+
type: "danger",
|
1908
|
+
message: formatMessage({
|
1909
|
+
id: "content-manager.validation.error",
|
1910
|
+
defaultMessage: "There are validation errors in your document. Please fix them before saving."
|
1911
|
+
})
|
1912
|
+
});
|
1913
|
+
return;
|
1914
|
+
}
|
1769
1915
|
}
|
1770
1916
|
if (isCloning) {
|
1771
1917
|
const res = await clone(
|
@@ -1777,10 +1923,13 @@ const UpdateAction = ({
|
|
1777
1923
|
document
|
1778
1924
|
);
|
1779
1925
|
if ("data" in res) {
|
1780
|
-
navigate(
|
1781
|
-
|
1782
|
-
|
1783
|
-
|
1926
|
+
navigate(
|
1927
|
+
{
|
1928
|
+
pathname: `../${res.data.documentId}`,
|
1929
|
+
search: rawQuery
|
1930
|
+
},
|
1931
|
+
{ relative: "path" }
|
1932
|
+
);
|
1784
1933
|
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1785
1934
|
setErrors(formatValidationErrors(res.error));
|
1786
1935
|
}
|
@@ -1808,10 +1957,13 @@ const UpdateAction = ({
|
|
1808
1957
|
document
|
1809
1958
|
);
|
1810
1959
|
if ("data" in res && collectionType !== SINGLE_TYPES) {
|
1811
|
-
navigate(
|
1812
|
-
|
1813
|
-
|
1814
|
-
|
1960
|
+
navigate(
|
1961
|
+
{
|
1962
|
+
pathname: `../${res.data.documentId}`,
|
1963
|
+
search: rawQuery
|
1964
|
+
},
|
1965
|
+
{ replace: true, relative: "path" }
|
1966
|
+
);
|
1815
1967
|
} else if ("error" in res && isBaseQueryError(res.error) && res.error.name === "ValidationError") {
|
1816
1968
|
setErrors(formatValidationErrors(res.error));
|
1817
1969
|
}
|
@@ -2057,23 +2209,13 @@ const Header = ({ isCreating, status, title: documentTitle = "Untitled" }) => {
|
|
2057
2209
|
id: "content-manager.containers.edit.title.new",
|
2058
2210
|
defaultMessage: "Create an entry"
|
2059
2211
|
}) : documentTitle;
|
2060
|
-
return /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "flex-start", paddingTop:
|
2212
|
+
return /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "flex-start", paddingTop: 6, paddingBottom: 4, gap: 2, children: [
|
2061
2213
|
/* @__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
|
2214
|
+
/* @__PURE__ */ jsxs(Flex, { width: "100%", justifyContent: "space-between", gap: "80px", alignItems: "flex-start", children: [
|
2215
|
+
/* @__PURE__ */ jsx(Typography, { variant: "alpha", tag: "h1", children: title }),
|
2216
|
+
/* @__PURE__ */ jsx(HeaderToolbar, {})
|
2217
|
+
] }),
|
2218
|
+
status ? /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(DocumentStatus, { status: isCloning ? "draft" : status }) }) : null
|
2077
2219
|
] });
|
2078
2220
|
};
|
2079
2221
|
const HeaderToolbar = () => {
|
@@ -2764,7 +2906,7 @@ const ConfirmBulkActionDialog = ({
|
|
2764
2906
|
endAction
|
2765
2907
|
}) => {
|
2766
2908
|
const { formatMessage } = useIntl();
|
2767
|
-
return /* @__PURE__ */ jsx(Dialog.Root, {
|
2909
|
+
return /* @__PURE__ */ jsx(Dialog.Root, { open: isOpen, children: /* @__PURE__ */ jsxs(Dialog.Content, { children: [
|
2768
2910
|
/* @__PURE__ */ jsx(Dialog.Header, { children: formatMessage({
|
2769
2911
|
id: "app.components.ConfirmDialog.title",
|
2770
2912
|
defaultMessage: "Confirmation"
|
@@ -2795,6 +2937,7 @@ const ConfirmDialogPublishAll = ({
|
|
2795
2937
|
const { _unstableFormatAPIError: formatAPIError } = useAPIErrorHandler(getTranslation);
|
2796
2938
|
const { model, schema } = useDoc();
|
2797
2939
|
const [{ query }] = useQueryParams();
|
2940
|
+
const enableDraftRelationsCount = false;
|
2798
2941
|
const {
|
2799
2942
|
data: countDraftRelations = 0,
|
2800
2943
|
isLoading,
|
@@ -2806,7 +2949,7 @@ const ConfirmDialogPublishAll = ({
|
|
2806
2949
|
locale: query?.plugins?.i18n?.locale
|
2807
2950
|
},
|
2808
2951
|
{
|
2809
|
-
skip:
|
2952
|
+
skip: !enableDraftRelationsCount
|
2810
2953
|
}
|
2811
2954
|
);
|
2812
2955
|
React.useEffect(() => {
|
@@ -2885,7 +3028,14 @@ const formatErrorMessages = (errors, parentKey, formatMessage) => {
|
|
2885
3028
|
)
|
2886
3029
|
);
|
2887
3030
|
} else {
|
2888
|
-
messages.push(
|
3031
|
+
messages.push(
|
3032
|
+
...formatErrorMessages(
|
3033
|
+
// @ts-expect-error TODO: check why value is not compatible with FormErrors
|
3034
|
+
value,
|
3035
|
+
currentKey,
|
3036
|
+
formatMessage
|
3037
|
+
)
|
3038
|
+
);
|
2889
3039
|
}
|
2890
3040
|
} else {
|
2891
3041
|
messages.push(
|
@@ -2984,7 +3134,7 @@ const SelectedEntriesTableContent = ({
|
|
2984
3134
|
status: row.status
|
2985
3135
|
}
|
2986
3136
|
) }),
|
2987
|
-
/* @__PURE__ */ jsx(Table.Cell, { children: /* @__PURE__ */ jsx(
|
3137
|
+
/* @__PURE__ */ jsx(Table.Cell, { children: /* @__PURE__ */ jsx(Flex, { children: /* @__PURE__ */ jsx(
|
2988
3138
|
IconButton,
|
2989
3139
|
{
|
2990
3140
|
tag: Link,
|
@@ -3007,9 +3157,10 @@ const SelectedEntriesTableContent = ({
|
|
3007
3157
|
),
|
3008
3158
|
target: "_blank",
|
3009
3159
|
marginLeft: "auto",
|
3010
|
-
|
3160
|
+
variant: "ghost",
|
3161
|
+
children: /* @__PURE__ */ jsx(Pencil, { width: "1.6rem", height: "1.6rem" })
|
3011
3162
|
}
|
3012
|
-
) })
|
3163
|
+
) }) })
|
3013
3164
|
] }, row.id)) })
|
3014
3165
|
] });
|
3015
3166
|
};
|
@@ -3046,7 +3197,13 @@ const SelectedEntriesModalContent = ({
|
|
3046
3197
|
);
|
3047
3198
|
const { rows, validationErrors } = React.useMemo(() => {
|
3048
3199
|
if (data.length > 0 && schema) {
|
3049
|
-
const validate = createYupSchema(
|
3200
|
+
const validate = createYupSchema(
|
3201
|
+
schema.attributes,
|
3202
|
+
components,
|
3203
|
+
// Since this is the "Publish" action, the validation
|
3204
|
+
// schema must enforce the rules for published entities
|
3205
|
+
{ status: "published" }
|
3206
|
+
);
|
3050
3207
|
const validationErrors2 = {};
|
3051
3208
|
const rows2 = data.map((entry) => {
|
3052
3209
|
try {
|
@@ -3396,7 +3553,7 @@ const TableActions = ({ document }) => {
|
|
3396
3553
|
DescriptionComponentRenderer,
|
3397
3554
|
{
|
3398
3555
|
props,
|
3399
|
-
descriptions: plugins["content-manager"].apis.getDocumentActions(),
|
3556
|
+
descriptions: plugins["content-manager"].apis.getDocumentActions().filter((action) => action.name !== "PublishAction"),
|
3400
3557
|
children: (actions2) => {
|
3401
3558
|
const tableRowActions = actions2.filter((action) => {
|
3402
3559
|
const positions = Array.isArray(action.position) ? action.position : [action.position];
|
@@ -3507,7 +3664,7 @@ const CloneAction = ({ model, documentId }) => {
|
|
3507
3664
|
}),
|
3508
3665
|
content: /* @__PURE__ */ jsx(AutoCloneFailureModalBody, { prohibitedFields }),
|
3509
3666
|
footer: ({ onClose }) => {
|
3510
|
-
return /* @__PURE__ */ jsxs(
|
3667
|
+
return /* @__PURE__ */ jsxs(Modal.Footer, { children: [
|
3511
3668
|
/* @__PURE__ */ jsx(Button, { onClick: onClose, variant: "tertiary", children: formatMessage({
|
3512
3669
|
id: "cancel",
|
3513
3670
|
defaultMessage: "Cancel"
|
@@ -3548,8 +3705,7 @@ class ContentManagerPlugin {
|
|
3548
3705
|
documentActions = [
|
3549
3706
|
...DEFAULT_ACTIONS,
|
3550
3707
|
...DEFAULT_TABLE_ROW_ACTIONS,
|
3551
|
-
...DEFAULT_HEADER_ACTIONS
|
3552
|
-
HistoryAction
|
3708
|
+
...DEFAULT_HEADER_ACTIONS
|
3553
3709
|
];
|
3554
3710
|
editViewSidePanels = [ActionsPanel];
|
3555
3711
|
headerActions = [];
|
@@ -3638,6 +3794,52 @@ const getPrintableType = (value) => {
|
|
3638
3794
|
}
|
3639
3795
|
return nativeType;
|
3640
3796
|
};
|
3797
|
+
const HistoryAction = ({ model, document }) => {
|
3798
|
+
const { formatMessage } = useIntl();
|
3799
|
+
const [{ query }] = useQueryParams();
|
3800
|
+
const navigate = useNavigate();
|
3801
|
+
const pluginsQueryParams = stringify({ plugins: query.plugins }, { encode: false });
|
3802
|
+
if (!window.strapi.features.isEnabled("cms-content-history")) {
|
3803
|
+
return null;
|
3804
|
+
}
|
3805
|
+
return {
|
3806
|
+
icon: /* @__PURE__ */ jsx(ClockCounterClockwise, {}),
|
3807
|
+
label: formatMessage({
|
3808
|
+
id: "content-manager.history.document-action",
|
3809
|
+
defaultMessage: "Content History"
|
3810
|
+
}),
|
3811
|
+
onClick: () => navigate({ pathname: "history", search: pluginsQueryParams }),
|
3812
|
+
disabled: (
|
3813
|
+
/**
|
3814
|
+
* The user is creating a new document.
|
3815
|
+
* It hasn't been saved yet, so there's no history to go to
|
3816
|
+
*/
|
3817
|
+
!document || /**
|
3818
|
+
* The document has been created but the current dimension has never been saved.
|
3819
|
+
* For example, the user is creating a new locale in an existing document,
|
3820
|
+
* so there's no history for the document in that locale
|
3821
|
+
*/
|
3822
|
+
!document.id || /**
|
3823
|
+
* History is only available for content types created by the user.
|
3824
|
+
* These have the `api::` prefix, as opposed to the ones created by Strapi or plugins,
|
3825
|
+
* which start with `admin::` or `plugin::`
|
3826
|
+
*/
|
3827
|
+
!model.startsWith("api::")
|
3828
|
+
),
|
3829
|
+
position: "header"
|
3830
|
+
};
|
3831
|
+
};
|
3832
|
+
HistoryAction.type = "history";
|
3833
|
+
const historyAdmin = {
|
3834
|
+
bootstrap(app) {
|
3835
|
+
const { addDocumentAction } = app.getPlugin("content-manager").apis;
|
3836
|
+
addDocumentAction((actions2) => {
|
3837
|
+
const indexOfDeleteAction = actions2.findIndex((action) => action.type === "delete");
|
3838
|
+
actions2.splice(indexOfDeleteAction, 0, HistoryAction);
|
3839
|
+
return actions2;
|
3840
|
+
});
|
3841
|
+
}
|
3842
|
+
};
|
3641
3843
|
const initialState = {
|
3642
3844
|
collectionTypeLinks: [],
|
3643
3845
|
components: [],
|
@@ -3688,15 +3890,29 @@ const index = {
|
|
3688
3890
|
defaultMessage: "Content Manager"
|
3689
3891
|
},
|
3690
3892
|
permissions: [],
|
3691
|
-
Component: () => import("./layout-DC503LnF.mjs").then((mod) => ({ default: mod.Layout })),
|
3692
3893
|
position: 1
|
3693
3894
|
});
|
3895
|
+
app.router.addRoute({
|
3896
|
+
path: "content-manager/*",
|
3897
|
+
lazy: async () => {
|
3898
|
+
const { Layout } = await import("./layout-uomiIGbG.mjs");
|
3899
|
+
return {
|
3900
|
+
Component: Layout
|
3901
|
+
};
|
3902
|
+
},
|
3903
|
+
children: routes
|
3904
|
+
});
|
3694
3905
|
app.registerPlugin(cm.config);
|
3695
3906
|
},
|
3907
|
+
bootstrap(app) {
|
3908
|
+
if (typeof historyAdmin.bootstrap === "function") {
|
3909
|
+
historyAdmin.bootstrap(app);
|
3910
|
+
}
|
3911
|
+
},
|
3696
3912
|
async registerTrads({ locales }) {
|
3697
3913
|
const importedTrads = await Promise.all(
|
3698
3914
|
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-
|
3915
|
+
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-CbaIuYoB.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
3916
|
return {
|
3701
3917
|
data: prefixPluginTranslations(data, PLUGIN_ID),
|
3702
3918
|
locale
|
@@ -3742,11 +3958,11 @@ export {
|
|
3742
3958
|
PERMISSIONS as k,
|
3743
3959
|
DocumentRBAC as l,
|
3744
3960
|
DOCUMENT_META_FIELDS as m,
|
3745
|
-
|
3746
|
-
|
3747
|
-
|
3748
|
-
|
3749
|
-
|
3961
|
+
CLONE_PATH as n,
|
3962
|
+
useDocLayout as o,
|
3963
|
+
useGetContentTypeConfigurationQuery as p,
|
3964
|
+
CREATOR_FIELDS as q,
|
3965
|
+
getMainField as r,
|
3750
3966
|
setInitialData as s,
|
3751
3967
|
getDisplayName as t,
|
3752
3968
|
useContentTypeSchema as u,
|
@@ -3756,4 +3972,4 @@ export {
|
|
3756
3972
|
capitalise as y,
|
3757
3973
|
useUpdateContentTypeConfigurationMutation as z
|
3758
3974
|
};
|
3759
|
-
//# sourceMappingURL=index-
|
3975
|
+
//# sourceMappingURL=index-BJ6uTqLL.mjs.map
|