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

Filter tags and folders #2964

Merged
merged 13 commits into from
Feb 6, 2020
Merged

Filter tags and folders #2964

merged 13 commits into from
Feb 6, 2020

Conversation

amedora
Copy link
Contributor

@amedora amedora commented Apr 3, 2019

Description

This PR is a continuation work to #2779
filtertags

Issue fixed

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

@ZeroX-DG ZeroX-DG added the awaiting review ❇️ Pull request is awaiting a review. label Apr 4, 2019
@AWolf81
Copy link
Contributor

AWolf81 commented May 8, 2019

Thanks for continuing the work from the other PR. You've took the other branch as base to start your work, right?

I'd like to review this but I'm having troubles to run yarn - seems like the js-sequence-diagrams dependency is wrong (see screenshot below).
I think it should be @rokt33r/js-sequence-diagrams - I'll add this locally and check if I get it to work.

grafik

navButtonColor()
position relative
margin-right 6px
top 3px
Copy link
Contributor

Choose a reason for hiding this comment

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

You've perfectly aligned the search glass to bottom (see first screenshot below). But I think it would be visually better to move it slightly up.

grafik

The following is with 2px as top
grafik

@AWolf81
Copy link
Contributor

AWolf81 commented May 8, 2019

This looks good so far.

Just the mentioned dependency issue & styling is open - requires two locations in code to update import in MarkdownPreview.js and script tag in main.html. In main.html you can search for the string fucknpm 😄
You can also merge master into your branch. This will also fix the dependency issue.

I have two points that needs to be discussed:

  • Empty folder list is a bit confusing (see screenshot below) - not sure how to handle this. Should there be a no match indication if there is no item in a storage location?
  • It looks like we're having two search locations one with the search glass and the other with the text field to search all notes. What do you think the search function for tags/folders is more a filtering and we could also change the search symbol to a filter symbol that will open the filter box. Filter icon could be like this one
    grafik

grafik

@amedora
Copy link
Contributor Author

amedora commented May 9, 2019

Thanks for detailed reviewing, @AWolf81 😄

I've merged master into this branch, so the dependency issue has resolved.
I agree with you about filter icon. It looks better I think.

@ZeroX-DG Do you have any ideas?

@ZeroX-DG
Copy link
Member

I think it looks good now, people will aware that they're in search mode so I don't think we need a "no match" indicator.

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.

LGTM 🎉

@ZeroX-DG ZeroX-DG added approved 👍 Pull request has been approved by sufficient reviewers. needs extra review 🔎 Pull request requires review from an additional reviewer. and removed awaiting review ❇️ Pull request is awaiting a review. labels May 11, 2019
@ZeroX-DG ZeroX-DG requested a review from Rokt33r May 11, 2019 23:24
@ZeroX-DG
Copy link
Member

On second thought, I think you're right @AWolf81 the glass icon can make people confuse with the search box next to it. How should we indicate that this is a button for filter tags/folders? Maybe add a placeholder "filter tags/folders..." to the text box when it appears

@ZeroX-DG ZeroX-DG added awaiting changes 🖊️ Pull request has been reviewed, but contributor needs to make changes. and removed needs extra review 🔎 Pull request requires review from an additional reviewer. approved 👍 Pull request has been approved by sufficient reviewers. labels May 11, 2019
@AWolf81
Copy link
Contributor

AWolf81 commented May 12, 2019

@ZeroX-DG good idea to add the placeholder filter tags/folders...

I mentioned the indication for not matching anything because I was confused during testing - I thought there is something broken with-out noticing that it's not matching anything from my three test tags (#1st, #2nd, #Typescript).
Maybe that was probably also caused by my test tags as everything you type except 1,2,T will have no match.

I think a small text with No match for <filter-term>... would be good - also the UI will look better as there is no empty space.

An indication about the active filter (e.g. changing the color of the search glass) would make sense if the feature can also be active with a freshly started app but I think after start the glass is disabled by default, right? So it's probably OK to have no mode indication & have just the seach box as indication.

@amedora
Copy link
Contributor Author

amedora commented May 21, 2019

adding placeholder has done 👍
placeholder

@Rokt33r Rokt33r added awaiting review ❇️ Pull request is awaiting a review. and removed awaiting changes 🖊️ Pull request has been reviewed, but contributor needs to make changes. labels May 28, 2019
@Rokt33r
Copy link
Member

Rokt33r commented May 28, 2019

@ZeroX-DG Could you review this again?

@ZeroX-DG
Copy link
Member

@amedora can you fix the conflicts so and can approve it?

# Conflicts:
#	browser/main/SideNav/index.js
#	locales/da.json
#	locales/de.json
#	locales/en.json
#	locales/es-ES.json
#	locales/fa.json
#	locales/fr.json
#	locales/hu.json
#	locales/it.json
#	locales/ja.json
#	locales/ko.json
#	locales/no.json
#	locales/pl.json
#	locales/pt-BR.json
#	locales/pt-PT.json
#	locales/ru.json
#	locales/sq.json
#	locales/th.json
#	locales/tr.json
#	locales/zh-CN.json
#	locales/zh-TW.json
@amedora
Copy link
Contributor Author

amedora commented Dec 23, 2019

@ZeroX-DG done 👍

# Conflicts:
#	locales/zh-CN.json
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.

Very nice, LGTM 🎉

@ZeroX-DG ZeroX-DG added approved 👍 Pull request has been approved by sufficient reviewers. and removed awaiting review ❇️ Pull request is awaiting a review. labels Jan 30, 2020
@Rokt33r Rokt33r added awaiting changes 🖊️ Pull request has been reviewed, but contributor needs to make changes. and removed approved 👍 Pull request has been approved by sufficient reviewers. labels Feb 4, 2020
@Rokt33r
Copy link
Member

Rokt33r commented Feb 4, 2020

@amedora Could you fix the conflicts?

@Rokt33r Rokt33r added this to the v0.15.0 milestone Feb 4, 2020
# Conflicts:
#	browser/main/SideNav/PreferenceButton.styl
#	browser/main/SideNav/SideNav.styl
@amedora
Copy link
Contributor Author

amedora commented Feb 5, 2020

@Rokt33r done 👍

# Conflicts:
#	browser/main/SideNav/index.js
@amedora
Copy link
Contributor Author

amedora commented Feb 6, 2020

ping @Rokt33r

@Rokt33r Rokt33r removed the awaiting changes 🖊️ Pull request has been reviewed, but contributor needs to make changes. label Feb 6, 2020
@Rokt33r Rokt33r merged commit e44381f into BoostIO:master Feb 6, 2020
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.

5 participants