remove secret from folder #3
Merged
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
Calyhre
requested changes
Dec 18, 2016
| 'createSecretUserRightsSuccess', | ||
| 'createSecretUserRightsFailure', | ||
| 'updateSecretUserRightsSuccess', | ||
| 'updateSecretUserRightsFailure', | ||
| 'deleteSecretUserRightsSuccess', | ||
| 'deleteSecretUserRightsFailure', | ||
| 'removeSecretFromCurrentFolderSuccess', | ||
| 'removeSecretFromCurrentFolderFailure', | ||
| 'moveSecretToFolderSuccess', | ||
| 'moveSecretToFolderFailure', |
There was a problem hiding this comment.
Please cleanup unused/commented code. Even if we plan to re-use it later, git is here to retrieve it if we need :)
| @@ -43,6 +48,9 @@ class MetadataActions { | |||
| return secretin | |||
| .deleteSecret(secret.id) | |||
| .catch((error) => { | |||
| this.deleteSecretFailure({ | |||
| currentUser: secretin.currentUser, | |||
| }); | |||
There was a problem hiding this comment.
As I now know we can easily have metadata, please return only those. Current user is useless here :)
ℹ️ Also for the success action.
| // this.moveSecretToFolderFailure({ error }); | ||
| // throw error; | ||
| // }); | ||
| // } |
| secret, | ||
| currentFolderId: parentFolderId, | ||
| })} | ||
| disabled={!secret.canBeUpdatedBy(currentUser) || typeof parentFolderId === 'undefined'} |
There was a problem hiding this comment.
parentFolderId may be null, undefined, or a string. Probably useless to check the type here?
| @@ -38,6 +38,12 @@ class MetadataStore { | |||
| ); | |||
| } | |||
|
|
|||
| onDeleteSecretFailure({ currentUser }) { | |||
| this.setState(this.state | |||
| .set('metadata', Immutable.fromJS(currentUser.metadatas).map(secret => Secret.createFromRaw(secret))) | |||
There was a problem hiding this comment.
When you'll change the return value, you won't need currentUser here ;)
Calyhre
approved these changes
Dec 18, 2016
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.
Replace
moveSecretToFolderbyaddSecretToFolderbecause move means deletion from the previous folder and would be a different action (done later).New actions
removeFromCurrentFolderwas written to put back one secret/folder in ROOT directory and unshare it with everybody accessing the folder.