Implement folder specific search for datasets #6677

philippotto · 2022-12-02T09:27:19Z

folder-specific search with optional recursion
folder path displayed as tag

URL of deployed dev instance (used for testing):

https://folderspecificsearch.webknossos.xyz

Steps to test:

create some folders to have a folder hierarchy
move some datasets
use the global search to find a dataset
customize the search to only search a specific folder and check that the search-subfolders option works
check that the paths next to the dataset names look good
switching to another folder while the search is active should change the folder that is searched (earlier versions cleared the search instead)
if the global search is enabled, there shouldn't be an active folder. activating a folder in that case, should switch automatically to the folder-specific search.
when going from global search to folder-specific search, the most recently active folder should be activated again (the same goes for clearing the search box)

Issues:

contributes to [Follow-up] Folder Enhancements #6669

(Please delete unneeded items, merge only when none are left open)

Updated (unreleased) changelog
Ready for review

…dingly

…der-specific-search

frontend/javascripts/dashboard/dataset/queries.tsx

fm3

Cool stuff :) I added some suggestions, only concerning code style in the backend.

app/controllers/DataSetController.scala

app/models/binary/DataSet.scala

daniel-wer

Works beautifully! Not much to add from my side :)

frontend/javascripts/dashboard/advanced_dataset/dataset_table.tsx

…ve); highlight currently searched folder in sidebar

…vated after clearing a search or going from global to local search again

daniel-wer

Great improvements! 🥇 I'll test once the CI is ready.

frontend/javascripts/dashboard/folders/folder_tree.tsx

frontend/javascripts/libs/react_hooks.ts

daniel-wer · 2022-12-07T12:28:53Z

Currently, the deployed dev branch fails to render with TypeError: Cannot read properties of undefined (reading 'key') at folder_tree.tsx:64:87. I think there needs to be a check whether treeData is empty.

Edit: Ironically, this is the line I commented with "Great 👍" 😅

…ullAndUndefined

philippotto · 2022-12-07T12:37:49Z

Currently, the deployed dev branch fails to render with TypeError: Cannot read properties of undefined (reading 'key') at folder_tree.tsx:64:87. I think there needs to be a check whether treeData is empty.

Fixed now :)

Edit: Ironically, this is the line I commented with "Great +1" sweat_smile

🤣 I relied too much on TS and didn't test the last code change obviously.

daniel-wer

It's a pleasure to use this feature, especially with the newest improvements! 👍

…cing * 'master' of github.com:scalableminds/webknossos: fixes infinite loop in getLineCount (#6689) Catch Malformed Json Exceptions (#6691) Implement folder-specific search for datasets (#6677) Fix s3fs region access, s3 url styles (#6679) Swagger annotation for shortLinkByKey (#6682) Improve layout of dashboard Provide valid JSON schema (#6642)

philippotto added 12 commits November 30, 2022 16:51

fix invalid active folder when switching to another organization

1ea19bc

adapt wording in sidebar when SEARCH_RESULTS_LIMIT is exceeded

3db78db

dont create folder when user hit escape in new-name-prompt

c0d0e6e

rename 'default' to Administrators & Dataset Managers

8a3e2f4

show drag preview image when dragging a dataset row

fe54b9d

add file icons

94848bc

extend comment

16d46ca

don't select a folder when an entry of its context menu was selected

76eb582

select folder root when deleting active folder

7276b10

update changelog

0a606bd

fix default value when setting recommended settings for task type

cd9711c

implement folder-specific search

10d195b

philippotto self-assigned this Dec 2, 2022

philippotto added 6 commits December 2, 2022 14:37

implement recursive folder search in backend and adapt frontend accor…

17e09a8

…dingly

format

7285fd7

only show breadcrumbs OR datastore in dataset table

e950557

improve UI for recursive configuration of search

43a6d9b

Merge branch 'master' of github.com:scalableminds/webknossos into fol…

d014011

…der-specific-search

update changelog

3466d40

philippotto commented Dec 5, 2022

View reviewed changes

frontend/javascripts/dashboard/dataset/queries.tsx Show resolved Hide resolved

frontend/javascripts/dashboard/dataset/queries.tsx Show resolved Hide resolved

add folder icon to breadcrumb tag

cee5f02

philippotto requested review from daniel-wer and fm3 December 5, 2022 09:57

philippotto changed the title ~~[WIP] Implement folder specific search for datasets~~ Implement folder specific search for datasets Dec 5, 2022

invalidate search results when mutating a dataset

701a2e9

fm3 reviewed Dec 6, 2022

View reviewed changes

app/controllers/DataSetController.scala Show resolved Hide resolved

app/models/binary/DataSet.scala Outdated Show resolved Hide resolved

app/models/binary/DataSet.scala Outdated Show resolved Hide resolved

daniel-wer reviewed Dec 6, 2022

View reviewed changes

frontend/javascripts/dashboard/advanced_dataset/dataset_table.tsx Outdated Show resolved Hide resolved

philippotto added 3 commits December 6, 2022 18:20

change search logic to implement three cases (global, folder, recursi…

f946290

…ve); highlight currently searched folder in sidebar

get rid of folderIdForSearch by unifying it with activeFolderId

bef4bc7

remember most recently used folder so that that folder can be re-acti…

f863eba

…vated after clearing a search or going from global to local search again

clean up

2cc4318

philippotto requested a review from daniel-wer December 7, 2022 10:37

philippotto and others added 2 commits December 7, 2022 11:49

use fancy-schmancy match expression

edcb920

Merge branch 'master' into folder-specific-search

cbb6ea0

daniel-wer reviewed Dec 7, 2022

View reviewed changes

frontend/javascripts/dashboard/folders/folder_tree.tsx Outdated Show resolved Hide resolved

frontend/javascripts/libs/react_hooks.ts Outdated Show resolved Hide resolved

philippotto added 2 commits December 7, 2022 12:04

rename recursive to includeSubfolders

e89b7a0

rename falsy to nullable in usePrevious

ab26e26

fix indexing of empty array and rename ignoreNullableValue to ignoreN…

3b7db93

…ullAndUndefined

philippotto added 2 commits December 8, 2022 14:14

fix get new task button in task tab in dashboard

3f29d02

update changelog

2ae8674

daniel-wer approved these changes Dec 8, 2022

View reviewed changes

Merge branch 'master' into folder-specific-search

671abc9

philippotto enabled auto-merge (squash) December 8, 2022 14:05

philippotto merged commit e027579 into master Dec 8, 2022

philippotto deleted the folder-specific-search branch December 8, 2022 14:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement folder specific search for datasets #6677

Implement folder specific search for datasets #6677

philippotto commented Dec 2, 2022 •

edited

Loading

fm3 left a comment

daniel-wer left a comment

daniel-wer left a comment

daniel-wer commented Dec 7, 2022 •

edited

Loading

philippotto commented Dec 7, 2022

daniel-wer left a comment

Implement folder specific search for datasets #6677

Implement folder specific search for datasets #6677

Conversation

philippotto commented Dec 2, 2022 • edited Loading

URL of deployed dev instance (used for testing):

Steps to test:

Issues:

fm3 left a comment

Choose a reason for hiding this comment

daniel-wer left a comment

Choose a reason for hiding this comment

daniel-wer left a comment

Choose a reason for hiding this comment

daniel-wer commented Dec 7, 2022 • edited Loading

philippotto commented Dec 7, 2022

daniel-wer left a comment

Choose a reason for hiding this comment

philippotto commented Dec 2, 2022 •

edited

Loading

daniel-wer commented Dec 7, 2022 •

edited

Loading