chore(core): sort locks, commit files, submit files by display name (#71

)
believer-oss · Jun 14, 2024 · b368289 · b368289
1 parent 8f766c8
commit b368289
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 29 deletions.
diff --git a/core/ui/src/lib/components/repo/CommitTable.svelte b/core/ui/src/lib/components/repo/CommitTable.svelte
@@ -23,6 +23,13 @@
 	let loadingCommitFiles = false;
 	let commitFiles: CommitFileInfo[] = [];
 
+	const getFileDisplayName = (file: CommitFileInfo): string => {
+		if (file.displayName === '') {
+			return file.file;
+		}
+		return file.displayName;
+	};
+
 	const isCommitLatestLocal = (sha: string): boolean => {
 		if (commits.length === 0) {
 			return false;
@@ -41,6 +48,7 @@
 
 		loadingCommitFiles = true;
 		commitFiles = await showFilesHandler(commit, false);
+		commitFiles.sort((a, b) => (getFileDisplayName(a) < getFileDisplayName(b) ? -1 : 1));
 		loadingCommitFiles = false;
 	};
 
@@ -57,13 +65,6 @@
 
 		return '';
 	};
-
-	const getFileDisplayName = (file: CommitFileInfo): string => {
-		if (file.displayName === '') {
-			return file.file;
-		}
-		return file.displayName;
-	};
 </script>
 
 <Table color="custom" striped={true}>

diff --git a/friendshipper/src/lib/stores.ts b/friendshipper/src/lib/stores.ts
@@ -118,7 +118,11 @@ export const allModifiedFiles = derived(repoStatus, ($repoStatus) => {
 	const modified = $repoStatus?.modifiedFiles ?? [];
 
 	const all: ModifiedFile[] = [...untracked, ...modified];
-	all.sort((a, b) => (a.path < b.path ? -1 : 1));
+	all.sort((a, b) => {
+		const aName = a.displayName === '' ? a.path : a.displayName;
+		const bName = b.displayName === '' ? b.path : b.displayName;
+		return aName < bName ? -1 : 1;
+	});
 
 	return all;
 });

diff --git a/friendshipper/src/routes/source/locks/+page.svelte b/friendshipper/src/routes/source/locks/+page.svelte
@@ -14,6 +14,7 @@
 		Toggle,
 		Tooltip
 	} from 'flowbite-svelte';
+	import { derived } from 'svelte/store';
 	import { emit } from '@tauri-apps/api/event';
 	import { onMount } from 'svelte';
 	import { RefreshOutline } from 'flowbite-svelte-icons';
@@ -29,15 +30,36 @@
 	let allowReleaseOtherLocks = false;
 	let searchTerm = '';
 
-	$: filteredOurs = $locks.ours.filter((item) =>
+	const formatPath = (path: string) => {
+		if (path === '/') return path;
+		return path.replace(/\/$/, '').split('/').pop();
+	};
+
+	const getLockDisplayName = (lock: Lock): string => {
+		if (lock.display_name === null || lock.display_name === '') {
+			return formatPath(lock.path);
+		}
+		return lock.display_name;
+	};
+
+	const sortLocksFunc = (a, b) => {
+		const aName = getLockDisplayName(a);
+		const bName = getLockDisplayName(b);
+		return aName < bName ? -1 : 1;
+	};
+
+	$: sortedOurs = derived(locks, ($locks) => $locks.ours.sort(sortLocksFunc), []);
+	$: sortedTheirs = derived(locks, ($locks) => $locks.theirs.sort(sortLocksFunc), []);
+
+	$: filteredOurs = $sortedOurs.filter((item) =>
 		item.path.toLowerCase().includes(searchTerm.toLowerCase())
 	);
-	$: filteredTheirs = $locks.theirs.filter(
+	$: filteredTheirs = $sortedTheirs.filter(
 		(item) =>
 			item.path.toLowerCase().includes(searchTerm.toLowerCase()) ||
 			item.owner?.name.toLowerCase().includes(searchTerm.toLowerCase())
 	);
-	$: unmodifiedLockedFiles = $locks.ours.filter(
+	$: unmodifiedLockedFiles = $sortedOurs.filter(
 		(lock) => !$allModifiedFiles.find((file) => file.path === lock.path)
 	);
 
@@ -57,33 +79,33 @@
 		if (!allowReleaseOtherLocks) return;
 
 		if ((e.target as HTMLInputElement).checked) {
-			const paths = $locks.theirs.map((lock) => lock.path);
+			const paths = $sortedTheirs.map((lock) => lock.path);
 			selectedForRelease = selectedForRelease.concat(paths);
 
-			numOthersSelected += $locks.theirs.length;
+			numOthersSelected += $sortedTheirs.length;
 
 			selectedForRelease = selectedForRelease.filter(
 				(item, index) => selectedForRelease.indexOf(item) === index
 			);
 		} else {
-			numOthersSelected -= $locks.theirs.length;
+			numOthersSelected -= $sortedTheirs.length;
 			selectedForRelease = selectedForRelease.filter(
-				(path) => !$locks.theirs.map((lock) => lock.path).includes(path)
+				(path) => !$sortedTheirs.map((lock) => lock.path).includes(path)
 			);
 		}
 	};
 
 	const handleReleaseAllOurs = (e: Event) => {
 		if ((e.target as HTMLInputElement).checked) {
-			const paths = $locks.ours.map((lock) => lock.path);
+			const paths = $sortedOurs.map((lock) => lock.path);
 			selectedForRelease = selectedForRelease.concat(paths);
 
 			selectedForRelease = selectedForRelease.filter(
 				(item, index) => selectedForRelease.indexOf(item) === index
 			);
 		} else {
 			selectedForRelease = selectedForRelease.filter(
-				(path) => !$locks.ours.map((lock) => lock.path).includes(path)
+				(path) => !$sortedOurs.map((lock) => lock.path).includes(path)
 			);
 		}
 	};
@@ -129,18 +151,6 @@
 		loading = false;
 	};
 
-	const formatPath = (path: string) => {
-		if (path === '/') return path;
-		return path.replace(/\/$/, '').split('/').pop();
-	};
-
-	const getLockDisplayName = (lock: Lock): string => {
-		if (lock.display_name === null || lock.display_name === '') {
-			return formatPath(lock.path);
-		}
-		return lock.display_name;
-	};
-
 	const getLockTimestamp = (locked_at: string): string => {
 		const date = new Date(locked_at);
 		return date.toLocaleString();