PLG_Development/PLG-MuDiCS
3
0
Fork 0
mirror of https://codeberg.org/PLG-Development/PLG-MuDiCS synced 2026-07-05 16:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(control): deselect files from displays which were deselected

Browse Source
This commit is contained in:
E44
2025-11-22 23:57:46 +01:00
parent 79ca11300a
commit c1afc20658
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
control/frontend/src/components/DisplayObject.svelte
+2
View File
@@ -11,6 +11,7 @@
import type { Display, MenuOption } from '../ts/types'; import type { Display, MenuOption } from '../ts/types';
import { is_selected, select, selected_display_ids } from '../ts/stores/select'; import { is_selected, select, selected_display_ids } from '../ts/stores/select';
import { update_screenshot } from '../ts/stores/displays'; import { update_screenshot } from '../ts/stores/displays';
import { filter_file_selection_for_current_selected_displays } from '../ts/stores/files';
let { display, get_display_menu_options, close_pinned_display } = $props<{ let { display, get_display_menu_options, close_pinned_display } = $props<{
display: Display; display: Display;
@@ -22,6 +23,7 @@
function onclick(e: Event) { function onclick(e: Event) {
select(selected_display_ids, display.id); select(selected_display_ids, display.id);
filter_file_selection_for_current_selected_displays();
e.stopPropagation(); e.stopPropagation();
} }
control/frontend/src/components/FileView.svelte
+2 -2
View File
@@ -22,7 +22,7 @@
get_current_folder_elements, get_current_folder_elements,
get_display_ids_where_file_is_missing, get_display_ids_where_file_is_missing,
get_display_ids_where_path_does_not_exist, get_display_ids_where_path_does_not_exist,
get_file_from_id, get_file_by_id,
get_longest_existing_path_and_needed_parts, get_longest_existing_path_and_needed_parts,
run_for_selected_files_on_selected_displays, run_for_selected_files_on_selected_displays,
update_current_folder_on_selected_displays update_current_folder_on_selected_displays
@@ -145,7 +145,7 @@
> >
<div class="flex flex-col gap-2 overflow-auto h-full min-h-0 grow-0"> <div class="flex flex-col gap-2 overflow-auto h-full min-h-0 grow-0">
{#each $selected_file_ids {#each $selected_file_ids
.map((file_id) => get_file_from_id(file_id, $all_files, $current_file_path)) .map((file_id) => get_file_by_id(file_id, $all_files, $current_file_path))
.filter((element) => element !== null) as file} .filter((element) => element !== null) as file}
<FolderElementObject {file} not_interactable /> <FolderElementObject {file} not_interactable />
{/each} {/each}
control/frontend/src/ts/stores/files.ts
+18 -4
View File
@@ -1,7 +1,7 @@
import { get, writable, type Writable } from "svelte/store"; import { get, writable, type Writable } from "svelte/store";
import type { Display, FolderElement, TreeElement } from "../types"; import type { Display, FolderElement, TreeElement } from "../types";
import { displays, get_display_by_id } from "./displays"; import { displays, get_display_by_id } from "./displays";
import { selected_display_ids, selected_file_ids } from "./select"; import { select, selected_display_ids, selected_file_ids } from "./select";
import { get_file_data, get_file_tree_data } from "../api_handler"; import { get_file_data, get_file_tree_data } from "../api_handler";
import { notifications } from "./notification"; import { notifications } from "./notification";
import { CirclePoundSterling } from "lucide-svelte"; import { CirclePoundSterling } from "lucide-svelte";
@@ -45,6 +45,15 @@ export async function change_file_path(new_path: string) {
} }
} }
export async function filter_file_selection_for_current_selected_displays() {
for (const selected_file_id of get(selected_file_ids)) {
if (!get_file_by_id(selected_file_id, get(all_files), get(current_file_path), true)) {
// file not found in selected displays
select(selected_file_ids, selected_file_id, false);
}
}
}
export async function update_current_folder_on_selected_displays() { export async function update_current_folder_on_selected_displays() {
const current_path = get(current_file_path); const current_path = get(current_file_path);
for (const display_id of get(selected_display_ids)) { for (const display_id of get(selected_display_ids)) {
@@ -250,9 +259,14 @@ function sort_files(files: FolderElement[]) {
return files; return files;
} }
export function get_file_from_id(file_id: string, all_files: Record<string, Record<string, FolderElement[]>>, current_file_path: string): FolderElement | null { export function get_file_by_id(file_id: string, all_files: Record<string, Record<string, FolderElement[]>>, current_file_path: string, only_from_selected_displays: boolean = false): FolderElement | null {
const current_path_elements: Record<string, FolderElement[]> | undefined = all_files[current_file_path]; let current_path_elements: Record<string, FolderElement[]> | undefined = all_files[current_file_path];
if (!current_path_elements) return null; if (!current_path_elements) return null;
if (only_from_selected_displays) {
current_path_elements = Object.fromEntries(
Object.entries(current_path_elements).filter(([key]) => get(selected_file_ids).includes(key))
);
}
const all_folder_elements = Object.values(current_path_elements).flat(); const all_folder_elements = Object.values(current_path_elements).flat();
const found = all_folder_elements.find(el => el.id === file_id); const found = all_folder_elements.find(el => el.id === file_id);
if (!found) return null; if (!found) return null;
@@ -263,7 +277,7 @@ export async function run_for_selected_files_on_selected_displays(action: (ip: s
const files = get(all_files); const files = get(all_files);
const file_path = get(current_file_path); const file_path = get(current_file_path);
const folder_element_hashs: string[] = get(selected_file_ids) const folder_element_hashs: string[] = get(selected_file_ids)
.map((file_id) => get_file_from_id(file_id, files, file_path)) .map((file_id) => get_file_by_id(file_id, files, file_path))
.filter((element) => element !== null) .filter((element) => element !== null)
.map((folder_element) => folder_element.hash) .map((folder_element) => folder_element.hash)
.filter((hash) => hash !== null); .filter((hash) => hash !== null);