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

Add filter UI in slide table and information dashboard [Feature] #391

Merged
merged 1 commit into from
Apr 23, 2020

Conversation

cjchirag7
Copy link
Contributor

@cjchirag7 cjchirag7 commented Apr 21, 2020

Description

Following changes have been made

  • Add filter UI in slide table and information dashboard
  • Validate filter when user uploads a slide.
  • Simplify code for searching in both table.html and info.html
  • Made sure that searching, sorting and filtering, all work together without any collision.
  • The filters are shown only in security mode.

Motivation and Context

How Has This Been Tested?

  • Tested both desktop and mobile view in Chrome and Firefox by once login in as 'Admin', once as 'Editor' with some filters and once by setting DISABLE_SEC and ALLOW_PUBLIC as true

Screencasts -

  1. Filters UI in table.html (Similar exists in Info.html)
    filter-ui

  2. Validation for filter during Slide Upload
    filter-validation

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

Include validation on filter when user uploads a slide
@birm birm self-requested a review April 21, 2020 19:46
@birm
Copy link
Member

birm commented Apr 21, 2020

As of now, we don't support having an array of filters on an object -- https://github.com/camicroscope/Caracal/blob/master/handlers/filterFunction.js
You could add support for this if you want. (presumably we'd allow if the user filter array and the object filter array have anything in common?)

@cjchirag7
Copy link
Contributor Author

@birm sorry, I didn't notice that earlier. But, I have added support for an array of filters in #camicroscope/Caracal/pull/28

@birm birm merged commit d69cdf6 into camicroscope:develop Apr 23, 2020
@cjchirag7 cjchirag7 deleted the filter-table-ui branch April 25, 2020 04:45
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.

2 participants