@strapi/content-releases 0.0.0-next.2b10ca9b97a5854909ba0a8d1d5b00f73cae58fa → 0.0.0-next.2dcec09530c87d7b3b453630c2d76a967476338d
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 +17 -1
- package/dist/_chunks/App-Cx72FM22.mjs +1558 -0
- package/dist/_chunks/App-Cx72FM22.mjs.map +1 -0
- package/dist/_chunks/App-DyjVixKE.js +1578 -0
- package/dist/_chunks/App-DyjVixKE.js.map +1 -0
- package/dist/_chunks/PurchaseContentReleases-BJlgTIuR.js +52 -0
- package/dist/_chunks/PurchaseContentReleases-BJlgTIuR.js.map +1 -0
- package/dist/_chunks/PurchaseContentReleases-CIiBmOhI.mjs +52 -0
- package/dist/_chunks/PurchaseContentReleases-CIiBmOhI.mjs.map +1 -0
- package/dist/_chunks/ReleasesSettingsPage-9si_53C5.mjs +178 -0
- package/dist/_chunks/ReleasesSettingsPage-9si_53C5.mjs.map +1 -0
- package/dist/_chunks/ReleasesSettingsPage-FsXF_FuJ.js +178 -0
- package/dist/_chunks/ReleasesSettingsPage-FsXF_FuJ.js.map +1 -0
- package/dist/_chunks/{en-haKSQIo8.js → en-BWPPsSH-.js} +47 -7
- package/dist/_chunks/en-BWPPsSH-.js.map +1 -0
- package/dist/_chunks/en-D9Q4YW03.mjs +102 -0
- package/dist/_chunks/en-D9Q4YW03.mjs.map +1 -0
- package/dist/_chunks/index-CVj5EFQC.mjs +1386 -0
- package/dist/_chunks/index-CVj5EFQC.mjs.map +1 -0
- package/dist/_chunks/index-CpTN5TdF.js +1404 -0
- package/dist/_chunks/index-CpTN5TdF.js.map +1 -0
- package/dist/_chunks/schemas-DBYv9gK8.js +61 -0
- package/dist/_chunks/schemas-DBYv9gK8.js.map +1 -0
- package/dist/_chunks/schemas-DdA2ic2U.mjs +44 -0
- package/dist/_chunks/schemas-DdA2ic2U.mjs.map +1 -0
- package/dist/admin/index.js +1 -14
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +2 -15
- package/dist/admin/index.mjs.map +1 -1
- package/dist/admin/src/components/EntryValidationPopover.d.ts +13 -0
- package/dist/admin/src/components/RelativeTime.d.ts +28 -0
- package/dist/admin/src/components/ReleaseAction.d.ts +3 -0
- package/dist/admin/src/components/ReleaseActionMenu.d.ts +26 -0
- package/dist/admin/src/components/ReleaseActionModal.d.ts +24 -0
- package/dist/admin/src/components/ReleaseActionOptions.d.ts +9 -0
- package/dist/admin/src/components/ReleaseListCell.d.ts +28 -0
- package/dist/admin/src/components/ReleaseModal.d.ts +17 -0
- package/dist/admin/src/components/ReleasesPanel.d.ts +3 -0
- package/dist/admin/src/constants.d.ts +76 -0
- package/dist/admin/src/index.d.ts +3 -0
- package/dist/admin/src/modules/hooks.d.ts +7 -0
- package/dist/admin/src/pages/App.d.ts +1 -0
- package/dist/admin/src/pages/PurchaseContentReleases.d.ts +2 -0
- package/dist/admin/src/pages/ReleaseDetailsPage.d.ts +2 -0
- package/dist/admin/src/pages/ReleasesPage.d.ts +8 -0
- package/dist/admin/src/pages/ReleasesSettingsPage.d.ts +1 -0
- package/dist/admin/src/pages/tests/mockReleaseDetailsPageData.d.ts +181 -0
- package/dist/admin/src/pages/tests/mockReleasesPageData.d.ts +39 -0
- package/dist/admin/src/pluginId.d.ts +1 -0
- package/dist/admin/src/services/release.d.ts +112 -0
- package/dist/admin/src/store/hooks.d.ts +7 -0
- package/dist/admin/src/utils/api.d.ts +6 -0
- package/dist/admin/src/utils/prefixPluginTranslations.d.ts +3 -0
- package/dist/admin/src/utils/time.d.ts +10 -0
- package/dist/admin/src/validation/schemas.d.ts +6 -0
- package/dist/server/index.js +1480 -458
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +1479 -456
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/bootstrap.d.ts +5 -0
- package/dist/server/src/bootstrap.d.ts.map +1 -0
- package/dist/server/src/constants.d.ts +21 -0
- package/dist/server/src/constants.d.ts.map +1 -0
- package/dist/server/src/content-types/index.d.ts +97 -0
- package/dist/server/src/content-types/index.d.ts.map +1 -0
- package/dist/server/src/content-types/release/index.d.ts +48 -0
- package/dist/server/src/content-types/release/index.d.ts.map +1 -0
- package/dist/server/src/content-types/release/schema.d.ts +47 -0
- package/dist/server/src/content-types/release/schema.d.ts.map +1 -0
- package/dist/server/src/content-types/release-action/index.d.ts +48 -0
- package/dist/server/src/content-types/release-action/index.d.ts.map +1 -0
- package/dist/server/src/content-types/release-action/schema.d.ts +47 -0
- package/dist/server/src/content-types/release-action/schema.d.ts.map +1 -0
- package/dist/server/src/controllers/index.d.ts +25 -0
- package/dist/server/src/controllers/index.d.ts.map +1 -0
- package/dist/server/src/controllers/release-action.d.ts +10 -0
- package/dist/server/src/controllers/release-action.d.ts.map +1 -0
- package/dist/server/src/controllers/release.d.ts +18 -0
- package/dist/server/src/controllers/release.d.ts.map +1 -0
- package/dist/server/src/controllers/settings.d.ts +11 -0
- package/dist/server/src/controllers/settings.d.ts.map +1 -0
- package/dist/server/src/controllers/validation/release-action.d.ts +14 -0
- package/dist/server/src/controllers/validation/release-action.d.ts.map +1 -0
- package/dist/server/src/controllers/validation/release.d.ts +4 -0
- package/dist/server/src/controllers/validation/release.d.ts.map +1 -0
- package/dist/server/src/controllers/validation/settings.d.ts +3 -0
- package/dist/server/src/controllers/validation/settings.d.ts.map +1 -0
- package/dist/server/src/destroy.d.ts +5 -0
- package/dist/server/src/destroy.d.ts.map +1 -0
- package/dist/server/src/index.d.ts +2111 -0
- package/dist/server/src/index.d.ts.map +1 -0
- package/dist/server/src/middlewares/documents.d.ts +6 -0
- package/dist/server/src/middlewares/documents.d.ts.map +1 -0
- package/dist/server/src/migrations/database/5.0.0-document-id-in-actions.d.ts +9 -0
- package/dist/server/src/migrations/database/5.0.0-document-id-in-actions.d.ts.map +1 -0
- package/dist/server/src/migrations/index.d.ts +13 -0
- package/dist/server/src/migrations/index.d.ts.map +1 -0
- package/dist/server/src/register.d.ts +5 -0
- package/dist/server/src/register.d.ts.map +1 -0
- package/dist/server/src/routes/index.d.ts +51 -0
- package/dist/server/src/routes/index.d.ts.map +1 -0
- package/dist/server/src/routes/release-action.d.ts +18 -0
- package/dist/server/src/routes/release-action.d.ts.map +1 -0
- package/dist/server/src/routes/release.d.ts +18 -0
- package/dist/server/src/routes/release.d.ts.map +1 -0
- package/dist/server/src/routes/settings.d.ts +18 -0
- package/dist/server/src/routes/settings.d.ts.map +1 -0
- package/dist/server/src/services/index.d.ts +1824 -0
- package/dist/server/src/services/index.d.ts.map +1 -0
- package/dist/server/src/services/release-action.d.ts +34 -0
- package/dist/server/src/services/release-action.d.ts.map +1 -0
- package/dist/server/src/services/release.d.ts +31 -0
- package/dist/server/src/services/release.d.ts.map +1 -0
- package/dist/server/src/services/scheduling.d.ts +18 -0
- package/dist/server/src/services/scheduling.d.ts.map +1 -0
- package/dist/server/src/services/settings.d.ts +13 -0
- package/dist/server/src/services/settings.d.ts.map +1 -0
- package/dist/server/src/services/validation.d.ts +18 -0
- package/dist/server/src/services/validation.d.ts.map +1 -0
- package/dist/server/src/utils/index.d.ts +35 -0
- package/dist/server/src/utils/index.d.ts.map +1 -0
- package/dist/shared/contracts/release-actions.d.ts +137 -0
- package/dist/shared/contracts/release-actions.d.ts.map +1 -0
- package/dist/shared/contracts/releases.d.ts +184 -0
- package/dist/shared/contracts/releases.d.ts.map +1 -0
- package/dist/shared/contracts/settings.d.ts +39 -0
- package/dist/shared/contracts/settings.d.ts.map +1 -0
- package/dist/shared/types.d.ts +24 -0
- package/dist/shared/types.d.ts.map +1 -0
- package/package.json +36 -36
- package/dist/_chunks/App-5PRKHpa2.js +0 -972
- package/dist/_chunks/App-5PRKHpa2.js.map +0 -1
- package/dist/_chunks/App-J4jrthEu.mjs +0 -950
- package/dist/_chunks/App-J4jrthEu.mjs.map +0 -1
- package/dist/_chunks/en-haKSQIo8.js.map +0 -1
- package/dist/_chunks/en-ngTk74JV.mjs +0 -62
- package/dist/_chunks/en-ngTk74JV.mjs.map +0 -1
- package/dist/_chunks/index-PEkKIRyJ.js +0 -849
- package/dist/_chunks/index-PEkKIRyJ.js.map +0 -1
- package/dist/_chunks/index-_Zsj8MUA.mjs +0 -828
- package/dist/_chunks/index-_Zsj8MUA.mjs.map +0 -1
- package/strapi-server.js +0 -3
package/dist/server/index.js
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const utils = require("@strapi/utils");
|
|
3
|
+
const isEqual = require("lodash/isEqual");
|
|
4
|
+
const lodash = require("lodash");
|
|
3
5
|
const _ = require("lodash/fp");
|
|
4
|
-
const
|
|
6
|
+
const nodeSchedule = require("node-schedule");
|
|
5
7
|
const yup = require("yup");
|
|
6
8
|
const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
|
|
7
9
|
function _interopNamespace(e) {
|
|
8
|
-
if (e && e.__esModule)
|
|
9
|
-
return e;
|
|
10
|
+
if (e && e.__esModule) return e;
|
|
10
11
|
const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
|
|
11
12
|
if (e) {
|
|
12
13
|
for (const k in e) {
|
|
@@ -22,8 +23,8 @@ function _interopNamespace(e) {
|
|
|
22
23
|
n.default = e;
|
|
23
24
|
return Object.freeze(n);
|
|
24
25
|
}
|
|
26
|
+
const isEqual__default = /* @__PURE__ */ _interopDefault(isEqual);
|
|
25
27
|
const ___default = /* @__PURE__ */ _interopDefault(_);
|
|
26
|
-
const EE__default = /* @__PURE__ */ _interopDefault(EE);
|
|
27
28
|
const yup__namespace = /* @__PURE__ */ _interopNamespace(yup);
|
|
28
29
|
const RELEASE_MODEL_UID = "plugin::content-releases.release";
|
|
29
30
|
const RELEASE_ACTION_MODEL_UID = "plugin::content-releases.release-action";
|
|
@@ -69,82 +70,463 @@ const ACTIONS = [
|
|
|
69
70
|
displayName: "Add an entry to a release",
|
|
70
71
|
uid: "create-action",
|
|
71
72
|
pluginName: "content-releases"
|
|
73
|
+
},
|
|
74
|
+
// Settings
|
|
75
|
+
{
|
|
76
|
+
uid: "settings.read",
|
|
77
|
+
section: "settings",
|
|
78
|
+
displayName: "Read",
|
|
79
|
+
category: "content releases",
|
|
80
|
+
subCategory: "options",
|
|
81
|
+
pluginName: "content-releases"
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
uid: "settings.update",
|
|
85
|
+
section: "settings",
|
|
86
|
+
displayName: "Edit",
|
|
87
|
+
category: "content releases",
|
|
88
|
+
subCategory: "options",
|
|
89
|
+
pluginName: "content-releases"
|
|
72
90
|
}
|
|
73
91
|
];
|
|
74
|
-
const
|
|
92
|
+
const ALLOWED_WEBHOOK_EVENTS = {
|
|
93
|
+
RELEASES_PUBLISH: "releases.publish"
|
|
94
|
+
};
|
|
95
|
+
const getService = (name, { strapi: strapi2 }) => {
|
|
75
96
|
return strapi2.plugin("content-releases").service(name);
|
|
76
97
|
};
|
|
77
|
-
const {
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
98
|
+
const getDraftEntryValidStatus = async ({ contentType, documentId, locale }, { strapi: strapi2 }) => {
|
|
99
|
+
const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
|
|
100
|
+
const populate = await populateBuilderService(contentType).populateDeep(Infinity).build();
|
|
101
|
+
const entry = await getEntry({ contentType, documentId, locale, populate }, { strapi: strapi2 });
|
|
102
|
+
return isEntryValid(contentType, entry, { strapi: strapi2 });
|
|
103
|
+
};
|
|
104
|
+
const isEntryValid = async (contentTypeUid, entry, { strapi: strapi2 }) => {
|
|
105
|
+
try {
|
|
106
|
+
await strapi2.entityValidator.validateEntityCreation(
|
|
107
|
+
strapi2.getModel(contentTypeUid),
|
|
108
|
+
entry,
|
|
109
|
+
void 0,
|
|
110
|
+
// @ts-expect-error - FIXME: entity here is unnecessary
|
|
111
|
+
entry
|
|
112
|
+
);
|
|
113
|
+
const workflowsService = strapi2.plugin("review-workflows").service("workflows");
|
|
114
|
+
const workflow = await workflowsService.getAssignedWorkflow(contentTypeUid, {
|
|
115
|
+
populate: "stageRequiredToPublish"
|
|
116
|
+
});
|
|
117
|
+
if (workflow?.stageRequiredToPublish) {
|
|
118
|
+
return entry.strapi_stage.id === workflow.stageRequiredToPublish.id;
|
|
119
|
+
}
|
|
120
|
+
return true;
|
|
121
|
+
} catch {
|
|
122
|
+
return false;
|
|
123
|
+
}
|
|
124
|
+
};
|
|
125
|
+
const getEntry = async ({
|
|
126
|
+
contentType,
|
|
127
|
+
documentId,
|
|
128
|
+
locale,
|
|
129
|
+
populate,
|
|
130
|
+
status = "draft"
|
|
131
|
+
}, { strapi: strapi2 }) => {
|
|
132
|
+
if (documentId) {
|
|
133
|
+
const entry = await strapi2.documents(contentType).findOne({ documentId, locale, populate, status });
|
|
134
|
+
if (status === "published" && !entry) {
|
|
135
|
+
return strapi2.documents(contentType).findOne({ documentId, locale, populate, status: "draft" });
|
|
136
|
+
}
|
|
137
|
+
return entry;
|
|
138
|
+
}
|
|
139
|
+
return strapi2.documents(contentType).findFirst({ locale, populate, status });
|
|
140
|
+
};
|
|
141
|
+
const getEntryStatus = async (contentType, entry) => {
|
|
142
|
+
if (entry.publishedAt) {
|
|
143
|
+
return "published";
|
|
144
|
+
}
|
|
145
|
+
const publishedEntry = await strapi.documents(contentType).findOne({
|
|
146
|
+
documentId: entry.documentId,
|
|
147
|
+
locale: entry.locale,
|
|
148
|
+
status: "published",
|
|
149
|
+
fields: ["updatedAt"]
|
|
150
|
+
});
|
|
151
|
+
if (!publishedEntry) {
|
|
152
|
+
return "draft";
|
|
153
|
+
}
|
|
154
|
+
const entryUpdatedAt = new Date(entry.updatedAt).getTime();
|
|
155
|
+
const publishedEntryUpdatedAt = new Date(publishedEntry.updatedAt).getTime();
|
|
156
|
+
if (entryUpdatedAt > publishedEntryUpdatedAt) {
|
|
157
|
+
return "modified";
|
|
158
|
+
}
|
|
159
|
+
return "published";
|
|
160
|
+
};
|
|
161
|
+
async function deleteActionsOnDisableDraftAndPublish({
|
|
162
|
+
oldContentTypes,
|
|
163
|
+
contentTypes: contentTypes2
|
|
164
|
+
}) {
|
|
165
|
+
if (!oldContentTypes) {
|
|
166
|
+
return;
|
|
167
|
+
}
|
|
168
|
+
for (const uid in contentTypes2) {
|
|
169
|
+
if (!oldContentTypes[uid]) {
|
|
170
|
+
continue;
|
|
171
|
+
}
|
|
172
|
+
const oldContentType = oldContentTypes[uid];
|
|
173
|
+
const contentType = contentTypes2[uid];
|
|
174
|
+
if (utils.contentTypes.hasDraftAndPublish(oldContentType) && !utils.contentTypes.hasDraftAndPublish(contentType)) {
|
|
175
|
+
await strapi.db?.queryBuilder(RELEASE_ACTION_MODEL_UID).delete().where({ contentType: uid }).execute();
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
async function deleteActionsOnDeleteContentType({ oldContentTypes, contentTypes: contentTypes2 }) {
|
|
180
|
+
const deletedContentTypes = lodash.difference(lodash.keys(oldContentTypes), lodash.keys(contentTypes2)) ?? [];
|
|
181
|
+
if (deletedContentTypes.length) {
|
|
182
|
+
await utils.async.map(deletedContentTypes, async (deletedContentTypeUID) => {
|
|
183
|
+
return strapi.db?.queryBuilder(RELEASE_ACTION_MODEL_UID).delete().where({ contentType: deletedContentTypeUID }).execute();
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
async function migrateIsValidAndStatusReleases() {
|
|
188
|
+
const releasesWithoutStatus = await strapi.db.query(RELEASE_MODEL_UID).findMany({
|
|
189
|
+
where: {
|
|
190
|
+
status: null,
|
|
191
|
+
releasedAt: null
|
|
192
|
+
},
|
|
193
|
+
populate: {
|
|
194
|
+
actions: {
|
|
195
|
+
populate: {
|
|
196
|
+
entry: true
|
|
88
197
|
}
|
|
89
198
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
199
|
+
}
|
|
200
|
+
});
|
|
201
|
+
utils.async.map(releasesWithoutStatus, async (release2) => {
|
|
202
|
+
const actions = release2.actions;
|
|
203
|
+
const notValidatedActions = actions.filter((action) => action.isEntryValid === null);
|
|
204
|
+
for (const action of notValidatedActions) {
|
|
205
|
+
if (action.entry) {
|
|
206
|
+
const isEntryValid2 = getDraftEntryValidStatus(
|
|
207
|
+
{
|
|
208
|
+
contentType: action.contentType,
|
|
209
|
+
documentId: action.entryDocumentId,
|
|
210
|
+
locale: action.locale
|
|
211
|
+
},
|
|
212
|
+
{ strapi }
|
|
213
|
+
);
|
|
214
|
+
await strapi.db.query(RELEASE_ACTION_MODEL_UID).update({
|
|
215
|
+
where: {
|
|
216
|
+
id: action.id
|
|
217
|
+
},
|
|
218
|
+
data: {
|
|
219
|
+
isEntryValid: isEntryValid2
|
|
220
|
+
}
|
|
221
|
+
});
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
return getService("release", { strapi }).updateReleaseStatus(release2.id);
|
|
225
|
+
});
|
|
226
|
+
const publishedReleases = await strapi.db.query(RELEASE_MODEL_UID).findMany({
|
|
227
|
+
where: {
|
|
228
|
+
status: null,
|
|
229
|
+
releasedAt: {
|
|
230
|
+
$notNull: true
|
|
96
231
|
}
|
|
232
|
+
}
|
|
233
|
+
});
|
|
234
|
+
utils.async.map(publishedReleases, async (release2) => {
|
|
235
|
+
return strapi.db.query(RELEASE_MODEL_UID).update({
|
|
236
|
+
where: {
|
|
237
|
+
id: release2.id
|
|
238
|
+
},
|
|
239
|
+
data: {
|
|
240
|
+
status: "done"
|
|
241
|
+
}
|
|
242
|
+
});
|
|
243
|
+
});
|
|
244
|
+
}
|
|
245
|
+
async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: contentTypes2 }) {
|
|
246
|
+
if (oldContentTypes !== void 0 && contentTypes2 !== void 0) {
|
|
247
|
+
const contentTypesWithDraftAndPublish = Object.keys(oldContentTypes).filter(
|
|
248
|
+
(uid) => oldContentTypes[uid]?.options?.draftAndPublish
|
|
97
249
|
);
|
|
98
|
-
|
|
250
|
+
const releasesAffected = /* @__PURE__ */ new Set();
|
|
251
|
+
utils.async.map(contentTypesWithDraftAndPublish, async (contentTypeUID) => {
|
|
252
|
+
const oldContentType = oldContentTypes[contentTypeUID];
|
|
253
|
+
const contentType = contentTypes2[contentTypeUID];
|
|
254
|
+
if (!isEqual__default.default(oldContentType?.attributes, contentType?.attributes)) {
|
|
255
|
+
const actions = await strapi.db.query(RELEASE_ACTION_MODEL_UID).findMany({
|
|
256
|
+
where: {
|
|
257
|
+
contentType: contentTypeUID
|
|
258
|
+
},
|
|
259
|
+
populate: {
|
|
260
|
+
entry: true,
|
|
261
|
+
release: true
|
|
262
|
+
}
|
|
263
|
+
});
|
|
264
|
+
await utils.async.map(actions, async (action) => {
|
|
265
|
+
if (action.entry && action.release && action.type === "publish") {
|
|
266
|
+
const isEntryValid2 = await getDraftEntryValidStatus(
|
|
267
|
+
{
|
|
268
|
+
contentType: contentTypeUID,
|
|
269
|
+
documentId: action.entryDocumentId,
|
|
270
|
+
locale: action.locale
|
|
271
|
+
},
|
|
272
|
+
{ strapi }
|
|
273
|
+
);
|
|
274
|
+
releasesAffected.add(action.release.id);
|
|
275
|
+
await strapi.db.query(RELEASE_ACTION_MODEL_UID).update({
|
|
276
|
+
where: {
|
|
277
|
+
id: action.id
|
|
278
|
+
},
|
|
279
|
+
data: {
|
|
280
|
+
isEntryValid: isEntryValid2
|
|
281
|
+
}
|
|
282
|
+
});
|
|
283
|
+
}
|
|
284
|
+
});
|
|
285
|
+
}
|
|
286
|
+
}).then(() => {
|
|
287
|
+
utils.async.map(releasesAffected, async (releaseId) => {
|
|
288
|
+
return getService("release", { strapi }).updateReleaseStatus(releaseId);
|
|
289
|
+
});
|
|
290
|
+
});
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
async function disableContentTypeLocalized({ oldContentTypes, contentTypes: contentTypes2 }) {
|
|
294
|
+
if (!oldContentTypes) {
|
|
295
|
+
return;
|
|
296
|
+
}
|
|
297
|
+
const i18nPlugin = strapi.plugin("i18n");
|
|
298
|
+
if (!i18nPlugin) {
|
|
299
|
+
return;
|
|
300
|
+
}
|
|
301
|
+
for (const uid in contentTypes2) {
|
|
302
|
+
if (!oldContentTypes[uid]) {
|
|
303
|
+
continue;
|
|
304
|
+
}
|
|
305
|
+
const oldContentType = oldContentTypes[uid];
|
|
306
|
+
const contentType = contentTypes2[uid];
|
|
307
|
+
const { isLocalizedContentType } = i18nPlugin.service("content-types");
|
|
308
|
+
if (isLocalizedContentType(oldContentType) && !isLocalizedContentType(contentType)) {
|
|
309
|
+
await strapi.db.queryBuilder(RELEASE_ACTION_MODEL_UID).update({
|
|
310
|
+
locale: null
|
|
311
|
+
}).where({ contentType: uid }).execute();
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
async function enableContentTypeLocalized({ oldContentTypes, contentTypes: contentTypes2 }) {
|
|
316
|
+
if (!oldContentTypes) {
|
|
317
|
+
return;
|
|
318
|
+
}
|
|
319
|
+
const i18nPlugin = strapi.plugin("i18n");
|
|
320
|
+
if (!i18nPlugin) {
|
|
321
|
+
return;
|
|
322
|
+
}
|
|
323
|
+
for (const uid in contentTypes2) {
|
|
324
|
+
if (!oldContentTypes[uid]) {
|
|
325
|
+
continue;
|
|
326
|
+
}
|
|
327
|
+
const oldContentType = oldContentTypes[uid];
|
|
328
|
+
const contentType = contentTypes2[uid];
|
|
329
|
+
const { isLocalizedContentType } = i18nPlugin.service("content-types");
|
|
330
|
+
const { getDefaultLocale } = i18nPlugin.service("locales");
|
|
331
|
+
if (!isLocalizedContentType(oldContentType) && isLocalizedContentType(contentType)) {
|
|
332
|
+
const defaultLocale = await getDefaultLocale();
|
|
333
|
+
await strapi.db.queryBuilder(RELEASE_ACTION_MODEL_UID).update({
|
|
334
|
+
locale: defaultLocale
|
|
335
|
+
}).where({ contentType: uid }).execute();
|
|
336
|
+
}
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
const addEntryDocumentToReleaseActions = {
|
|
340
|
+
name: "content-releases::5.0.0-add-entry-document-id-to-release-actions",
|
|
341
|
+
async up(trx, db) {
|
|
342
|
+
const hasTable = await trx.schema.hasTable("strapi_release_actions");
|
|
343
|
+
if (!hasTable) {
|
|
344
|
+
return;
|
|
345
|
+
}
|
|
346
|
+
const hasPolymorphicColumn = await trx.schema.hasColumn("strapi_release_actions", "target_id");
|
|
347
|
+
if (hasPolymorphicColumn) {
|
|
348
|
+
const hasEntryDocumentIdColumn = await trx.schema.hasColumn(
|
|
349
|
+
"strapi_release_actions",
|
|
350
|
+
"entry_document_id"
|
|
351
|
+
);
|
|
352
|
+
if (!hasEntryDocumentIdColumn) {
|
|
353
|
+
await trx.schema.alterTable("strapi_release_actions", (table) => {
|
|
354
|
+
table.string("entry_document_id");
|
|
355
|
+
});
|
|
356
|
+
}
|
|
357
|
+
const releaseActions = await trx.select("*").from("strapi_release_actions");
|
|
358
|
+
utils.async.map(releaseActions, async (action) => {
|
|
359
|
+
const { target_type, target_id } = action;
|
|
360
|
+
const entry = await db.query(target_type).findOne({ where: { id: target_id } });
|
|
361
|
+
if (entry) {
|
|
362
|
+
await trx("strapi_release_actions").update({ entry_document_id: entry.documentId }).where("id", action.id);
|
|
363
|
+
}
|
|
364
|
+
});
|
|
365
|
+
}
|
|
366
|
+
},
|
|
367
|
+
async down() {
|
|
368
|
+
throw new Error("not implemented");
|
|
369
|
+
}
|
|
370
|
+
};
|
|
371
|
+
const register = async ({ strapi: strapi2 }) => {
|
|
372
|
+
if (strapi2.ee.features.isEnabled("cms-content-releases")) {
|
|
373
|
+
await strapi2.service("admin::permission").actionProvider.registerMany(ACTIONS);
|
|
374
|
+
strapi2.db.migrations.providers.internal.register(addEntryDocumentToReleaseActions);
|
|
375
|
+
strapi2.hook("strapi::content-types.beforeSync").register(disableContentTypeLocalized).register(deleteActionsOnDisableDraftAndPublish);
|
|
376
|
+
strapi2.hook("strapi::content-types.afterSync").register(deleteActionsOnDeleteContentType).register(enableContentTypeLocalized).register(revalidateChangedContentTypes).register(migrateIsValidAndStatusReleases);
|
|
377
|
+
}
|
|
378
|
+
if (strapi2.plugin("graphql")) {
|
|
379
|
+
const graphqlExtensionService = strapi2.plugin("graphql").service("extension");
|
|
380
|
+
graphqlExtensionService.shadowCRUD(RELEASE_MODEL_UID).disable();
|
|
381
|
+
graphqlExtensionService.shadowCRUD(RELEASE_ACTION_MODEL_UID).disable();
|
|
382
|
+
}
|
|
383
|
+
};
|
|
384
|
+
const updateActionsStatusAndUpdateReleaseStatus = async (contentType, entry) => {
|
|
385
|
+
const releases = await strapi.db.query(RELEASE_MODEL_UID).findMany({
|
|
386
|
+
where: {
|
|
387
|
+
releasedAt: null,
|
|
388
|
+
actions: {
|
|
389
|
+
contentType,
|
|
390
|
+
entryDocumentId: entry.documentId,
|
|
391
|
+
locale: entry.locale
|
|
392
|
+
}
|
|
393
|
+
}
|
|
394
|
+
});
|
|
395
|
+
const entryStatus = await isEntryValid(contentType, entry, { strapi });
|
|
396
|
+
await strapi.db.query(RELEASE_ACTION_MODEL_UID).updateMany({
|
|
397
|
+
where: {
|
|
398
|
+
contentType,
|
|
399
|
+
entryDocumentId: entry.documentId,
|
|
400
|
+
locale: entry.locale
|
|
401
|
+
},
|
|
402
|
+
data: {
|
|
403
|
+
isEntryValid: entryStatus
|
|
404
|
+
}
|
|
405
|
+
});
|
|
406
|
+
for (const release2 of releases) {
|
|
407
|
+
getService("release", { strapi }).updateReleaseStatus(release2.id);
|
|
408
|
+
}
|
|
409
|
+
};
|
|
410
|
+
const deleteActionsAndUpdateReleaseStatus = async (params) => {
|
|
411
|
+
const releases = await strapi.db.query(RELEASE_MODEL_UID).findMany({
|
|
412
|
+
where: {
|
|
413
|
+
actions: params
|
|
414
|
+
}
|
|
415
|
+
});
|
|
416
|
+
await strapi.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
|
|
417
|
+
where: params
|
|
418
|
+
});
|
|
419
|
+
for (const release2 of releases) {
|
|
420
|
+
getService("release", { strapi }).updateReleaseStatus(release2.id);
|
|
421
|
+
}
|
|
422
|
+
};
|
|
423
|
+
const deleteActionsOnDelete = async (ctx, next) => {
|
|
424
|
+
if (ctx.action !== "delete") {
|
|
425
|
+
return next();
|
|
426
|
+
}
|
|
427
|
+
if (!utils.contentTypes.hasDraftAndPublish(ctx.contentType)) {
|
|
428
|
+
return next();
|
|
429
|
+
}
|
|
430
|
+
const contentType = ctx.contentType.uid;
|
|
431
|
+
const { documentId, locale } = ctx.params;
|
|
432
|
+
const result = await next();
|
|
433
|
+
if (!result) {
|
|
434
|
+
return result;
|
|
435
|
+
}
|
|
436
|
+
try {
|
|
437
|
+
deleteActionsAndUpdateReleaseStatus({
|
|
438
|
+
contentType,
|
|
439
|
+
entryDocumentId: documentId,
|
|
440
|
+
...locale !== "*" && { locale }
|
|
441
|
+
});
|
|
442
|
+
} catch (error) {
|
|
443
|
+
strapi.log.error("Error while deleting release actions after delete", {
|
|
444
|
+
error
|
|
445
|
+
});
|
|
446
|
+
}
|
|
447
|
+
return result;
|
|
448
|
+
};
|
|
449
|
+
const updateActionsOnUpdate = async (ctx, next) => {
|
|
450
|
+
if (ctx.action !== "update") {
|
|
451
|
+
return next();
|
|
452
|
+
}
|
|
453
|
+
if (!utils.contentTypes.hasDraftAndPublish(ctx.contentType)) {
|
|
454
|
+
return next();
|
|
455
|
+
}
|
|
456
|
+
const contentType = ctx.contentType.uid;
|
|
457
|
+
const result = await next();
|
|
458
|
+
if (!result) {
|
|
459
|
+
return result;
|
|
460
|
+
}
|
|
461
|
+
try {
|
|
462
|
+
updateActionsStatusAndUpdateReleaseStatus(contentType, result);
|
|
463
|
+
} catch (error) {
|
|
464
|
+
strapi.log.error("Error while updating release actions after update", {
|
|
465
|
+
error
|
|
466
|
+
});
|
|
467
|
+
}
|
|
468
|
+
return result;
|
|
469
|
+
};
|
|
470
|
+
const deleteReleasesActionsAndUpdateReleaseStatus = async (params) => {
|
|
471
|
+
const releases = await strapi.db.query(RELEASE_MODEL_UID).findMany({
|
|
472
|
+
where: {
|
|
473
|
+
actions: params
|
|
474
|
+
}
|
|
475
|
+
});
|
|
476
|
+
await strapi.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
|
|
477
|
+
where: params
|
|
478
|
+
});
|
|
479
|
+
for (const release2 of releases) {
|
|
480
|
+
getService("release", { strapi }).updateReleaseStatus(release2.id);
|
|
99
481
|
}
|
|
100
482
|
};
|
|
101
|
-
const { features: features$1 } = require("@strapi/strapi/dist/utils/ee");
|
|
102
483
|
const bootstrap = async ({ strapi: strapi2 }) => {
|
|
103
|
-
if (features
|
|
484
|
+
if (strapi2.ee.features.isEnabled("cms-content-releases")) {
|
|
485
|
+
const contentTypesWithDraftAndPublish = Object.keys(strapi2.contentTypes).filter(
|
|
486
|
+
(uid) => strapi2.contentTypes[uid]?.options?.draftAndPublish
|
|
487
|
+
);
|
|
104
488
|
strapi2.db.lifecycles.subscribe({
|
|
105
|
-
|
|
106
|
-
const { model, result } = event;
|
|
107
|
-
if (model.kind === "collectionType" && model.options.draftAndPublish) {
|
|
108
|
-
const { id } = result;
|
|
109
|
-
strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
|
|
110
|
-
where: {
|
|
111
|
-
target_type: model.uid,
|
|
112
|
-
target_id: id
|
|
113
|
-
}
|
|
114
|
-
});
|
|
115
|
-
}
|
|
116
|
-
},
|
|
117
|
-
/**
|
|
118
|
-
* deleteMany hook doesn't return the deleted entries ids
|
|
119
|
-
* so we need to fetch them before deleting the entries to save the ids on our state
|
|
120
|
-
*/
|
|
121
|
-
async beforeDeleteMany(event) {
|
|
122
|
-
const { model, params } = event;
|
|
123
|
-
if (model.kind === "collectionType" && model.options.draftAndPublish) {
|
|
124
|
-
const { where } = params;
|
|
125
|
-
const entriesToDelete = await strapi2.db.query(model.uid).findMany({ select: ["id"], where });
|
|
126
|
-
event.state.entriesToDelete = entriesToDelete;
|
|
127
|
-
}
|
|
128
|
-
},
|
|
489
|
+
models: contentTypesWithDraftAndPublish,
|
|
129
490
|
/**
|
|
130
|
-
*
|
|
131
|
-
* We make this only after deleteMany is succesfully executed to avoid errors
|
|
491
|
+
* deleteMany is still used outside documents service, for example when deleting a locale
|
|
132
492
|
*/
|
|
133
493
|
async afterDeleteMany(event) {
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
494
|
+
try {
|
|
495
|
+
const model = strapi2.getModel(event.model.uid);
|
|
496
|
+
if (model.kind === "collectionType" && model.options?.draftAndPublish) {
|
|
497
|
+
const { where } = event.params;
|
|
498
|
+
deleteReleasesActionsAndUpdateReleaseStatus({
|
|
499
|
+
contentType: model.uid,
|
|
500
|
+
locale: where?.locale ?? null,
|
|
501
|
+
...where?.documentId && { entryDocumentId: where.documentId }
|
|
502
|
+
});
|
|
503
|
+
}
|
|
504
|
+
} catch (error) {
|
|
505
|
+
strapi2.log.error("Error while deleting release actions after entry deleteMany", {
|
|
506
|
+
error
|
|
144
507
|
});
|
|
145
508
|
}
|
|
146
509
|
}
|
|
147
510
|
});
|
|
511
|
+
strapi2.documents.use(deleteActionsOnDelete);
|
|
512
|
+
strapi2.documents.use(updateActionsOnUpdate);
|
|
513
|
+
getService("scheduling", { strapi: strapi2 }).syncFromDatabase().catch((err) => {
|
|
514
|
+
strapi2.log.error(
|
|
515
|
+
"Error while syncing scheduled jobs from the database in the content-releases plugin. This could lead to errors in the releases scheduling."
|
|
516
|
+
);
|
|
517
|
+
throw err;
|
|
518
|
+
});
|
|
519
|
+
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
|
520
|
+
strapi2.get("webhookStore").addAllowedEvent(key, value);
|
|
521
|
+
});
|
|
522
|
+
}
|
|
523
|
+
};
|
|
524
|
+
const destroy = async ({ strapi: strapi2 }) => {
|
|
525
|
+
const scheduledJobs = getService("scheduling", {
|
|
526
|
+
strapi: strapi2
|
|
527
|
+
}).getAll();
|
|
528
|
+
for (const [, job] of scheduledJobs) {
|
|
529
|
+
job.cancel();
|
|
148
530
|
}
|
|
149
531
|
};
|
|
150
532
|
const schema$1 = {
|
|
@@ -173,6 +555,17 @@ const schema$1 = {
|
|
|
173
555
|
releasedAt: {
|
|
174
556
|
type: "datetime"
|
|
175
557
|
},
|
|
558
|
+
scheduledAt: {
|
|
559
|
+
type: "datetime"
|
|
560
|
+
},
|
|
561
|
+
timezone: {
|
|
562
|
+
type: "string"
|
|
563
|
+
},
|
|
564
|
+
status: {
|
|
565
|
+
type: "enumeration",
|
|
566
|
+
enum: ["ready", "blocked", "failed", "done", "empty"],
|
|
567
|
+
required: true
|
|
568
|
+
},
|
|
176
569
|
actions: {
|
|
177
570
|
type: "relation",
|
|
178
571
|
relation: "oneToMany",
|
|
@@ -208,15 +601,13 @@ const schema = {
|
|
|
208
601
|
enum: ["publish", "unpublish"],
|
|
209
602
|
required: true
|
|
210
603
|
},
|
|
211
|
-
entry: {
|
|
212
|
-
type: "relation",
|
|
213
|
-
relation: "morphToOne",
|
|
214
|
-
configurable: false
|
|
215
|
-
},
|
|
216
604
|
contentType: {
|
|
217
605
|
type: "string",
|
|
218
606
|
required: true
|
|
219
607
|
},
|
|
608
|
+
entryDocumentId: {
|
|
609
|
+
type: "string"
|
|
610
|
+
},
|
|
220
611
|
locale: {
|
|
221
612
|
type: "string"
|
|
222
613
|
},
|
|
@@ -225,6 +616,9 @@ const schema = {
|
|
|
225
616
|
relation: "manyToOne",
|
|
226
617
|
target: RELEASE_MODEL_UID,
|
|
227
618
|
inversedBy: "actions"
|
|
619
|
+
},
|
|
620
|
+
isEntryValid: {
|
|
621
|
+
type: "boolean"
|
|
228
622
|
}
|
|
229
623
|
}
|
|
230
624
|
};
|
|
@@ -235,215 +629,307 @@ const contentTypes = {
|
|
|
235
629
|
release: release$1,
|
|
236
630
|
"release-action": releaseAction$1
|
|
237
631
|
};
|
|
238
|
-
const
|
|
239
|
-
|
|
240
|
-
|
|
632
|
+
const createReleaseService = ({ strapi: strapi2 }) => {
|
|
633
|
+
const dispatchWebhook = (event, { isPublished, release: release2, error }) => {
|
|
634
|
+
strapi2.eventHub.emit(event, {
|
|
635
|
+
isPublished,
|
|
636
|
+
error,
|
|
637
|
+
release: release2
|
|
638
|
+
});
|
|
639
|
+
};
|
|
640
|
+
const getFormattedActions = async (releaseId) => {
|
|
641
|
+
const actions = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).findMany({
|
|
241
642
|
where: {
|
|
242
|
-
|
|
643
|
+
release: {
|
|
644
|
+
id: releaseId
|
|
645
|
+
}
|
|
243
646
|
}
|
|
244
647
|
});
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
})
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
648
|
+
if (actions.length === 0) {
|
|
649
|
+
throw new utils.errors.ValidationError("No entries to publish");
|
|
650
|
+
}
|
|
651
|
+
const formattedActions = {};
|
|
652
|
+
for (const action of actions) {
|
|
653
|
+
const contentTypeUid = action.contentType;
|
|
654
|
+
if (!formattedActions[contentTypeUid]) {
|
|
655
|
+
formattedActions[contentTypeUid] = {
|
|
656
|
+
publish: [],
|
|
657
|
+
unpublish: []
|
|
658
|
+
};
|
|
659
|
+
}
|
|
660
|
+
formattedActions[contentTypeUid][action.type].push({
|
|
661
|
+
documentId: action.entryDocumentId,
|
|
662
|
+
locale: action.locale
|
|
663
|
+
});
|
|
664
|
+
}
|
|
665
|
+
return formattedActions;
|
|
666
|
+
};
|
|
667
|
+
return {
|
|
668
|
+
async create(releaseData, { user }) {
|
|
669
|
+
const releaseWithCreatorFields = await utils.setCreatorFields({ user })(releaseData);
|
|
670
|
+
const {
|
|
671
|
+
validatePendingReleasesLimit,
|
|
672
|
+
validateUniqueNameForPendingRelease,
|
|
673
|
+
validateScheduledAtIsLaterThanNow
|
|
674
|
+
} = getService("release-validation", { strapi: strapi2 });
|
|
675
|
+
await Promise.all([
|
|
676
|
+
validatePendingReleasesLimit(),
|
|
677
|
+
validateUniqueNameForPendingRelease(releaseWithCreatorFields.name),
|
|
678
|
+
validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
|
|
679
|
+
]);
|
|
680
|
+
const release2 = await strapi2.db.query(RELEASE_MODEL_UID).create({
|
|
681
|
+
data: {
|
|
682
|
+
...releaseWithCreatorFields,
|
|
683
|
+
status: "empty"
|
|
280
684
|
}
|
|
685
|
+
});
|
|
686
|
+
if (releaseWithCreatorFields.scheduledAt) {
|
|
687
|
+
const schedulingService = getService("scheduling", { strapi: strapi2 });
|
|
688
|
+
await schedulingService.set(release2.id, release2.scheduledAt);
|
|
281
689
|
}
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
690
|
+
strapi2.telemetry.send("didCreateContentRelease");
|
|
691
|
+
return release2;
|
|
692
|
+
},
|
|
693
|
+
async findOne(id, query = {}) {
|
|
694
|
+
const dbQuery = strapi2.get("query-params").transform(RELEASE_MODEL_UID, query);
|
|
695
|
+
const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
|
|
696
|
+
...dbQuery,
|
|
697
|
+
where: { id }
|
|
698
|
+
});
|
|
699
|
+
return release2;
|
|
700
|
+
},
|
|
701
|
+
findPage(query) {
|
|
702
|
+
const dbQuery = strapi2.get("query-params").transform(RELEASE_MODEL_UID, query ?? {});
|
|
703
|
+
return strapi2.db.query(RELEASE_MODEL_UID).findPage({
|
|
704
|
+
...dbQuery,
|
|
705
|
+
populate: {
|
|
706
|
+
actions: {
|
|
707
|
+
count: true
|
|
708
|
+
}
|
|
709
|
+
}
|
|
710
|
+
});
|
|
711
|
+
},
|
|
712
|
+
findMany(query) {
|
|
713
|
+
const dbQuery = strapi2.get("query-params").transform(RELEASE_MODEL_UID, query ?? {});
|
|
714
|
+
return strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
715
|
+
...dbQuery
|
|
716
|
+
});
|
|
717
|
+
},
|
|
718
|
+
async update(id, releaseData, { user }) {
|
|
719
|
+
const releaseWithCreatorFields = await utils.setCreatorFields({ user, isEdition: true })(
|
|
720
|
+
releaseData
|
|
721
|
+
);
|
|
722
|
+
const { validateUniqueNameForPendingRelease, validateScheduledAtIsLaterThanNow } = getService(
|
|
723
|
+
"release-validation",
|
|
724
|
+
{ strapi: strapi2 }
|
|
725
|
+
);
|
|
726
|
+
await Promise.all([
|
|
727
|
+
validateUniqueNameForPendingRelease(releaseWithCreatorFields.name, id),
|
|
728
|
+
validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
|
|
729
|
+
]);
|
|
730
|
+
const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({ where: { id } });
|
|
731
|
+
if (!release2) {
|
|
732
|
+
throw new utils.errors.NotFoundError(`No release found for id ${id}`);
|
|
294
733
|
}
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
734
|
+
if (release2.releasedAt) {
|
|
735
|
+
throw new utils.errors.ValidationError("Release already published");
|
|
736
|
+
}
|
|
737
|
+
const updatedRelease = await strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
738
|
+
where: { id },
|
|
739
|
+
data: releaseWithCreatorFields
|
|
740
|
+
});
|
|
741
|
+
const schedulingService = getService("scheduling", { strapi: strapi2 });
|
|
742
|
+
if (releaseData.scheduledAt) {
|
|
743
|
+
await schedulingService.set(id, releaseData.scheduledAt);
|
|
744
|
+
} else if (release2.scheduledAt) {
|
|
745
|
+
schedulingService.cancel(id);
|
|
746
|
+
}
|
|
747
|
+
this.updateReleaseStatus(id);
|
|
748
|
+
strapi2.telemetry.send("didUpdateContentRelease");
|
|
749
|
+
return updatedRelease;
|
|
750
|
+
},
|
|
751
|
+
async getAllComponents() {
|
|
752
|
+
const contentManagerComponentsService = strapi2.plugin("content-manager").service("components");
|
|
753
|
+
const components = await contentManagerComponentsService.findAllComponents();
|
|
754
|
+
const componentsMap = components.reduce(
|
|
755
|
+
(acc, component) => {
|
|
756
|
+
acc[component.uid] = component;
|
|
757
|
+
return acc;
|
|
758
|
+
},
|
|
759
|
+
{}
|
|
760
|
+
);
|
|
761
|
+
return componentsMap;
|
|
762
|
+
},
|
|
763
|
+
async delete(releaseId) {
|
|
764
|
+
const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
|
|
765
|
+
where: { id: releaseId },
|
|
766
|
+
populate: {
|
|
767
|
+
actions: {
|
|
768
|
+
select: ["id"]
|
|
769
|
+
}
|
|
770
|
+
}
|
|
771
|
+
});
|
|
772
|
+
if (!release2) {
|
|
773
|
+
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
774
|
+
}
|
|
775
|
+
if (release2.releasedAt) {
|
|
776
|
+
throw new utils.errors.ValidationError("Release already published");
|
|
777
|
+
}
|
|
778
|
+
await strapi2.db.transaction(async () => {
|
|
779
|
+
await strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
|
|
780
|
+
where: {
|
|
781
|
+
id: {
|
|
782
|
+
$in: release2.actions.map((action) => action.id)
|
|
303
783
|
}
|
|
304
784
|
}
|
|
305
|
-
}
|
|
306
|
-
{
|
|
307
|
-
|
|
785
|
+
});
|
|
786
|
+
await strapi2.db.query(RELEASE_MODEL_UID).delete({
|
|
787
|
+
where: {
|
|
788
|
+
id: releaseId
|
|
789
|
+
}
|
|
790
|
+
});
|
|
791
|
+
});
|
|
792
|
+
if (release2.scheduledAt) {
|
|
793
|
+
const schedulingService = getService("scheduling", { strapi: strapi2 });
|
|
794
|
+
await schedulingService.cancel(release2.id);
|
|
795
|
+
}
|
|
796
|
+
strapi2.telemetry.send("didDeleteContentRelease");
|
|
797
|
+
return release2;
|
|
798
|
+
},
|
|
799
|
+
async publish(releaseId) {
|
|
800
|
+
const {
|
|
801
|
+
release: release2,
|
|
802
|
+
error
|
|
803
|
+
} = await strapi2.db.transaction(async ({ trx }) => {
|
|
804
|
+
const lockedRelease = await strapi2.db?.queryBuilder(RELEASE_MODEL_UID).where({ id: releaseId }).select(["id", "name", "releasedAt", "status"]).first().transacting(trx).forUpdate().execute();
|
|
805
|
+
if (!lockedRelease) {
|
|
806
|
+
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
308
807
|
}
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
const populateAttachedAction = hasEntryAttached ? {
|
|
312
|
-
// Filter the action to get only the content type entry
|
|
313
|
-
actions: {
|
|
314
|
-
where: {
|
|
315
|
-
target_type: contentTypeUid,
|
|
316
|
-
target_id: entryId
|
|
808
|
+
if (lockedRelease.releasedAt) {
|
|
809
|
+
throw new utils.errors.ValidationError("Release already published");
|
|
317
810
|
}
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
321
|
-
where: {
|
|
322
|
-
...whereActions,
|
|
323
|
-
releasedAt: {
|
|
324
|
-
$null: true
|
|
811
|
+
if (lockedRelease.status === "failed") {
|
|
812
|
+
throw new utils.errors.ValidationError("Release failed to publish");
|
|
325
813
|
}
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
814
|
+
try {
|
|
815
|
+
strapi2.log.info(`[Content Releases] Starting to publish release ${lockedRelease.name}`);
|
|
816
|
+
const formattedActions = await getFormattedActions(releaseId);
|
|
817
|
+
await strapi2.db.transaction(
|
|
818
|
+
async () => Promise.all(
|
|
819
|
+
Object.keys(formattedActions).map(async (contentTypeUid) => {
|
|
820
|
+
const contentType = contentTypeUid;
|
|
821
|
+
const { publish, unpublish } = formattedActions[contentType];
|
|
822
|
+
return Promise.all([
|
|
823
|
+
...publish.map((params) => strapi2.documents(contentType).publish(params)),
|
|
824
|
+
...unpublish.map((params) => strapi2.documents(contentType).unpublish(params))
|
|
825
|
+
]);
|
|
826
|
+
})
|
|
827
|
+
)
|
|
828
|
+
);
|
|
829
|
+
const release22 = await strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
830
|
+
where: {
|
|
831
|
+
id: releaseId
|
|
832
|
+
},
|
|
833
|
+
data: {
|
|
834
|
+
status: "done",
|
|
835
|
+
releasedAt: /* @__PURE__ */ new Date()
|
|
836
|
+
}
|
|
837
|
+
});
|
|
838
|
+
dispatchWebhook(ALLOWED_WEBHOOK_EVENTS.RELEASES_PUBLISH, {
|
|
839
|
+
isPublished: true,
|
|
840
|
+
release: release22
|
|
841
|
+
});
|
|
842
|
+
strapi2.telemetry.send("didPublishContentRelease");
|
|
843
|
+
return { release: release22, error: null };
|
|
844
|
+
} catch (error2) {
|
|
845
|
+
dispatchWebhook(ALLOWED_WEBHOOK_EVENTS.RELEASES_PUBLISH, {
|
|
846
|
+
isPublished: false,
|
|
847
|
+
error: error2
|
|
848
|
+
});
|
|
849
|
+
await strapi2.db?.queryBuilder(RELEASE_MODEL_UID).where({ id: releaseId }).update({
|
|
850
|
+
status: "failed"
|
|
851
|
+
}).transacting(trx).execute();
|
|
852
|
+
return {
|
|
853
|
+
release: null,
|
|
854
|
+
error: error2
|
|
855
|
+
};
|
|
856
|
+
}
|
|
857
|
+
});
|
|
858
|
+
if (error instanceof Error) {
|
|
859
|
+
throw error;
|
|
339
860
|
}
|
|
340
861
|
return release2;
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
type,
|
|
381
|
-
contentType: entry.contentType,
|
|
382
|
-
locale: entry.locale,
|
|
383
|
-
entry: {
|
|
384
|
-
id: entry.id,
|
|
385
|
-
__type: entry.contentType,
|
|
386
|
-
__pivot: { field: "entry" }
|
|
862
|
+
},
|
|
863
|
+
async updateReleaseStatus(releaseId) {
|
|
864
|
+
const releaseActionService = getService("release-action", { strapi: strapi2 });
|
|
865
|
+
const [totalActions, invalidActions] = await Promise.all([
|
|
866
|
+
releaseActionService.countActions({
|
|
867
|
+
filters: {
|
|
868
|
+
release: releaseId
|
|
869
|
+
}
|
|
870
|
+
}),
|
|
871
|
+
releaseActionService.countActions({
|
|
872
|
+
filters: {
|
|
873
|
+
release: releaseId,
|
|
874
|
+
isEntryValid: false
|
|
875
|
+
}
|
|
876
|
+
})
|
|
877
|
+
]);
|
|
878
|
+
if (totalActions > 0) {
|
|
879
|
+
if (invalidActions > 0) {
|
|
880
|
+
return strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
881
|
+
where: {
|
|
882
|
+
id: releaseId
|
|
883
|
+
},
|
|
884
|
+
data: {
|
|
885
|
+
status: "blocked"
|
|
886
|
+
}
|
|
887
|
+
});
|
|
888
|
+
}
|
|
889
|
+
return strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
890
|
+
where: {
|
|
891
|
+
id: releaseId
|
|
892
|
+
},
|
|
893
|
+
data: {
|
|
894
|
+
status: "ready"
|
|
895
|
+
}
|
|
896
|
+
});
|
|
897
|
+
}
|
|
898
|
+
return strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
899
|
+
where: {
|
|
900
|
+
id: releaseId
|
|
387
901
|
},
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
},
|
|
393
|
-
async findActions(releaseId, query) {
|
|
394
|
-
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
|
|
395
|
-
fields: ["id"]
|
|
396
|
-
});
|
|
397
|
-
if (!release2) {
|
|
398
|
-
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
902
|
+
data: {
|
|
903
|
+
status: "empty"
|
|
904
|
+
}
|
|
905
|
+
});
|
|
399
906
|
}
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
}
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
}
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
contentTypeUids
|
|
422
|
-
);
|
|
423
|
-
const allLocales = await strapi2.plugin("i18n").service("locales").find();
|
|
424
|
-
const allLocalesDictionary = allLocales.reduce((acc, locale) => {
|
|
907
|
+
};
|
|
908
|
+
};
|
|
909
|
+
const getGroupName = (queryValue) => {
|
|
910
|
+
switch (queryValue) {
|
|
911
|
+
case "contentType":
|
|
912
|
+
return "contentType.displayName";
|
|
913
|
+
case "type":
|
|
914
|
+
return "type";
|
|
915
|
+
case "locale":
|
|
916
|
+
return ___default.default.getOr("No locale", "locale.name");
|
|
917
|
+
default:
|
|
918
|
+
return "contentType.displayName";
|
|
919
|
+
}
|
|
920
|
+
};
|
|
921
|
+
const createReleaseActionService = ({ strapi: strapi2 }) => {
|
|
922
|
+
const getLocalesDataForActions = async () => {
|
|
923
|
+
if (!strapi2.plugin("i18n")) {
|
|
924
|
+
return {};
|
|
925
|
+
}
|
|
926
|
+
const allLocales = await strapi2.plugin("i18n").service("locales").find() || [];
|
|
927
|
+
return allLocales.reduce((acc, locale) => {
|
|
425
928
|
acc[locale.code] = { name: locale.name, code: locale.code };
|
|
426
929
|
return acc;
|
|
427
930
|
}, {});
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
return {
|
|
431
|
-
...action,
|
|
432
|
-
entry: {
|
|
433
|
-
id: action.entry.id,
|
|
434
|
-
contentType: {
|
|
435
|
-
displayName,
|
|
436
|
-
mainFieldValue: action.entry[mainField]
|
|
437
|
-
},
|
|
438
|
-
locale: action.locale ? allLocalesDictionary[action.locale] : null,
|
|
439
|
-
status: action.entry.publishedAt ? "published" : "draft"
|
|
440
|
-
}
|
|
441
|
-
};
|
|
442
|
-
});
|
|
443
|
-
const groupName = getGroupName(groupBy);
|
|
444
|
-
return ___default.default.groupBy(groupName)(formattedData);
|
|
445
|
-
},
|
|
446
|
-
async getContentTypesDataForActions(contentTypesUids) {
|
|
931
|
+
};
|
|
932
|
+
const getContentTypesDataForActions = async (contentTypesUids) => {
|
|
447
933
|
const contentManagerContentTypeService = strapi2.plugin("content-manager").service("content-types");
|
|
448
934
|
const contentTypesData = {};
|
|
449
935
|
for (const contentTypeUid of contentTypesUids) {
|
|
@@ -456,167 +942,307 @@ const createReleaseService = ({ strapi: strapi2 }) => ({
|
|
|
456
942
|
};
|
|
457
943
|
}
|
|
458
944
|
return contentTypesData;
|
|
459
|
-
}
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
945
|
+
};
|
|
946
|
+
return {
|
|
947
|
+
async create(releaseId, action, { disableUpdateReleaseStatus = false } = {}) {
|
|
948
|
+
const { validateEntryData, validateUniqueEntry } = getService("release-validation", {
|
|
949
|
+
strapi: strapi2
|
|
950
|
+
});
|
|
951
|
+
await Promise.all([
|
|
952
|
+
validateEntryData(action.contentType, action.entryDocumentId),
|
|
953
|
+
validateUniqueEntry(releaseId, action)
|
|
954
|
+
]);
|
|
955
|
+
const model = strapi2.contentType(action.contentType);
|
|
956
|
+
if (model.kind === "singleType") {
|
|
957
|
+
const document = await strapi2.db.query(model.uid).findOne({ select: ["documentId"] });
|
|
958
|
+
if (!document) {
|
|
959
|
+
throw new utils.errors.NotFoundError(`No entry found for contentType ${action.contentType}`);
|
|
465
960
|
}
|
|
961
|
+
action.entryDocumentId = document.documentId;
|
|
466
962
|
}
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
963
|
+
const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({ where: { id: releaseId } });
|
|
964
|
+
if (!release2) {
|
|
965
|
+
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
966
|
+
}
|
|
967
|
+
if (release2.releasedAt) {
|
|
968
|
+
throw new utils.errors.ValidationError("Release already published");
|
|
969
|
+
}
|
|
970
|
+
const actionStatus = action.type === "publish" ? await getDraftEntryValidStatus(
|
|
971
|
+
{
|
|
972
|
+
contentType: action.contentType,
|
|
973
|
+
documentId: action.entryDocumentId,
|
|
974
|
+
locale: action.locale
|
|
975
|
+
},
|
|
976
|
+
{
|
|
977
|
+
strapi: strapi2
|
|
978
|
+
}
|
|
979
|
+
) : true;
|
|
980
|
+
const releaseAction2 = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).create({
|
|
981
|
+
data: {
|
|
982
|
+
...action,
|
|
983
|
+
release: release2.id,
|
|
984
|
+
isEntryValid: actionStatus
|
|
985
|
+
},
|
|
986
|
+
populate: { release: { select: ["id"] } }
|
|
987
|
+
});
|
|
988
|
+
if (!disableUpdateReleaseStatus) {
|
|
989
|
+
getService("release", { strapi: strapi2 }).updateReleaseStatus(release2.id);
|
|
990
|
+
}
|
|
991
|
+
return releaseAction2;
|
|
992
|
+
},
|
|
993
|
+
async findPage(releaseId, query) {
|
|
994
|
+
const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
|
|
995
|
+
where: { id: releaseId },
|
|
996
|
+
select: ["id"]
|
|
997
|
+
});
|
|
998
|
+
if (!release2) {
|
|
999
|
+
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
1000
|
+
}
|
|
1001
|
+
const dbQuery = strapi2.get("query-params").transform(RELEASE_ACTION_MODEL_UID, query ?? {});
|
|
1002
|
+
const { results: actions, pagination } = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).findPage({
|
|
1003
|
+
...dbQuery,
|
|
476
1004
|
where: {
|
|
477
|
-
|
|
478
|
-
$in: release2.actions.map((action) => action.id)
|
|
479
|
-
}
|
|
1005
|
+
release: releaseId
|
|
480
1006
|
}
|
|
481
1007
|
});
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
1008
|
+
const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
|
|
1009
|
+
const actionsWithEntry = await utils.async.map(actions, async (action) => {
|
|
1010
|
+
const populate = await populateBuilderService(action.contentType).populateDeep(Infinity).build();
|
|
1011
|
+
const entry = await getEntry(
|
|
1012
|
+
{
|
|
1013
|
+
contentType: action.contentType,
|
|
1014
|
+
documentId: action.entryDocumentId,
|
|
1015
|
+
locale: action.locale,
|
|
1016
|
+
populate,
|
|
1017
|
+
status: action.type === "publish" ? "draft" : "published"
|
|
1018
|
+
},
|
|
1019
|
+
{ strapi: strapi2 }
|
|
1020
|
+
);
|
|
1021
|
+
return {
|
|
1022
|
+
...action,
|
|
1023
|
+
entry,
|
|
1024
|
+
status: entry ? await getEntryStatus(action.contentType, entry) : null
|
|
1025
|
+
};
|
|
1026
|
+
});
|
|
1027
|
+
return {
|
|
1028
|
+
results: actionsWithEntry,
|
|
1029
|
+
pagination
|
|
1030
|
+
};
|
|
1031
|
+
},
|
|
1032
|
+
async groupActions(actions, groupBy) {
|
|
1033
|
+
const contentTypeUids = actions.reduce((acc, action) => {
|
|
1034
|
+
if (!acc.includes(action.contentType)) {
|
|
1035
|
+
acc.push(action.contentType);
|
|
1036
|
+
}
|
|
1037
|
+
return acc;
|
|
1038
|
+
}, []);
|
|
1039
|
+
const allReleaseContentTypesDictionary = await getContentTypesDataForActions(contentTypeUids);
|
|
1040
|
+
const allLocalesDictionary = await getLocalesDataForActions();
|
|
1041
|
+
const formattedData = actions.map((action) => {
|
|
1042
|
+
const { mainField, displayName } = allReleaseContentTypesDictionary[action.contentType];
|
|
1043
|
+
return {
|
|
1044
|
+
...action,
|
|
1045
|
+
locale: action.locale ? allLocalesDictionary[action.locale] : null,
|
|
1046
|
+
contentType: {
|
|
1047
|
+
displayName,
|
|
1048
|
+
mainFieldValue: action.entry[mainField],
|
|
1049
|
+
uid: action.contentType
|
|
1050
|
+
}
|
|
1051
|
+
};
|
|
1052
|
+
});
|
|
1053
|
+
const groupName = getGroupName(groupBy);
|
|
1054
|
+
return ___default.default.groupBy(groupName)(formattedData);
|
|
1055
|
+
},
|
|
1056
|
+
async getContentTypeModelsFromActions(actions) {
|
|
1057
|
+
const contentTypeUids = actions.reduce((acc, action) => {
|
|
1058
|
+
if (!acc.includes(action.contentType)) {
|
|
1059
|
+
acc.push(action.contentType);
|
|
1060
|
+
}
|
|
1061
|
+
return acc;
|
|
1062
|
+
}, []);
|
|
1063
|
+
const workflowsService = strapi2.plugin("review-workflows").service("workflows");
|
|
1064
|
+
const contentTypeModelsMap = await utils.async.reduce(contentTypeUids)(
|
|
1065
|
+
async (accPromise, contentTypeUid) => {
|
|
1066
|
+
const acc = await accPromise;
|
|
1067
|
+
const contentTypeModel = strapi2.getModel(contentTypeUid);
|
|
1068
|
+
const workflow = await workflowsService.getAssignedWorkflow(contentTypeUid, {
|
|
1069
|
+
populate: "stageRequiredToPublish"
|
|
1070
|
+
});
|
|
1071
|
+
acc[contentTypeUid] = {
|
|
1072
|
+
...contentTypeModel,
|
|
1073
|
+
hasReviewWorkflow: !!workflow,
|
|
1074
|
+
stageRequiredToPublish: workflow?.stageRequiredToPublish
|
|
1075
|
+
};
|
|
1076
|
+
return acc;
|
|
1077
|
+
},
|
|
1078
|
+
{}
|
|
1079
|
+
);
|
|
1080
|
+
return contentTypeModelsMap;
|
|
1081
|
+
},
|
|
1082
|
+
async countActions(query) {
|
|
1083
|
+
const dbQuery = strapi2.get("query-params").transform(RELEASE_ACTION_MODEL_UID, query ?? {});
|
|
1084
|
+
return strapi2.db.query(RELEASE_ACTION_MODEL_UID).count(dbQuery);
|
|
1085
|
+
},
|
|
1086
|
+
async update(actionId, releaseId, update) {
|
|
1087
|
+
const action = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).findOne({
|
|
1088
|
+
where: {
|
|
1089
|
+
id: actionId,
|
|
1090
|
+
release: {
|
|
1091
|
+
id: releaseId,
|
|
1092
|
+
releasedAt: {
|
|
1093
|
+
$null: true
|
|
495
1094
|
}
|
|
496
1095
|
}
|
|
497
1096
|
}
|
|
1097
|
+
});
|
|
1098
|
+
if (!action) {
|
|
1099
|
+
throw new utils.errors.NotFoundError(
|
|
1100
|
+
`Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
|
|
1101
|
+
);
|
|
498
1102
|
}
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
throw new utils.errors.ValidationError("No entries to publish");
|
|
508
|
-
}
|
|
509
|
-
const actions = {};
|
|
510
|
-
for (const action of releaseWithPopulatedActionEntries.actions) {
|
|
511
|
-
const contentTypeUid = action.contentType;
|
|
512
|
-
if (!actions[contentTypeUid]) {
|
|
513
|
-
actions[contentTypeUid] = {
|
|
514
|
-
publish: [],
|
|
515
|
-
unpublish: []
|
|
516
|
-
};
|
|
517
|
-
}
|
|
518
|
-
if (action.type === "publish") {
|
|
519
|
-
actions[contentTypeUid].publish.push(action.entry);
|
|
520
|
-
} else {
|
|
521
|
-
actions[contentTypeUid].unpublish.push(action.entry);
|
|
522
|
-
}
|
|
523
|
-
}
|
|
524
|
-
const entityManagerService = strapi2.plugin("content-manager").service("entity-manager");
|
|
525
|
-
await strapi2.db.transaction(async () => {
|
|
526
|
-
for (const contentTypeUid of Object.keys(actions)) {
|
|
527
|
-
const { publish, unpublish } = actions[contentTypeUid];
|
|
528
|
-
if (publish.length > 0) {
|
|
529
|
-
await entityManagerService.publishMany(publish, contentTypeUid);
|
|
1103
|
+
const actionStatus = update.type === "publish" ? await getDraftEntryValidStatus(
|
|
1104
|
+
{
|
|
1105
|
+
contentType: action.contentType,
|
|
1106
|
+
documentId: action.entryDocumentId,
|
|
1107
|
+
locale: action.locale
|
|
1108
|
+
},
|
|
1109
|
+
{
|
|
1110
|
+
strapi: strapi2
|
|
530
1111
|
}
|
|
531
|
-
|
|
532
|
-
|
|
1112
|
+
) : true;
|
|
1113
|
+
const updatedAction = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
|
|
1114
|
+
where: {
|
|
1115
|
+
id: actionId,
|
|
1116
|
+
release: {
|
|
1117
|
+
id: releaseId,
|
|
1118
|
+
releasedAt: {
|
|
1119
|
+
$null: true
|
|
1120
|
+
}
|
|
1121
|
+
}
|
|
1122
|
+
},
|
|
1123
|
+
data: {
|
|
1124
|
+
...update,
|
|
1125
|
+
isEntryValid: actionStatus
|
|
533
1126
|
}
|
|
534
|
-
}
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
async updateAction(actionId, releaseId, update) {
|
|
548
|
-
const updatedAction = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
|
|
549
|
-
where: {
|
|
550
|
-
id: actionId,
|
|
551
|
-
release: {
|
|
552
|
-
id: releaseId,
|
|
553
|
-
releasedAt: {
|
|
554
|
-
$null: true
|
|
1127
|
+
});
|
|
1128
|
+
getService("release", { strapi: strapi2 }).updateReleaseStatus(releaseId);
|
|
1129
|
+
return updatedAction;
|
|
1130
|
+
},
|
|
1131
|
+
async delete(actionId, releaseId) {
|
|
1132
|
+
const deletedAction = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).delete({
|
|
1133
|
+
where: {
|
|
1134
|
+
id: actionId,
|
|
1135
|
+
release: {
|
|
1136
|
+
id: releaseId,
|
|
1137
|
+
releasedAt: {
|
|
1138
|
+
$null: true
|
|
1139
|
+
}
|
|
555
1140
|
}
|
|
556
1141
|
}
|
|
557
|
-
}
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
);
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
1142
|
+
});
|
|
1143
|
+
if (!deletedAction) {
|
|
1144
|
+
throw new utils.errors.NotFoundError(
|
|
1145
|
+
`Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
|
|
1146
|
+
);
|
|
1147
|
+
}
|
|
1148
|
+
getService("release", { strapi: strapi2 }).updateReleaseStatus(releaseId);
|
|
1149
|
+
return deletedAction;
|
|
1150
|
+
},
|
|
1151
|
+
async validateActionsByContentTypes(contentTypeUids) {
|
|
1152
|
+
const actions = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).findMany({
|
|
1153
|
+
where: {
|
|
1154
|
+
contentType: {
|
|
1155
|
+
$in: contentTypeUids
|
|
1156
|
+
},
|
|
1157
|
+
// We only want to validate actions that are going to be published
|
|
1158
|
+
type: "publish",
|
|
1159
|
+
release: {
|
|
1160
|
+
releasedAt: {
|
|
1161
|
+
$null: true
|
|
1162
|
+
}
|
|
575
1163
|
}
|
|
1164
|
+
},
|
|
1165
|
+
populate: { release: true }
|
|
1166
|
+
});
|
|
1167
|
+
const releasesUpdated = [];
|
|
1168
|
+
await utils.async.map(actions, async (action) => {
|
|
1169
|
+
const isValid = await getDraftEntryValidStatus(
|
|
1170
|
+
{
|
|
1171
|
+
contentType: action.contentType,
|
|
1172
|
+
documentId: action.entryDocumentId,
|
|
1173
|
+
locale: action.locale
|
|
1174
|
+
},
|
|
1175
|
+
{ strapi: strapi2 }
|
|
1176
|
+
);
|
|
1177
|
+
await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
|
|
1178
|
+
where: {
|
|
1179
|
+
id: action.id
|
|
1180
|
+
},
|
|
1181
|
+
data: {
|
|
1182
|
+
isEntryValid: isValid
|
|
1183
|
+
}
|
|
1184
|
+
});
|
|
1185
|
+
if (!releasesUpdated.includes(action.release.id)) {
|
|
1186
|
+
releasesUpdated.push(action.release.id);
|
|
576
1187
|
}
|
|
1188
|
+
return {
|
|
1189
|
+
id: action.id,
|
|
1190
|
+
isEntryValid: isValid
|
|
1191
|
+
};
|
|
1192
|
+
});
|
|
1193
|
+
if (releasesUpdated.length > 0) {
|
|
1194
|
+
await utils.async.map(releasesUpdated, async (releaseId) => {
|
|
1195
|
+
await getService("release", { strapi: strapi2 }).updateReleaseStatus(releaseId);
|
|
1196
|
+
});
|
|
577
1197
|
}
|
|
578
|
-
});
|
|
579
|
-
if (!deletedAction) {
|
|
580
|
-
throw new utils.errors.NotFoundError(
|
|
581
|
-
`Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
|
|
582
|
-
);
|
|
583
1198
|
}
|
|
584
|
-
|
|
1199
|
+
};
|
|
1200
|
+
};
|
|
1201
|
+
class AlreadyOnReleaseError extends utils.errors.ApplicationError {
|
|
1202
|
+
constructor(message) {
|
|
1203
|
+
super(message);
|
|
1204
|
+
this.name = "AlreadyOnReleaseError";
|
|
585
1205
|
}
|
|
586
|
-
}
|
|
1206
|
+
}
|
|
587
1207
|
const createReleaseValidationService = ({ strapi: strapi2 }) => ({
|
|
588
1208
|
async validateUniqueEntry(releaseId, releaseActionArgs) {
|
|
589
|
-
const release2 = await strapi2.
|
|
590
|
-
|
|
1209
|
+
const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
|
|
1210
|
+
where: {
|
|
1211
|
+
id: releaseId
|
|
1212
|
+
},
|
|
1213
|
+
populate: {
|
|
1214
|
+
actions: true
|
|
1215
|
+
}
|
|
591
1216
|
});
|
|
592
1217
|
if (!release2) {
|
|
593
1218
|
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
594
1219
|
}
|
|
595
1220
|
const isEntryInRelease = release2.actions.some(
|
|
596
|
-
(action) =>
|
|
1221
|
+
(action) => action.entryDocumentId === releaseActionArgs.entryDocumentId && action.contentType === releaseActionArgs.contentType && (releaseActionArgs.locale ? action.locale === releaseActionArgs.locale : true)
|
|
597
1222
|
);
|
|
598
1223
|
if (isEntryInRelease) {
|
|
599
|
-
throw new
|
|
600
|
-
`Entry with
|
|
1224
|
+
throw new AlreadyOnReleaseError(
|
|
1225
|
+
`Entry with documentId ${releaseActionArgs.entryDocumentId}${releaseActionArgs.locale ? `( ${releaseActionArgs.locale})` : ""} and contentType ${releaseActionArgs.contentType} already exists in release with id ${releaseId}`
|
|
601
1226
|
);
|
|
602
1227
|
}
|
|
603
1228
|
},
|
|
604
|
-
|
|
1229
|
+
validateEntryData(contentTypeUid, entryDocumentId) {
|
|
605
1230
|
const contentType = strapi2.contentType(contentTypeUid);
|
|
606
1231
|
if (!contentType) {
|
|
607
1232
|
throw new utils.errors.NotFoundError(`No content type found for uid ${contentTypeUid}`);
|
|
608
1233
|
}
|
|
609
|
-
if (!contentType
|
|
1234
|
+
if (!utils.contentTypes.hasDraftAndPublish(contentType)) {
|
|
610
1235
|
throw new utils.errors.ValidationError(
|
|
611
1236
|
`Content type with uid ${contentTypeUid} does not have draftAndPublish enabled`
|
|
612
1237
|
);
|
|
613
1238
|
}
|
|
1239
|
+
if (contentType.kind === "collectionType" && !entryDocumentId) {
|
|
1240
|
+
throw new utils.errors.ValidationError("Document id is required for collection type");
|
|
1241
|
+
}
|
|
614
1242
|
},
|
|
615
1243
|
async validatePendingReleasesLimit() {
|
|
616
|
-
const
|
|
617
|
-
|
|
618
|
-
EE__default.default.features.get("cms-content-releases")?.options?.maximumReleases || 3
|
|
619
|
-
);
|
|
1244
|
+
const featureCfg = strapi2.ee.features.get("cms-content-releases");
|
|
1245
|
+
const maximumPendingReleases = typeof featureCfg === "object" && featureCfg?.options?.maximumReleases || 3;
|
|
620
1246
|
const [, pendingReleasesCount] = await strapi2.db.query(RELEASE_MODEL_UID).findWithCount({
|
|
621
1247
|
filters: {
|
|
622
1248
|
releasedAt: {
|
|
@@ -627,23 +1253,98 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
|
|
|
627
1253
|
if (pendingReleasesCount >= maximumPendingReleases) {
|
|
628
1254
|
throw new utils.errors.ValidationError("You have reached the maximum number of pending releases");
|
|
629
1255
|
}
|
|
1256
|
+
},
|
|
1257
|
+
async validateUniqueNameForPendingRelease(name, id) {
|
|
1258
|
+
const pendingReleases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
1259
|
+
where: {
|
|
1260
|
+
releasedAt: {
|
|
1261
|
+
$null: true
|
|
1262
|
+
},
|
|
1263
|
+
name,
|
|
1264
|
+
...id && { id: { $ne: id } }
|
|
1265
|
+
}
|
|
1266
|
+
});
|
|
1267
|
+
const isNameUnique = pendingReleases.length === 0;
|
|
1268
|
+
if (!isNameUnique) {
|
|
1269
|
+
throw new utils.errors.ValidationError(`Release with name ${name} already exists`);
|
|
1270
|
+
}
|
|
1271
|
+
},
|
|
1272
|
+
async validateScheduledAtIsLaterThanNow(scheduledAt) {
|
|
1273
|
+
if (scheduledAt && new Date(scheduledAt) <= /* @__PURE__ */ new Date()) {
|
|
1274
|
+
throw new utils.errors.ValidationError("Scheduled at must be later than now");
|
|
1275
|
+
}
|
|
630
1276
|
}
|
|
631
1277
|
});
|
|
632
|
-
const
|
|
633
|
-
const
|
|
634
|
-
destroyListenerCallbacks: []
|
|
635
|
-
};
|
|
1278
|
+
const createSchedulingService = ({ strapi: strapi2 }) => {
|
|
1279
|
+
const scheduledJobs = /* @__PURE__ */ new Map();
|
|
636
1280
|
return {
|
|
637
|
-
|
|
638
|
-
|
|
1281
|
+
async set(releaseId, scheduleDate) {
|
|
1282
|
+
const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({ where: { id: releaseId, releasedAt: null } });
|
|
1283
|
+
if (!release2) {
|
|
1284
|
+
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
1285
|
+
}
|
|
1286
|
+
const job = nodeSchedule.scheduleJob(scheduleDate, async () => {
|
|
1287
|
+
try {
|
|
1288
|
+
await getService("release", { strapi: strapi2 }).publish(releaseId);
|
|
1289
|
+
} catch (error) {
|
|
1290
|
+
}
|
|
1291
|
+
this.cancel(releaseId);
|
|
1292
|
+
});
|
|
1293
|
+
if (scheduledJobs.has(releaseId)) {
|
|
1294
|
+
this.cancel(releaseId);
|
|
1295
|
+
}
|
|
1296
|
+
scheduledJobs.set(releaseId, job);
|
|
1297
|
+
return scheduledJobs;
|
|
639
1298
|
},
|
|
640
|
-
|
|
641
|
-
if (
|
|
642
|
-
|
|
1299
|
+
cancel(releaseId) {
|
|
1300
|
+
if (scheduledJobs.has(releaseId)) {
|
|
1301
|
+
scheduledJobs.get(releaseId).cancel();
|
|
1302
|
+
scheduledJobs.delete(releaseId);
|
|
643
1303
|
}
|
|
644
|
-
|
|
645
|
-
|
|
1304
|
+
return scheduledJobs;
|
|
1305
|
+
},
|
|
1306
|
+
getAll() {
|
|
1307
|
+
return scheduledJobs;
|
|
1308
|
+
},
|
|
1309
|
+
/**
|
|
1310
|
+
* On bootstrap, we can use this function to make sure to sync the scheduled jobs from the database that are not yet released
|
|
1311
|
+
* This is useful in case the server was restarted and the scheduled jobs were lost
|
|
1312
|
+
* This also could be used to sync different Strapi instances in case of a cluster
|
|
1313
|
+
*/
|
|
1314
|
+
async syncFromDatabase() {
|
|
1315
|
+
const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
1316
|
+
where: {
|
|
1317
|
+
scheduledAt: {
|
|
1318
|
+
$gte: /* @__PURE__ */ new Date()
|
|
1319
|
+
},
|
|
1320
|
+
releasedAt: null
|
|
1321
|
+
}
|
|
646
1322
|
});
|
|
1323
|
+
for (const release2 of releases) {
|
|
1324
|
+
this.set(release2.id, release2.scheduledAt);
|
|
1325
|
+
}
|
|
1326
|
+
return scheduledJobs;
|
|
1327
|
+
}
|
|
1328
|
+
};
|
|
1329
|
+
};
|
|
1330
|
+
const DEFAULT_SETTINGS = {
|
|
1331
|
+
defaultTimezone: null
|
|
1332
|
+
};
|
|
1333
|
+
const createSettingsService = ({ strapi: strapi2 }) => {
|
|
1334
|
+
const getStore = async () => strapi2.store({ type: "core", name: "content-releases" });
|
|
1335
|
+
return {
|
|
1336
|
+
async update({ settings: settings2 }) {
|
|
1337
|
+
const store = await getStore();
|
|
1338
|
+
store.set({ key: "settings", value: settings2 });
|
|
1339
|
+
return settings2;
|
|
1340
|
+
},
|
|
1341
|
+
async find() {
|
|
1342
|
+
const store = await getStore();
|
|
1343
|
+
const settings2 = await store.get({ key: "settings" });
|
|
1344
|
+
return {
|
|
1345
|
+
...DEFAULT_SETTINGS,
|
|
1346
|
+
...settings2 || {}
|
|
1347
|
+
};
|
|
647
1348
|
}
|
|
648
1349
|
};
|
|
649
1350
|
};
|
|
@@ -651,64 +1352,148 @@ const services = {
|
|
|
651
1352
|
release: createReleaseService,
|
|
652
1353
|
"release-action": createReleaseActionService,
|
|
653
1354
|
"release-validation": createReleaseValidationService,
|
|
654
|
-
|
|
1355
|
+
scheduling: createSchedulingService,
|
|
1356
|
+
settings: createSettingsService
|
|
655
1357
|
};
|
|
656
|
-
const RELEASE_SCHEMA =
|
|
657
|
-
name:
|
|
1358
|
+
const RELEASE_SCHEMA = utils.yup.object().shape({
|
|
1359
|
+
name: utils.yup.string().trim().required(),
|
|
1360
|
+
scheduledAt: utils.yup.string().nullable(),
|
|
1361
|
+
timezone: utils.yup.string().when("scheduledAt", {
|
|
1362
|
+
is: (value) => value !== null && value !== void 0,
|
|
1363
|
+
then: utils.yup.string().required(),
|
|
1364
|
+
otherwise: utils.yup.string().nullable()
|
|
1365
|
+
})
|
|
1366
|
+
}).required().noUnknown();
|
|
1367
|
+
const FIND_BY_DOCUMENT_ATTACHED_PARAMS_SCHEMA = utils.yup.object().shape({
|
|
1368
|
+
contentType: utils.yup.string().required(),
|
|
1369
|
+
entryDocumentId: utils.yup.string().nullable(),
|
|
1370
|
+
hasEntryAttached: utils.yup.string().nullable(),
|
|
1371
|
+
locale: utils.yup.string().nullable()
|
|
658
1372
|
}).required().noUnknown();
|
|
659
1373
|
const validateRelease = utils.validateYupSchema(RELEASE_SCHEMA);
|
|
1374
|
+
const validatefindByDocumentAttachedParams = utils.validateYupSchema(
|
|
1375
|
+
FIND_BY_DOCUMENT_ATTACHED_PARAMS_SCHEMA
|
|
1376
|
+
);
|
|
660
1377
|
const releaseController = {
|
|
661
|
-
|
|
662
|
-
|
|
1378
|
+
/**
|
|
1379
|
+
* Find releases based on documents attached or not to the release.
|
|
1380
|
+
* If `hasEntryAttached` is true, it will return all releases that have the entry attached.
|
|
1381
|
+
* If `hasEntryAttached` is false, it will return all releases that don't have the entry attached.
|
|
1382
|
+
*/
|
|
1383
|
+
async findByDocumentAttached(ctx) {
|
|
1384
|
+
const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
|
|
663
1385
|
ability: ctx.state.userAbility,
|
|
664
1386
|
model: RELEASE_MODEL_UID
|
|
665
1387
|
});
|
|
666
1388
|
await permissionsManager.validateQuery(ctx.query);
|
|
667
1389
|
const releaseService = getService("release", { strapi });
|
|
668
|
-
const
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
const
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
1390
|
+
const query = await permissionsManager.sanitizeQuery(ctx.query);
|
|
1391
|
+
await validatefindByDocumentAttachedParams(query);
|
|
1392
|
+
const model = strapi.getModel(query.contentType);
|
|
1393
|
+
if (model.kind && model.kind === "singleType") {
|
|
1394
|
+
const document = await strapi.db.query(model.uid).findOne({ select: ["documentId"] });
|
|
1395
|
+
if (!document) {
|
|
1396
|
+
throw new utils.errors.NotFoundError(`No entry found for contentType ${query.contentType}`);
|
|
1397
|
+
}
|
|
1398
|
+
query.entryDocumentId = document.documentId;
|
|
1399
|
+
}
|
|
1400
|
+
const { contentType, hasEntryAttached, entryDocumentId, locale } = query;
|
|
1401
|
+
const isEntryAttached = typeof hasEntryAttached === "string" ? Boolean(JSON.parse(hasEntryAttached)) : false;
|
|
1402
|
+
if (isEntryAttached) {
|
|
1403
|
+
const releases = await releaseService.findMany({
|
|
1404
|
+
where: {
|
|
1405
|
+
releasedAt: null,
|
|
1406
|
+
actions: {
|
|
1407
|
+
contentType,
|
|
1408
|
+
entryDocumentId: entryDocumentId ?? null,
|
|
1409
|
+
locale: locale ?? null
|
|
1410
|
+
}
|
|
1411
|
+
},
|
|
1412
|
+
populate: {
|
|
1413
|
+
actions: {
|
|
1414
|
+
fields: ["type"],
|
|
1415
|
+
filters: {
|
|
1416
|
+
contentType,
|
|
1417
|
+
entryDocumentId: entryDocumentId ?? null,
|
|
1418
|
+
locale: locale ?? null
|
|
1419
|
+
}
|
|
1420
|
+
}
|
|
1421
|
+
}
|
|
676
1422
|
});
|
|
677
|
-
ctx.body = { data };
|
|
1423
|
+
ctx.body = { data: releases };
|
|
678
1424
|
} else {
|
|
679
|
-
const
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
const { actions, ...releaseData } = release2;
|
|
683
|
-
return {
|
|
684
|
-
...releaseData,
|
|
1425
|
+
const relatedReleases = await releaseService.findMany({
|
|
1426
|
+
where: {
|
|
1427
|
+
releasedAt: null,
|
|
685
1428
|
actions: {
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
1429
|
+
contentType,
|
|
1430
|
+
entryDocumentId: entryDocumentId ?? null,
|
|
1431
|
+
locale: locale ?? null
|
|
689
1432
|
}
|
|
690
|
-
}
|
|
1433
|
+
}
|
|
691
1434
|
});
|
|
692
|
-
|
|
1435
|
+
const releases = await releaseService.findMany({
|
|
1436
|
+
where: {
|
|
1437
|
+
$or: [
|
|
1438
|
+
{
|
|
1439
|
+
id: {
|
|
1440
|
+
$notIn: relatedReleases.map((release2) => release2.id)
|
|
1441
|
+
}
|
|
1442
|
+
},
|
|
1443
|
+
{
|
|
1444
|
+
actions: null
|
|
1445
|
+
}
|
|
1446
|
+
],
|
|
1447
|
+
releasedAt: null
|
|
1448
|
+
}
|
|
1449
|
+
});
|
|
1450
|
+
ctx.body = { data: releases };
|
|
693
1451
|
}
|
|
694
1452
|
},
|
|
695
|
-
async
|
|
696
|
-
const
|
|
697
|
-
const releaseService = getService("release", { strapi });
|
|
698
|
-
const release2 = await releaseService.findOne(id, { populate: ["createdBy"] });
|
|
699
|
-
const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
|
|
1453
|
+
async findPage(ctx) {
|
|
1454
|
+
const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
|
|
700
1455
|
ability: ctx.state.userAbility,
|
|
701
1456
|
model: RELEASE_MODEL_UID
|
|
702
1457
|
});
|
|
703
|
-
|
|
704
|
-
const
|
|
705
|
-
|
|
706
|
-
|
|
1458
|
+
await permissionsManager.validateQuery(ctx.query);
|
|
1459
|
+
const releaseService = getService("release", { strapi });
|
|
1460
|
+
const query = await permissionsManager.sanitizeQuery(ctx.query);
|
|
1461
|
+
const { results, pagination } = await releaseService.findPage(query);
|
|
1462
|
+
const data = results.map((release2) => {
|
|
1463
|
+
const { actions, ...releaseData } = release2;
|
|
1464
|
+
return {
|
|
1465
|
+
...releaseData,
|
|
1466
|
+
actions: {
|
|
1467
|
+
meta: {
|
|
1468
|
+
count: actions.count
|
|
1469
|
+
}
|
|
1470
|
+
}
|
|
1471
|
+
};
|
|
1472
|
+
});
|
|
1473
|
+
const pendingReleasesCount = await strapi.db.query(RELEASE_MODEL_UID).count({
|
|
1474
|
+
where: {
|
|
1475
|
+
releasedAt: null
|
|
707
1476
|
}
|
|
708
1477
|
});
|
|
1478
|
+
ctx.body = { data, meta: { pagination, pendingReleasesCount } };
|
|
1479
|
+
},
|
|
1480
|
+
async findOne(ctx) {
|
|
1481
|
+
const id = ctx.params.id;
|
|
1482
|
+
const releaseService = getService("release", { strapi });
|
|
1483
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1484
|
+
const release2 = await releaseService.findOne(id, { populate: ["createdBy"] });
|
|
709
1485
|
if (!release2) {
|
|
710
1486
|
throw new utils.errors.NotFoundError(`Release not found for id: ${id}`);
|
|
711
1487
|
}
|
|
1488
|
+
const count = await releaseActionService.countActions({
|
|
1489
|
+
filters: {
|
|
1490
|
+
release: id
|
|
1491
|
+
}
|
|
1492
|
+
});
|
|
1493
|
+
const sanitizedRelease = {
|
|
1494
|
+
...release2,
|
|
1495
|
+
createdBy: release2.createdBy ? strapi.service("admin::user").sanitizeUser(release2.createdBy) : null
|
|
1496
|
+
};
|
|
712
1497
|
const data = {
|
|
713
1498
|
...sanitizedRelease,
|
|
714
1499
|
actions: {
|
|
@@ -719,19 +1504,63 @@ const releaseController = {
|
|
|
719
1504
|
};
|
|
720
1505
|
ctx.body = { data };
|
|
721
1506
|
},
|
|
1507
|
+
async mapEntriesToReleases(ctx) {
|
|
1508
|
+
const { contentTypeUid, documentIds, locale } = ctx.query;
|
|
1509
|
+
if (!contentTypeUid || !documentIds) {
|
|
1510
|
+
throw new utils.errors.ValidationError("Missing required query parameters");
|
|
1511
|
+
}
|
|
1512
|
+
const releaseService = getService("release", { strapi });
|
|
1513
|
+
const releasesWithActions = await releaseService.findMany({
|
|
1514
|
+
where: {
|
|
1515
|
+
releasedAt: null,
|
|
1516
|
+
actions: {
|
|
1517
|
+
contentType: contentTypeUid,
|
|
1518
|
+
entryDocumentId: {
|
|
1519
|
+
$in: documentIds
|
|
1520
|
+
},
|
|
1521
|
+
locale
|
|
1522
|
+
}
|
|
1523
|
+
},
|
|
1524
|
+
populate: {
|
|
1525
|
+
actions: true
|
|
1526
|
+
}
|
|
1527
|
+
});
|
|
1528
|
+
const mappedEntriesInReleases = releasesWithActions.reduce(
|
|
1529
|
+
(acc, release2) => {
|
|
1530
|
+
release2.actions.forEach((action) => {
|
|
1531
|
+
if (action.contentType !== contentTypeUid) {
|
|
1532
|
+
return;
|
|
1533
|
+
}
|
|
1534
|
+
if (locale && action.locale !== locale) {
|
|
1535
|
+
return;
|
|
1536
|
+
}
|
|
1537
|
+
if (!acc[action.entryDocumentId]) {
|
|
1538
|
+
acc[action.entryDocumentId] = [{ id: release2.id, name: release2.name }];
|
|
1539
|
+
} else {
|
|
1540
|
+
acc[action.entryDocumentId].push({ id: release2.id, name: release2.name });
|
|
1541
|
+
}
|
|
1542
|
+
});
|
|
1543
|
+
return acc;
|
|
1544
|
+
},
|
|
1545
|
+
{}
|
|
1546
|
+
);
|
|
1547
|
+
ctx.body = {
|
|
1548
|
+
data: mappedEntriesInReleases
|
|
1549
|
+
};
|
|
1550
|
+
},
|
|
722
1551
|
async create(ctx) {
|
|
723
1552
|
const user = ctx.state.user;
|
|
724
1553
|
const releaseArgs = ctx.request.body;
|
|
725
1554
|
await validateRelease(releaseArgs);
|
|
726
1555
|
const releaseService = getService("release", { strapi });
|
|
727
1556
|
const release2 = await releaseService.create(releaseArgs, { user });
|
|
728
|
-
const permissionsManager = strapi.admin
|
|
1557
|
+
const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
|
|
729
1558
|
ability: ctx.state.userAbility,
|
|
730
1559
|
model: RELEASE_MODEL_UID
|
|
731
1560
|
});
|
|
732
|
-
ctx.
|
|
1561
|
+
ctx.created({
|
|
733
1562
|
data: await permissionsManager.sanitizeOutput(release2)
|
|
734
|
-
};
|
|
1563
|
+
});
|
|
735
1564
|
},
|
|
736
1565
|
async update(ctx) {
|
|
737
1566
|
const user = ctx.state.user;
|
|
@@ -740,7 +1569,7 @@ const releaseController = {
|
|
|
740
1569
|
await validateRelease(releaseArgs);
|
|
741
1570
|
const releaseService = getService("release", { strapi });
|
|
742
1571
|
const release2 = await releaseService.update(id, releaseArgs, { user });
|
|
743
|
-
const permissionsManager = strapi.admin
|
|
1572
|
+
const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
|
|
744
1573
|
ability: ctx.state.userAbility,
|
|
745
1574
|
model: RELEASE_MODEL_UID
|
|
746
1575
|
});
|
|
@@ -757,55 +1586,142 @@ const releaseController = {
|
|
|
757
1586
|
};
|
|
758
1587
|
},
|
|
759
1588
|
async publish(ctx) {
|
|
760
|
-
const user = ctx.state.user;
|
|
761
1589
|
const id = ctx.params.id;
|
|
762
1590
|
const releaseService = getService("release", { strapi });
|
|
763
|
-
const
|
|
1591
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1592
|
+
const release2 = await releaseService.publish(id);
|
|
1593
|
+
const [countPublishActions, countUnpublishActions] = await Promise.all([
|
|
1594
|
+
releaseActionService.countActions({
|
|
1595
|
+
filters: {
|
|
1596
|
+
release: id,
|
|
1597
|
+
type: "publish"
|
|
1598
|
+
}
|
|
1599
|
+
}),
|
|
1600
|
+
releaseActionService.countActions({
|
|
1601
|
+
filters: {
|
|
1602
|
+
release: id,
|
|
1603
|
+
type: "unpublish"
|
|
1604
|
+
}
|
|
1605
|
+
})
|
|
1606
|
+
]);
|
|
764
1607
|
ctx.body = {
|
|
765
|
-
data: release2
|
|
1608
|
+
data: release2,
|
|
1609
|
+
meta: {
|
|
1610
|
+
totalEntries: countPublishActions + countUnpublishActions,
|
|
1611
|
+
totalPublishedEntries: countPublishActions,
|
|
1612
|
+
totalUnpublishedEntries: countUnpublishActions
|
|
1613
|
+
}
|
|
766
1614
|
};
|
|
767
1615
|
}
|
|
768
1616
|
};
|
|
769
1617
|
const RELEASE_ACTION_SCHEMA = utils.yup.object().shape({
|
|
770
|
-
|
|
771
|
-
|
|
772
|
-
|
|
773
|
-
}).required(),
|
|
1618
|
+
contentType: utils.yup.string().required(),
|
|
1619
|
+
entryDocumentId: utils.yup.strapiID(),
|
|
1620
|
+
locale: utils.yup.string(),
|
|
774
1621
|
type: utils.yup.string().oneOf(["publish", "unpublish"]).required()
|
|
775
1622
|
});
|
|
776
1623
|
const RELEASE_ACTION_UPDATE_SCHEMA = utils.yup.object().shape({
|
|
777
1624
|
type: utils.yup.string().oneOf(["publish", "unpublish"]).required()
|
|
778
1625
|
});
|
|
1626
|
+
const FIND_MANY_ACTIONS_PARAMS = utils.yup.object().shape({
|
|
1627
|
+
groupBy: utils.yup.string().oneOf(["action", "contentType", "locale"])
|
|
1628
|
+
});
|
|
779
1629
|
const validateReleaseAction = utils.validateYupSchema(RELEASE_ACTION_SCHEMA);
|
|
780
1630
|
const validateReleaseActionUpdateSchema = utils.validateYupSchema(RELEASE_ACTION_UPDATE_SCHEMA);
|
|
1631
|
+
const validateFindManyActionsParams = utils.validateYupSchema(FIND_MANY_ACTIONS_PARAMS);
|
|
781
1632
|
const releaseActionController = {
|
|
782
1633
|
async create(ctx) {
|
|
783
1634
|
const releaseId = ctx.params.releaseId;
|
|
784
1635
|
const releaseActionArgs = ctx.request.body;
|
|
785
1636
|
await validateReleaseAction(releaseActionArgs);
|
|
786
|
-
const
|
|
787
|
-
const releaseAction2 = await
|
|
788
|
-
ctx.
|
|
1637
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1638
|
+
const releaseAction2 = await releaseActionService.create(releaseId, releaseActionArgs);
|
|
1639
|
+
ctx.created({
|
|
789
1640
|
data: releaseAction2
|
|
790
|
-
};
|
|
1641
|
+
});
|
|
1642
|
+
},
|
|
1643
|
+
async createMany(ctx) {
|
|
1644
|
+
const releaseId = ctx.params.releaseId;
|
|
1645
|
+
const releaseActionsArgs = ctx.request.body;
|
|
1646
|
+
await Promise.all(
|
|
1647
|
+
releaseActionsArgs.map((releaseActionArgs) => validateReleaseAction(releaseActionArgs))
|
|
1648
|
+
);
|
|
1649
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1650
|
+
const releaseService = getService("release", { strapi });
|
|
1651
|
+
const releaseActions = await strapi.db.transaction(async () => {
|
|
1652
|
+
const releaseActions2 = await Promise.all(
|
|
1653
|
+
releaseActionsArgs.map(async (releaseActionArgs) => {
|
|
1654
|
+
try {
|
|
1655
|
+
const action = await releaseActionService.create(releaseId, releaseActionArgs, {
|
|
1656
|
+
disableUpdateReleaseStatus: true
|
|
1657
|
+
});
|
|
1658
|
+
return action;
|
|
1659
|
+
} catch (error) {
|
|
1660
|
+
if (error instanceof AlreadyOnReleaseError) {
|
|
1661
|
+
return null;
|
|
1662
|
+
}
|
|
1663
|
+
throw error;
|
|
1664
|
+
}
|
|
1665
|
+
})
|
|
1666
|
+
);
|
|
1667
|
+
return releaseActions2;
|
|
1668
|
+
});
|
|
1669
|
+
const newReleaseActions = releaseActions.filter((action) => action !== null);
|
|
1670
|
+
if (newReleaseActions.length > 0) {
|
|
1671
|
+
releaseService.updateReleaseStatus(releaseId);
|
|
1672
|
+
}
|
|
1673
|
+
ctx.created({
|
|
1674
|
+
data: newReleaseActions,
|
|
1675
|
+
meta: {
|
|
1676
|
+
entriesAlreadyInRelease: releaseActions.length - newReleaseActions.length,
|
|
1677
|
+
totalEntries: releaseActions.length
|
|
1678
|
+
}
|
|
1679
|
+
});
|
|
791
1680
|
},
|
|
792
1681
|
async findMany(ctx) {
|
|
793
1682
|
const releaseId = ctx.params.releaseId;
|
|
794
|
-
const permissionsManager = strapi.admin
|
|
1683
|
+
const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
|
|
795
1684
|
ability: ctx.state.userAbility,
|
|
796
1685
|
model: RELEASE_ACTION_MODEL_UID
|
|
797
1686
|
});
|
|
1687
|
+
await validateFindManyActionsParams(ctx.query);
|
|
1688
|
+
if (ctx.query.groupBy) {
|
|
1689
|
+
if (!["action", "contentType", "locale"].includes(ctx.query.groupBy)) {
|
|
1690
|
+
ctx.badRequest("Invalid groupBy parameter");
|
|
1691
|
+
}
|
|
1692
|
+
}
|
|
1693
|
+
ctx.query.sort = ctx.query.groupBy === "action" ? "type" : ctx.query.groupBy;
|
|
1694
|
+
delete ctx.query.groupBy;
|
|
798
1695
|
const query = await permissionsManager.sanitizeQuery(ctx.query);
|
|
799
|
-
const
|
|
800
|
-
const { results, pagination } = await
|
|
801
|
-
sort: query.groupBy === "action" ? "type" : query.groupBy,
|
|
1696
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1697
|
+
const { results, pagination } = await releaseActionService.findPage(releaseId, {
|
|
802
1698
|
...query
|
|
803
1699
|
});
|
|
804
|
-
const
|
|
1700
|
+
const contentTypeOutputSanitizers = results.reduce((acc, action) => {
|
|
1701
|
+
if (acc[action.contentType]) {
|
|
1702
|
+
return acc;
|
|
1703
|
+
}
|
|
1704
|
+
const contentTypePermissionsManager = strapi.service("admin::permission").createPermissionsManager({
|
|
1705
|
+
ability: ctx.state.userAbility,
|
|
1706
|
+
model: action.contentType
|
|
1707
|
+
});
|
|
1708
|
+
acc[action.contentType] = contentTypePermissionsManager.sanitizeOutput;
|
|
1709
|
+
return acc;
|
|
1710
|
+
}, {});
|
|
1711
|
+
const sanitizedResults = await utils.async.map(results, async (action) => ({
|
|
1712
|
+
...action,
|
|
1713
|
+
entry: action.entry ? await contentTypeOutputSanitizers[action.contentType](action.entry) : {}
|
|
1714
|
+
}));
|
|
1715
|
+
const groupedData = await releaseActionService.groupActions(sanitizedResults, query.sort);
|
|
1716
|
+
const contentTypes2 = await releaseActionService.getContentTypeModelsFromActions(results);
|
|
1717
|
+
const releaseService = getService("release", { strapi });
|
|
1718
|
+
const components = await releaseService.getAllComponents();
|
|
805
1719
|
ctx.body = {
|
|
806
1720
|
data: groupedData,
|
|
807
1721
|
meta: {
|
|
808
|
-
pagination
|
|
1722
|
+
pagination,
|
|
1723
|
+
contentTypes: contentTypes2,
|
|
1724
|
+
components
|
|
809
1725
|
}
|
|
810
1726
|
};
|
|
811
1727
|
},
|
|
@@ -814,8 +1730,8 @@ const releaseActionController = {
|
|
|
814
1730
|
const releaseId = ctx.params.releaseId;
|
|
815
1731
|
const releaseActionUpdateArgs = ctx.request.body;
|
|
816
1732
|
await validateReleaseActionUpdateSchema(releaseActionUpdateArgs);
|
|
817
|
-
const
|
|
818
|
-
const updatedAction = await
|
|
1733
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1734
|
+
const updatedAction = await releaseActionService.update(
|
|
819
1735
|
actionId,
|
|
820
1736
|
releaseId,
|
|
821
1737
|
releaseActionUpdateArgs
|
|
@@ -827,17 +1743,71 @@ const releaseActionController = {
|
|
|
827
1743
|
async delete(ctx) {
|
|
828
1744
|
const actionId = ctx.params.actionId;
|
|
829
1745
|
const releaseId = ctx.params.releaseId;
|
|
830
|
-
const
|
|
831
|
-
const deletedReleaseAction = await
|
|
1746
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1747
|
+
const deletedReleaseAction = await releaseActionService.delete(actionId, releaseId);
|
|
832
1748
|
ctx.body = {
|
|
833
1749
|
data: deletedReleaseAction
|
|
834
1750
|
};
|
|
835
1751
|
}
|
|
836
1752
|
};
|
|
837
|
-
const
|
|
1753
|
+
const SETTINGS_SCHEMA = yup__namespace.object().shape({
|
|
1754
|
+
defaultTimezone: yup__namespace.string().nullable().default(null)
|
|
1755
|
+
}).required().noUnknown();
|
|
1756
|
+
const validateSettings = utils.validateYupSchema(SETTINGS_SCHEMA);
|
|
1757
|
+
const settingsController = {
|
|
1758
|
+
async find(ctx) {
|
|
1759
|
+
const settingsService = getService("settings", { strapi });
|
|
1760
|
+
const settings2 = await settingsService.find();
|
|
1761
|
+
ctx.body = { data: settings2 };
|
|
1762
|
+
},
|
|
1763
|
+
async update(ctx) {
|
|
1764
|
+
const settingsBody = ctx.request.body;
|
|
1765
|
+
const settings2 = await validateSettings(settingsBody);
|
|
1766
|
+
const settingsService = getService("settings", { strapi });
|
|
1767
|
+
const updatedSettings = await settingsService.update({ settings: settings2 });
|
|
1768
|
+
ctx.body = { data: updatedSettings };
|
|
1769
|
+
}
|
|
1770
|
+
};
|
|
1771
|
+
const controllers = {
|
|
1772
|
+
release: releaseController,
|
|
1773
|
+
"release-action": releaseActionController,
|
|
1774
|
+
settings: settingsController
|
|
1775
|
+
};
|
|
838
1776
|
const release = {
|
|
839
1777
|
type: "admin",
|
|
840
1778
|
routes: [
|
|
1779
|
+
{
|
|
1780
|
+
method: "GET",
|
|
1781
|
+
path: "/mapEntriesToReleases",
|
|
1782
|
+
handler: "release.mapEntriesToReleases",
|
|
1783
|
+
config: {
|
|
1784
|
+
policies: [
|
|
1785
|
+
"admin::isAuthenticatedAdmin",
|
|
1786
|
+
{
|
|
1787
|
+
name: "admin::hasPermissions",
|
|
1788
|
+
config: {
|
|
1789
|
+
actions: ["plugin::content-releases.read"]
|
|
1790
|
+
}
|
|
1791
|
+
}
|
|
1792
|
+
]
|
|
1793
|
+
}
|
|
1794
|
+
},
|
|
1795
|
+
{
|
|
1796
|
+
method: "GET",
|
|
1797
|
+
path: "/getByDocumentAttached",
|
|
1798
|
+
handler: "release.findByDocumentAttached",
|
|
1799
|
+
config: {
|
|
1800
|
+
policies: [
|
|
1801
|
+
"admin::isAuthenticatedAdmin",
|
|
1802
|
+
{
|
|
1803
|
+
name: "admin::hasPermissions",
|
|
1804
|
+
config: {
|
|
1805
|
+
actions: ["plugin::content-releases.read"]
|
|
1806
|
+
}
|
|
1807
|
+
}
|
|
1808
|
+
]
|
|
1809
|
+
}
|
|
1810
|
+
},
|
|
841
1811
|
{
|
|
842
1812
|
method: "POST",
|
|
843
1813
|
path: "/",
|
|
@@ -857,7 +1827,7 @@ const release = {
|
|
|
857
1827
|
{
|
|
858
1828
|
method: "GET",
|
|
859
1829
|
path: "/",
|
|
860
|
-
handler: "release.
|
|
1830
|
+
handler: "release.findPage",
|
|
861
1831
|
config: {
|
|
862
1832
|
policies: [
|
|
863
1833
|
"admin::isAuthenticatedAdmin",
|
|
@@ -955,6 +1925,22 @@ const releaseAction = {
|
|
|
955
1925
|
]
|
|
956
1926
|
}
|
|
957
1927
|
},
|
|
1928
|
+
{
|
|
1929
|
+
method: "POST",
|
|
1930
|
+
path: "/:releaseId/actions/bulk",
|
|
1931
|
+
handler: "release-action.createMany",
|
|
1932
|
+
config: {
|
|
1933
|
+
policies: [
|
|
1934
|
+
"admin::isAuthenticatedAdmin",
|
|
1935
|
+
{
|
|
1936
|
+
name: "admin::hasPermissions",
|
|
1937
|
+
config: {
|
|
1938
|
+
actions: ["plugin::content-releases.create-action"]
|
|
1939
|
+
}
|
|
1940
|
+
}
|
|
1941
|
+
]
|
|
1942
|
+
}
|
|
1943
|
+
},
|
|
958
1944
|
{
|
|
959
1945
|
method: "GET",
|
|
960
1946
|
path: "/:releaseId/actions",
|
|
@@ -1005,28 +1991,64 @@ const releaseAction = {
|
|
|
1005
1991
|
}
|
|
1006
1992
|
]
|
|
1007
1993
|
};
|
|
1994
|
+
const settings = {
|
|
1995
|
+
type: "admin",
|
|
1996
|
+
routes: [
|
|
1997
|
+
{
|
|
1998
|
+
method: "GET",
|
|
1999
|
+
path: "/settings",
|
|
2000
|
+
handler: "settings.find",
|
|
2001
|
+
config: {
|
|
2002
|
+
policies: [
|
|
2003
|
+
"admin::isAuthenticatedAdmin",
|
|
2004
|
+
{
|
|
2005
|
+
name: "admin::hasPermissions",
|
|
2006
|
+
config: {
|
|
2007
|
+
actions: ["plugin::content-releases.settings.read"]
|
|
2008
|
+
}
|
|
2009
|
+
}
|
|
2010
|
+
]
|
|
2011
|
+
}
|
|
2012
|
+
},
|
|
2013
|
+
{
|
|
2014
|
+
method: "PUT",
|
|
2015
|
+
path: "/settings",
|
|
2016
|
+
handler: "settings.update",
|
|
2017
|
+
config: {
|
|
2018
|
+
policies: [
|
|
2019
|
+
"admin::isAuthenticatedAdmin",
|
|
2020
|
+
{
|
|
2021
|
+
name: "admin::hasPermissions",
|
|
2022
|
+
config: {
|
|
2023
|
+
actions: ["plugin::content-releases.settings.update"]
|
|
2024
|
+
}
|
|
2025
|
+
}
|
|
2026
|
+
]
|
|
2027
|
+
}
|
|
2028
|
+
}
|
|
2029
|
+
]
|
|
2030
|
+
};
|
|
1008
2031
|
const routes = {
|
|
2032
|
+
settings,
|
|
1009
2033
|
release,
|
|
1010
2034
|
"release-action": releaseAction
|
|
1011
2035
|
};
|
|
1012
|
-
const { features } = require("@strapi/strapi/dist/utils/ee");
|
|
1013
2036
|
const getPlugin = () => {
|
|
1014
|
-
if (features.isEnabled("cms-content-releases")
|
|
2037
|
+
if (strapi.ee.features.isEnabled("cms-content-releases")) {
|
|
1015
2038
|
return {
|
|
1016
2039
|
register,
|
|
1017
2040
|
bootstrap,
|
|
2041
|
+
destroy,
|
|
1018
2042
|
contentTypes,
|
|
1019
2043
|
services,
|
|
1020
2044
|
controllers,
|
|
1021
|
-
routes
|
|
1022
|
-
destroy() {
|
|
1023
|
-
if (features.isEnabled("cms-content-releases") && strapi.features.future.isEnabled("contentReleases")) {
|
|
1024
|
-
getService("event-manager").destroyAllListeners();
|
|
1025
|
-
}
|
|
1026
|
-
}
|
|
2045
|
+
routes
|
|
1027
2046
|
};
|
|
1028
2047
|
}
|
|
1029
2048
|
return {
|
|
2049
|
+
// Always return register, it handles its own feature check
|
|
2050
|
+
register,
|
|
2051
|
+
// Always return contentTypes to avoid losing data when the feature is disabled
|
|
1030
2052
|
contentTypes
|
|
1031
2053
|
};
|
|
1032
2054
|
};
|