[ENG-1269] Search options (#1561)

* search options start

* small progress

* more

* bunch of stuff

* semi functioning filters

* cleanup setup api

* progress

* remove filters

* hooked up to query epic moment

* fix

* move db stuff to specific modules

* in/notIn for some fields

* generate ts

* big gains

* working filter options for locations, tags and kind

* working search query

* perfect fixed filters

* saved searches lol

* merge error

* saved searches via api

* better routing

* [ENG-1338] Fix fresh Spacedrive install failing to start due to attempting to query a nonexistent Library (#1649)

Fix Spacedrive failing to start due to attempting to query a nonexistent Library
 - Rename useShoudRedirect to useRedirectToNewLocations
 - Improve behaviour for the immedite redirection after adding a new location

* Show hidden files false by default (#1652)

bool

* fix remove filter in list

* tweaks

* fix nav buttons

* unify MediaData search handling

* cleanup saved search writing

* Add left top bar portals for tags and search + fixed media view on tags

* added search to filter dropdown

* render cycle improvements

* hotfix

* wip

* Refactor with Brendan, but this is a WIP and the search query no longer works

Co-authored-by: Brendan Allan <[email protected]>

* progress

* fix location/$id page

* fix tags too

Co-authored-by: Brendan Allan <[email protected]>

* 3rd refactor lol

epic style

* half-done with enum-ification of SearchFilterArgs

* broken fixed filters but working inNotIn filters

* search name + extension kinda working

* hidden filter

* fixed filters working??

* deferred search value

* extensions works

* filtered search items mostly working

* tweaks

* stacked approach working for non-search filters

* move to Explorer/Search

* actually use filterArgs in queries

things actually work properly now

* added new icons from Mint

* goof

* cleanup types, filters and mutation logic

* actually use search value

* remove overview from sidebar

* don't shrink LibrariesDropdown ga

* remove overview from sidebar and default to /network

---------

Co-authored-by: Brendan Allan <[email protected]>
Co-authored-by: Vítor Vasconcellos <[email protected]>
Co-authored-by: Brendan Allan <[email protected]>

apps/mobile/src/screens/Location.tsx

@@ -12,10 +12,14 @@ export default function LocationScreen({ navigation, route }: SharedScreenProps<
  const { data } = useLibraryQuery([
  'search.paths',
  {
- filter: {
- locationId: id,
- path: path ?? ''
- },
+ filters: [
+ {
+ filePath: {
+ locations: { in: [id] },
+ path: { path: path ?? '', location_id: id, include_descendants: false }
+ }
+ }
+ ],
  take: 100
  }
  ]);

apps/mobile/src/screens/Search.tsx

@@ -2,7 +2,7 @@ import { MagnifyingGlass } from 'phosphor-react-native';
 import { Suspense, useDeferredValue, useMemo, useState } from 'react';
 import { ActivityIndicator, Pressable, Text, TextInput, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import { getExplorerItemData, useLibraryQuery } from '@sd/client';
+import { getExplorerItemData, SearchFilterArgs, useLibraryQuery } from '@sd/client';
 import Explorer from '~/components/explorer/Explorer';
 import { tw, twStyle } from '~/lib/tailwind';
 import { RootStackScreenProps } from '~/navigation';
@@ -18,14 +18,23 @@ const SearchScreen = ({ navigation }: RootStackScreenProps<'Search'>) => {
  const [search, setSearch] = useState('');
  const deferredSearch = useDeferredValue(search);
 
+ const filters = useMemo(() => {
+ const [name, ext] = deferredSearch.split('.');
+
+ const filters: SearchFilterArgs[] = [];
+
+ if (name) filters.push({ filePath: { name: { contains: name } } });
+ if (ext) filters.push({ filePath: { extension: { in: [ext] } } });
+
+ return filters;
+ }, [deferredSearch]);
+
  const query = useLibraryQuery(
  [
  'search.paths',
  {
  // ...args,
- filter: {
- search: deferredSearch
- },
+ filters,
  take: 100
  }
  ],

apps/mobile/src/screens/Tag.tsx

@@ -9,9 +9,7 @@ export default function TagScreen({ navigation, route }: SharedScreenProps<'Tag'
  const search = useLibraryQuery([
  'search.objects',
  {
- filter: {
- tags: [id]
- },
+ filters: [{ object: { tags: { in: [id] } } }],
  take: 100
  }
  ]);

core/prisma/migrations/20231022013532_saved_searches/migration.sql

@@ -0,0 +1,15 @@
+-- CreateTable
+CREATE TABLE "saved_search" (
+ "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ "pub_id" BLOB NOT NULL,
+ "filters" BLOB,
+ "name" TEXT,
+ "icon" TEXT,
+ "description" TEXT,
+ "order" INTEGER,
+ "date_created" DATETIME,
+ "date_modified" DATETIME
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "saved_search_pub_id_key" ON "saved_search"("pub_id");

core/prisma/schema.prisma

@@ -532,3 +532,17 @@ model Notification {
 
  @@map("notification")
 }
+
+model SavedSearch {
+ id Int @id @default(autoincrement())
+ pub_id Bytes @unique
+ filters Bytes?
+ name String?
+ icon String?
+ description String?
+ order Int? // Add this line to include ordering
+ date_created DateTime?
+ date_modified DateTime?
+
+ @@map("saved_search")
+}

core/src/api/mod.rs

@@ -50,7 +50,7 @@ impl BackendFeature {
 
 mod auth;
 mod backups;
-mod categories;
+// mod categories;
 mod ephemeral_files;
 mod files;
 mod jobs;
@@ -173,7 +173,7 @@ pub(crate) fn mount() -> Arc<Router> {
  .merge("library.", libraries::mount())
  .merge("volumes.", volumes::mount())
  .merge("tags.", tags::mount())
- .merge("categories.", categories::mount())
+ // .merge("categories.", categories::mount())
  // .merge("keys.", keys::mount())
  .merge("locations.", locations::mount())
  .merge("ephemeralFiles.", ephemeral_files::mount())