payload 1.5.5 → 1.5.7
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.
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.mergeDrafts = void 0;
|
|
7
7
|
const auth_1 = require("../../auth");
|
|
8
8
|
const appendVersionToQueryKey_1 = require("./appendVersionToQueryKey");
|
|
9
|
-
const sanitizeInternalFields_1 = __importDefault(require("../../utilities/sanitizeInternalFields"));
|
|
10
9
|
const replaceWithDraftIfAvailable_1 = __importDefault(require("./replaceWithDraftIfAvailable"));
|
|
11
10
|
const mergeDrafts = async ({ accessResult, collection, locale, payload, paginationOptions, query, where: incomingWhere, }) => {
|
|
12
11
|
// Query the main collection for any IDs that match the query
|
|
@@ -84,6 +83,9 @@ const mergeDrafts = async ({ accessResult, collection, locale, payload, paginati
|
|
|
84
83
|
updatedAt: {
|
|
85
84
|
$gt: parentDocUpdatedAt,
|
|
86
85
|
},
|
|
86
|
+
parent: {
|
|
87
|
+
$eq: parentDocID,
|
|
88
|
+
},
|
|
87
89
|
}, {}, { limit: 1 }).lean();
|
|
88
90
|
// If there are,
|
|
89
91
|
// this says that the newest version does not match the incoming query,
|
|
@@ -105,8 +107,8 @@ const mergeDrafts = async ({ accessResult, collection, locale, payload, paginati
|
|
|
105
107
|
if ((0, auth_1.hasWhereAccessResult)(accessResult)) {
|
|
106
108
|
finalQueryToBuild.where.and.push(accessResult);
|
|
107
109
|
}
|
|
108
|
-
if (
|
|
109
|
-
finalQueryToBuild.where.and[0].or.push(
|
|
110
|
+
if (incomingWhere) {
|
|
111
|
+
finalQueryToBuild.where.and[0].or.push(incomingWhere);
|
|
110
112
|
}
|
|
111
113
|
if (includedParentIDs.length > 0) {
|
|
112
114
|
finalQueryToBuild.where.and[0].or.push({
|
|
@@ -116,7 +118,7 @@ const mergeDrafts = async ({ accessResult, collection, locale, payload, paginati
|
|
|
116
118
|
});
|
|
117
119
|
}
|
|
118
120
|
if (excludedParentIDs.length > 0) {
|
|
119
|
-
finalQueryToBuild.where.and
|
|
121
|
+
finalQueryToBuild.where.and.push({
|
|
120
122
|
id: {
|
|
121
123
|
not_in: excludedParentIDs,
|
|
122
124
|
},
|
|
@@ -127,13 +129,10 @@ const mergeDrafts = async ({ accessResult, collection, locale, payload, paginati
|
|
|
127
129
|
result = {
|
|
128
130
|
...result,
|
|
129
131
|
docs: await Promise.all(result.docs.map(async (doc) => {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
sanitizedDoc = (0, sanitizeInternalFields_1.default)(sanitizedDoc);
|
|
133
|
-
const matchedVersion = versionCollectionMatchMap[sanitizedDoc.id];
|
|
134
|
-
if (matchedVersion) {
|
|
132
|
+
const matchedVersion = versionCollectionMatchMap[doc.id];
|
|
133
|
+
if (matchedVersion && matchedVersion.updatedAt > doc.updatedAt) {
|
|
135
134
|
return {
|
|
136
|
-
...
|
|
135
|
+
...doc,
|
|
137
136
|
...matchedVersion.version,
|
|
138
137
|
createdAt: matchedVersion.createdAt,
|
|
139
138
|
updatedAt: matchedVersion.updatedAt,
|
|
@@ -144,7 +143,7 @@ const mergeDrafts = async ({ accessResult, collection, locale, payload, paginati
|
|
|
144
143
|
payload,
|
|
145
144
|
entity: collection.config,
|
|
146
145
|
entityType: 'collection',
|
|
147
|
-
doc
|
|
146
|
+
doc,
|
|
148
147
|
locale,
|
|
149
148
|
});
|
|
150
149
|
})),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeDrafts.js","sourceRoot":"","sources":["../../../src/versions/drafts/mergeDrafts.ts"],"names":[],"mappings":";;;;;;AAKA,qCAAkD;AAClD,uEAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"mergeDrafts.js","sourceRoot":"","sources":["../../../src/versions/drafts/mergeDrafts.ts"],"names":[],"mappings":"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"}
|