From 97a86a9fbbd2ebe2b4e686c799009d5b5eaa8c61 Mon Sep 17 00:00:00 2001
From: "Ericson \"Fogo\" Soares" <ericson.ds999@gmail.com>
Date: Fri, 6 Oct 2023 17:46:26 -0300
Subject: [PATCH] [ENG-888] Media view should show current folder downward
 (#1437)

* Done but ugly

* layout

* Now with a select

---------

Co-authored-by: ameer2468 <33054370+ameer2468@users.noreply.github.com>
---
 core/src/api/search.rs                        | 12 ++++++-
 core/src/preferences/library.rs               |  1 +
 .../app/$libraryId/Explorer/OptionsPanel.tsx  | 33 +++++++++++++++++--
 interface/app/$libraryId/Explorer/store.ts    |  1 +
 interface/app/$libraryId/location/$id.tsx     | 18 ++++++----
 packages/client/src/core.ts                   |  4 +--
 6 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/core/src/api/search.rs b/core/src/api/search.rs
index 4f65f4631..a87767cc1 100644
--- a/core/src/api/search.rs
+++ b/core/src/api/search.rs
@@ -121,6 +121,8 @@ struct FilePathFilterArgs {
 	#[specta(optional)]
 	path: Option<String>,
 	#[specta(optional)]
+	with_descendants: Option<bool>,
+	#[specta(optional)]
 	object: Option<ObjectFilterArgs>,
 	#[specta(optional)]
 	hidden: Option<bool>,
@@ -177,7 +179,15 @@ impl FilePathFilterArgs {
 					self.hidden.map(Some).map(hidden::equals),
 					directory_materialized_path_str
 						.map(Some)
-						.map(materialized_path::equals),
+						.map(|materialized_path| {
+							if let Some(true) = self.with_descendants {
+								materialized_path::starts_with(
+									materialized_path.unwrap_or_else(|| "/".into()),
+								)
+							} else {
+								materialized_path::equals(materialized_path)
+							}
+						}),
 					self.object.and_then(|obj| {
 						let params = obj.into_params();
 
diff --git a/core/src/preferences/library.rs b/core/src/preferences/library.rs
index 781cfc473..cec510822 100644
--- a/core/src/preferences/library.rs
+++ b/core/src/preferences/library.rs
@@ -62,6 +62,7 @@ pub struct ExplorerSettings<TOrder> {
 	grid_item_size: Option<i32>,
 	media_columns: Option<i32>,
 	media_aspect_square: Option<bool>,
+	media_view_with_descendants: Option<bool>,
 	open_on_double_click: Option<DoubleClickAction>,
 	show_bytes_in_grid_view: Option<bool>,
 	col_visibility: Option<BTreeMap<String, bool>>,
diff --git a/interface/app/$libraryId/Explorer/OptionsPanel.tsx b/interface/app/$libraryId/Explorer/OptionsPanel.tsx
index fd086d6c2..dc3035dfd 100644
--- a/interface/app/$libraryId/Explorer/OptionsPanel.tsx
+++ b/interface/app/$libraryId/Explorer/OptionsPanel.tsx
@@ -121,7 +121,7 @@ export default () => {
 
 			<div>
 				<Subheading>Explorer</Subheading>
-				<div className="flex flex-row flex-wrap justify-between gap-1">
+				<div className="grid grid-cols-2 gap-y-1">
 					<RadixCheckbox
 						checked={layoutStore.showPathBar}
 						label="Show Path Bar"
@@ -159,7 +159,7 @@ export default () => {
 					{settings.layoutMode === 'media' && (
 						<RadixCheckbox
 							checked={settings.mediaAspectSquare}
-							label="Show square thumbnails"
+							label="Square Thumbnails"
 							name="mediaAspectSquare"
 							onCheckedChange={(value) => {
 								if (typeof value !== 'boolean') return;
@@ -171,6 +171,30 @@ export default () => {
 				</div>
 			</div>
 
+			{settings.layoutMode === 'media' && (
+				<div>
+					<Subheading>Media View Context</Subheading>
+					<Select
+						className="w-full"
+						value={
+							explorer.settingsStore.mediaViewWithDescendants ?
+							'withDescendants'
+							: 'withoutDescendants'
+						}
+						onChange={(value) => {
+
+							explorer.settingsStore.mediaViewWithDescendants = value === 'withDescendants';
+						}}
+					>
+						{mediaViewContextActions.options.map((option) => (
+							<SelectOption key={option.value} value={option.value}>
+								{option.description}
+							</SelectOption>
+						))}
+					</Select>
+				</div>
+			)}
+
 			<div>
 				<Subheading>Double click action</Subheading>
 				<Select
@@ -195,3 +219,8 @@ const doubleClickActions = z.union([
 	z.literal('openFile').describe('Open File'),
 	z.literal('quickPreview').describe('Quick Preview')
 ]);
+
+const mediaViewContextActions = z.union([
+	z.literal('withDescendants').describe('Current Directory With Descendants'),
+	z.literal('withoutDescendants').describe('Current Directory')
+]);
diff --git a/interface/app/$libraryId/Explorer/store.ts b/interface/app/$libraryId/Explorer/store.ts
index eb8dc4f40..c8475024d 100644
--- a/interface/app/$libraryId/Explorer/store.ts
+++ b/interface/app/$libraryId/Explorer/store.ts
@@ -76,6 +76,7 @@ export const createDefaultExplorerSettings = <TOrder extends Ordering>(args?: {
 		showHiddenFiles: false as boolean,
 		mediaColumns: 8 as number,
 		mediaAspectSquare: false as boolean,
+		mediaViewWithDescendants: true as boolean,
 		openOnDoubleClick: 'openFile' as DoubleClickAction,
 		colVisibility: {
 			name: true,
diff --git a/interface/app/$libraryId/location/$id.tsx b/interface/app/$libraryId/location/$id.tsx
index 807fcaadb..1dda84d10 100644
--- a/interface/app/$libraryId/location/$id.tsx
+++ b/interface/app/$libraryId/location/$id.tsx
@@ -143,13 +143,17 @@ const useItems = ({
 
 	const explorerSettings = settings.useSettingsSnapshot();
 
-	const filter: FilePathFilterArgs = {
-		locationId,
-		...(explorerSettings.layoutMode === 'media'
-			? { object: { kind: [ObjectKindEnum.Image, ObjectKindEnum.Video] } }
-			: { path: path ?? '' }),
-		...(explorerSettings.showHiddenFiles ? {} : { hidden: false })
-	};
+	const filter: FilePathFilterArgs = { locationId, path: path ?? '' };
+
+	if (explorerSettings.layoutMode === 'media') {
+		filter.object = { kind: [ObjectKindEnum.Image, ObjectKindEnum.Video] };
+
+		if (explorerSettings.mediaViewWithDescendants)
+			filter.withDescendants = true;
+	}
+
+	if (!explorerSettings.showHiddenFiles)
+		filter.hidden = false;
 
 	const count = useLibraryQuery(['search.pathsCount', { filter }]);
 
diff --git a/packages/client/src/core.ts b/packages/client/src/core.ts
index 929af1f2a..150963ab2 100644
--- a/packages/client/src/core.ts
+++ b/packages/client/src/core.ts
@@ -157,7 +157,7 @@ export type ExplorerItem = { type: "Path"; has_local_thumbnail: boolean; thumbna
 
 export type ExplorerLayout = "grid" | "list" | "media"
 
-export type ExplorerSettings<TOrder> = { layoutMode: ExplorerLayout | null; gridItemSize: number | null; mediaColumns: number | null; mediaAspectSquare: boolean | null; openOnDoubleClick: DoubleClickAction | null; showBytesInGridView: boolean | null; colVisibility: { [key: string]: boolean } | null; colSizes: { [key: string]: number } | null; order?: TOrder | null; showHiddenFiles?: boolean }
+export type ExplorerSettings<TOrder> = { layoutMode: ExplorerLayout | null; gridItemSize: number | null; mediaColumns: number | null; mediaAspectSquare: boolean | null; mediaViewWithDescendants: boolean | null; openOnDoubleClick: DoubleClickAction | null; showBytesInGridView: boolean | null; colVisibility: { [key: string]: boolean } | null; colSizes: { [key: string]: number } | null; order?: TOrder | null; showHiddenFiles?: boolean }
 
 export type FileCopierJobInit = { source_location_id: number; target_location_id: number; sources_file_path_ids: number[]; target_location_relative_directory_path: string; target_file_name_suffix: string | null }
 
@@ -173,7 +173,7 @@ export type FilePathCursor = { isDir: boolean; variant: FilePathCursorVariant }
 
 export type FilePathCursorVariant = "none" | { name: CursorOrderItem<string> } | { sizeInBytes: SortOrder } | { dateCreated: CursorOrderItem<string> } | { dateModified: CursorOrderItem<string> } | { dateIndexed: CursorOrderItem<string> } | { object: FilePathObjectCursor }
 
-export type FilePathFilterArgs = { locationId?: number | null; search?: string | null; extension?: string | null; createdAt?: OptionalRange<string>; path?: string | null; object?: ObjectFilterArgs | null; hidden?: boolean | null }
+export type FilePathFilterArgs = { locationId?: number | null; search?: string | null; extension?: string | null; createdAt?: OptionalRange<string>; path?: string | null; withDescendants?: boolean | null; object?: ObjectFilterArgs | null; hidden?: boolean | null }
 
 export type FilePathObjectCursor = { dateAccessed: CursorOrderItem<string> } | { kind: CursorOrderItem<number> }