feat(sql-library): add sorting options for SQL files in library folder

This commit is contained in:
lxk955 authored and GitHub committed 2026-10-04 17:24:50 +08:00
1 parent 7af2ee1fce
commit 827c934b18
15 files changed
+414 -2

No files matched your search

@@ -2,7 +2,34 @@
import { computed, nextTick, onBeforeUnmount, reactive, ref, watch } from "vue"; import { computed, nextTick, onBeforeUnmount, reactive, ref, watch } from "vue";
import type { CSSProperties } from "vue"; import type { CSSProperties } from "vue";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import { ArrowDownWideNarrow, ArrowRightLeft, ChevronsDownUp, Database, Download, FilePlus, FileText, FolderCog, FolderClosed, FolderOpen, FolderPlus, Layers, Library, Loader2, LocateFixed, Pencil, Play, Search, Trash2, Upload, X } from "@lucide/vue"; import {
ArrowDownAZ,
ArrowDownWideNarrow,
ArrowRightLeft,
ArrowUpAZ,
ArrowUpDown,
Calendar,
ChevronsDownUp,
Clock,
Database,
Download,
FilePlus,
FileText,
FolderCog,
FolderClosed,
FolderOpen,
FolderPlus,
Layers,
Library,
Loader2,
LocateFixed,
Pencil,
Play,
Search,
Trash2,
Upload,
X,
} from "@lucide/vue";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog"; import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { SearchableSelect } from "@/components/ui/searchable-select"; import { SearchableSelect } from "@/components/ui/searchable-select";
@@ -16,7 +43,7 @@ import { useToast } from "@/composables/useToast";
import { isTauriRuntime } from "@/lib/backend/tauriRuntime"; import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
import * as api from "@/lib/backend/api"; import * as api from "@/lib/backend/api";
import { externalSqlFileOpenErrorMessage } from "@/lib/sql/sqlFileOpen"; import { externalSqlFileOpenErrorMessage } from "@/lib/sql/sqlFileOpen";
import { useSavedSqlStore } from "@/stores/savedSqlStore"; import { useSavedSqlStore, type SavedSqlFileSortMode, type SavedSqlFolderSortMode } from "@/stores/savedSqlStore";
import { useConnectionStore } from "@/stores/connectionStore"; import { useConnectionStore } from "@/stores/connectionStore";
import { useQueryStore } from "@/stores/queryStore"; import { useQueryStore } from "@/stores/queryStore";
import { useSettingsStore } from "@/stores/settingsStore"; import { useSettingsStore } from "@/stores/settingsStore";
@@ -1021,6 +1048,33 @@ function folderMoveMenuItems(fileIds: string[]): CtxMenuItem[] {
]; ];
} }
async function handleSortFolderFiles(folderId: string | undefined, mode: SavedSqlFileSortMode) {
try {
await savedSqlStore.sortFolderFiles(folderId, mode);
toast(t("sqlLibrary.sortSuccess"));
} catch (error) {
toast(t("sqlLibrary.moveFailed", { message: savedSqlErrorMessage(error, t) }), 5000);
}
}
async function handleSortFolderChildren(parentFolderId: string | undefined, mode: SavedSqlFolderSortMode) {
try {
await savedSqlStore.sortFolderChildren(parentFolderId, mode);
toast(t("sqlLibrary.sortSuccess"));
} catch (error) {
toast(t("sqlLibrary.moveFailed", { message: savedSqlErrorMessage(error, t) }), 5000);
}
}
async function handleSortAllFolderFiles(mode: SavedSqlFileSortMode) {
try {
await savedSqlStore.sortAllFolderFiles(mode);
toast(t("sqlLibrary.sortSuccess"));
} catch (error) {
toast(t("sqlLibrary.moveFailed", { message: savedSqlErrorMessage(error, t) }), 5000);
}
}
const contextMenuItems = computed<CtxMenuItem[]>(() => { const contextMenuItems = computed<CtxMenuItem[]>(() => {
const target = contextTarget.value; const target = contextTarget.value;
if (!target) return []; if (!target) return [];
@@ -1054,11 +1108,50 @@ const contextMenuItems = computed<CtxMenuItem[]>(() => {
} }
if (target === "panel") { if (target === "panel") {
const unfiledFiles = savedSqlStore.filesWithoutFolder();
const rootFolders = childFolders();
const hasSortOptions = unfiledFiles.length > 1 || rootFolders.length > 1 || savedSqlStore.allFiles.length > 1;
return [ return [
{ label: t("savedSql.newFolder"), action: openNewFolderInput, icon: FolderPlus }, { label: t("savedSql.newFolder"), action: openNewFolderInput, icon: FolderPlus },
{ label: t("savedSql.newQuery"), action: () => openNewQueryInFolder(), icon: FilePlus }, { label: t("savedSql.newQuery"), action: () => openNewQueryInFolder(), icon: FilePlus },
{ label: t("sqlLibrary.importDirectory"), action: () => importDirectoryIntoLibrary(), icon: Download }, { label: t("sqlLibrary.importDirectory"), action: () => importDirectoryIntoLibrary(), icon: Download },
{ label: t("sqlLibrary.exportLibrary"), action: () => exportFolderContents(), icon: Upload }, { label: t("sqlLibrary.exportLibrary"), action: () => exportFolderContents(), icon: Upload },
...(hasSortOptions
? [
{ label: "", separator: true },
{
label: t("sqlLibrary.sortUnfiledFiles"),
icon: ArrowDownAZ,
visible: unfiledFiles.length > 1,
children: [
{ label: t("sqlLibrary.sortNameAsc"), action: () => handleSortFolderFiles(undefined, "name-asc"), icon: ArrowDownAZ },
{ label: t("sqlLibrary.sortNameDesc"), action: () => handleSortFolderFiles(undefined, "name-desc"), icon: ArrowUpAZ },
{ label: t("sqlLibrary.sortDateDesc"), action: () => handleSortFolderFiles(undefined, "updated-desc"), icon: Clock },
{ label: t("sqlLibrary.sortDateAsc"), action: () => handleSortFolderFiles(undefined, "updated-asc"), icon: Calendar },
],
},
{
label: t("sqlLibrary.sortRootFolders"),
icon: FolderClosed,
visible: rootFolders.length > 1,
children: [
{ label: t("sqlLibrary.sortNameAsc"), action: () => handleSortFolderChildren(undefined, "name-asc"), icon: ArrowDownAZ },
{ label: t("sqlLibrary.sortNameDesc"), action: () => handleSortFolderChildren(undefined, "name-desc"), icon: ArrowUpAZ },
],
},
{
label: t("sqlLibrary.sortAllFiles"),
icon: ArrowUpDown,
visible: savedSqlStore.allFiles.length > 1,
children: [
{ label: t("sqlLibrary.sortNameAsc"), action: () => handleSortAllFolderFiles("name-asc"), icon: ArrowDownAZ },
{ label: t("sqlLibrary.sortNameDesc"), action: () => handleSortAllFolderFiles("name-desc"), icon: ArrowUpAZ },
{ label: t("sqlLibrary.sortDateDesc"), action: () => handleSortAllFolderFiles("updated-desc"), icon: Clock },
{ label: t("sqlLibrary.sortDateAsc"), action: () => handleSortAllFolderFiles("updated-asc"), icon: Calendar },
],
},
]
: []),
{ label: "", separator: true }, { label: "", separator: true },
{ label: t("sqlLibrary.openStorageDirectory"), action: openSqlStorageDirectory, icon: LocateFixed }, { label: t("sqlLibrary.openStorageDirectory"), action: openSqlStorageDirectory, icon: LocateFixed },
{ label: t("sqlLibrary.chooseSyncDirectory"), action: chooseSyncDirectory, icon: FolderCog }, { label: t("sqlLibrary.chooseSyncDirectory"), action: chooseSyncDirectory, icon: FolderCog },
@@ -1094,6 +1187,8 @@ const contextMenuItems = computed<CtxMenuItem[]>(() => {
]; ];
} }
const folderFiles = allFilesInFolderBranch(target.id); const folderFiles = allFilesInFolderBranch(target.id);
const directFiles = savedSqlStore.filesInFolder(target.id);
const directFolders = childFolders(target.id);
return [ return [
{ label: t("savedSql.newSubfolder"), action: () => openNewFolderInput(target.id), icon: FolderPlus }, { label: t("savedSql.newSubfolder"), action: () => openNewFolderInput(target.id), icon: FolderPlus },
{ label: t("savedSql.newQuery"), action: () => openNewQueryInFolder(target), icon: FilePlus }, { label: t("savedSql.newQuery"), action: () => openNewQueryInFolder(target), icon: FilePlus },
@@ -1106,6 +1201,27 @@ const contextMenuItems = computed<CtxMenuItem[]>(() => {
{ label: t("sqlLibrary.importIntoFolder"), action: () => importDirectoryIntoLibrary(target), icon: Download }, { label: t("sqlLibrary.importIntoFolder"), action: () => importDirectoryIntoLibrary(target), icon: Download },
{ label: t("sqlLibrary.exportFolder"), action: () => exportFolderContents(target), icon: Upload }, { label: t("sqlLibrary.exportFolder"), action: () => exportFolderContents(target), icon: Upload },
{ label: "", separator: true }, { label: "", separator: true },
{
label: t("sqlLibrary.sortFiles"),
icon: ArrowDownAZ,
disabled: directFiles.length <= 1,
children: [
{ label: t("sqlLibrary.sortNameAsc"), action: () => handleSortFolderFiles(target.id, "name-asc"), icon: ArrowDownAZ },
{ label: t("sqlLibrary.sortNameDesc"), action: () => handleSortFolderFiles(target.id, "name-desc"), icon: ArrowUpAZ },
{ label: t("sqlLibrary.sortDateDesc"), action: () => handleSortFolderFiles(target.id, "updated-desc"), icon: Clock },
{ label: t("sqlLibrary.sortDateAsc"), action: () => handleSortFolderFiles(target.id, "updated-asc"), icon: Calendar },
],
},
{
label: t("sqlLibrary.sortSubfolders"),
icon: FolderClosed,
visible: directFolders.length > 1,
children: [
{ label: t("sqlLibrary.sortNameAsc"), action: () => handleSortFolderChildren(target.id, "name-asc"), icon: ArrowDownAZ },
{ label: t("sqlLibrary.sortNameDesc"), action: () => handleSortFolderChildren(target.id, "name-desc"), icon: ArrowUpAZ },
],
},
{ label: "", separator: true },
{ label: t("savedSql.renameFolder"), action: () => startRenameFolder(target), icon: Pencil }, { label: t("savedSql.renameFolder"), action: () => startRenameFolder(target), icon: Pencil },
{ label: "", separator: true }, { label: "", separator: true },
{ {
+10
View File
@@ -543,6 +543,16 @@ export default withEnglishFallback({
clearSelection: "Seçimi təmizlə", clearSelection: "Seçimi təmizlə",
sortByDate: "Dəyişiklik tarixinə görə sırala", sortByDate: "Dəyişiklik tarixinə görə sırala",
sortByFolder: "Qovluq quruluşuna görə sırala", sortByFolder: "Qovluq quruluşuna görə sırala",
sortFiles: "Faylları sırala",
sortSubfolders: "Alt qovluqları sırala",
sortUnfiledFiles: "Kateqoriyasız faylları sırala",
sortRootFolders: "Kök qovluqları sırala",
sortAllFiles: "Bütün qovluqlardakı faylları sırala",
sortNameAsc: "Ada görə artan (A–Z)",
sortNameDesc: "Ada görə azalan (Z–A)",
sortDateDesc: "Dəyişmə tarixi (əvvəlcə yenilər)",
sortDateAsc: "Dəyişmə tarixi (əvvəlcə köhnələr)",
sortSuccess: "Sıralama tamamlandı",
collapseAll: "Hamısını yığ", collapseAll: "Hamısını yığ",
moreMatches: "+ {count} uyğunluq daha", moreMatches: "+ {count} uyğunluq daha",
collapseMatches: "Yığ", collapseMatches: "Yığ",
+10
View File
@@ -776,6 +776,16 @@ export default {
clearSelection: "Clear Selection", clearSelection: "Clear Selection",
sortByDate: "Sort by Date Modified", sortByDate: "Sort by Date Modified",
sortByFolder: "Sort by Folder Structure", sortByFolder: "Sort by Folder Structure",
sortFiles: "Sort Files",
sortSubfolders: "Sort Subfolders",
sortUnfiledFiles: "Sort Unfiled Files",
sortRootFolders: "Sort Root Folders",
sortAllFiles: "Sort All Files in All Folders",
sortNameAsc: "Name (A to Z)",
sortNameDesc: "Name (Z to A)",
sortDateDesc: "Date Modified (Newest First)",
sortDateAsc: "Date Modified (Oldest First)",
sortSuccess: "Sorted successfully",
collapseAll: "Collapse all", collapseAll: "Collapse all",
moreMatches: "+ {count} more matches", moreMatches: "+ {count} more matches",
collapseMatches: "Collapse", collapseMatches: "Collapse",
+10
View File
@@ -770,6 +770,16 @@ export default withEnglishFallback({
clearSelection: "Limpiar selección", clearSelection: "Limpiar selección",
sortByDate: "Ordenar por fecha de modificación", sortByDate: "Ordenar por fecha de modificación",
sortByFolder: "Ordenar por estructura de carpetas", sortByFolder: "Ordenar por estructura de carpetas",
sortFiles: "Ordenar archivos",
sortSubfolders: "Ordenar subcarpetas",
sortUnfiledFiles: "Ordenar archivos no archivados",
sortRootFolders: "Ordenar carpetas raíz",
sortAllFiles: "Ordenar todos los archivos en todas las carpetas",
sortNameAsc: "Nombre (A a Z)",
sortNameDesc: "Nombre (Z a A)",
sortDateDesc: "Fecha de modificación (más reciente)",
sortDateAsc: "Fecha de modificación (más antigua)",
sortSuccess: "Ordenado con éxito",
collapseAll: "Contraer todo", collapseAll: "Contraer todo",
moreMatches: "+ {count} coincidencias más", moreMatches: "+ {count} coincidencias más",
collapseMatches: "Contraer", collapseMatches: "Contraer",
+10
View File
@@ -715,6 +715,16 @@ export default withEnglishFallback({
clearSelection: "Bersihkan Pilihan", clearSelection: "Bersihkan Pilihan",
sortByDate: "Urutkan berdasarkan Tanggal Diubah", sortByDate: "Urutkan berdasarkan Tanggal Diubah",
sortByFolder: "Urutkan berdasarkan Struktur Folder", sortByFolder: "Urutkan berdasarkan Struktur Folder",
sortFiles: "Urutkan Berkas",
sortSubfolders: "Urutkan Subfolder",
sortUnfiledFiles: "Urutkan Berkas Tanpa Kategori",
sortRootFolders: "Urutkan Folder Root",
sortAllFiles: "Urutkan Semua Berkas di Semua Folder",
sortNameAsc: "Nama (A ke Z)",
sortNameDesc: "Nama (Z ke A)",
sortDateDesc: "Tanggal Diubah (Terbaru Dulu)",
sortDateAsc: "Tanggal Diubah (Terlama Dulu)",
sortSuccess: "Berhasil diurutkan",
collapseAll: "Ciutkan semua", collapseAll: "Ciutkan semua",
}, },
+10
View File
@@ -759,6 +759,16 @@ export default withEnglishFallback({
clearSelection: "Cancella selezione", clearSelection: "Cancella selezione",
sortByDate: "Ordina per data di modifica", sortByDate: "Ordina per data di modifica",
sortByFolder: "Ordina per struttura cartelle", sortByFolder: "Ordina per struttura cartelle",
sortFiles: "Ordina file",
sortSubfolders: "Ordina sottocartelle",
sortUnfiledFiles: "Ordina file non archiviati",
sortRootFolders: "Ordina cartelle radice",
sortAllFiles: "Ordina tutti i file in tutte le cartelle",
sortNameAsc: "Nome (A–Z)",
sortNameDesc: "Nome (Z–A)",
sortDateDesc: "Data di modifica (più recenti prima)",
sortDateAsc: "Data di modifica (meno recenti prima)",
sortSuccess: "Ordinamento completato",
collapseAll: "Comprimi tutto", collapseAll: "Comprimi tutto",
moreMatches: "+ altre {count} corrispondenze", moreMatches: "+ altre {count} corrispondenze",
collapseMatches: "Comprimi", collapseMatches: "Comprimi",
+10
View File
@@ -760,6 +760,16 @@ export default withEnglishFallback({
clearSelection: "選択を解除", clearSelection: "選択を解除",
sortByDate: "更新日時で並べ替え", sortByDate: "更新日時で並べ替え",
sortByFolder: "フォルダー構造で並べ替え", sortByFolder: "フォルダー構造で並べ替え",
sortFiles: "ファイルを並べ替え",
sortSubfolders: "サブフォルダを並べ替え",
sortUnfiledFiles: "未分類ファイルを並べ替え",
sortRootFolders: "ルートフォルダを並べ替え",
sortAllFiles: "すべてのフォルダ内のファイルを並べ替え",
sortNameAsc: "名前昇順 (A–Z)",
sortNameDesc: "名前降順 (Z–A)",
sortDateDesc: "更新日時 (新しい順)",
sortDateAsc: "更新日時 (古い順)",
sortSuccess: "並べ替えました",
collapseAll: "すべて折りたたむ", collapseAll: "すべて折りたたむ",
moreMatches: "+ 他 {count} 件の一致", moreMatches: "+ 他 {count} 件の一致",
collapseMatches: "折りたたむ", collapseMatches: "折りたたむ",
+10
View File
@@ -762,6 +762,16 @@ export default withEnglishFallback({
clearSelection: "선택 해제", clearSelection: "선택 해제",
sortByDate: "수정 날짜순 정렬", sortByDate: "수정 날짜순 정렬",
sortByFolder: "폴더 구조순 정렬", sortByFolder: "폴더 구조순 정렬",
sortFiles: "파일 정렬",
sortSubfolders: "하위 폴더 정렬",
sortUnfiledFiles: "미분류 파일 정렬",
sortRootFolders: "루트 폴더 정렬",
sortAllFiles: "모든 폴더의 파일 정렬",
sortNameAsc: "이름 오름차순 (A–Z)",
sortNameDesc: "이름 내림차순 (Z–A)",
sortDateDesc: "수정일 (최신순)",
sortDateAsc: "수정일 (오래된 순)",
sortSuccess: "정렬 완료",
collapseAll: "모두 접기", collapseAll: "모두 접기",
moreMatches: "+ {count}개 더 일치", moreMatches: "+ {count}개 더 일치",
collapseMatches: "접기", collapseMatches: "접기",
+10
View File
@@ -760,6 +760,16 @@ export default withEnglishFallback({
clearSelection: "Limpar seleção", clearSelection: "Limpar seleção",
sortByDate: "Ordenar por data de modificação", sortByDate: "Ordenar por data de modificação",
sortByFolder: "Ordenar por estrutura de pastas", sortByFolder: "Ordenar por estrutura de pastas",
sortFiles: "Ordenar arquivos",
sortSubfolders: "Ordenar subpastas",
sortUnfiledFiles: "Ordenar arquivos não categorizados",
sortRootFolders: "Ordenar pastas raiz",
sortAllFiles: "Ordenar todos os arquivos em todas as pastas",
sortNameAsc: "Nome (A a Z)",
sortNameDesc: "Nome (Z a A)",
sortDateDesc: "Data de modificação (mais recente primeiro)",
sortDateAsc: "Data de modificação (mais antiga primeiro)",
sortSuccess: "Ordenado com sucesso",
collapseAll: "Recolher todos", collapseAll: "Recolher todos",
moreMatches: "+ {count} mais correspondências", moreMatches: "+ {count} mais correspondências",
collapseMatches: "Recolher", collapseMatches: "Recolher",
+10
View File
@@ -742,6 +742,16 @@ export default withEnglishFallback({
clearSelection: "Снять выделение", clearSelection: "Снять выделение",
sortByDate: "Сортировать по дате изменения", sortByDate: "Сортировать по дате изменения",
sortByFolder: "Сортировать по структуре папок", sortByFolder: "Сортировать по структуре папок",
sortFiles: "Сортировка файлов",
sortSubfolders: "Сортировка подпапок",
sortUnfiledFiles: "Сортировка файлов без папки",
sortRootFolders: "Сортировка корневых папок",
sortAllFiles: "Сортировка всех файлов во всех папках",
sortNameAsc: "По имени (A–Z)",
sortNameDesc: "По имени (Z–A)",
sortDateDesc: "Дата изменения (сначала новые)",
sortDateAsc: "Дата изменения (сначала старые)",
sortSuccess: "Сортировка завершена",
collapseAll: "Свернуть все", collapseAll: "Свернуть все",
moreMatches: "+ ещё {count} совпадений", moreMatches: "+ ещё {count} совпадений",
collapseMatches: "Свернуть", collapseMatches: "Свернуть",
+10
View File
@@ -543,6 +543,16 @@ export default withEnglishFallback({
clearSelection: "Seçimi Temizle", clearSelection: "Seçimi Temizle",
sortByDate: "Değiştirilme Tarihine Göre Sırala", sortByDate: "Değiştirilme Tarihine Göre Sırala",
sortByFolder: "Klasör Yapısına Göre Sırala", sortByFolder: "Klasör Yapısına Göre Sırala",
sortFiles: "Dosyaları Sırala",
sortSubfolders: "Alt Klasörleri Sırala",
sortUnfiledFiles: "Klasörsüz Dosyaları Sırala",
sortRootFolders: "Kök Klasörleri Sırala",
sortAllFiles: "Tüm Klasörlerdeki Dosyaları Sırala",
sortNameAsc: "İsim (A'dan Z'ye)",
sortNameDesc: "İsim (Z'den A'ya)",
sortDateDesc: "Değiştirilme Tarihi (En Yeni)",
sortDateAsc: "Değiştirilme Tarihi (En Eski)",
sortSuccess: "Başarıyla sıralandı",
collapseAll: "Tümünü daralt", collapseAll: "Tümünü daralt",
moreMatches: "+ {count} eşleşme daha", moreMatches: "+ {count} eşleşme daha",
collapseMatches: "Daralt", collapseMatches: "Daralt",
+10
View File
@@ -713,6 +713,16 @@ export default withEnglishFallback({
clearSelection: "清除选择", clearSelection: "清除选择",
sortByDate: "按修改日期排序", sortByDate: "按修改日期排序",
sortByFolder: "按文件夹结构排序", sortByFolder: "按文件夹结构排序",
sortFiles: "排序文件",
sortSubfolders: "排序子文件夹",
sortUnfiledFiles: "排序未分类文件",
sortRootFolders: "排序根文件夹",
sortAllFiles: "排序所有文件夹内的文件",
sortNameAsc: "按名称升序 (A–Z)",
sortNameDesc: "按名称降序 (Z–A)",
sortDateDesc: "按修改时间 (最新优先)",
sortDateAsc: "按修改时间 (最早优先)",
sortSuccess: "已完成排序",
collapseAll: "全部折叠", collapseAll: "全部折叠",
moreMatches: "+ {count} 项更多匹配", moreMatches: "+ {count} 项更多匹配",
collapseMatches: "收起", collapseMatches: "收起",
+10
View File
@@ -765,6 +765,16 @@ export default withEnglishFallback({
clearSelection: "清除選取", clearSelection: "清除選取",
sortByDate: "依修改日期排序", sortByDate: "依修改日期排序",
sortByFolder: "依資料夾結構排序", sortByFolder: "依資料夾結構排序",
sortFiles: "排序檔案",
sortSubfolders: "排序子資料夾",
sortUnfiledFiles: "排序未分類檔案",
sortRootFolders: "排序根資料夾",
sortAllFiles: "排序所有資料夾內的檔案",
sortNameAsc: "依名稱遞增 (A–Z)",
sortNameDesc: "依名稱遞減 (Z–A)",
sortDateDesc: "依修改時間 (最新優先)",
sortDateAsc: "依修改時間 (最早優先)",
sortSuccess: "已完成排序",
collapseAll: "全部摺疊", collapseAll: "全部摺疊",
moreMatches: "+ {count} 項更多相符", moreMatches: "+ {count} 項更多相符",
collapseMatches: "收起", collapseMatches: "收起",
+73
View File
@@ -122,6 +122,30 @@ function sortFilesByOrder(items: SavedSqlFile[]) {
}); });
} }
export type SavedSqlFileSortMode = "name-asc" | "name-desc" | "updated-desc" | "updated-asc";
export type SavedSqlFolderSortMode = "name-asc" | "name-desc";
function sortFilesByCriteria(items: SavedSqlFile[], mode: SavedSqlFileSortMode): SavedSqlFile[] {
return [...items].sort((a, b) => {
switch (mode) {
case "name-asc":
return a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: "base" });
case "name-desc":
return b.name.localeCompare(a.name, undefined, { numeric: true, sensitivity: "base" });
case "updated-desc": {
const timeDiff = b.updatedAt.localeCompare(a.updatedAt);
if (timeDiff !== 0) return timeDiff;
return a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: "base" });
}
case "updated-asc": {
const timeDiff = a.updatedAt.localeCompare(b.updatedAt);
if (timeDiff !== 0) return timeDiff;
return a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: "base" });
}
}
});
}
function reindexFolders(items: SavedSqlFolder[]) { function reindexFolders(items: SavedSqlFolder[]) {
return items.map((folder, index) => ({ ...folder, orderIndex: index })); return items.map((folder, index) => ({ ...folder, orderIndex: index }));
} }
@@ -968,6 +992,52 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
return allFiles.value.filter((f) => !f.folderId); return allFiles.value.filter((f) => !f.folderId);
} }
async function sortFolderFiles(folderId: string | undefined, mode: SavedSqlFileSortMode) {
const targetFolderId = folderId || undefined;
const groupFiles = files.value.filter((file) => (file.folderId || undefined) === targetFolderId);
if (groupFiles.length <= 1) return;
const sortedGroup = sortFilesByCriteria(groupFiles, mode);
const reindexed = reindexFiles(sortedGroup, targetFolderId);
const untouched = files.value.filter((file) => (file.folderId || undefined) !== targetFolderId);
await persistFiles([...untouched, ...reindexed]);
}
async function sortFolderChildren(parentFolderId: string | undefined, mode: SavedSqlFolderSortMode) {
const targetParentId = parentFolderId || undefined;
const groupFolders = folders.value.filter((folder) => (folder.parentFolderId || undefined) === targetParentId);
if (groupFolders.length <= 1) return;
const sortedGroup = [...groupFolders].sort((a, b) => {
if (mode === "name-asc") {
return a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: "base" });
}
return b.name.localeCompare(a.name, undefined, { numeric: true, sensitivity: "base" });
});
const reindexed = reindexFolders(sortedGroup).map((folder) => ({
...folder,
parentFolderId: targetParentId,
}));
const untouched = folders.value.filter((folder) => (folder.parentFolderId || undefined) !== targetParentId);
await persistFolders([...untouched, ...reindexed]);
}
async function sortAllFolderFiles(mode: SavedSqlFileSortMode) {
const folderIds = new Set<string | undefined>([undefined, ...folders.value.map((f) => f.id)]);
const nextFiles: SavedSqlFile[] = [];
for (const fId of folderIds) {
const groupFiles = files.value.filter((file) => (file.folderId || undefined) === fId);
if (groupFiles.length <= 1) {
nextFiles.push(...groupFiles);
} else {
const sorted = sortFilesByCriteria(groupFiles, mode);
nextFiles.push(...reindexFiles(sorted, fId));
}
}
await persistFiles(nextFiles);
}
return { return {
folders, folders,
files, files,
@@ -997,6 +1067,9 @@ export const useSavedSqlStore = defineStore("savedSql", () => {
reorderFiles, reorderFiles,
moveFileToFolder, moveFileToFolder,
moveFilesToFolder, moveFilesToFolder,
sortFolderFiles,
sortFolderChildren,
sortAllFolderFiles,
syncToLocalDirectory, syncToLocalDirectory,
allFolders, allFolders,
allFoldersTreeOrder, allFoldersTreeOrder,
+103
View File
@@ -1454,3 +1454,106 @@ test("a conflict suggestion also skips names reserved by in-flight saves", async
pending.resolve({ id: "sql-pending", connectionId: "conn-1", database: "db-1", name: "query_4.sql", sql: "SELECT 1;", sqlLoaded: true, createdAt: "2026-07-19T00:00:00.000Z", updatedAt: "2026-07-19T00:00:00.000Z" }); pending.resolve({ id: "sql-pending", connectionId: "conn-1", database: "db-1", name: "query_4.sql", sql: "SELECT 1;", sqlLoaded: true, createdAt: "2026-07-19T00:00:00.000Z", updatedAt: "2026-07-19T00:00:00.000Z" });
await inFlight; await inFlight;
}); });
test("sortFolderFiles sorts files in a folder by name and updatedAt", async () => {
apiMock.saveSavedSqlFile.mockImplementation((file) => Promise.resolve(file));
apiMock.loadSavedSqlLibrary.mockResolvedValue({
folders: [{ id: "folder-1", name: "My Folder", createdAt: "2026-07-19T00:00:00.000Z", updatedAt: "2026-07-19T00:00:00.000Z" }],
files: [
scopeSeedFile("sql-1", "cherry.sql", { folderId: "folder-1", orderIndex: 0, updatedAt: "2026-07-19T01:00:00.000Z" }),
scopeSeedFile("sql-2", "apple.sql", { folderId: "folder-1", orderIndex: 1, updatedAt: "2026-07-19T03:00:00.000Z" }),
scopeSeedFile("sql-3", "banana.sql", { folderId: "folder-1", orderIndex: 2, updatedAt: "2026-07-19T02:00:00.000Z" }),
scopeSeedFile("sql-4", "other.sql", { folderId: "folder-2", orderIndex: 0 }),
],
});
const store = useSavedSqlStore();
await store.initFromStorage();
// Sort by name-asc
await store.sortFolderFiles("folder-1", "name-asc");
assert.deepEqual(
store.filesInFolder("folder-1").map((f) => f.name),
["apple.sql", "banana.sql", "cherry.sql"],
);
// Other folder unaffected
assert.equal(store.filesInFolder("folder-2")[0]?.name, "other.sql");
// Sort by name-desc
await store.sortFolderFiles("folder-1", "name-desc");
assert.deepEqual(
store.filesInFolder("folder-1").map((f) => f.name),
["cherry.sql", "banana.sql", "apple.sql"],
);
// Sort by updated-desc (newest first)
await store.sortFolderFiles("folder-1", "updated-desc");
assert.deepEqual(
store.filesInFolder("folder-1").map((f) => f.name),
["apple.sql", "banana.sql", "cherry.sql"],
);
// Sort by updated-asc (oldest first)
await store.sortFolderFiles("folder-1", "updated-asc");
assert.deepEqual(
store.filesInFolder("folder-1").map((f) => f.name),
["cherry.sql", "banana.sql", "apple.sql"],
);
});
test("sortFolderChildren sorts subfolders by name", async () => {
apiMock.saveSavedSqlFolder.mockImplementation((folder) => Promise.resolve(folder));
apiMock.loadSavedSqlLibrary.mockResolvedValue({
folders: [
{ id: "parent", name: "Parent", createdAt: "2026-07-19T00:00:00.000Z", updatedAt: "2026-07-19T00:00:00.000Z" },
{ id: "c1", name: "Zebra", parentFolderId: "parent", orderIndex: 0, createdAt: "2026-07-19T00:00:00.000Z", updatedAt: "2026-07-19T00:00:00.000Z" },
{ id: "c2", name: "Alpha", parentFolderId: "parent", orderIndex: 1, createdAt: "2026-07-19T00:00:00.000Z", updatedAt: "2026-07-19T00:00:00.000Z" },
{ id: "c3", name: "Beta", parentFolderId: "parent", orderIndex: 2, createdAt: "2026-07-19T00:00:00.000Z", updatedAt: "2026-07-19T00:00:00.000Z" },
],
files: [],
});
const store = useSavedSqlStore();
await store.initFromStorage();
await store.sortFolderChildren("parent", "name-asc");
assert.deepEqual(
store.allFolders.filter((f) => f.parentFolderId === "parent").map((f) => f.name),
["Alpha", "Beta", "Zebra"],
);
await store.sortFolderChildren("parent", "name-desc");
assert.deepEqual(
store.allFolders.filter((f) => f.parentFolderId === "parent").map((f) => f.name),
["Zebra", "Beta", "Alpha"],
);
});
test("sortAllFolderFiles sorts files across all folders", async () => {
apiMock.saveSavedSqlFile.mockImplementation((file) => Promise.resolve(file));
apiMock.loadSavedSqlLibrary.mockResolvedValue({
folders: [
{ id: "f1", name: "F1", createdAt: "2026-07-19T00:00:00.000Z", updatedAt: "2026-07-19T00:00:00.000Z" },
{ id: "f2", name: "F2", createdAt: "2026-07-19T00:00:00.000Z", updatedAt: "2026-07-19T00:00:00.000Z" },
],
files: [
scopeSeedFile("sql-1", "z.sql", { folderId: "f1", orderIndex: 0 }),
scopeSeedFile("sql-2", "a.sql", { folderId: "f1", orderIndex: 1 }),
scopeSeedFile("sql-3", "y.sql", { folderId: "f2", orderIndex: 0 }),
scopeSeedFile("sql-4", "b.sql", { folderId: "f2", orderIndex: 1 }),
],
});
const store = useSavedSqlStore();
await store.initFromStorage();
await store.sortAllFolderFiles("name-asc");
assert.deepEqual(
store.filesInFolder("f1").map((f) => f.name),
["a.sql", "z.sql"],
);
assert.deepEqual(
store.filesInFolder("f2").map((f) => f.name),
["b.sql", "y.sql"],
);
});