@strapi/content-releases 0.0.0-next.6d384ed205b7f0792d9bea79195f01b30463cfa0 → 0.0.0-next.73143c28059b343ba62d98c29672ab114562fbbc
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/dist/_chunks/{App-WkwjSaDY.mjs → App-g3vtS2Wa.mjs} +385 -174
- package/dist/_chunks/App-g3vtS2Wa.mjs.map +1 -0
- package/dist/_chunks/{App-IQIHCiSO.js → App-lnXbSPgp.js} +383 -171
- package/dist/_chunks/App-lnXbSPgp.js.map +1 -0
- package/dist/_chunks/PurchaseContentReleases-Clm0iACO.mjs +51 -0
- package/dist/_chunks/PurchaseContentReleases-Clm0iACO.mjs.map +1 -0
- package/dist/_chunks/PurchaseContentReleases-YhAPgpG9.js +51 -0
- package/dist/_chunks/PurchaseContentReleases-YhAPgpG9.js.map +1 -0
- package/dist/_chunks/{en-m9eTk4UF.mjs → en-WuuhP6Bn.mjs} +15 -4
- package/dist/_chunks/en-WuuhP6Bn.mjs.map +1 -0
- package/dist/_chunks/{en-r9YocBH0.js → en-gcJJ5htG.js} +15 -4
- package/dist/_chunks/en-gcJJ5htG.js.map +1 -0
- package/dist/_chunks/{index-u_da7WHb.js → index-ItlgrLcr.js} +122 -19
- package/dist/_chunks/index-ItlgrLcr.js.map +1 -0
- package/dist/_chunks/{index-CyVlvX8h.mjs → index-uGex_IIQ.mjs} +126 -23
- package/dist/_chunks/index-uGex_IIQ.mjs.map +1 -0
- package/dist/admin/index.js +1 -1
- package/dist/admin/index.mjs +2 -2
- package/dist/server/index.js +814 -418
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +813 -418
- package/dist/server/index.mjs.map +1 -1
- package/package.json +13 -11
- package/dist/_chunks/App-IQIHCiSO.js.map +0 -1
- package/dist/_chunks/App-WkwjSaDY.mjs.map +0 -1
- package/dist/_chunks/en-m9eTk4UF.mjs.map +0 -1
- package/dist/_chunks/en-r9YocBH0.js.map +0 -1
- package/dist/_chunks/index-CyVlvX8h.mjs.map +0 -1
- package/dist/_chunks/index-u_da7WHb.js.map +0 -1
package/dist/server/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
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
6
|
const EE = require("@strapi/strapi/dist/utils/ee");
|
|
@@ -24,6 +25,7 @@ function _interopNamespace(e) {
|
|
|
24
25
|
n.default = e;
|
|
25
26
|
return Object.freeze(n);
|
|
26
27
|
}
|
|
28
|
+
const isEqual__default = /* @__PURE__ */ _interopDefault(isEqual);
|
|
27
29
|
const ___default = /* @__PURE__ */ _interopDefault(_);
|
|
28
30
|
const EE__default = /* @__PURE__ */ _interopDefault(EE);
|
|
29
31
|
const yup__namespace = /* @__PURE__ */ _interopNamespace(yup);
|
|
@@ -73,6 +75,32 @@ const ACTIONS = [
|
|
|
73
75
|
pluginName: "content-releases"
|
|
74
76
|
}
|
|
75
77
|
];
|
|
78
|
+
const ALLOWED_WEBHOOK_EVENTS = {
|
|
79
|
+
RELEASES_PUBLISH: "releases.publish"
|
|
80
|
+
};
|
|
81
|
+
const getService = (name, { strapi: strapi2 } = { strapi: global.strapi }) => {
|
|
82
|
+
return strapi2.plugin("content-releases").service(name);
|
|
83
|
+
};
|
|
84
|
+
const getPopulatedEntry = async (contentTypeUid, entryId, { strapi: strapi2 } = { strapi: global.strapi }) => {
|
|
85
|
+
const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
|
|
86
|
+
const populate = await populateBuilderService(contentTypeUid).populateDeep(Infinity).build();
|
|
87
|
+
const entry = await strapi2.entityService.findOne(contentTypeUid, entryId, { populate });
|
|
88
|
+
return entry;
|
|
89
|
+
};
|
|
90
|
+
const getEntryValidStatus = async (contentTypeUid, entry, { strapi: strapi2 } = { strapi: global.strapi }) => {
|
|
91
|
+
try {
|
|
92
|
+
await strapi2.entityValidator.validateEntityCreation(
|
|
93
|
+
strapi2.getModel(contentTypeUid),
|
|
94
|
+
entry,
|
|
95
|
+
void 0,
|
|
96
|
+
// @ts-expect-error - FIXME: entity here is unnecessary
|
|
97
|
+
entry
|
|
98
|
+
);
|
|
99
|
+
return true;
|
|
100
|
+
} catch {
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
};
|
|
76
104
|
async function deleteActionsOnDisableDraftAndPublish({
|
|
77
105
|
oldContentTypes,
|
|
78
106
|
contentTypes: contentTypes2
|
|
@@ -99,28 +127,151 @@ async function deleteActionsOnDeleteContentType({ oldContentTypes, contentTypes:
|
|
|
99
127
|
});
|
|
100
128
|
}
|
|
101
129
|
}
|
|
130
|
+
async function migrateIsValidAndStatusReleases() {
|
|
131
|
+
const releasesWithoutStatus = await strapi.db.query(RELEASE_MODEL_UID).findMany({
|
|
132
|
+
where: {
|
|
133
|
+
status: null,
|
|
134
|
+
releasedAt: null
|
|
135
|
+
},
|
|
136
|
+
populate: {
|
|
137
|
+
actions: {
|
|
138
|
+
populate: {
|
|
139
|
+
entry: true
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
utils.mapAsync(releasesWithoutStatus, async (release2) => {
|
|
145
|
+
const actions = release2.actions;
|
|
146
|
+
const notValidatedActions = actions.filter((action) => action.isEntryValid === null);
|
|
147
|
+
for (const action of notValidatedActions) {
|
|
148
|
+
if (action.entry) {
|
|
149
|
+
const populatedEntry = await getPopulatedEntry(action.contentType, action.entry.id, {
|
|
150
|
+
strapi
|
|
151
|
+
});
|
|
152
|
+
if (populatedEntry) {
|
|
153
|
+
const isEntryValid = getEntryValidStatus(action.contentType, populatedEntry, { strapi });
|
|
154
|
+
await strapi.db.query(RELEASE_ACTION_MODEL_UID).update({
|
|
155
|
+
where: {
|
|
156
|
+
id: action.id
|
|
157
|
+
},
|
|
158
|
+
data: {
|
|
159
|
+
isEntryValid
|
|
160
|
+
}
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
return getService("release", { strapi }).updateReleaseStatus(release2.id);
|
|
166
|
+
});
|
|
167
|
+
const publishedReleases = await strapi.db.query(RELEASE_MODEL_UID).findMany({
|
|
168
|
+
where: {
|
|
169
|
+
status: null,
|
|
170
|
+
releasedAt: {
|
|
171
|
+
$notNull: true
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
});
|
|
175
|
+
utils.mapAsync(publishedReleases, async (release2) => {
|
|
176
|
+
return strapi.db.query(RELEASE_MODEL_UID).update({
|
|
177
|
+
where: {
|
|
178
|
+
id: release2.id
|
|
179
|
+
},
|
|
180
|
+
data: {
|
|
181
|
+
status: "done"
|
|
182
|
+
}
|
|
183
|
+
});
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: contentTypes2 }) {
|
|
187
|
+
if (oldContentTypes !== void 0 && contentTypes2 !== void 0) {
|
|
188
|
+
const contentTypesWithDraftAndPublish = Object.keys(oldContentTypes).filter(
|
|
189
|
+
(uid) => oldContentTypes[uid]?.options?.draftAndPublish
|
|
190
|
+
);
|
|
191
|
+
const releasesAffected = /* @__PURE__ */ new Set();
|
|
192
|
+
utils.mapAsync(contentTypesWithDraftAndPublish, async (contentTypeUID) => {
|
|
193
|
+
const oldContentType = oldContentTypes[contentTypeUID];
|
|
194
|
+
const contentType = contentTypes2[contentTypeUID];
|
|
195
|
+
if (!isEqual__default.default(oldContentType?.attributes, contentType?.attributes)) {
|
|
196
|
+
const actions = await strapi.db.query(RELEASE_ACTION_MODEL_UID).findMany({
|
|
197
|
+
where: {
|
|
198
|
+
contentType: contentTypeUID
|
|
199
|
+
},
|
|
200
|
+
populate: {
|
|
201
|
+
entry: true,
|
|
202
|
+
release: true
|
|
203
|
+
}
|
|
204
|
+
});
|
|
205
|
+
await utils.mapAsync(actions, async (action) => {
|
|
206
|
+
if (action.entry) {
|
|
207
|
+
const populatedEntry = await getPopulatedEntry(contentTypeUID, action.entry.id, {
|
|
208
|
+
strapi
|
|
209
|
+
});
|
|
210
|
+
if (populatedEntry) {
|
|
211
|
+
const isEntryValid = await getEntryValidStatus(contentTypeUID, populatedEntry, {
|
|
212
|
+
strapi
|
|
213
|
+
});
|
|
214
|
+
releasesAffected.add(action.release.id);
|
|
215
|
+
await strapi.db.query(RELEASE_ACTION_MODEL_UID).update({
|
|
216
|
+
where: {
|
|
217
|
+
id: action.id
|
|
218
|
+
},
|
|
219
|
+
data: {
|
|
220
|
+
isEntryValid
|
|
221
|
+
}
|
|
222
|
+
});
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
}).then(() => {
|
|
228
|
+
utils.mapAsync(releasesAffected, async (releaseId) => {
|
|
229
|
+
return getService("release", { strapi }).updateReleaseStatus(releaseId);
|
|
230
|
+
});
|
|
231
|
+
});
|
|
232
|
+
}
|
|
233
|
+
}
|
|
102
234
|
const { features: features$2 } = require("@strapi/strapi/dist/utils/ee");
|
|
103
235
|
const register = async ({ strapi: strapi2 }) => {
|
|
104
236
|
if (features$2.isEnabled("cms-content-releases")) {
|
|
105
237
|
await strapi2.admin.services.permission.actionProvider.registerMany(ACTIONS);
|
|
106
238
|
strapi2.hook("strapi::content-types.beforeSync").register(deleteActionsOnDisableDraftAndPublish);
|
|
107
|
-
strapi2.hook("strapi::content-types.afterSync").register(deleteActionsOnDeleteContentType);
|
|
239
|
+
strapi2.hook("strapi::content-types.afterSync").register(deleteActionsOnDeleteContentType).register(revalidateChangedContentTypes).register(migrateIsValidAndStatusReleases);
|
|
108
240
|
}
|
|
109
241
|
};
|
|
110
242
|
const { features: features$1 } = require("@strapi/strapi/dist/utils/ee");
|
|
111
243
|
const bootstrap = async ({ strapi: strapi2 }) => {
|
|
112
244
|
if (features$1.isEnabled("cms-content-releases")) {
|
|
245
|
+
const contentTypesWithDraftAndPublish = Object.keys(strapi2.contentTypes).filter(
|
|
246
|
+
(uid) => strapi2.contentTypes[uid]?.options?.draftAndPublish
|
|
247
|
+
);
|
|
113
248
|
strapi2.db.lifecycles.subscribe({
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
const {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
249
|
+
models: contentTypesWithDraftAndPublish,
|
|
250
|
+
async afterDelete(event) {
|
|
251
|
+
try {
|
|
252
|
+
const { model, result } = event;
|
|
253
|
+
if (model.kind === "collectionType" && model.options?.draftAndPublish) {
|
|
254
|
+
const { id } = result;
|
|
255
|
+
const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
256
|
+
where: {
|
|
257
|
+
actions: {
|
|
258
|
+
target_type: model.uid,
|
|
259
|
+
target_id: id
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
});
|
|
263
|
+
await strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
|
|
264
|
+
where: {
|
|
265
|
+
target_type: model.uid,
|
|
266
|
+
target_id: id
|
|
267
|
+
}
|
|
268
|
+
});
|
|
269
|
+
for (const release2 of releases) {
|
|
270
|
+
getService("release", { strapi: strapi2 }).updateReleaseStatus(release2.id);
|
|
122
271
|
}
|
|
123
|
-
}
|
|
272
|
+
}
|
|
273
|
+
} catch (error) {
|
|
274
|
+
strapi2.log.error("Error while deleting release actions after entry delete", { error });
|
|
124
275
|
}
|
|
125
276
|
},
|
|
126
277
|
/**
|
|
@@ -140,20 +291,98 @@ const bootstrap = async ({ strapi: strapi2 }) => {
|
|
|
140
291
|
* We make this only after deleteMany is succesfully executed to avoid errors
|
|
141
292
|
*/
|
|
142
293
|
async afterDeleteMany(event) {
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
294
|
+
try {
|
|
295
|
+
const { model, state } = event;
|
|
296
|
+
const entriesToDelete = state.entriesToDelete;
|
|
297
|
+
if (entriesToDelete) {
|
|
298
|
+
const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
299
|
+
where: {
|
|
300
|
+
actions: {
|
|
301
|
+
target_type: model.uid,
|
|
302
|
+
target_id: {
|
|
303
|
+
$in: entriesToDelete.map(
|
|
304
|
+
(entry) => entry.id
|
|
305
|
+
)
|
|
306
|
+
}
|
|
307
|
+
}
|
|
151
308
|
}
|
|
309
|
+
});
|
|
310
|
+
await strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
|
|
311
|
+
where: {
|
|
312
|
+
target_type: model.uid,
|
|
313
|
+
target_id: {
|
|
314
|
+
$in: entriesToDelete.map((entry) => entry.id)
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
});
|
|
318
|
+
for (const release2 of releases) {
|
|
319
|
+
getService("release", { strapi: strapi2 }).updateReleaseStatus(release2.id);
|
|
152
320
|
}
|
|
321
|
+
}
|
|
322
|
+
} catch (error) {
|
|
323
|
+
strapi2.log.error("Error while deleting release actions after entry deleteMany", {
|
|
324
|
+
error
|
|
153
325
|
});
|
|
154
326
|
}
|
|
327
|
+
},
|
|
328
|
+
async afterUpdate(event) {
|
|
329
|
+
try {
|
|
330
|
+
const { model, result } = event;
|
|
331
|
+
if (model.kind === "collectionType" && model.options?.draftAndPublish) {
|
|
332
|
+
const isEntryValid = await getEntryValidStatus(
|
|
333
|
+
model.uid,
|
|
334
|
+
result,
|
|
335
|
+
{
|
|
336
|
+
strapi: strapi2
|
|
337
|
+
}
|
|
338
|
+
);
|
|
339
|
+
await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
|
|
340
|
+
where: {
|
|
341
|
+
target_type: model.uid,
|
|
342
|
+
target_id: result.id
|
|
343
|
+
},
|
|
344
|
+
data: {
|
|
345
|
+
isEntryValid
|
|
346
|
+
}
|
|
347
|
+
});
|
|
348
|
+
const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
349
|
+
where: {
|
|
350
|
+
actions: {
|
|
351
|
+
target_type: model.uid,
|
|
352
|
+
target_id: result.id
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
});
|
|
356
|
+
for (const release2 of releases) {
|
|
357
|
+
getService("release", { strapi: strapi2 }).updateReleaseStatus(release2.id);
|
|
358
|
+
}
|
|
359
|
+
}
|
|
360
|
+
} catch (error) {
|
|
361
|
+
strapi2.log.error("Error while updating release actions after entry update", { error });
|
|
362
|
+
}
|
|
155
363
|
}
|
|
156
364
|
});
|
|
365
|
+
if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
|
|
366
|
+
getService("scheduling", { strapi: strapi2 }).syncFromDatabase().catch((err) => {
|
|
367
|
+
strapi2.log.error(
|
|
368
|
+
"Error while syncing scheduled jobs from the database in the content-releases plugin. This could lead to errors in the releases scheduling."
|
|
369
|
+
);
|
|
370
|
+
throw err;
|
|
371
|
+
});
|
|
372
|
+
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
|
373
|
+
strapi2.webhookStore.addAllowedEvent(key, value);
|
|
374
|
+
});
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
};
|
|
378
|
+
const destroy = async ({ strapi: strapi2 }) => {
|
|
379
|
+
if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
|
|
380
|
+
const scheduledJobs = getService("scheduling", {
|
|
381
|
+
strapi: strapi2
|
|
382
|
+
}).getAll();
|
|
383
|
+
for (const [, job] of scheduledJobs) {
|
|
384
|
+
job.cancel();
|
|
385
|
+
}
|
|
157
386
|
}
|
|
158
387
|
};
|
|
159
388
|
const schema$1 = {
|
|
@@ -185,6 +414,14 @@ const schema$1 = {
|
|
|
185
414
|
scheduledAt: {
|
|
186
415
|
type: "datetime"
|
|
187
416
|
},
|
|
417
|
+
timezone: {
|
|
418
|
+
type: "string"
|
|
419
|
+
},
|
|
420
|
+
status: {
|
|
421
|
+
type: "enumeration",
|
|
422
|
+
enum: ["ready", "blocked", "failed", "done", "empty"],
|
|
423
|
+
required: true
|
|
424
|
+
},
|
|
188
425
|
actions: {
|
|
189
426
|
type: "relation",
|
|
190
427
|
relation: "oneToMany",
|
|
@@ -237,6 +474,9 @@ const schema = {
|
|
|
237
474
|
relation: "manyToOne",
|
|
238
475
|
target: RELEASE_MODEL_UID,
|
|
239
476
|
inversedBy: "actions"
|
|
477
|
+
},
|
|
478
|
+
isEntryValid: {
|
|
479
|
+
type: "boolean"
|
|
240
480
|
}
|
|
241
481
|
}
|
|
242
482
|
};
|
|
@@ -247,9 +487,6 @@ const contentTypes = {
|
|
|
247
487
|
release: release$1,
|
|
248
488
|
"release-action": releaseAction$1
|
|
249
489
|
};
|
|
250
|
-
const getService = (name, { strapi: strapi2 } = { strapi: global.strapi }) => {
|
|
251
|
-
return strapi2.plugin("content-releases").service(name);
|
|
252
|
-
};
|
|
253
490
|
const getGroupName = (queryValue) => {
|
|
254
491
|
switch (queryValue) {
|
|
255
492
|
case "contentType":
|
|
@@ -262,448 +499,563 @@ const getGroupName = (queryValue) => {
|
|
|
262
499
|
return "contentType.displayName";
|
|
263
500
|
}
|
|
264
501
|
};
|
|
265
|
-
const createReleaseService = ({ strapi: strapi2 }) =>
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
validateScheduledAtIsLaterThanNow
|
|
272
|
-
} = getService("release-validation", { strapi: strapi2 });
|
|
273
|
-
await Promise.all([
|
|
274
|
-
validatePendingReleasesLimit(),
|
|
275
|
-
validateUniqueNameForPendingRelease(releaseWithCreatorFields.name),
|
|
276
|
-
validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
|
|
277
|
-
]);
|
|
278
|
-
const release2 = await strapi2.entityService.create(RELEASE_MODEL_UID, {
|
|
279
|
-
data: releaseWithCreatorFields
|
|
280
|
-
});
|
|
281
|
-
if (strapi2.features.future.isEnabled("contentReleasesScheduling") && releaseWithCreatorFields.scheduledAt) {
|
|
282
|
-
const schedulingService = getService("scheduling", { strapi: strapi2 });
|
|
283
|
-
await schedulingService.set(release2.id, release2.scheduledAt);
|
|
284
|
-
}
|
|
285
|
-
return release2;
|
|
286
|
-
},
|
|
287
|
-
async findOne(id, query = {}) {
|
|
288
|
-
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id, {
|
|
289
|
-
...query
|
|
502
|
+
const createReleaseService = ({ strapi: strapi2 }) => {
|
|
503
|
+
const dispatchWebhook = (event, { isPublished, release: release2, error }) => {
|
|
504
|
+
strapi2.eventHub.emit(event, {
|
|
505
|
+
isPublished,
|
|
506
|
+
error,
|
|
507
|
+
release: release2
|
|
290
508
|
});
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
509
|
+
};
|
|
510
|
+
return {
|
|
511
|
+
async create(releaseData, { user }) {
|
|
512
|
+
const releaseWithCreatorFields = await utils.setCreatorFields({ user })(releaseData);
|
|
513
|
+
const {
|
|
514
|
+
validatePendingReleasesLimit,
|
|
515
|
+
validateUniqueNameForPendingRelease,
|
|
516
|
+
validateScheduledAtIsLaterThanNow
|
|
517
|
+
} = getService("release-validation", { strapi: strapi2 });
|
|
518
|
+
await Promise.all([
|
|
519
|
+
validatePendingReleasesLimit(),
|
|
520
|
+
validateUniqueNameForPendingRelease(releaseWithCreatorFields.name),
|
|
521
|
+
validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
|
|
522
|
+
]);
|
|
523
|
+
const release2 = await strapi2.entityService.create(RELEASE_MODEL_UID, {
|
|
524
|
+
data: {
|
|
525
|
+
...releaseWithCreatorFields,
|
|
526
|
+
status: "empty"
|
|
300
527
|
}
|
|
528
|
+
});
|
|
529
|
+
if (strapi2.features.future.isEnabled("contentReleasesScheduling") && releaseWithCreatorFields.scheduledAt) {
|
|
530
|
+
const schedulingService = getService("scheduling", { strapi: strapi2 });
|
|
531
|
+
await schedulingService.set(release2.id, release2.scheduledAt);
|
|
301
532
|
}
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
533
|
+
strapi2.telemetry.send("didCreateContentRelease");
|
|
534
|
+
return release2;
|
|
535
|
+
},
|
|
536
|
+
async findOne(id, query = {}) {
|
|
537
|
+
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id, {
|
|
538
|
+
...query
|
|
539
|
+
});
|
|
540
|
+
return release2;
|
|
541
|
+
},
|
|
542
|
+
findPage(query) {
|
|
543
|
+
return strapi2.entityService.findPage(RELEASE_MODEL_UID, {
|
|
544
|
+
...query,
|
|
545
|
+
populate: {
|
|
546
|
+
actions: {
|
|
547
|
+
// @ts-expect-error Ignore missing properties
|
|
548
|
+
count: true
|
|
549
|
+
}
|
|
313
550
|
}
|
|
314
|
-
}
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
551
|
+
});
|
|
552
|
+
},
|
|
553
|
+
async findManyWithContentTypeEntryAttached(contentTypeUid, entryId) {
|
|
554
|
+
const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
555
|
+
where: {
|
|
556
|
+
actions: {
|
|
319
557
|
target_type: contentTypeUid,
|
|
320
558
|
target_id: entryId
|
|
559
|
+
},
|
|
560
|
+
releasedAt: {
|
|
561
|
+
$null: true
|
|
321
562
|
}
|
|
322
|
-
}
|
|
323
|
-
}
|
|
324
|
-
});
|
|
325
|
-
return releases.map((release2) => {
|
|
326
|
-
if (release2.actions?.length) {
|
|
327
|
-
const [actionForEntry] = release2.actions;
|
|
328
|
-
delete release2.actions;
|
|
329
|
-
return {
|
|
330
|
-
...release2,
|
|
331
|
-
action: actionForEntry
|
|
332
|
-
};
|
|
333
|
-
}
|
|
334
|
-
return release2;
|
|
335
|
-
});
|
|
336
|
-
},
|
|
337
|
-
async findManyWithoutContentTypeEntryAttached(contentTypeUid, entryId) {
|
|
338
|
-
const releasesRelated = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
339
|
-
where: {
|
|
340
|
-
releasedAt: {
|
|
341
|
-
$null: true
|
|
342
563
|
},
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
350
|
-
where: {
|
|
351
|
-
$or: [
|
|
352
|
-
{
|
|
353
|
-
id: {
|
|
354
|
-
$notIn: releasesRelated.map((release2) => release2.id)
|
|
564
|
+
populate: {
|
|
565
|
+
// Filter the action to get only the content type entry
|
|
566
|
+
actions: {
|
|
567
|
+
where: {
|
|
568
|
+
target_type: contentTypeUid,
|
|
569
|
+
target_id: entryId
|
|
355
570
|
}
|
|
571
|
+
}
|
|
572
|
+
}
|
|
573
|
+
});
|
|
574
|
+
return releases.map((release2) => {
|
|
575
|
+
if (release2.actions?.length) {
|
|
576
|
+
const [actionForEntry] = release2.actions;
|
|
577
|
+
delete release2.actions;
|
|
578
|
+
return {
|
|
579
|
+
...release2,
|
|
580
|
+
action: actionForEntry
|
|
581
|
+
};
|
|
582
|
+
}
|
|
583
|
+
return release2;
|
|
584
|
+
});
|
|
585
|
+
},
|
|
586
|
+
async findManyWithoutContentTypeEntryAttached(contentTypeUid, entryId) {
|
|
587
|
+
const releasesRelated = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
588
|
+
where: {
|
|
589
|
+
releasedAt: {
|
|
590
|
+
$null: true
|
|
356
591
|
},
|
|
357
|
-
{
|
|
358
|
-
|
|
592
|
+
actions: {
|
|
593
|
+
target_type: contentTypeUid,
|
|
594
|
+
target_id: entryId
|
|
359
595
|
}
|
|
360
|
-
],
|
|
361
|
-
releasedAt: {
|
|
362
|
-
$null: true
|
|
363
596
|
}
|
|
597
|
+
});
|
|
598
|
+
const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
599
|
+
where: {
|
|
600
|
+
$or: [
|
|
601
|
+
{
|
|
602
|
+
id: {
|
|
603
|
+
$notIn: releasesRelated.map((release2) => release2.id)
|
|
604
|
+
}
|
|
605
|
+
},
|
|
606
|
+
{
|
|
607
|
+
actions: null
|
|
608
|
+
}
|
|
609
|
+
],
|
|
610
|
+
releasedAt: {
|
|
611
|
+
$null: true
|
|
612
|
+
}
|
|
613
|
+
}
|
|
614
|
+
});
|
|
615
|
+
return releases.map((release2) => {
|
|
616
|
+
if (release2.actions?.length) {
|
|
617
|
+
const [actionForEntry] = release2.actions;
|
|
618
|
+
delete release2.actions;
|
|
619
|
+
return {
|
|
620
|
+
...release2,
|
|
621
|
+
action: actionForEntry
|
|
622
|
+
};
|
|
623
|
+
}
|
|
624
|
+
return release2;
|
|
625
|
+
});
|
|
626
|
+
},
|
|
627
|
+
async update(id, releaseData, { user }) {
|
|
628
|
+
const releaseWithCreatorFields = await utils.setCreatorFields({ user, isEdition: true })(
|
|
629
|
+
releaseData
|
|
630
|
+
);
|
|
631
|
+
const { validateUniqueNameForPendingRelease, validateScheduledAtIsLaterThanNow } = getService(
|
|
632
|
+
"release-validation",
|
|
633
|
+
{ strapi: strapi2 }
|
|
634
|
+
);
|
|
635
|
+
await Promise.all([
|
|
636
|
+
validateUniqueNameForPendingRelease(releaseWithCreatorFields.name, id),
|
|
637
|
+
validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
|
|
638
|
+
]);
|
|
639
|
+
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id);
|
|
640
|
+
if (!release2) {
|
|
641
|
+
throw new utils.errors.NotFoundError(`No release found for id ${id}`);
|
|
364
642
|
}
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
if (release2.actions?.length) {
|
|
368
|
-
const [actionForEntry] = release2.actions;
|
|
369
|
-
delete release2.actions;
|
|
370
|
-
return {
|
|
371
|
-
...release2,
|
|
372
|
-
action: actionForEntry
|
|
373
|
-
};
|
|
643
|
+
if (release2.releasedAt) {
|
|
644
|
+
throw new utils.errors.ValidationError("Release already published");
|
|
374
645
|
}
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
* The type returned from the entity service: Partial<Input<"plugin::content-releases.release">>
|
|
390
|
-
* is not compatible with the type we are passing here: UpdateRelease.Request['body']
|
|
391
|
-
*/
|
|
392
|
-
// @ts-expect-error see above
|
|
393
|
-
data: releaseWithCreatorFields
|
|
394
|
-
});
|
|
395
|
-
return updatedRelease;
|
|
396
|
-
},
|
|
397
|
-
async createAction(releaseId, action) {
|
|
398
|
-
const { validateEntryContentType, validateUniqueEntry } = getService("release-validation", {
|
|
399
|
-
strapi: strapi2
|
|
400
|
-
});
|
|
401
|
-
await Promise.all([
|
|
402
|
-
validateEntryContentType(action.entry.contentType),
|
|
403
|
-
validateUniqueEntry(releaseId, action)
|
|
404
|
-
]);
|
|
405
|
-
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId);
|
|
406
|
-
if (!release2) {
|
|
407
|
-
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
408
|
-
}
|
|
409
|
-
if (release2.releasedAt) {
|
|
410
|
-
throw new utils.errors.ValidationError("Release already published");
|
|
411
|
-
}
|
|
412
|
-
const { entry, type } = action;
|
|
413
|
-
return strapi2.entityService.create(RELEASE_ACTION_MODEL_UID, {
|
|
414
|
-
data: {
|
|
415
|
-
type,
|
|
416
|
-
contentType: entry.contentType,
|
|
417
|
-
locale: entry.locale,
|
|
418
|
-
entry: {
|
|
419
|
-
id: entry.id,
|
|
420
|
-
__type: entry.contentType,
|
|
421
|
-
__pivot: { field: "entry" }
|
|
422
|
-
},
|
|
423
|
-
release: releaseId
|
|
424
|
-
},
|
|
425
|
-
populate: { release: { fields: ["id"] }, entry: { fields: ["id"] } }
|
|
426
|
-
});
|
|
427
|
-
},
|
|
428
|
-
async findActions(releaseId, query) {
|
|
429
|
-
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
|
|
430
|
-
fields: ["id"]
|
|
431
|
-
});
|
|
432
|
-
if (!release2) {
|
|
433
|
-
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
434
|
-
}
|
|
435
|
-
return strapi2.entityService.findPage(RELEASE_ACTION_MODEL_UID, {
|
|
436
|
-
...query,
|
|
437
|
-
populate: {
|
|
438
|
-
entry: {
|
|
439
|
-
populate: "*"
|
|
646
|
+
const updatedRelease = await strapi2.entityService.update(RELEASE_MODEL_UID, id, {
|
|
647
|
+
/*
|
|
648
|
+
* The type returned from the entity service: Partial<Input<"plugin::content-releases.release">>
|
|
649
|
+
* is not compatible with the type we are passing here: UpdateRelease.Request['body']
|
|
650
|
+
*/
|
|
651
|
+
// @ts-expect-error see above
|
|
652
|
+
data: releaseWithCreatorFields
|
|
653
|
+
});
|
|
654
|
+
if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
|
|
655
|
+
const schedulingService = getService("scheduling", { strapi: strapi2 });
|
|
656
|
+
if (releaseData.scheduledAt) {
|
|
657
|
+
await schedulingService.set(id, releaseData.scheduledAt);
|
|
658
|
+
} else if (release2.scheduledAt) {
|
|
659
|
+
schedulingService.cancel(id);
|
|
440
660
|
}
|
|
441
|
-
},
|
|
442
|
-
filters: {
|
|
443
|
-
release: releaseId
|
|
444
661
|
}
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
662
|
+
this.updateReleaseStatus(id);
|
|
663
|
+
strapi2.telemetry.send("didUpdateContentRelease");
|
|
664
|
+
return updatedRelease;
|
|
665
|
+
},
|
|
666
|
+
async createAction(releaseId, action) {
|
|
667
|
+
const { validateEntryContentType, validateUniqueEntry } = getService("release-validation", {
|
|
668
|
+
strapi: strapi2
|
|
669
|
+
});
|
|
670
|
+
await Promise.all([
|
|
671
|
+
validateEntryContentType(action.entry.contentType),
|
|
672
|
+
validateUniqueEntry(releaseId, action)
|
|
673
|
+
]);
|
|
674
|
+
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId);
|
|
675
|
+
if (!release2) {
|
|
676
|
+
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
454
677
|
}
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
678
|
+
if (release2.releasedAt) {
|
|
679
|
+
throw new utils.errors.ValidationError("Release already published");
|
|
680
|
+
}
|
|
681
|
+
const { entry, type } = action;
|
|
682
|
+
const populatedEntry = await getPopulatedEntry(entry.contentType, entry.id, { strapi: strapi2 });
|
|
683
|
+
const isEntryValid = await getEntryValidStatus(entry.contentType, populatedEntry, { strapi: strapi2 });
|
|
684
|
+
const releaseAction2 = await strapi2.entityService.create(RELEASE_ACTION_MODEL_UID, {
|
|
685
|
+
data: {
|
|
686
|
+
type,
|
|
687
|
+
contentType: entry.contentType,
|
|
688
|
+
locale: entry.locale,
|
|
689
|
+
isEntryValid,
|
|
690
|
+
entry: {
|
|
691
|
+
id: entry.id,
|
|
692
|
+
__type: entry.contentType,
|
|
693
|
+
__pivot: { field: "entry" }
|
|
694
|
+
},
|
|
695
|
+
release: releaseId
|
|
696
|
+
},
|
|
697
|
+
populate: { release: { fields: ["id"] }, entry: { fields: ["id"] } }
|
|
698
|
+
});
|
|
699
|
+
this.updateReleaseStatus(releaseId);
|
|
700
|
+
return releaseAction2;
|
|
701
|
+
},
|
|
702
|
+
async findActions(releaseId, query) {
|
|
703
|
+
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
|
|
704
|
+
fields: ["id"]
|
|
705
|
+
});
|
|
706
|
+
if (!release2) {
|
|
707
|
+
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
708
|
+
}
|
|
709
|
+
return strapi2.entityService.findPage(RELEASE_ACTION_MODEL_UID, {
|
|
710
|
+
...query,
|
|
711
|
+
populate: {
|
|
712
|
+
entry: {
|
|
713
|
+
populate: "*"
|
|
714
|
+
}
|
|
715
|
+
},
|
|
716
|
+
filters: {
|
|
717
|
+
release: releaseId
|
|
470
718
|
}
|
|
471
|
-
};
|
|
472
|
-
});
|
|
473
|
-
const groupName = getGroupName(groupBy);
|
|
474
|
-
return ___default.default.groupBy(groupName)(formattedData);
|
|
475
|
-
},
|
|
476
|
-
async getLocalesDataForActions() {
|
|
477
|
-
if (!strapi2.plugin("i18n")) {
|
|
478
|
-
return {};
|
|
479
|
-
}
|
|
480
|
-
const allLocales = await strapi2.plugin("i18n").service("locales").find() || [];
|
|
481
|
-
return allLocales.reduce((acc, locale) => {
|
|
482
|
-
acc[locale.code] = { name: locale.name, code: locale.code };
|
|
483
|
-
return acc;
|
|
484
|
-
}, {});
|
|
485
|
-
},
|
|
486
|
-
async getContentTypesDataForActions(contentTypesUids) {
|
|
487
|
-
const contentManagerContentTypeService = strapi2.plugin("content-manager").service("content-types");
|
|
488
|
-
const contentTypesData = {};
|
|
489
|
-
for (const contentTypeUid of contentTypesUids) {
|
|
490
|
-
const contentTypeConfig = await contentManagerContentTypeService.findConfiguration({
|
|
491
|
-
uid: contentTypeUid
|
|
492
719
|
});
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
720
|
+
},
|
|
721
|
+
async countActions(query) {
|
|
722
|
+
return strapi2.entityService.count(RELEASE_ACTION_MODEL_UID, query);
|
|
723
|
+
},
|
|
724
|
+
async groupActions(actions, groupBy) {
|
|
725
|
+
const contentTypeUids = actions.reduce((acc, action) => {
|
|
726
|
+
if (!acc.includes(action.contentType)) {
|
|
727
|
+
acc.push(action.contentType);
|
|
728
|
+
}
|
|
729
|
+
return acc;
|
|
730
|
+
}, []);
|
|
731
|
+
const allReleaseContentTypesDictionary = await this.getContentTypesDataForActions(
|
|
732
|
+
contentTypeUids
|
|
733
|
+
);
|
|
734
|
+
const allLocalesDictionary = await this.getLocalesDataForActions();
|
|
735
|
+
const formattedData = actions.map((action) => {
|
|
736
|
+
const { mainField, displayName } = allReleaseContentTypesDictionary[action.contentType];
|
|
737
|
+
return {
|
|
738
|
+
...action,
|
|
739
|
+
locale: action.locale ? allLocalesDictionary[action.locale] : null,
|
|
740
|
+
contentType: {
|
|
741
|
+
displayName,
|
|
742
|
+
mainFieldValue: action.entry[mainField],
|
|
743
|
+
uid: action.contentType
|
|
744
|
+
}
|
|
745
|
+
};
|
|
746
|
+
});
|
|
747
|
+
const groupName = getGroupName(groupBy);
|
|
748
|
+
return ___default.default.groupBy(groupName)(formattedData);
|
|
749
|
+
},
|
|
750
|
+
async getLocalesDataForActions() {
|
|
751
|
+
if (!strapi2.plugin("i18n")) {
|
|
752
|
+
return {};
|
|
504
753
|
}
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
(acc, contentTypeUid) => {
|
|
509
|
-
acc[contentTypeUid] = strapi2.getModel(contentTypeUid);
|
|
754
|
+
const allLocales = await strapi2.plugin("i18n").service("locales").find() || [];
|
|
755
|
+
return allLocales.reduce((acc, locale) => {
|
|
756
|
+
acc[locale.code] = { name: locale.name, code: locale.code };
|
|
510
757
|
return acc;
|
|
511
|
-
},
|
|
512
|
-
|
|
513
|
-
)
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
758
|
+
}, {});
|
|
759
|
+
},
|
|
760
|
+
async getContentTypesDataForActions(contentTypesUids) {
|
|
761
|
+
const contentManagerContentTypeService = strapi2.plugin("content-manager").service("content-types");
|
|
762
|
+
const contentTypesData = {};
|
|
763
|
+
for (const contentTypeUid of contentTypesUids) {
|
|
764
|
+
const contentTypeConfig = await contentManagerContentTypeService.findConfiguration({
|
|
765
|
+
uid: contentTypeUid
|
|
766
|
+
});
|
|
767
|
+
contentTypesData[contentTypeUid] = {
|
|
768
|
+
mainField: contentTypeConfig.settings.mainField,
|
|
769
|
+
displayName: strapi2.getModel(contentTypeUid).info.displayName
|
|
770
|
+
};
|
|
771
|
+
}
|
|
772
|
+
return contentTypesData;
|
|
773
|
+
},
|
|
774
|
+
getContentTypeModelsFromActions(actions) {
|
|
775
|
+
const contentTypeUids = actions.reduce((acc, action) => {
|
|
776
|
+
if (!acc.includes(action.contentType)) {
|
|
777
|
+
acc.push(action.contentType);
|
|
778
|
+
}
|
|
522
779
|
return acc;
|
|
523
|
-
},
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
780
|
+
}, []);
|
|
781
|
+
const contentTypeModelsMap = contentTypeUids.reduce(
|
|
782
|
+
(acc, contentTypeUid) => {
|
|
783
|
+
acc[contentTypeUid] = strapi2.getModel(contentTypeUid);
|
|
784
|
+
return acc;
|
|
785
|
+
},
|
|
786
|
+
{}
|
|
787
|
+
);
|
|
788
|
+
return contentTypeModelsMap;
|
|
789
|
+
},
|
|
790
|
+
async getAllComponents() {
|
|
791
|
+
const contentManagerComponentsService = strapi2.plugin("content-manager").service("components");
|
|
792
|
+
const components = await contentManagerComponentsService.findAllComponents();
|
|
793
|
+
const componentsMap = components.reduce(
|
|
794
|
+
(acc, component) => {
|
|
795
|
+
acc[component.uid] = component;
|
|
796
|
+
return acc;
|
|
797
|
+
},
|
|
798
|
+
{}
|
|
799
|
+
);
|
|
800
|
+
return componentsMap;
|
|
801
|
+
},
|
|
802
|
+
async delete(releaseId) {
|
|
803
|
+
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
|
|
804
|
+
populate: {
|
|
805
|
+
actions: {
|
|
806
|
+
fields: ["id"]
|
|
807
|
+
}
|
|
533
808
|
}
|
|
809
|
+
});
|
|
810
|
+
if (!release2) {
|
|
811
|
+
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
534
812
|
}
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
where: {
|
|
545
|
-
id: {
|
|
546
|
-
$in: release2.actions.map((action) => action.id)
|
|
813
|
+
if (release2.releasedAt) {
|
|
814
|
+
throw new utils.errors.ValidationError("Release already published");
|
|
815
|
+
}
|
|
816
|
+
await strapi2.db.transaction(async () => {
|
|
817
|
+
await strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
|
|
818
|
+
where: {
|
|
819
|
+
id: {
|
|
820
|
+
$in: release2.actions.map((action) => action.id)
|
|
821
|
+
}
|
|
547
822
|
}
|
|
548
|
-
}
|
|
823
|
+
});
|
|
824
|
+
await strapi2.entityService.delete(RELEASE_MODEL_UID, releaseId);
|
|
549
825
|
});
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
{
|
|
559
|
-
|
|
560
|
-
|
|
826
|
+
if (strapi2.features.future.isEnabled("contentReleasesScheduling") && release2.scheduledAt) {
|
|
827
|
+
const schedulingService = getService("scheduling", { strapi: strapi2 });
|
|
828
|
+
await schedulingService.cancel(release2.id);
|
|
829
|
+
}
|
|
830
|
+
strapi2.telemetry.send("didDeleteContentRelease");
|
|
831
|
+
return release2;
|
|
832
|
+
},
|
|
833
|
+
async publish(releaseId) {
|
|
834
|
+
try {
|
|
835
|
+
const releaseWithPopulatedActionEntries = await strapi2.entityService.findOne(
|
|
836
|
+
RELEASE_MODEL_UID,
|
|
837
|
+
releaseId,
|
|
838
|
+
{
|
|
561
839
|
populate: {
|
|
562
|
-
|
|
563
|
-
|
|
840
|
+
actions: {
|
|
841
|
+
populate: {
|
|
842
|
+
entry: {
|
|
843
|
+
fields: ["id"]
|
|
844
|
+
}
|
|
845
|
+
}
|
|
564
846
|
}
|
|
565
847
|
}
|
|
566
848
|
}
|
|
849
|
+
);
|
|
850
|
+
if (!releaseWithPopulatedActionEntries) {
|
|
851
|
+
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
567
852
|
}
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
if (!releaseWithPopulatedActionEntries) {
|
|
571
|
-
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
572
|
-
}
|
|
573
|
-
if (releaseWithPopulatedActionEntries.releasedAt) {
|
|
574
|
-
throw new utils.errors.ValidationError("Release already published");
|
|
575
|
-
}
|
|
576
|
-
if (releaseWithPopulatedActionEntries.actions.length === 0) {
|
|
577
|
-
throw new utils.errors.ValidationError("No entries to publish");
|
|
578
|
-
}
|
|
579
|
-
const collectionTypeActions = {};
|
|
580
|
-
const singleTypeActions = [];
|
|
581
|
-
for (const action of releaseWithPopulatedActionEntries.actions) {
|
|
582
|
-
const contentTypeUid = action.contentType;
|
|
583
|
-
if (strapi2.contentTypes[contentTypeUid].kind === "collectionType") {
|
|
584
|
-
if (!collectionTypeActions[contentTypeUid]) {
|
|
585
|
-
collectionTypeActions[contentTypeUid] = {
|
|
586
|
-
entriestoPublishIds: [],
|
|
587
|
-
entriesToUnpublishIds: []
|
|
588
|
-
};
|
|
853
|
+
if (releaseWithPopulatedActionEntries.releasedAt) {
|
|
854
|
+
throw new utils.errors.ValidationError("Release already published");
|
|
589
855
|
}
|
|
590
|
-
if (
|
|
591
|
-
|
|
592
|
-
} else {
|
|
593
|
-
collectionTypeActions[contentTypeUid].entriesToUnpublishIds.push(action.entry.id);
|
|
856
|
+
if (releaseWithPopulatedActionEntries.actions.length === 0) {
|
|
857
|
+
throw new utils.errors.ValidationError("No entries to publish");
|
|
594
858
|
}
|
|
595
|
-
|
|
596
|
-
singleTypeActions
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
await entityManagerService.publish(entry, uid);
|
|
859
|
+
const collectionTypeActions = {};
|
|
860
|
+
const singleTypeActions = [];
|
|
861
|
+
for (const action of releaseWithPopulatedActionEntries.actions) {
|
|
862
|
+
const contentTypeUid = action.contentType;
|
|
863
|
+
if (strapi2.contentTypes[contentTypeUid].kind === "collectionType") {
|
|
864
|
+
if (!collectionTypeActions[contentTypeUid]) {
|
|
865
|
+
collectionTypeActions[contentTypeUid] = {
|
|
866
|
+
entriestoPublishIds: [],
|
|
867
|
+
entriesToUnpublishIds: []
|
|
868
|
+
};
|
|
869
|
+
}
|
|
870
|
+
if (action.type === "publish") {
|
|
871
|
+
collectionTypeActions[contentTypeUid].entriestoPublishIds.push(action.entry.id);
|
|
872
|
+
} else {
|
|
873
|
+
collectionTypeActions[contentTypeUid].entriesToUnpublishIds.push(action.entry.id);
|
|
874
|
+
}
|
|
612
875
|
} else {
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
;
|
|
618
|
-
else {
|
|
619
|
-
throw error;
|
|
876
|
+
singleTypeActions.push({
|
|
877
|
+
uid: contentTypeUid,
|
|
878
|
+
action: action.type,
|
|
879
|
+
id: action.entry.id
|
|
880
|
+
});
|
|
620
881
|
}
|
|
621
882
|
}
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
883
|
+
const entityManagerService = strapi2.plugin("content-manager").service("entity-manager");
|
|
884
|
+
const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
|
|
885
|
+
await strapi2.db.transaction(async () => {
|
|
886
|
+
for (const { uid, action, id } of singleTypeActions) {
|
|
887
|
+
const populate = await populateBuilderService(uid).populateDeep(Infinity).build();
|
|
888
|
+
const entry = await strapi2.entityService.findOne(uid, id, { populate });
|
|
889
|
+
try {
|
|
890
|
+
if (action === "publish") {
|
|
891
|
+
await entityManagerService.publish(entry, uid);
|
|
892
|
+
} else {
|
|
893
|
+
await entityManagerService.unpublish(entry, uid);
|
|
632
894
|
}
|
|
633
|
-
}
|
|
634
|
-
|
|
895
|
+
} catch (error) {
|
|
896
|
+
if (error instanceof utils.errors.ApplicationError && (error.message === "already.published" || error.message === "already.draft")) {
|
|
897
|
+
} else {
|
|
898
|
+
throw error;
|
|
899
|
+
}
|
|
900
|
+
}
|
|
635
901
|
}
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
902
|
+
for (const contentTypeUid of Object.keys(collectionTypeActions)) {
|
|
903
|
+
const populate = await populateBuilderService(contentTypeUid).populateDeep(Infinity).build();
|
|
904
|
+
const { entriestoPublishIds, entriesToUnpublishIds } = collectionTypeActions[contentTypeUid];
|
|
905
|
+
const entriesToPublish = await strapi2.entityService.findMany(
|
|
906
|
+
contentTypeUid,
|
|
907
|
+
{
|
|
908
|
+
filters: {
|
|
909
|
+
id: {
|
|
910
|
+
$in: entriestoPublishIds
|
|
911
|
+
}
|
|
912
|
+
},
|
|
913
|
+
populate
|
|
643
914
|
}
|
|
644
|
-
|
|
645
|
-
|
|
915
|
+
);
|
|
916
|
+
const entriesToUnpublish = await strapi2.entityService.findMany(
|
|
917
|
+
contentTypeUid,
|
|
918
|
+
{
|
|
919
|
+
filters: {
|
|
920
|
+
id: {
|
|
921
|
+
$in: entriesToUnpublishIds
|
|
922
|
+
}
|
|
923
|
+
},
|
|
924
|
+
populate
|
|
925
|
+
}
|
|
926
|
+
);
|
|
927
|
+
if (entriesToPublish.length > 0) {
|
|
928
|
+
await entityManagerService.publishMany(entriesToPublish, contentTypeUid);
|
|
929
|
+
}
|
|
930
|
+
if (entriesToUnpublish.length > 0) {
|
|
931
|
+
await entityManagerService.unpublishMany(entriesToUnpublish, contentTypeUid);
|
|
932
|
+
}
|
|
646
933
|
}
|
|
647
|
-
);
|
|
648
|
-
|
|
649
|
-
|
|
934
|
+
});
|
|
935
|
+
const release2 = await strapi2.entityService.update(RELEASE_MODEL_UID, releaseId, {
|
|
936
|
+
data: {
|
|
937
|
+
/*
|
|
938
|
+
* The type returned from the entity service: Partial<Input<"plugin::content-releases.release">> looks like it's wrong
|
|
939
|
+
*/
|
|
940
|
+
// @ts-expect-error see above
|
|
941
|
+
releasedAt: /* @__PURE__ */ new Date()
|
|
942
|
+
},
|
|
943
|
+
populate: {
|
|
944
|
+
actions: {
|
|
945
|
+
// @ts-expect-error is not expecting count but it is working
|
|
946
|
+
count: true
|
|
947
|
+
}
|
|
948
|
+
}
|
|
949
|
+
});
|
|
950
|
+
if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
|
|
951
|
+
dispatchWebhook(ALLOWED_WEBHOOK_EVENTS.RELEASES_PUBLISH, {
|
|
952
|
+
isPublished: true,
|
|
953
|
+
release: release2
|
|
954
|
+
});
|
|
650
955
|
}
|
|
651
|
-
|
|
652
|
-
|
|
956
|
+
strapi2.telemetry.send("didPublishContentRelease");
|
|
957
|
+
return release2;
|
|
958
|
+
} catch (error) {
|
|
959
|
+
if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
|
|
960
|
+
dispatchWebhook(ALLOWED_WEBHOOK_EVENTS.RELEASES_PUBLISH, {
|
|
961
|
+
isPublished: false,
|
|
962
|
+
error
|
|
963
|
+
});
|
|
653
964
|
}
|
|
965
|
+
strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
966
|
+
where: { id: releaseId },
|
|
967
|
+
data: {
|
|
968
|
+
status: "failed"
|
|
969
|
+
}
|
|
970
|
+
});
|
|
971
|
+
throw error;
|
|
654
972
|
}
|
|
655
|
-
}
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
973
|
+
},
|
|
974
|
+
async updateAction(actionId, releaseId, update) {
|
|
975
|
+
const updatedAction = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
|
|
976
|
+
where: {
|
|
977
|
+
id: actionId,
|
|
978
|
+
release: {
|
|
979
|
+
id: releaseId,
|
|
980
|
+
releasedAt: {
|
|
981
|
+
$null: true
|
|
982
|
+
}
|
|
983
|
+
}
|
|
984
|
+
},
|
|
985
|
+
data: update
|
|
986
|
+
});
|
|
987
|
+
if (!updatedAction) {
|
|
988
|
+
throw new utils.errors.NotFoundError(
|
|
989
|
+
`Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
|
|
990
|
+
);
|
|
663
991
|
}
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
992
|
+
return updatedAction;
|
|
993
|
+
},
|
|
994
|
+
async deleteAction(actionId, releaseId) {
|
|
995
|
+
const deletedAction = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).delete({
|
|
996
|
+
where: {
|
|
997
|
+
id: actionId,
|
|
998
|
+
release: {
|
|
999
|
+
id: releaseId,
|
|
1000
|
+
releasedAt: {
|
|
1001
|
+
$null: true
|
|
1002
|
+
}
|
|
675
1003
|
}
|
|
676
1004
|
}
|
|
677
|
-
}
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
);
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
1005
|
+
});
|
|
1006
|
+
if (!deletedAction) {
|
|
1007
|
+
throw new utils.errors.NotFoundError(
|
|
1008
|
+
`Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
|
|
1009
|
+
);
|
|
1010
|
+
}
|
|
1011
|
+
this.updateReleaseStatus(releaseId);
|
|
1012
|
+
return deletedAction;
|
|
1013
|
+
},
|
|
1014
|
+
async updateReleaseStatus(releaseId) {
|
|
1015
|
+
const [totalActions, invalidActions] = await Promise.all([
|
|
1016
|
+
this.countActions({
|
|
1017
|
+
filters: {
|
|
1018
|
+
release: releaseId
|
|
1019
|
+
}
|
|
1020
|
+
}),
|
|
1021
|
+
this.countActions({
|
|
1022
|
+
filters: {
|
|
1023
|
+
release: releaseId,
|
|
1024
|
+
isEntryValid: false
|
|
695
1025
|
}
|
|
1026
|
+
})
|
|
1027
|
+
]);
|
|
1028
|
+
if (totalActions > 0) {
|
|
1029
|
+
if (invalidActions > 0) {
|
|
1030
|
+
return strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
1031
|
+
where: {
|
|
1032
|
+
id: releaseId
|
|
1033
|
+
},
|
|
1034
|
+
data: {
|
|
1035
|
+
status: "blocked"
|
|
1036
|
+
}
|
|
1037
|
+
});
|
|
696
1038
|
}
|
|
1039
|
+
return strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
1040
|
+
where: {
|
|
1041
|
+
id: releaseId
|
|
1042
|
+
},
|
|
1043
|
+
data: {
|
|
1044
|
+
status: "ready"
|
|
1045
|
+
}
|
|
1046
|
+
});
|
|
697
1047
|
}
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
1048
|
+
return strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
1049
|
+
where: {
|
|
1050
|
+
id: releaseId
|
|
1051
|
+
},
|
|
1052
|
+
data: {
|
|
1053
|
+
status: "empty"
|
|
1054
|
+
}
|
|
1055
|
+
});
|
|
703
1056
|
}
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
});
|
|
1057
|
+
};
|
|
1058
|
+
};
|
|
707
1059
|
const createReleaseValidationService = ({ strapi: strapi2 }) => ({
|
|
708
1060
|
async validateUniqueEntry(releaseId, releaseActionArgs) {
|
|
709
1061
|
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
|
|
@@ -748,13 +1100,14 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
|
|
|
748
1100
|
throw new utils.errors.ValidationError("You have reached the maximum number of pending releases");
|
|
749
1101
|
}
|
|
750
1102
|
},
|
|
751
|
-
async validateUniqueNameForPendingRelease(name) {
|
|
1103
|
+
async validateUniqueNameForPendingRelease(name, id) {
|
|
752
1104
|
const pendingReleases = await strapi2.entityService.findMany(RELEASE_MODEL_UID, {
|
|
753
1105
|
filters: {
|
|
754
1106
|
releasedAt: {
|
|
755
1107
|
$null: true
|
|
756
1108
|
},
|
|
757
|
-
name
|
|
1109
|
+
name,
|
|
1110
|
+
...id && { id: { $ne: id } }
|
|
758
1111
|
}
|
|
759
1112
|
});
|
|
760
1113
|
const isNameUnique = pendingReleases.length === 0;
|
|
@@ -795,6 +1148,28 @@ const createSchedulingService = ({ strapi: strapi2 }) => {
|
|
|
795
1148
|
scheduledJobs.delete(releaseId);
|
|
796
1149
|
}
|
|
797
1150
|
return scheduledJobs;
|
|
1151
|
+
},
|
|
1152
|
+
getAll() {
|
|
1153
|
+
return scheduledJobs;
|
|
1154
|
+
},
|
|
1155
|
+
/**
|
|
1156
|
+
* On bootstrap, we can use this function to make sure to sync the scheduled jobs from the database that are not yet released
|
|
1157
|
+
* This is useful in case the server was restarted and the scheduled jobs were lost
|
|
1158
|
+
* This also could be used to sync different Strapi instances in case of a cluster
|
|
1159
|
+
*/
|
|
1160
|
+
async syncFromDatabase() {
|
|
1161
|
+
const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
1162
|
+
where: {
|
|
1163
|
+
scheduledAt: {
|
|
1164
|
+
$gte: /* @__PURE__ */ new Date()
|
|
1165
|
+
},
|
|
1166
|
+
releasedAt: null
|
|
1167
|
+
}
|
|
1168
|
+
});
|
|
1169
|
+
for (const release2 of releases) {
|
|
1170
|
+
this.set(release2.id, release2.scheduledAt);
|
|
1171
|
+
}
|
|
1172
|
+
return scheduledJobs;
|
|
798
1173
|
}
|
|
799
1174
|
};
|
|
800
1175
|
};
|
|
@@ -805,8 +1180,23 @@ const services = {
|
|
|
805
1180
|
};
|
|
806
1181
|
const RELEASE_SCHEMA = yup__namespace.object().shape({
|
|
807
1182
|
name: yup__namespace.string().trim().required(),
|
|
808
|
-
|
|
809
|
-
|
|
1183
|
+
scheduledAt: yup__namespace.string().nullable(),
|
|
1184
|
+
isScheduled: yup__namespace.boolean().optional(),
|
|
1185
|
+
time: yup__namespace.string().when("isScheduled", {
|
|
1186
|
+
is: true,
|
|
1187
|
+
then: yup__namespace.string().trim().required(),
|
|
1188
|
+
otherwise: yup__namespace.string().nullable()
|
|
1189
|
+
}),
|
|
1190
|
+
timezone: yup__namespace.string().when("isScheduled", {
|
|
1191
|
+
is: true,
|
|
1192
|
+
then: yup__namespace.string().required().nullable(),
|
|
1193
|
+
otherwise: yup__namespace.string().nullable()
|
|
1194
|
+
}),
|
|
1195
|
+
date: yup__namespace.string().when("isScheduled", {
|
|
1196
|
+
is: true,
|
|
1197
|
+
then: yup__namespace.string().required().nullable(),
|
|
1198
|
+
otherwise: yup__namespace.string().nullable()
|
|
1199
|
+
})
|
|
810
1200
|
}).required().noUnknown();
|
|
811
1201
|
const validateRelease = utils.validateYupSchema(RELEASE_SCHEMA);
|
|
812
1202
|
const releaseController = {
|
|
@@ -839,7 +1229,12 @@ const releaseController = {
|
|
|
839
1229
|
}
|
|
840
1230
|
};
|
|
841
1231
|
});
|
|
842
|
-
|
|
1232
|
+
const pendingReleasesCount = await strapi.query(RELEASE_MODEL_UID).count({
|
|
1233
|
+
where: {
|
|
1234
|
+
releasedAt: null
|
|
1235
|
+
}
|
|
1236
|
+
});
|
|
1237
|
+
ctx.body = { data, meta: { pagination, pendingReleasesCount } };
|
|
843
1238
|
}
|
|
844
1239
|
},
|
|
845
1240
|
async findOne(ctx) {
|
|
@@ -1202,6 +1597,7 @@ const getPlugin = () => {
|
|
|
1202
1597
|
return {
|
|
1203
1598
|
register,
|
|
1204
1599
|
bootstrap,
|
|
1600
|
+
destroy,
|
|
1205
1601
|
contentTypes,
|
|
1206
1602
|
services,
|
|
1207
1603
|
controllers,
|