Skip to content

Issue 1706 tag rename - finishing #2989#3469

Merged
Rokt33r merged 20 commits intoBoostIO:masterfrom
AWolf81:1706-tag-rename
Apr 21, 2020
Merged

Issue 1706 tag rename - finishing #2989#3469
Rokt33r merged 20 commits intoBoostIO:masterfrom
AWolf81:1706-tag-rename

Conversation

@AWolf81
Copy link
Contributor

@AWolf81 AWolf81 commented Feb 14, 2020 •
edited
Loading

Description

@khaliqgant I hope it's OK that I'm adding the requested changes from your PR #2989.
My PR adds a dialog if the new tag is matching an existing tag and shows a warning dialog.

@ZeroX-DG can you please check if the feature is now like you expect it? Please also check if the copy of the dialog is OK.

Linting issue is present here too. I've commited with --no-verify option. Linting will be fixed in my other open PR.

Issue fixed

#1706

Type of changes

  • ⚪ Bug fix (Change that fixed an issue)
  • ⚪ Breaking change (Change that can cause existing functionality to change)
  • 🔘 Improvement (Change that improves the code. Maybe performance or development improvement)
  • ⚪ Feature (Change that adds new functionality)
  • ⚪ Documentation change (Change that modifies documentation. Maybe typo fixes)

Checklist:

  • 🔘 My code follows the project code style
  • ⚪ I have written test for my code and it has been tested
  • ⚪ All existing tests have been passed
  • 🔘 I have attached a screenshot/video to visualize my change if possible

Example merge warning (tag was 2nd and renamed to react - react tag already exists)
grafik

khaliqgant and others added 17 commits May 3, 2019 17:29
@khaliqgant
allow a tag to be renamed and update all notes that use that tag
4428963 
• repurpose RenameFolderModal.styl to RenameModal so it is more generic
@khaliqgant
call handleConfirmButtonClick directly instead of sending through a c…
242e8b6 
…onfirm method
@khaliqgant
better name for method to confirm the rename
0f6e218
@khaliqgant
Merge branch 'master' of https://github.com/BoostIO/Boostnote into 17…
5873e50 
…06-tag-rename
@khaliqgant
use close prop instead of a new method
e985f12
@khaliqgant
use callback ref instead of legacy string refs
b1d62c8
@khaliqgant
bind the handleChange in the constructor to allow for direct function…
ce5d4ac 
… assignment
@khaliqgant
update the tag in the URL upon change
7c5077b
@khaliqgant
use the eventEmitter to update the tags in the SnippetNoteDetail head…
d2c329a 
…er via the TagSelect component
@khaliqgant
Merge branch 'master' of https://github.com/BoostIO/Boostnote into 17…
e2f0692 
…06-tag-rename
@khaliqgant
Merge branch 'master' of https://github.com/BoostIO/Boostnote into 17…
e493a83 
…06-tag-rename
@khaliqgant
respect themes when modal is opened
9a2dcbc
@khaliqgant
show error message when trying to rename to an existing tag
4efbe08
@khaliqgant
lint fix, const over let
c0d22db
@AWolf81
add missing letter
a4532f1
@AWolf81
fix routing and add merge warning dialog
686376a
@AWolf81
Merge branch 'master' into 1706-tag-rename
2b56a11
@ZeroX-DG ZeroX-DG added the awaiting review ❇️ Pull request is awaiting a review. label Feb 14, 2020
@Flexo013
Copy link
Contributor

Flexo013 commented Feb 15, 2020

@AWolf81 Could you investigate the failing check of the CI?

@AWolf81
Copy link
Contributor Author

AWolf81 commented Feb 15, 2020 •
edited
Loading

@Flexo013 sure, I've checked it and fixed the build.

Update
Sorry, for the confusion. Seem like we're not using space-before-parens rule - so no space before the function parens is used here. Not sure why it was added. I need to check why format on save is not working for me at the moment.

@ZeroX-DG
Copy link
Member

ZeroX-DG commented Mar 22, 2020

@AWolf81 can you change the style to of the way we currently styling right now? Also the rename modal background doesn't match with some of the theme

@ZeroX-DG ZeroX-DG added awaiting changes 🖊️ Pull request has been reviewed, but contributor needs to make changes. and removed awaiting review ❇️ Pull request is awaiting a review. labels Mar 22, 2020
@AWolf81
Copy link
Contributor Author

AWolf81 commented Mar 27, 2020 •
edited
Loading

@ZeroX-DG Theme should be OK now. Please have a look.
I've noticed that it's not looking like the create new folder modal but I think the look is better with just the border below the input instead of the complete white border. But let me know how this should look or if that's OK.

I've noticed one point that could be improved. If you clicked on a tag to rename and click confirm with-out any changes there was also the merge dialog. I've added a check so it will just close the modal with-out the merge dialog if tag is not changed.

Update 02.04.2020
@ZeroX-DG Travis is running on my instance. Not sure why it is not running here. Maybe it needs to be re-run manually.

ZeroX-DG
ZeroX-DG approved these changes Apr 19, 2020
View reviewed changes
Copy link
Member

@ZeroX-DG ZeroX-DG left a comment

Choose a reason for hiding this comment

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

Sorry for the wait @AWolf81 LGTM 🎉 I think Travis got some error with it, not just you, Travis not running on many PR. I think we can try switching to something like Github Action 😄

@ZeroX-DG ZeroX-DG added approved 👍 Pull request has been approved by sufficient reviewers. and removed awaiting changes 🖊️ Pull request has been reviewed, but contributor needs to make changes. labels Apr 19, 2020
@Rokt33r Rokt33r added this to the v0.16.0 milestone Apr 21, 2020
@Rokt33r Rokt33r merged commit 8b13ec4 into BoostIO:master Apr 21, 2020
@khaliqgant
Copy link
Contributor

khaliqgant commented Oct 20, 2020

Totally missed the pings, thanks for wrapping this up @AWolf81!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ZeroX-DG ZeroX-DG ZeroX-DG approved these changes

Assignees

No one assigned

Labels

approved 👍 Pull request has been approved by sufficient reviewers.

Projects

None yet

Milestone

v0.16.0

Development

Successfully merging this pull request may close these issues.

5 participants

@AWolf81 @Flexo013 @ZeroX-DG @khaliqgant @Rokt33r