Document Archive #921
Merged
Document Archive #921
Conversation
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
Allow reading of archived docs
Fix: Duplicate user name on published but unedited docs
tommoor
commented
Apr 6, 2019
| isDraft, | ||
| } = document; | ||
| const neverUpdated = publishedAt === updatedAt; | ||
| let content; | ||
|
|
||
| if (deletedAt) { |
There was a problem hiding this comment.
Made this logic easier to reason about
| command: yarn lint |
There was a problem hiding this comment.
Just separating CI flow and lint into separate steps for clarity
| @@ -72,16 +71,6 @@ class Layout extends React.Component<Props> { | |||
| this.redirectTo = homeUrl(); | |||
| } | |||
|
|
|||
| @keydown('e') | |||
| goToEdit(ev) { | |||
| @@ -94,6 +100,17 @@ class MainSidebar extends React.Component<Props> { | |||
| <Section> | |||
| <Collections onCreateCollection={this.handleCreateCollection} /> | |||
| </Section> | |||
| <Section> | |||
| this.redirectTo = duped.url; | ||
| this.props.ui.showToast('Document duplicated'); |
There was a problem hiding this comment.
New toast messages after actions for clarity and consistency
| @@ -121,7 +120,7 @@ | |||
| "mobx-react": "^5.4.2", | |||
| "natural-sort": "^1.0.0", | |||
| "nodemailer": "^4.4.0", | |||
| "outline-icons": "^1.7.0", | |||
| "outline-icons": "^1.8.0-0", | |||
| @@ -0,0 +1,11 @@ | |||
| module.exports = { | |||
|
|
||
| // documentStructure can only be updated by one request at the time | ||
| const unlock = await asyncLock('testLock'); |
There was a problem hiding this comment.
🔥 looks like this should have been using the same collection lock – updated.
| if (match) { | ||
| if (!options.deleteDocument && !returnValue) returnValue = match; |
There was a problem hiding this comment.
Separated the code for managing the documentStructure and deleting / archiving individual docs
|
|
||
| await this.destroy({ transaction, ...options }); | ||
|
|
||
| events.add({ name: 'documents.delete', model: this }); |
There was a problem hiding this comment.
New events for future audit log
This was referenced Apr 6, 2019
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
TODO