Filtering Overhaul (#2207)
* Implemented the first version of dynamic filtering which is all Extension based. * Implemented basic generic property filter for expanded metadata filtering. * Fixed up the code to allow for nested properties and fixed up the Contains to work only for IList's * Started refactoring for the new approach * More progress, need to rethink a few filters like read progress to be % based and people needs to be more explicit. * Refactored most of the existing filtering operations into dedicate extensions for the appropriate comparisons. People still need to be reworked to be more dynamic. * Fixed a bug with continue point where it fails on chapters or volumes tagged with a range * Wired up a basic api path to start building groups. No and/or support yet. * Started on the UI * Made a bit of progress on the UI as I'm putting the pieces together about how to design it. * Refactored names to make it more consistent. New thinking is we will have one row that will take a filter statement and manipulate it. It will emit said statement and a builder will turn into the higher level statement. * Started working on updating code to use new inject() method. * Fixed the code to switch the comparisons. * Added dynamic input structure in and moved add/remove to the builder. * Fixed an enum bug * Hooked in basic dropdown support that is dynamic to the field. Only language is missing as that needs a DTO change (but don't want to break API) * Fixed a bug where dropdown options wouldn't re-populate when switching fields that are both dropdowns * Started adding metadata builder * Fixed when typing on filter row the focus resetting * Refactored to add an additional component which handles the compounding of filter rows. * Started hooking up v2 dto in the UI to send to the backend. * Started working on building group UI for and/or support. * Lots of backend code fixes to ensure OR and AND statements combine correctly. * More trying to figure out how to write the UI code * Started debugging to remember what I was last doing. * Lots of progress towards building out the UI recursively * I got the dto to build and propagate up the chain * Started hooking up to the actual api to fetch the data. * Basic wire up to the backend is working. * HasName is now complete * Refactored SortOptions code into an extension and streamlined LimitTo to the correct place. * Fixed a bug where Library Filters from the Group weren't actually being taken into account. * Refactored a lot of code so builder will now export the full dto. * Cleaned up the data flow from metadata filter to library detail * Got the dropdown to load preset values on first load, but now it triggers twice. * Changed so when you add a new filter, it does it at top and fixed remove * Fixed the remove button being on the wrong row * Cleaned up the arrays to make it easier to manage * Cleaned up some of the backend to ensure it doesn't throw an incorrect exception * I'm starting to tread water, taking a break * Fixed a merge issue * Cleaned up Docker checks. * Default IpAddresses to empty string. * Refactored IsDocker to be completely static * Figured out the issue with the dropdown not working. * Almost got it, but the event isn't being called. * I think i might try something else. This doesn't seem to be working. * On the new implementation, implemented remove group. * Use enums to reduce copy/paste * the new system is working pretty well, ill go with it and move on. Can alwasy refactor. * Code is totally broken, but working the cache resume code with some hiccups. * I need to take a break * Stashing my broken code. I have an idea on how to serialize to the URL, but I need to rearchitect a lot. * Reverted last commit * remove domain * Fixed up some hardcoded caching. I'm giving up on this implementation and going to a simpler version * Refactored the backend to just allow flat filtering. * Started refactoring the components to make it flat filtering only. * Finished refactoring so that the base preset case will render. * Implemented basic query functionality on desktop. Clear needs some work and url code. * Some cleanup * Working on filtering url encode/decode * Interacting with filters now saves to url and can be reloaded from the url. Named filters is not hooked up. * Fixed a double load on the library detail page. * Moved the library filtering code out of the FilterBuilder as it needs to be handled differently. * Fixed up how we handle library statements in the filter. * Fixed up how links that perform a filter work. * Refactored a bunch of linking to a search page. * LimitTo works, my css however does not. * Switched some code to use localized strings. * Cleaned up some css * Hooked up Languages and put some additional code in so that Languages will return invalid Language codes back. * Removed a duplicate language signature. * Hooked up ability to preload collection tag. * Want To Read is converted * Converted lots of code to new filtering system. Need to do Bookmarks. * Fixed a potential bug with default filter creation. * Hooked up the ability to disable certain filter fields from appearing. * Added mobile drawer code and a hook for Robbie to take a look for some css. * Converted the APIs for dashboard along with other safety fixes to ensure bad data doesn't break any of the filtering apis * Added the backend code to handle summary query * Converted Want to Read api properly now. * Fixed the HasReadingProgress query * Hooked back the Reading Progress for legacy APIs * Fixed some bad localization strings * Wrote the filtering code for all-bookmarks. * OPDS is now using the new filter * Fixed OPDS reading lists and covers not sending their images. * Fixed up the OPDS feed and fixed a bug where libraries also weren't sending their images over OPDS * All but dropdown options have been validated and tested. * Fixed up some default cases for setting up the filter. * Sorted filter fields and re-keyed to be better suited based on user's needs. Fixed a bug where OPDS Series (from library view) wasn't showing the summary. Moved the (Format) from the title to the description to make the UX much better for OPDS. MOved * don't send empty summaries in the new summary formatting * Fixed up some default cases for setting up the filter. * Fixed the reset button * Fixed infinite scroller not having correct scope key * Added localization to the new components and removed old debug code * Styling fixes * Fixed deep linking across the app. Made it so you can click Characters from Reading list and open a filtered search. * A bit of styling for mobile * Don't show language if it's not properly set --------- Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
This commit is contained in:
Joe Milazzo
GitHub
parent
bc2a12a9cd
commit
9cc5953d07
102 changed files with 3299 additions and 1827 deletions
|
|
@ -164,7 +164,7 @@
|
|||
|
||||
"user-holds": {
|
||||
"title": "Scrobble Holds",
|
||||
"description": "This is a user-managed list of Series that will not be scrobbled to upstream providers. You can remove a series at any time and the next Scrobble-able event (reading progress, rating, want to read status) will trigger events."
|
||||
"description": "This is a user-managed list of Series that will not be scrobbled to upstream providers. You can remove a series at any time and the next scrobble-able event (reading progress, rating, want to read status) will trigger events."
|
||||
},
|
||||
|
||||
"theme-manager": {
|
||||
|
|
@ -522,6 +522,7 @@
|
|||
},
|
||||
|
||||
"all-series": {
|
||||
"title": "All Series",
|
||||
"series-count": "{{common.series-count}}"
|
||||
},
|
||||
|
||||
|
|
@ -1322,7 +1323,8 @@
|
|||
"read": "{{common.read}}",
|
||||
"read-options-alt": "Read options",
|
||||
"incognito-alt": "(Incognito)",
|
||||
"no-data": "Nothing added"
|
||||
"no-data": "Nothing added",
|
||||
"characters-title": "{{series-metadata-detail.characters-title}}"
|
||||
},
|
||||
|
||||
"events-widget": {
|
||||
|
|
@ -1435,7 +1437,7 @@
|
|||
"close-reader-alt": "Close Reader"
|
||||
},
|
||||
|
||||
"infinite-reader": {
|
||||
"infinite-scroller": {
|
||||
"continuous-reading-prev-chapter-alt": "Scroll up to move to previous chapter",
|
||||
"continuous-reading-prev-chapter": "Previous Chapter",
|
||||
"continuous-reading-next-chapter-alt": "Scroll up to move to next chapter",
|
||||
|
|
@ -1481,8 +1483,14 @@
|
|||
|
||||
"metadata-filter": {
|
||||
"filter-title": "Filter",
|
||||
"sort-by-label": "Sort By",
|
||||
"ascending-alt": "Ascending",
|
||||
"descending-alt": "Descending",
|
||||
"reset": "{{common.reset}}",
|
||||
"apply": "{{common.apply}}",
|
||||
"limit-label": "Limit To",
|
||||
|
||||
"format-label": "Format",
|
||||
"format-tooltip": "This is library agnostic",
|
||||
"libraries-label": "Libraries",
|
||||
"collections-label": "Collections",
|
||||
"genres-label": "Genres",
|
||||
|
|
@ -1509,13 +1517,7 @@
|
|||
"series-name-tooltip": "Series name will filter against Name, Sort Name, or Localized Name",
|
||||
"release-label": "Release",
|
||||
"min": "Min",
|
||||
"max": "Max",
|
||||
"sort-by-label": "Sort By",
|
||||
"ascending-alt": "Ascending",
|
||||
"descending-alt": "Descending",
|
||||
"reset": "{{common.reset}}",
|
||||
"apply": "{{common.apply}}"
|
||||
|
||||
"max": "Max"
|
||||
},
|
||||
|
||||
"sort-field-pipe": {
|
||||
|
|
@ -1688,6 +1690,58 @@
|
|||
"invalid-password-reset-url": "Invalid reset password url"
|
||||
},
|
||||
|
||||
"metadata-builder": {
|
||||
"or": "Match any of the following",
|
||||
"and": "Match all of the following",
|
||||
"add-rule": "Add Rule",
|
||||
"remove-rule": "Remove Row {{num}}"
|
||||
},
|
||||
|
||||
"filter-field-pipe": {
|
||||
"age-rating": "Age Rating",
|
||||
"characters": "Characters",
|
||||
"collection-tags": "Collection Tags",
|
||||
"colorist": "Colorist",
|
||||
"cover-artist": "Cover Artist",
|
||||
"editor": "Editor",
|
||||
"formats": "Formats",
|
||||
"genres": "Genres",
|
||||
"inker": "Inker",
|
||||
"languages": "Languages",
|
||||
"libraries": "Libraries",
|
||||
"letterer": "Letterer",
|
||||
"publication-status": "Publication Status",
|
||||
"penciller": "Penciller",
|
||||
"publisher": "Publisher",
|
||||
"read-progress": "Read Progress",
|
||||
"read-time": "Read Time",
|
||||
"release-year": "Release Year",
|
||||
"series-name": "Series Name",
|
||||
"summary": "Summary",
|
||||
"tags": "Tags",
|
||||
"translators": "Translators",
|
||||
"user-rating": "User Rating",
|
||||
"writers": "Writers"
|
||||
},
|
||||
|
||||
"filter-comparison-pipe": {
|
||||
"begins-with": "Begins with",
|
||||
"contains": "Contains",
|
||||
"equal": "Equal",
|
||||
"greater-than": "Greater than",
|
||||
"greater-than-or-equal": "Greater than or equal",
|
||||
"less-than": "Less than",
|
||||
"less-than-or-equal": "Less than or equal",
|
||||
"matches": "Matches",
|
||||
"does-not-contain": "Does not contain",
|
||||
"not-equal": "Not equal",
|
||||
"ends-with": "Ends with",
|
||||
"is-before": "Is before",
|
||||
"is-after": "Is after",
|
||||
"is-in-last": "Is in last",
|
||||
"is-not-in-last": "Is not in last"
|
||||
},
|
||||
|
||||
"toasts": {
|
||||
"regen-cover": "A job has been enqueued to regenerate the cover image",
|
||||
"no-pages": "There are no pages. Kavita was not able to read this archive.",
|
||||
|
|
@ -1763,7 +1817,8 @@
|
|||
"alert-bad-theme": "There is invalid or unsafe css in the theme. Please reach out to your admin to have this corrected. Defaulting to dark theme.",
|
||||
"confirm-library-delete": "Are you sure you want to delete the {{name}} library? You cannot undo this action.",
|
||||
"confirm-library-type-change": "Changing library type will trigger a new scan with different parsing rules and may lead to series being re-created and hence you may loose progress and bookmarks. You should backup before you do this. Are you sure you want to continue?",
|
||||
"confirm-download-size": "The {{entityType}} is {{size}}. Are you sure you want to continue?"
|
||||
"confirm-download-size": "The {{entityType}} is {{size}}. Are you sure you want to continue?",
|
||||
"list-doesnt-exist": "This list doesn't exist"
|
||||
},
|
||||
|
||||
"actionable": {
|
||||
|
|
@ -1790,7 +1845,11 @@
|
|||
"view-series": "View Series",
|
||||
"clear": "Clear",
|
||||
"import-cbl": "Import CBL",
|
||||
"read": "Read"
|
||||
"read": "Read",
|
||||
"add-rule-group-and": "Add Rule Group (AND)",
|
||||
"add-rule-group-or": "Add Rule Group (OR)",
|
||||
"remove-rule-group": "Remove Rule Group"
|
||||
|
||||
},
|
||||
|
||||
"preferences": {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue