Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make changes for import/export module to work properly #4270

Merged
merged 26 commits into from
Oct 12, 2023
Merged

make changes for import/export module to work properly #4270

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
30ab5da
pass checked document ids to toolbar
ETLaurent Aug 15, 2023
5cbec97
use dismissProgressNotification
ETLaurent Aug 23, 2023
c714926
pass notification options and sent results as an event in notif
ETLaurent Aug 23, 2023
3b06f5e
remove notification options and use req.body.messages to sent results…
ETLaurent Aug 23, 2023
7c94ea6
adds the option originalResponse to the http remote method for the ba…
ValJed Aug 28, 2023
ccb5c18
disable export for users
ETLaurent Aug 29, 2023
eaf5179
importExport
ETLaurent Aug 30, 2023
b376997
adds new color variable
ValJed Sep 18, 2023
fc15e25
allows to pass existing ID to attachment insert method
ValJed Sep 18, 2023
bea905a
when passing attachmentId check if this one exists already
ValJed Sep 20, 2023
f1eb181
adds update method
ValJed Sep 21, 2023
a560591
returns promise in order to wait if needed
ValJed Sep 22, 2023
5346f26
starts notification with percentage of 0 to avoid NaN
ValJed Sep 26, 2023
e9f7a0c
removes an useless return satement
ValJed Sep 26, 2023
66989c4
in attachment update method, make sure to delete the existing retriev…
ValJed Sep 28, 2023
2b62ecf
Merge remote-tracking branch 'origin/main' into pro-4261-export-docs
ETLaurent Oct 2, 2023
6d88220
fixes lint
ValJed Oct 3, 2023
26df2d0
adds changelog
ValJed Oct 3, 2023
b1b72c2
minor changes
ValJed Oct 4, 2023
2c6f00a
compute new docIds and archivedDocIds when updating attachment to ver…
ValJed Oct 6, 2023
734e292
moves import export related options to the module itself
ValJed Oct 6, 2023
90f9fb3
only gets existing related docs from IDs
ValJed Oct 6, 2023
92b8054
Merge remote-tracking branch 'origin/main' into pro-4261-export-docs
ETLaurent Oct 11, 2023
526c519
typos
ETLaurent Oct 12, 2023
8af5ac0
typo
ETLaurent Oct 12, 2023
4ba007d
use docIds and archivedDocIds from existing attachment to get related…
ETLaurent Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions modules/@apostrophecms/attachment/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,9 +474,18 @@ module.exports = {
archived: 1
};

const existingRelatedDocs = await self.apos.doc.db.find({
_id: { $in: [ ...attachment.docIds, ...attachment.archivedDocIds ] }
}, { projection }).toArray();
const existingRelatedDocs = await self.apos.doc.db
.find({
_id: {
$in: [
...existing.docIds,
...existing.archivedDocIds,
...attachment.docIds,
...attachment.archivedDocIds
Comment on lines +481 to +484
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@boutell is this what you meant?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes sorry

]
}
}, { projection })
.toArray();

const { docIds, archivedDocIds } = existingRelatedDocs
.reduce(({ docIds, archivedDocIds }, doc) => {
Expand Down
Loading