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