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