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