@strapi/content-releases 0.0.0-next.615ae85762cbae9fc80af36685075ef25abd1c88 → 0.0.0-next.62c4d48d34e826c6c9f6fbe5cf6e858546239e40
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-YhAPgpG9.js → PurchaseContentReleases-Be3acS2L.js} +8 -7
- package/dist/_chunks/PurchaseContentReleases-Be3acS2L.js.map +1 -0
- package/dist/_chunks/{PurchaseContentReleases-Clm0iACO.mjs → PurchaseContentReleases-_MxP6-Dt.mjs} +9 -8
- 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-bDhIlw-B.js → en-CmYoEnA7.js} +30 -6
- package/dist/_chunks/en-CmYoEnA7.js.map +1 -0
- package/dist/_chunks/{en-GqXgfmzl.mjs → en-D0yVZFqf.mjs} +30 -6
- 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 +1258 -561
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +1258 -561
- 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 +34 -37
- package/dist/_chunks/App-1hHIqUoZ.js +0 -1099
- package/dist/_chunks/App-1hHIqUoZ.js.map +0 -1
- package/dist/_chunks/App-U6GbyLIE.mjs +0 -1077
- package/dist/_chunks/App-U6GbyLIE.mjs.map +0 -1
- package/dist/_chunks/PurchaseContentReleases-Clm0iACO.mjs.map +0 -1
- package/dist/_chunks/PurchaseContentReleases-YhAPgpG9.js.map +0 -1
- package/dist/_chunks/en-GqXgfmzl.mjs.map +0 -1
- package/dist/_chunks/en-bDhIlw-B.js.map +0 -1
- package/dist/_chunks/index-gkExFBa0.mjs +0 -950
- package/dist/_chunks/index-gkExFBa0.mjs.map +0 -1
- package/dist/_chunks/index-l-FvkQlQ.js +0 -971
- package/dist/_chunks/index-l-FvkQlQ.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,87 +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();
|
|
108
372
|
}
|
|
109
373
|
};
|
|
110
|
-
const
|
|
111
|
-
|
|
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);
|
|
470
|
+
}
|
|
112
471
|
};
|
|
113
|
-
const { features: features$1 } = require("@strapi/strapi/dist/utils/ee");
|
|
114
472
|
const bootstrap = async ({ strapi: strapi2 }) => {
|
|
115
|
-
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
|
+
);
|
|
116
477
|
strapi2.db.lifecycles.subscribe({
|
|
117
|
-
|
|
118
|
-
const { model, result } = event;
|
|
119
|
-
if (model.kind === "collectionType" && model.options?.draftAndPublish) {
|
|
120
|
-
const { id } = result;
|
|
121
|
-
strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
|
|
122
|
-
where: {
|
|
123
|
-
target_type: model.uid,
|
|
124
|
-
target_id: id
|
|
125
|
-
}
|
|
126
|
-
});
|
|
127
|
-
}
|
|
128
|
-
},
|
|
478
|
+
models: contentTypesWithDraftAndPublish,
|
|
129
479
|
/**
|
|
130
|
-
* deleteMany
|
|
131
|
-
* so we need to fetch them before deleting the entries to save the ids on our state
|
|
132
|
-
*/
|
|
133
|
-
async beforeDeleteMany(event) {
|
|
134
|
-
const { model, params } = event;
|
|
135
|
-
if (model.kind === "collectionType" && model.options?.draftAndPublish) {
|
|
136
|
-
const { where } = params;
|
|
137
|
-
const entriesToDelete = await strapi2.db.query(model.uid).findMany({ select: ["id"], where });
|
|
138
|
-
event.state.entriesToDelete = entriesToDelete;
|
|
139
|
-
}
|
|
140
|
-
},
|
|
141
|
-
/**
|
|
142
|
-
* We delete the release actions related to deleted entries
|
|
143
|
-
* 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
|
|
144
481
|
*/
|
|
145
482
|
async afterDeleteMany(event) {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
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
|
|
156
496
|
});
|
|
157
497
|
}
|
|
158
498
|
}
|
|
159
499
|
});
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
}
|
|
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
|
+
});
|
|
168
511
|
}
|
|
169
512
|
};
|
|
170
513
|
const destroy = async ({ strapi: strapi2 }) => {
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
job.cancel();
|
|
177
|
-
}
|
|
514
|
+
const scheduledJobs = getService("scheduling", {
|
|
515
|
+
strapi: strapi2
|
|
516
|
+
}).getAll();
|
|
517
|
+
for (const [, job] of scheduledJobs) {
|
|
518
|
+
job.cancel();
|
|
178
519
|
}
|
|
179
520
|
};
|
|
180
521
|
const schema$1 = {
|
|
@@ -209,6 +550,11 @@ const schema$1 = {
|
|
|
209
550
|
timezone: {
|
|
210
551
|
type: "string"
|
|
211
552
|
},
|
|
553
|
+
status: {
|
|
554
|
+
type: "enumeration",
|
|
555
|
+
enum: ["ready", "blocked", "failed", "done", "empty"],
|
|
556
|
+
required: true
|
|
557
|
+
},
|
|
212
558
|
actions: {
|
|
213
559
|
type: "relation",
|
|
214
560
|
relation: "oneToMany",
|
|
@@ -244,15 +590,13 @@ const schema = {
|
|
|
244
590
|
enum: ["publish", "unpublish"],
|
|
245
591
|
required: true
|
|
246
592
|
},
|
|
247
|
-
entry: {
|
|
248
|
-
type: "relation",
|
|
249
|
-
relation: "morphToOne",
|
|
250
|
-
configurable: false
|
|
251
|
-
},
|
|
252
593
|
contentType: {
|
|
253
594
|
type: "string",
|
|
254
595
|
required: true
|
|
255
596
|
},
|
|
597
|
+
entryDocumentId: {
|
|
598
|
+
type: "string"
|
|
599
|
+
},
|
|
256
600
|
locale: {
|
|
257
601
|
type: "string"
|
|
258
602
|
},
|
|
@@ -261,6 +605,9 @@ const schema = {
|
|
|
261
605
|
relation: "manyToOne",
|
|
262
606
|
target: RELEASE_MODEL_UID,
|
|
263
607
|
inversedBy: "actions"
|
|
608
|
+
},
|
|
609
|
+
isEntryValid: {
|
|
610
|
+
type: "boolean"
|
|
264
611
|
}
|
|
265
612
|
}
|
|
266
613
|
};
|
|
@@ -271,248 +618,297 @@ const contentTypes = {
|
|
|
271
618
|
release: release$1,
|
|
272
619
|
"release-action": releaseAction$1
|
|
273
620
|
};
|
|
274
|
-
const
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
case "locale":
|
|
281
|
-
return ___default.default.getOr("No locale", "locale.name");
|
|
282
|
-
default:
|
|
283
|
-
return "contentType.displayName";
|
|
284
|
-
}
|
|
285
|
-
};
|
|
286
|
-
const createReleaseService = ({ strapi: strapi2 }) => ({
|
|
287
|
-
async create(releaseData, { user }) {
|
|
288
|
-
const releaseWithCreatorFields = await utils.setCreatorFields({ user })(releaseData);
|
|
289
|
-
const {
|
|
290
|
-
validatePendingReleasesLimit,
|
|
291
|
-
validateUniqueNameForPendingRelease,
|
|
292
|
-
validateScheduledAtIsLaterThanNow
|
|
293
|
-
} = getService("release-validation", { strapi: strapi2 });
|
|
294
|
-
await Promise.all([
|
|
295
|
-
validatePendingReleasesLimit(),
|
|
296
|
-
validateUniqueNameForPendingRelease(releaseWithCreatorFields.name),
|
|
297
|
-
validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
|
|
298
|
-
]);
|
|
299
|
-
const release2 = await strapi2.entityService.create(RELEASE_MODEL_UID, {
|
|
300
|
-
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
|
|
301
627
|
});
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
}
|
|
306
|
-
strapi2.telemetry.send("didCreateContentRelease");
|
|
307
|
-
return release2;
|
|
308
|
-
},
|
|
309
|
-
async findOne(id, query = {}) {
|
|
310
|
-
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id, {
|
|
311
|
-
...query
|
|
312
|
-
});
|
|
313
|
-
return release2;
|
|
314
|
-
},
|
|
315
|
-
findPage(query) {
|
|
316
|
-
return strapi2.entityService.findPage(RELEASE_MODEL_UID, {
|
|
317
|
-
...query,
|
|
318
|
-
populate: {
|
|
319
|
-
actions: {
|
|
320
|
-
// @ts-expect-error Ignore missing properties
|
|
321
|
-
count: true
|
|
322
|
-
}
|
|
323
|
-
}
|
|
324
|
-
});
|
|
325
|
-
},
|
|
326
|
-
async findManyWithContentTypeEntryAttached(contentTypeUid, entryId) {
|
|
327
|
-
const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
628
|
+
};
|
|
629
|
+
const getFormattedActions = async (releaseId) => {
|
|
630
|
+
const actions = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).findMany({
|
|
328
631
|
where: {
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
target_id: entryId
|
|
332
|
-
},
|
|
333
|
-
releasedAt: {
|
|
334
|
-
$null: true
|
|
335
|
-
}
|
|
336
|
-
},
|
|
337
|
-
populate: {
|
|
338
|
-
// Filter the action to get only the content type entry
|
|
339
|
-
actions: {
|
|
340
|
-
where: {
|
|
341
|
-
target_type: contentTypeUid,
|
|
342
|
-
target_id: entryId
|
|
343
|
-
}
|
|
632
|
+
release: {
|
|
633
|
+
id: releaseId
|
|
344
634
|
}
|
|
345
635
|
}
|
|
346
636
|
});
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
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: []
|
|
354
647
|
};
|
|
355
648
|
}
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
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"
|
|
368
673
|
}
|
|
674
|
+
});
|
|
675
|
+
if (releaseWithCreatorFields.scheduledAt) {
|
|
676
|
+
const schedulingService = getService("scheduling", { strapi: strapi2 });
|
|
677
|
+
await schedulingService.set(release2.id, release2.scheduledAt);
|
|
369
678
|
}
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
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
|
|
381
697
|
}
|
|
382
|
-
],
|
|
383
|
-
releasedAt: {
|
|
384
|
-
$null: true
|
|
385
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}`);
|
|
386
722
|
}
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
if (release2.actions?.length) {
|
|
390
|
-
const [actionForEntry] = release2.actions;
|
|
391
|
-
delete release2.actions;
|
|
392
|
-
return {
|
|
393
|
-
...release2,
|
|
394
|
-
action: actionForEntry
|
|
395
|
-
};
|
|
723
|
+
if (release2.releasedAt) {
|
|
724
|
+
throw new utils.errors.ValidationError("Release already published");
|
|
396
725
|
}
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
const releaseWithCreatorFields = await utils.setCreatorFields({ user, isEdition: true })(releaseData);
|
|
402
|
-
const { validateUniqueNameForPendingRelease, validateScheduledAtIsLaterThanNow } = getService(
|
|
403
|
-
"release-validation",
|
|
404
|
-
{ strapi: strapi2 }
|
|
405
|
-
);
|
|
406
|
-
await Promise.all([
|
|
407
|
-
validateUniqueNameForPendingRelease(releaseWithCreatorFields.name, id),
|
|
408
|
-
validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
|
|
409
|
-
]);
|
|
410
|
-
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id);
|
|
411
|
-
if (!release2) {
|
|
412
|
-
throw new utils.errors.NotFoundError(`No release found for id ${id}`);
|
|
413
|
-
}
|
|
414
|
-
if (release2.releasedAt) {
|
|
415
|
-
throw new utils.errors.ValidationError("Release already published");
|
|
416
|
-
}
|
|
417
|
-
const updatedRelease = await strapi2.entityService.update(RELEASE_MODEL_UID, id, {
|
|
418
|
-
/*
|
|
419
|
-
* The type returned from the entity service: Partial<Input<"plugin::content-releases.release">>
|
|
420
|
-
* is not compatible with the type we are passing here: UpdateRelease.Request['body']
|
|
421
|
-
*/
|
|
422
|
-
// @ts-expect-error see above
|
|
423
|
-
data: releaseWithCreatorFields
|
|
424
|
-
});
|
|
425
|
-
if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
|
|
726
|
+
const updatedRelease = await strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
727
|
+
where: { id },
|
|
728
|
+
data: releaseWithCreatorFields
|
|
729
|
+
});
|
|
426
730
|
const schedulingService = getService("scheduling", { strapi: strapi2 });
|
|
427
731
|
if (releaseData.scheduledAt) {
|
|
428
732
|
await schedulingService.set(id, releaseData.scheduledAt);
|
|
429
733
|
} else if (release2.scheduledAt) {
|
|
430
734
|
schedulingService.cancel(id);
|
|
431
735
|
}
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
]);
|
|
444
|
-
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId);
|
|
445
|
-
if (!release2) {
|
|
446
|
-
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
447
|
-
}
|
|
448
|
-
if (release2.releasedAt) {
|
|
449
|
-
throw new utils.errors.ValidationError("Release already published");
|
|
450
|
-
}
|
|
451
|
-
const { entry, type } = action;
|
|
452
|
-
return strapi2.entityService.create(RELEASE_ACTION_MODEL_UID, {
|
|
453
|
-
data: {
|
|
454
|
-
type,
|
|
455
|
-
contentType: entry.contentType,
|
|
456
|
-
locale: entry.locale,
|
|
457
|
-
entry: {
|
|
458
|
-
id: entry.id,
|
|
459
|
-
__type: entry.contentType,
|
|
460
|
-
__pivot: { field: "entry" }
|
|
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;
|
|
461
747
|
},
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
}
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
}
|
|
474
|
-
return strapi2.entityService.findPage(RELEASE_ACTION_MODEL_UID, {
|
|
475
|
-
...query,
|
|
476
|
-
populate: {
|
|
477
|
-
entry: {
|
|
478
|
-
populate: "*"
|
|
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
|
+
}
|
|
479
759
|
}
|
|
480
|
-
}
|
|
481
|
-
|
|
482
|
-
release
|
|
760
|
+
});
|
|
761
|
+
if (!release2) {
|
|
762
|
+
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
483
763
|
}
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
async countActions(query) {
|
|
487
|
-
return strapi2.entityService.count(RELEASE_ACTION_MODEL_UID, query);
|
|
488
|
-
},
|
|
489
|
-
async groupActions(actions, groupBy) {
|
|
490
|
-
const contentTypeUids = actions.reduce((acc, action) => {
|
|
491
|
-
if (!acc.includes(action.contentType)) {
|
|
492
|
-
acc.push(action.contentType);
|
|
764
|
+
if (release2.releasedAt) {
|
|
765
|
+
throw new utils.errors.ValidationError("Release already published");
|
|
493
766
|
}
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
767
|
+
await strapi2.db.transaction(async () => {
|
|
768
|
+
await strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
|
|
769
|
+
where: {
|
|
770
|
+
id: {
|
|
771
|
+
$in: release2.actions.map((action) => action.id)
|
|
772
|
+
}
|
|
773
|
+
}
|
|
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);
|
|
784
|
+
}
|
|
785
|
+
strapi2.telemetry.send("didDeleteContentRelease");
|
|
786
|
+
return release2;
|
|
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}`);
|
|
509
796
|
}
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
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;
|
|
849
|
+
}
|
|
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
|
+
});
|
|
886
|
+
}
|
|
887
|
+
return strapi2.db.query(RELEASE_MODEL_UID).update({
|
|
888
|
+
where: {
|
|
889
|
+
id: releaseId
|
|
890
|
+
},
|
|
891
|
+
data: {
|
|
892
|
+
status: "empty"
|
|
893
|
+
}
|
|
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 () => {
|
|
516
912
|
if (!strapi2.plugin("i18n")) {
|
|
517
913
|
return {};
|
|
518
914
|
}
|
|
@@ -521,8 +917,8 @@ const createReleaseService = ({ strapi: strapi2 }) => ({
|
|
|
521
917
|
acc[locale.code] = { name: locale.name, code: locale.code };
|
|
522
918
|
return acc;
|
|
523
919
|
}, {});
|
|
524
|
-
}
|
|
525
|
-
async
|
|
920
|
+
};
|
|
921
|
+
const getContentTypesDataForActions = async (contentTypesUids) => {
|
|
526
922
|
const contentManagerContentTypeService = strapi2.plugin("content-manager").service("content-types");
|
|
527
923
|
const contentTypesData = {};
|
|
528
924
|
for (const contentTypeUid of contentTypesUids) {
|
|
@@ -535,253 +931,249 @@ const createReleaseService = ({ strapi: strapi2 }) => ({
|
|
|
535
931
|
};
|
|
536
932
|
}
|
|
537
933
|
return contentTypesData;
|
|
538
|
-
}
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
}
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
return contentTypeModelsMap;
|
|
554
|
-
},
|
|
555
|
-
async getAllComponents() {
|
|
556
|
-
const contentManagerComponentsService = strapi2.plugin("content-manager").service("components");
|
|
557
|
-
const components = await contentManagerComponentsService.findAllComponents();
|
|
558
|
-
const componentsMap = components.reduce(
|
|
559
|
-
(acc, component) => {
|
|
560
|
-
acc[component.uid] = component;
|
|
561
|
-
return acc;
|
|
562
|
-
},
|
|
563
|
-
{}
|
|
564
|
-
);
|
|
565
|
-
return componentsMap;
|
|
566
|
-
},
|
|
567
|
-
async delete(releaseId) {
|
|
568
|
-
const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
|
|
569
|
-
populate: {
|
|
570
|
-
actions: {
|
|
571
|
-
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}`);
|
|
572
949
|
}
|
|
950
|
+
action.entryDocumentId = document.documentId;
|
|
573
951
|
}
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
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
|
|
587
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"] } }
|
|
588
976
|
});
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
if (strapi2.features.future.isEnabled("contentReleasesScheduling") && release2.scheduledAt) {
|
|
592
|
-
const schedulingService = getService("scheduling", { strapi: strapi2 });
|
|
593
|
-
await schedulingService.cancel(release2.id);
|
|
594
|
-
}
|
|
595
|
-
strapi2.telemetry.send("didDeleteContentRelease");
|
|
596
|
-
return release2;
|
|
597
|
-
},
|
|
598
|
-
async publish(releaseId) {
|
|
599
|
-
const releaseWithPopulatedActionEntries = await strapi2.entityService.findOne(
|
|
600
|
-
RELEASE_MODEL_UID,
|
|
601
|
-
releaseId,
|
|
602
|
-
{
|
|
603
|
-
populate: {
|
|
604
|
-
actions: {
|
|
605
|
-
populate: {
|
|
606
|
-
entry: {
|
|
607
|
-
fields: ["id"]
|
|
608
|
-
}
|
|
609
|
-
}
|
|
610
|
-
}
|
|
611
|
-
}
|
|
977
|
+
if (!disableUpdateReleaseStatus) {
|
|
978
|
+
getService("release", { strapi: strapi2 }).updateReleaseStatus(release2.id);
|
|
612
979
|
}
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
}
|
|
623
|
-
const collectionTypeActions = {};
|
|
624
|
-
const singleTypeActions = [];
|
|
625
|
-
for (const action of releaseWithPopulatedActionEntries.actions) {
|
|
626
|
-
const contentTypeUid = action.contentType;
|
|
627
|
-
if (strapi2.contentTypes[contentTypeUid].kind === "collectionType") {
|
|
628
|
-
if (!collectionTypeActions[contentTypeUid]) {
|
|
629
|
-
collectionTypeActions[contentTypeUid] = {
|
|
630
|
-
entriestoPublishIds: [],
|
|
631
|
-
entriesToUnpublishIds: []
|
|
632
|
-
};
|
|
633
|
-
}
|
|
634
|
-
if (action.type === "publish") {
|
|
635
|
-
collectionTypeActions[contentTypeUid].entriestoPublishIds.push(action.entry.id);
|
|
636
|
-
} else {
|
|
637
|
-
collectionTypeActions[contentTypeUid].entriesToUnpublishIds.push(action.entry.id);
|
|
638
|
-
}
|
|
639
|
-
} else {
|
|
640
|
-
singleTypeActions.push({
|
|
641
|
-
uid: contentTypeUid,
|
|
642
|
-
action: action.type,
|
|
643
|
-
id: action.entry.id
|
|
644
|
-
});
|
|
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}`);
|
|
645
989
|
}
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
const populate = await populateBuilderService(uid).populateDeep(Infinity).build();
|
|
652
|
-
const entry = await strapi2.entityService.findOne(uid, id, { populate });
|
|
653
|
-
try {
|
|
654
|
-
if (action === "publish") {
|
|
655
|
-
await entityManagerService.publish(entry, uid);
|
|
656
|
-
} else {
|
|
657
|
-
await entityManagerService.unpublish(entry, uid);
|
|
658
|
-
}
|
|
659
|
-
} catch (error) {
|
|
660
|
-
if (error instanceof utils.errors.ApplicationError && (error.message === "already.published" || error.message === "already.draft"))
|
|
661
|
-
;
|
|
662
|
-
else {
|
|
663
|
-
throw error;
|
|
664
|
-
}
|
|
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
|
|
665
995
|
}
|
|
666
|
-
}
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
const
|
|
670
|
-
const
|
|
671
|
-
contentTypeUid,
|
|
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(
|
|
672
1001
|
{
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
}
|
|
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 }
|
|
680
1009
|
);
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
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);
|
|
1025
|
+
}
|
|
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
|
|
690
1039
|
}
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
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);
|
|
694
1049
|
}
|
|
695
|
-
|
|
696
|
-
|
|
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
|
+
}
|
|
1074
|
+
}
|
|
697
1075
|
}
|
|
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
|
+
);
|
|
698
1081
|
}
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
id: releaseId,
|
|
718
|
-
releasedAt: {
|
|
719
|
-
$null: true
|
|
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
|
+
}
|
|
720
1100
|
}
|
|
1101
|
+
},
|
|
1102
|
+
data: {
|
|
1103
|
+
...update,
|
|
1104
|
+
isEntryValid: actionStatus
|
|
721
1105
|
}
|
|
722
|
-
}
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
|
|
735
|
-
id: actionId,
|
|
736
|
-
release: {
|
|
737
|
-
id: releaseId,
|
|
738
|
-
releasedAt: {
|
|
739
|
-
$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
|
+
}
|
|
740
1119
|
}
|
|
741
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
|
+
);
|
|
742
1126
|
}
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
throw new utils.errors.NotFoundError(
|
|
746
|
-
`Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
|
|
747
|
-
);
|
|
1127
|
+
getService("release", { strapi: strapi2 }).updateReleaseStatus(releaseId);
|
|
1128
|
+
return deletedAction;
|
|
748
1129
|
}
|
|
749
|
-
|
|
1130
|
+
};
|
|
1131
|
+
};
|
|
1132
|
+
class AlreadyOnReleaseError extends utils.errors.ApplicationError {
|
|
1133
|
+
constructor(message) {
|
|
1134
|
+
super(message);
|
|
1135
|
+
this.name = "AlreadyOnReleaseError";
|
|
750
1136
|
}
|
|
751
|
-
}
|
|
1137
|
+
}
|
|
752
1138
|
const createReleaseValidationService = ({ strapi: strapi2 }) => ({
|
|
753
1139
|
async validateUniqueEntry(releaseId, releaseActionArgs) {
|
|
754
|
-
const release2 = await strapi2.
|
|
755
|
-
|
|
1140
|
+
const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
|
|
1141
|
+
where: {
|
|
1142
|
+
id: releaseId
|
|
1143
|
+
},
|
|
1144
|
+
populate: {
|
|
1145
|
+
actions: true
|
|
1146
|
+
}
|
|
756
1147
|
});
|
|
757
1148
|
if (!release2) {
|
|
758
1149
|
throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
|
|
759
1150
|
}
|
|
760
1151
|
const isEntryInRelease = release2.actions.some(
|
|
761
|
-
(action) =>
|
|
1152
|
+
(action) => action.entryDocumentId === releaseActionArgs.entryDocumentId && action.contentType === releaseActionArgs.contentType && (releaseActionArgs.locale ? action.locale === releaseActionArgs.locale : true)
|
|
762
1153
|
);
|
|
763
1154
|
if (isEntryInRelease) {
|
|
764
|
-
throw new
|
|
765
|
-
`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}`
|
|
766
1157
|
);
|
|
767
1158
|
}
|
|
768
1159
|
},
|
|
769
|
-
|
|
1160
|
+
validateEntryData(contentTypeUid, entryDocumentId) {
|
|
770
1161
|
const contentType = strapi2.contentType(contentTypeUid);
|
|
771
1162
|
if (!contentType) {
|
|
772
1163
|
throw new utils.errors.NotFoundError(`No content type found for uid ${contentTypeUid}`);
|
|
773
1164
|
}
|
|
774
|
-
if (!contentType
|
|
1165
|
+
if (!utils.contentTypes.hasDraftAndPublish(contentType)) {
|
|
775
1166
|
throw new utils.errors.ValidationError(
|
|
776
1167
|
`Content type with uid ${contentTypeUid} does not have draftAndPublish enabled`
|
|
777
1168
|
);
|
|
778
1169
|
}
|
|
1170
|
+
if (contentType.kind === "collectionType" && !entryDocumentId) {
|
|
1171
|
+
throw new utils.errors.ValidationError("Document id is required for collection type");
|
|
1172
|
+
}
|
|
779
1173
|
},
|
|
780
1174
|
async validatePendingReleasesLimit() {
|
|
781
|
-
const
|
|
782
|
-
|
|
783
|
-
EE__default.default.features.get("cms-content-releases")?.options?.maximumReleases || 3
|
|
784
|
-
);
|
|
1175
|
+
const featureCfg = strapi2.ee.features.get("cms-content-releases");
|
|
1176
|
+
const maximumPendingReleases = typeof featureCfg === "object" && featureCfg?.options?.maximumReleases || 3;
|
|
785
1177
|
const [, pendingReleasesCount] = await strapi2.db.query(RELEASE_MODEL_UID).findWithCount({
|
|
786
1178
|
filters: {
|
|
787
1179
|
releasedAt: {
|
|
@@ -794,8 +1186,8 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
|
|
|
794
1186
|
}
|
|
795
1187
|
},
|
|
796
1188
|
async validateUniqueNameForPendingRelease(name, id) {
|
|
797
|
-
const pendingReleases = await strapi2.
|
|
798
|
-
|
|
1189
|
+
const pendingReleases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
|
|
1190
|
+
where: {
|
|
799
1191
|
releasedAt: {
|
|
800
1192
|
$null: true
|
|
801
1193
|
},
|
|
@@ -824,7 +1216,7 @@ const createSchedulingService = ({ strapi: strapi2 }) => {
|
|
|
824
1216
|
}
|
|
825
1217
|
const job = nodeSchedule.scheduleJob(scheduleDate, async () => {
|
|
826
1218
|
try {
|
|
827
|
-
await getService("release").publish(releaseId);
|
|
1219
|
+
await getService("release", { strapi: strapi2 }).publish(releaseId);
|
|
828
1220
|
} catch (error) {
|
|
829
1221
|
}
|
|
830
1222
|
this.cancel(releaseId);
|
|
@@ -866,70 +1258,172 @@ const createSchedulingService = ({ strapi: strapi2 }) => {
|
|
|
866
1258
|
}
|
|
867
1259
|
};
|
|
868
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
|
+
};
|
|
1279
|
+
}
|
|
1280
|
+
};
|
|
1281
|
+
};
|
|
869
1282
|
const services = {
|
|
870
1283
|
release: createReleaseService,
|
|
1284
|
+
"release-action": createReleaseActionService,
|
|
871
1285
|
"release-validation": createReleaseValidationService,
|
|
872
|
-
|
|
1286
|
+
scheduling: createSchedulingService,
|
|
1287
|
+
settings: createSettingsService
|
|
873
1288
|
};
|
|
874
|
-
const RELEASE_SCHEMA =
|
|
875
|
-
name:
|
|
876
|
-
|
|
877
|
-
|
|
878
|
-
|
|
879
|
-
|
|
880
|
-
|
|
881
|
-
otherwise: yup__namespace.string().nullable()
|
|
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()
|
|
882
1296
|
})
|
|
883
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()
|
|
1303
|
+
}).required().noUnknown();
|
|
884
1304
|
const validateRelease = utils.validateYupSchema(RELEASE_SCHEMA);
|
|
1305
|
+
const validatefindByDocumentAttachedParams = utils.validateYupSchema(
|
|
1306
|
+
FIND_BY_DOCUMENT_ATTACHED_PARAMS_SCHEMA
|
|
1307
|
+
);
|
|
885
1308
|
const releaseController = {
|
|
886
|
-
|
|
887
|
-
|
|
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({
|
|
888
1316
|
ability: ctx.state.userAbility,
|
|
889
1317
|
model: RELEASE_MODEL_UID
|
|
890
1318
|
});
|
|
891
1319
|
await permissionsManager.validateQuery(ctx.query);
|
|
892
1320
|
const releaseService = getService("release", { strapi });
|
|
893
|
-
const
|
|
894
|
-
|
|
895
|
-
|
|
896
|
-
|
|
897
|
-
const
|
|
898
|
-
|
|
899
|
-
|
|
900
|
-
|
|
901
|
-
|
|
902
|
-
|
|
903
|
-
|
|
904
|
-
|
|
905
|
-
|
|
906
|
-
|
|
907
|
-
|
|
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: {
|
|
908
1344
|
actions: {
|
|
909
|
-
|
|
910
|
-
|
|
1345
|
+
fields: ["type"],
|
|
1346
|
+
filters: {
|
|
1347
|
+
contentType,
|
|
1348
|
+
entryDocumentId: entryDocumentId ?? null,
|
|
1349
|
+
locale: locale ?? null
|
|
911
1350
|
}
|
|
912
1351
|
}
|
|
913
|
-
}
|
|
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
|
+
}
|
|
914
1380
|
});
|
|
915
|
-
ctx.body = { data
|
|
1381
|
+
ctx.body = { data: releases };
|
|
916
1382
|
}
|
|
917
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
|
+
},
|
|
918
1411
|
async findOne(ctx) {
|
|
919
1412
|
const id = ctx.params.id;
|
|
920
1413
|
const releaseService = getService("release", { strapi });
|
|
1414
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
921
1415
|
const release2 = await releaseService.findOne(id, { populate: ["createdBy"] });
|
|
922
1416
|
if (!release2) {
|
|
923
1417
|
throw new utils.errors.NotFoundError(`Release not found for id: ${id}`);
|
|
924
1418
|
}
|
|
925
|
-
const count = await
|
|
1419
|
+
const count = await releaseActionService.countActions({
|
|
926
1420
|
filters: {
|
|
927
1421
|
release: id
|
|
928
1422
|
}
|
|
929
1423
|
});
|
|
930
1424
|
const sanitizedRelease = {
|
|
931
1425
|
...release2,
|
|
932
|
-
createdBy: release2.createdBy ? strapi.admin
|
|
1426
|
+
createdBy: release2.createdBy ? strapi.service("admin::user").sanitizeUser(release2.createdBy) : null
|
|
933
1427
|
};
|
|
934
1428
|
const data = {
|
|
935
1429
|
...sanitizedRelease,
|
|
@@ -941,19 +1435,63 @@ const releaseController = {
|
|
|
941
1435
|
};
|
|
942
1436
|
ctx.body = { data };
|
|
943
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
|
+
},
|
|
944
1482
|
async create(ctx) {
|
|
945
1483
|
const user = ctx.state.user;
|
|
946
1484
|
const releaseArgs = ctx.request.body;
|
|
947
1485
|
await validateRelease(releaseArgs);
|
|
948
1486
|
const releaseService = getService("release", { strapi });
|
|
949
1487
|
const release2 = await releaseService.create(releaseArgs, { user });
|
|
950
|
-
const permissionsManager = strapi.admin
|
|
1488
|
+
const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
|
|
951
1489
|
ability: ctx.state.userAbility,
|
|
952
1490
|
model: RELEASE_MODEL_UID
|
|
953
1491
|
});
|
|
954
|
-
ctx.
|
|
1492
|
+
ctx.created({
|
|
955
1493
|
data: await permissionsManager.sanitizeOutput(release2)
|
|
956
|
-
};
|
|
1494
|
+
});
|
|
957
1495
|
},
|
|
958
1496
|
async update(ctx) {
|
|
959
1497
|
const user = ctx.state.user;
|
|
@@ -962,7 +1500,7 @@ const releaseController = {
|
|
|
962
1500
|
await validateRelease(releaseArgs);
|
|
963
1501
|
const releaseService = getService("release", { strapi });
|
|
964
1502
|
const release2 = await releaseService.update(id, releaseArgs, { user });
|
|
965
|
-
const permissionsManager = strapi.admin
|
|
1503
|
+
const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
|
|
966
1504
|
ability: ctx.state.userAbility,
|
|
967
1505
|
model: RELEASE_MODEL_UID
|
|
968
1506
|
});
|
|
@@ -979,18 +1517,18 @@ const releaseController = {
|
|
|
979
1517
|
};
|
|
980
1518
|
},
|
|
981
1519
|
async publish(ctx) {
|
|
982
|
-
const user = ctx.state.user;
|
|
983
1520
|
const id = ctx.params.id;
|
|
984
1521
|
const releaseService = getService("release", { strapi });
|
|
985
|
-
const
|
|
1522
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1523
|
+
const release2 = await releaseService.publish(id);
|
|
986
1524
|
const [countPublishActions, countUnpublishActions] = await Promise.all([
|
|
987
|
-
|
|
1525
|
+
releaseActionService.countActions({
|
|
988
1526
|
filters: {
|
|
989
1527
|
release: id,
|
|
990
1528
|
type: "publish"
|
|
991
1529
|
}
|
|
992
1530
|
}),
|
|
993
|
-
|
|
1531
|
+
releaseActionService.countActions({
|
|
994
1532
|
filters: {
|
|
995
1533
|
release: id,
|
|
996
1534
|
type: "unpublish"
|
|
@@ -1008,57 +1546,106 @@ const releaseController = {
|
|
|
1008
1546
|
}
|
|
1009
1547
|
};
|
|
1010
1548
|
const RELEASE_ACTION_SCHEMA = utils.yup.object().shape({
|
|
1011
|
-
|
|
1012
|
-
|
|
1013
|
-
|
|
1014
|
-
}).required(),
|
|
1549
|
+
contentType: utils.yup.string().required(),
|
|
1550
|
+
entryDocumentId: utils.yup.strapiID(),
|
|
1551
|
+
locale: utils.yup.string(),
|
|
1015
1552
|
type: utils.yup.string().oneOf(["publish", "unpublish"]).required()
|
|
1016
1553
|
});
|
|
1017
1554
|
const RELEASE_ACTION_UPDATE_SCHEMA = utils.yup.object().shape({
|
|
1018
1555
|
type: utils.yup.string().oneOf(["publish", "unpublish"]).required()
|
|
1019
1556
|
});
|
|
1557
|
+
const FIND_MANY_ACTIONS_PARAMS = utils.yup.object().shape({
|
|
1558
|
+
groupBy: utils.yup.string().oneOf(["action", "contentType", "locale"])
|
|
1559
|
+
});
|
|
1020
1560
|
const validateReleaseAction = utils.validateYupSchema(RELEASE_ACTION_SCHEMA);
|
|
1021
1561
|
const validateReleaseActionUpdateSchema = utils.validateYupSchema(RELEASE_ACTION_UPDATE_SCHEMA);
|
|
1562
|
+
const validateFindManyActionsParams = utils.validateYupSchema(FIND_MANY_ACTIONS_PARAMS);
|
|
1022
1563
|
const releaseActionController = {
|
|
1023
1564
|
async create(ctx) {
|
|
1024
1565
|
const releaseId = ctx.params.releaseId;
|
|
1025
1566
|
const releaseActionArgs = ctx.request.body;
|
|
1026
1567
|
await validateReleaseAction(releaseActionArgs);
|
|
1027
|
-
const
|
|
1028
|
-
const releaseAction2 = await
|
|
1029
|
-
ctx.
|
|
1568
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1569
|
+
const releaseAction2 = await releaseActionService.create(releaseId, releaseActionArgs);
|
|
1570
|
+
ctx.created({
|
|
1030
1571
|
data: releaseAction2
|
|
1031
|
-
};
|
|
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
|
+
});
|
|
1032
1611
|
},
|
|
1033
1612
|
async findMany(ctx) {
|
|
1034
1613
|
const releaseId = ctx.params.releaseId;
|
|
1035
|
-
const permissionsManager = strapi.admin
|
|
1614
|
+
const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
|
|
1036
1615
|
ability: ctx.state.userAbility,
|
|
1037
1616
|
model: RELEASE_ACTION_MODEL_UID
|
|
1038
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;
|
|
1039
1626
|
const query = await permissionsManager.sanitizeQuery(ctx.query);
|
|
1040
|
-
const
|
|
1041
|
-
const { results, pagination } = await
|
|
1042
|
-
sort: query.groupBy === "action" ? "type" : query.groupBy,
|
|
1627
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1628
|
+
const { results, pagination } = await releaseActionService.findPage(releaseId, {
|
|
1043
1629
|
...query
|
|
1044
1630
|
});
|
|
1045
1631
|
const contentTypeOutputSanitizers = results.reduce((acc, action) => {
|
|
1046
1632
|
if (acc[action.contentType]) {
|
|
1047
1633
|
return acc;
|
|
1048
1634
|
}
|
|
1049
|
-
const contentTypePermissionsManager = strapi.admin
|
|
1635
|
+
const contentTypePermissionsManager = strapi.service("admin::permission").createPermissionsManager({
|
|
1050
1636
|
ability: ctx.state.userAbility,
|
|
1051
1637
|
model: action.contentType
|
|
1052
1638
|
});
|
|
1053
1639
|
acc[action.contentType] = contentTypePermissionsManager.sanitizeOutput;
|
|
1054
1640
|
return acc;
|
|
1055
1641
|
}, {});
|
|
1056
|
-
const sanitizedResults = await utils.
|
|
1642
|
+
const sanitizedResults = await utils.async.map(results, async (action) => ({
|
|
1057
1643
|
...action,
|
|
1058
|
-
entry: await contentTypeOutputSanitizers[action.contentType](action.entry)
|
|
1644
|
+
entry: action.entry ? await contentTypeOutputSanitizers[action.contentType](action.entry) : {}
|
|
1059
1645
|
}));
|
|
1060
|
-
const groupedData = await
|
|
1061
|
-
const contentTypes2 =
|
|
1646
|
+
const groupedData = await releaseActionService.groupActions(sanitizedResults, query.sort);
|
|
1647
|
+
const contentTypes2 = releaseActionService.getContentTypeModelsFromActions(results);
|
|
1648
|
+
const releaseService = getService("release", { strapi });
|
|
1062
1649
|
const components = await releaseService.getAllComponents();
|
|
1063
1650
|
ctx.body = {
|
|
1064
1651
|
data: groupedData,
|
|
@@ -1074,8 +1661,8 @@ const releaseActionController = {
|
|
|
1074
1661
|
const releaseId = ctx.params.releaseId;
|
|
1075
1662
|
const releaseActionUpdateArgs = ctx.request.body;
|
|
1076
1663
|
await validateReleaseActionUpdateSchema(releaseActionUpdateArgs);
|
|
1077
|
-
const
|
|
1078
|
-
const updatedAction = await
|
|
1664
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1665
|
+
const updatedAction = await releaseActionService.update(
|
|
1079
1666
|
actionId,
|
|
1080
1667
|
releaseId,
|
|
1081
1668
|
releaseActionUpdateArgs
|
|
@@ -1087,17 +1674,71 @@ const releaseActionController = {
|
|
|
1087
1674
|
async delete(ctx) {
|
|
1088
1675
|
const actionId = ctx.params.actionId;
|
|
1089
1676
|
const releaseId = ctx.params.releaseId;
|
|
1090
|
-
const
|
|
1091
|
-
const deletedReleaseAction = await
|
|
1677
|
+
const releaseActionService = getService("release-action", { strapi });
|
|
1678
|
+
const deletedReleaseAction = await releaseActionService.delete(actionId, releaseId);
|
|
1092
1679
|
ctx.body = {
|
|
1093
1680
|
data: deletedReleaseAction
|
|
1094
1681
|
};
|
|
1095
1682
|
}
|
|
1096
1683
|
};
|
|
1097
|
-
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
|
+
};
|
|
1098
1707
|
const release = {
|
|
1099
1708
|
type: "admin",
|
|
1100
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
|
+
},
|
|
1101
1742
|
{
|
|
1102
1743
|
method: "POST",
|
|
1103
1744
|
path: "/",
|
|
@@ -1117,7 +1758,7 @@ const release = {
|
|
|
1117
1758
|
{
|
|
1118
1759
|
method: "GET",
|
|
1119
1760
|
path: "/",
|
|
1120
|
-
handler: "release.
|
|
1761
|
+
handler: "release.findPage",
|
|
1121
1762
|
config: {
|
|
1122
1763
|
policies: [
|
|
1123
1764
|
"admin::isAuthenticatedAdmin",
|
|
@@ -1215,6 +1856,22 @@ const releaseAction = {
|
|
|
1215
1856
|
]
|
|
1216
1857
|
}
|
|
1217
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
|
+
},
|
|
1218
1875
|
{
|
|
1219
1876
|
method: "GET",
|
|
1220
1877
|
path: "/:releaseId/actions",
|
|
@@ -1265,13 +1922,50 @@ const releaseAction = {
|
|
|
1265
1922
|
}
|
|
1266
1923
|
]
|
|
1267
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
|
+
};
|
|
1268
1962
|
const routes = {
|
|
1963
|
+
settings,
|
|
1269
1964
|
release,
|
|
1270
1965
|
"release-action": releaseAction
|
|
1271
1966
|
};
|
|
1272
|
-
const { features } = require("@strapi/strapi/dist/utils/ee");
|
|
1273
1967
|
const getPlugin = () => {
|
|
1274
|
-
if (features.isEnabled("cms-content-releases")) {
|
|
1968
|
+
if (strapi.ee.features.isEnabled("cms-content-releases")) {
|
|
1275
1969
|
return {
|
|
1276
1970
|
register,
|
|
1277
1971
|
bootstrap,
|
|
@@ -1283,6 +1977,9 @@ const getPlugin = () => {
|
|
|
1283
1977
|
};
|
|
1284
1978
|
}
|
|
1285
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
|
|
1286
1983
|
contentTypes
|
|
1287
1984
|
};
|
|
1288
1985
|
};
|