Backup_Repos/filestash
1
0
Fork 0
mirror of https://github.com/mickael-kerjean/filestash synced 2026-01-04 14:52:36 +01:00
Code Issues Projects Releases Wiki Activity

chore (search): improve UX around search

Browse source
This commit is contained in:
MickaelK 2025-01-24 15:18:07 +11:00
parent 42fd37e2ec
commit 6b3edfbffa
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
public/assets/pages/filespage/ctrl_filesystem.js
View file

@ -67,10 +67,10 @@ export default async function(render) {
$listBefore.setAttribute("style", "");
$listAfter.setAttribute("style", "");
return search(state.search).pipe(rxjs.map(({ files }) => ({
files, read_only: true, ...state, ...rest,
files, ...state, ...rest,
})), removeLoader);
}
return rxjs.of({ files, read_only: false, ...state, ...rest });
return rxjs.of({ files, ...state, ...rest });
}))),
rxjs.mergeMap((obj) => getPermission(path).pipe(
rxjs.map((permissions) => ({ ...obj, permissions })),
@ -88,10 +88,10 @@ export default async function(render) {
renderEmpty(createRender(qs($page, `[data-target="header"]`)), search ? ICONS.EMPTY_SEARCH : ICONS.EMPTY_FILES);
return rxjs.EMPTY;
}
return rxjs.of({ ...rest, files });
return rxjs.of({ ...rest, files, search });
}),
rxjs.mergeMap((obj) => refreshOnResize$.pipe(rxjs.mapTo(obj))),
rxjs.mergeMap(({ files, view, read_only, count, permissions }) => { // STEP1: setup the list of files
rxjs.mergeMap(({ files, view, search, count, permissions }) => { // STEP1: setup the list of files
$list.closest(".scroll-y").scrollTop = 0;
let FILE_HEIGHT, COLUMN_PER_ROW;
switch (view) {
@ -123,7 +123,7 @@ export default async function(render) {
...file,
...createLink(file, currentPath()),
view,
read_only,
search,
n: i,
permissions,
}));
@ -159,7 +159,7 @@ export default async function(render) {
return rxjs.of({
virtual: true,
files,
read_only,
search,
path,
view,
permissions,
@ -173,7 +173,7 @@ export default async function(render) {
});
}),
rxjs.switchMap(({
files, path, view, read_only, permissions,
files, path, view, search, permissions,
BLOCK_SIZE, COLUMN_PER_ROW, FILE_HEIGHT,
MARGIN,
currentState,
@ -238,8 +238,8 @@ export default async function(render) {
}));
else $fs.appendChild(createThing({
...file,
read_only,
...createLink(file, path),
search,
view,
permissions,
n: i,

2
public/assets/pages/filespage/model_files.js
View file

@ -132,7 +132,7 @@ export const ls = (path) => {
};
export const search = (term) => ajax({
url: `api/files/search?path=${encodeURIComponent(currentPath())}&q=${encodeURIComponent(term)}`,
url: withURLParams(`api/files/search?path=${encodeURIComponent(currentPath())}&q=${encodeURIComponent(term)}`),
responseType: "json"
}).pipe(rxjs.map(({ responseJSON }) => ({
files: responseJSON.results,

5
public/assets/pages/filespage/thing.js
View file

@ -64,8 +64,8 @@ export function createThing({
loading = false,
link = "",
view = "",
search = "",
n = 0,
read_only = false,
permissions = {},
}) {
const [, ext] = formatFile(name);
@ -138,8 +138,9 @@ export function createThing({
$link.setAttribute("href", "#");
$extension.innerHTML = "";
return $thing;
} else if (read_only === true) {
} else if (search !== "") {
$checkbox.classList.add("hidden");
if (view === "list") $img.style.visibility = "initial";
return $thing;
} else if (type === "hidden") {
$thing.classList.add("hidden");