adds method to sort all documents and pages #101
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
|
|
||
| module.exports = self => { | ||
| return { | ||
| 'apostrophe:modulesRegistered': { | ||
| setContextOperations() { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,9 +33,11 @@ module.exports = self => { | |
|
|
||
| const hasRelatedTypes = !!relatedTypes.length; | ||
|
|
||
| const docs = (await self.getDocs(req, ids, manager, reporting)) | ||
| .map((doc) => self.apos.util.clonePermanent(doc)); | ||
|
|
||
| if (!hasRelatedTypes) { | ||
| self.sortDocs(docs); | ||
| return self.exportFile( | ||
| req, | ||
| reporting, | ||
|
|
@@ -55,6 +57,8 @@ module.exports = self => { | |
| }); | ||
| } | ||
|
|
||
| self.sortDocs(allDocs); | ||
|
|
||
| if (!format.includeAttachments) { | ||
| return self.exportFile( | ||
| req, | ||
|
|
@@ -101,10 +105,48 @@ module.exports = self => { | |
| ); | ||
| }, | ||
|
|
||
| sortDocs(docs) { | ||
| docs.sort((a, b) => { | ||
| if (a.aposMode === 'draft' && b.aposMode === 'published') { | ||
| return -1; | ||
| } | ||
| if (a.aposMode === 'published' && b.aposMode === 'draft') { | ||
| return 1; | ||
| } | ||
| if (!self.apos.page.isPage(a) && !self.apos.page.isPage(b)) { | ||
| return 0; | ||
| } | ||
| if (self.apos.page.isPage(a) && !self.apos.page.isPage(b)) { | ||
| return -1; | ||
| } | ||
| if (!self.apos.page.isPage(a) && self.apos.page.isPage(b)) { | ||
| return 1; | ||
| } | ||
| if (a.level > b.level) { | ||
| return 1; | ||
| } | ||
| if (a.level < b.level) { | ||
| return -1; | ||
| } | ||
| if (a.rank < b.rank) { | ||
| return -1; | ||
| } | ||
| if (a.rank > b.rank) { | ||
| return 1; | ||
| } | ||
| return 0; | ||
| }); | ||
| }, | ||
|
|
||
| // Get docs via their manager in order to populate them | ||
| // so that we can retrieve their relationships IDs later, | ||
| // and to let the manager handle permissions. | ||
| async getDocs(req, docsIds, manager, reporting) { | ||
| // For BC, used to accept hasRelatedTypes as third param | ||
| if (arguments.length === 5) { | ||
| manager = arguments[3]; | ||
| reporting = arguments[4]; | ||
| } | ||
| if (!docsIds.length) { | ||
| return []; | ||
| } | ||
|
|
@@ -121,7 +163,7 @@ module.exports = self => { | |
| $in: draftIds | ||
| } | ||
| }) | ||
| .relationships(false) | ||
|
There was a problem hiding this comment. unneeded since we get related docs manually There was a problem hiding this comment. BC issue: someone may have overridden this method, so please check for 5 arguments and if there are five, accept them that way too, ignoring the redundant parameter. There was a problem hiding this comment. Riiiight BC, always forget that. Would be so good to have a public API, and internal methods that shouldn't be updated by users. |
||
| .toArray(); | ||
|
|
||
| docs.push(...draftDocs); | ||
|
|
@@ -133,7 +175,7 @@ module.exports = self => { | |
| $in: publishedIds | ||
| } | ||
| }) | ||
| .relationships(false) | ||
|
There was a problem hiding this comment. unneeded since we get related docs manually There was a problem hiding this comment. Avoiding the redundant call should be a nice little perf win then. |
||
| .toArray(); | ||
|
|
||
| docs.push(...publishedDocs); | ||
|
|
@@ -225,7 +267,7 @@ module.exports = self => { | |
| if (!field.withType && !fieldValue) { | ||
| continue; | ||
| } | ||
| if (field.withType && relatedTypes && !self.relatedTypesIncludes(field.withType, relatedTypes)) { | ||
| continue; | ||
| } | ||
| if (field.withType && !self.canExport(req, field.withType)) { | ||
|
|
@@ -290,16 +332,16 @@ module.exports = self => { | |
| }); | ||
| } | ||
| } | ||
| }, | ||
|
|
||
| relatedTypesIncludes(name, relatedTypes) { | ||
| if ([ '@apostrophecms/any-page-type', '@apostrophecms/page' ].includes(name)) { | ||
| return relatedTypes.some(type => { | ||
| const module = self.apos.modules[type]; | ||
| return self.apos.instanceOf(module, '@apostrophecms/page-type'); | ||
| }); | ||
|
There was a problem hiding this comment. @boutell I can move this function in a utils file if you think it makes no sense to attach it to self (which I would agree with I think). |
||
| } | ||
| return relatedTypes.includes(name); | ||
| }, | ||
|
|
||
| async getRelatedDocsFromRichTextWidget(req, { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we do not get relationships whatever if
export related docshas been checked or no, we don't need this param anymore.