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.

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

Feat/add settings modal to folder card #245

Merged
merged 9 commits into from
Nov 23, 2020

Conversation

alexanderleegs
Copy link
Contributor

This PR adds a settings dropdown and folder renaming modal to the existing FolderCard. This allows users to rename collections/resource categories, or delete collections/resource categories with all their associated contents.

In addition, this PR is also intended to address the following issues:

Copy link
Contributor

@kwajiehao kwajiehao left a comment

Choose a reason for hiding this comment

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

left very minor comments

Comment on lines 48 to 51
<SaveDeleteButtons
isDisabled={false}
hasDeleteButton={false}
saveCallback={saveHandler}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we align these to the right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Resolved in 583bedc

Comment on lines 63 to 64
onProceed: PropTypes.func.isRequired,
onCancel: PropTypes.func.isRequired,
Copy link
Contributor

Choose a reason for hiding this comment

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

These props are marked as isRequired but aren't defined on the component

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Resolved in 697b4c7

Comment on lines +80 to +84
<DeleteWarningModal
onCancel={() => setCanShowDeleteWarningModal(false)}
onDelete={deleteHandler}
type="folder"
/>
Copy link
Contributor

Choose a reason for hiding this comment

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

This should have been changed before, but can we also align the delete warning modal's buttons to the right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Resolved in 583bedc

Copy link
Contributor

@kwajiehao kwajiehao left a comment

Choose a reason for hiding this comment

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

lgtm

@alexanderleegs alexanderleegs merged commit 49a6eee into staging Nov 23, 2020
@kwajiehao
Copy link
Contributor

kwajiehao commented Nov 23, 2020

Note that this PR also fixes the first point in issue #232

@alexanderleegs alexanderleegs deleted the feat/add-settings-modal-to-folderCard branch November 23, 2020 05:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Exit page-moving modal when clicking outside of it Misc. UI issues
2 participants