feat(sidebar): allow pinning default database to top
This commit is contained in:
1 parent
f991d118cd
commit
b498b1e63a
22 files changed
+135
-1
No files matched your search
@@ -842,6 +842,7 @@ const editRoutineSourceOpenMode = ref(settingsStore.editorSettings.routineSource
|
||||
const editSidebarTableSearchEnabled = ref(settingsStore.editorSettings.sidebarTableSearchEnabled);
|
||||
const editSidebarSearchOpenedDatabasesOnly = ref(settingsStore.editorSettings.sidebarSearchOpenedDatabasesOnly);
|
||||
const editAutoSelectActiveSidebarNode = ref(settingsStore.editorSettings.autoSelectActiveSidebarNode);
|
||||
const editSidebarPinDefaultDatabase = ref(settingsStore.editorSettings.sidebarPinDefaultDatabase);
|
||||
const editSidebarBrowseObjectsOnDatabaseActivation = ref(settingsStore.editorSettings.sidebarBrowseObjectsOnDatabaseActivation);
|
||||
const editOpenTabsRestoreMode = ref<OpenTabsRestoreMode>(settingsStore.editorSettings.openTabsRestoreMode);
|
||||
const editAutoReloadRestoredDataTabsOnOpen = ref(settingsStore.editorSettings.autoReloadRestoredDataTabsOnOpen);
|
||||
@@ -1126,6 +1127,7 @@ function currentEditorSettingsDraft(): EditorSettingsDraft {
|
||||
sidebarTableSearchEnabled: editSidebarTableSearchEnabled.value,
|
||||
sidebarSearchOpenedDatabasesOnly: editSidebarSearchOpenedDatabasesOnly.value,
|
||||
autoSelectActiveSidebarNode: editAutoSelectActiveSidebarNode.value,
|
||||
sidebarPinDefaultDatabase: editSidebarPinDefaultDatabase.value,
|
||||
sidebarBrowseObjectsOnDatabaseActivation: editSidebarBrowseObjectsOnDatabaseActivation.value,
|
||||
openTabsRestoreMode: editOpenTabsRestoreMode.value,
|
||||
autoReloadRestoredDataTabsOnOpen: editAutoReloadRestoredDataTabsOnOpen.value,
|
||||
@@ -1796,6 +1798,7 @@ function syncEditorSettingsDraftFromStore() {
|
||||
editSidebarTableSearchEnabled.value = settingsStore.editorSettings.sidebarTableSearchEnabled;
|
||||
editSidebarSearchOpenedDatabasesOnly.value = settingsStore.editorSettings.sidebarSearchOpenedDatabasesOnly;
|
||||
editAutoSelectActiveSidebarNode.value = settingsStore.editorSettings.autoSelectActiveSidebarNode;
|
||||
editSidebarPinDefaultDatabase.value = settingsStore.editorSettings.sidebarPinDefaultDatabase;
|
||||
editSidebarBrowseObjectsOnDatabaseActivation.value = settingsStore.editorSettings.sidebarBrowseObjectsOnDatabaseActivation;
|
||||
editOpenTabsRestoreMode.value = settingsStore.editorSettings.openTabsRestoreMode;
|
||||
editAutoReloadRestoredDataTabsOnOpen.value = settingsStore.editorSettings.autoReloadRestoredDataTabsOnOpen;
|
||||
@@ -1938,6 +1941,7 @@ const editorSettingsDraftRefs: EditorSettingsDraftRefMap = {
|
||||
sidebarTableSearchEnabled: editSidebarTableSearchEnabled,
|
||||
sidebarSearchOpenedDatabasesOnly: editSidebarSearchOpenedDatabasesOnly,
|
||||
autoSelectActiveSidebarNode: editAutoSelectActiveSidebarNode,
|
||||
sidebarPinDefaultDatabase: editSidebarPinDefaultDatabase,
|
||||
sidebarBrowseObjectsOnDatabaseActivation: editSidebarBrowseObjectsOnDatabaseActivation,
|
||||
openTabsRestoreMode: editOpenTabsRestoreMode,
|
||||
autoReloadRestoredDataTabsOnOpen: editAutoReloadRestoredDataTabsOnOpen,
|
||||
@@ -2446,6 +2450,7 @@ function resetDefaultsForTab(tab: SettingsCategory) {
|
||||
editSidebarTableSearchEnabled.value = DEFAULT_EDITOR_SETTINGS.sidebarTableSearchEnabled;
|
||||
editSidebarSearchOpenedDatabasesOnly.value = DEFAULT_EDITOR_SETTINGS.sidebarSearchOpenedDatabasesOnly;
|
||||
editAutoSelectActiveSidebarNode.value = DEFAULT_EDITOR_SETTINGS.autoSelectActiveSidebarNode;
|
||||
editSidebarPinDefaultDatabase.value = DEFAULT_EDITOR_SETTINGS.sidebarPinDefaultDatabase;
|
||||
editSidebarBrowseObjectsOnDatabaseActivation.value = DEFAULT_EDITOR_SETTINGS.sidebarBrowseObjectsOnDatabaseActivation;
|
||||
editOpenTabsRestoreMode.value = DEFAULT_EDITOR_SETTINGS.openTabsRestoreMode;
|
||||
editAutoReloadRestoredDataTabsOnOpen.value = DEFAULT_EDITOR_SETTINGS.autoReloadRestoredDataTabsOnOpen;
|
||||
@@ -2629,6 +2634,7 @@ function resetAllDefaults() {
|
||||
editSidebarTableSearchEnabled.value = DEFAULT_EDITOR_SETTINGS.sidebarTableSearchEnabled;
|
||||
editSidebarSearchOpenedDatabasesOnly.value = DEFAULT_EDITOR_SETTINGS.sidebarSearchOpenedDatabasesOnly;
|
||||
editAutoSelectActiveSidebarNode.value = DEFAULT_EDITOR_SETTINGS.autoSelectActiveSidebarNode;
|
||||
editSidebarPinDefaultDatabase.value = DEFAULT_EDITOR_SETTINGS.sidebarPinDefaultDatabase;
|
||||
editSidebarBrowseObjectsOnDatabaseActivation.value = DEFAULT_EDITOR_SETTINGS.sidebarBrowseObjectsOnDatabaseActivation;
|
||||
editOpenTabsRestoreMode.value = DEFAULT_EDITOR_SETTINGS.openTabsRestoreMode;
|
||||
editAutoReloadRestoredDataTabsOnOpen.value = DEFAULT_EDITOR_SETTINGS.autoReloadRestoredDataTabsOnOpen;
|
||||
@@ -7862,6 +7868,15 @@ onUnmounted(() => {
|
||||
</div>
|
||||
<Switch id="auto-select-active-sidebar-node" v-model="editAutoSelectActiveSidebarNode" />
|
||||
</div>
|
||||
<div class="settings-item flex items-center justify-between gap-4 rounded-md border bg-muted/20 px-3 py-2">
|
||||
<div class="flex items-center gap-2">
|
||||
<Label for="sidebar-pin-default-database">{{ t("settings.sidebarPinDefaultDatabase") }}</Label>
|
||||
<HelpTooltip :label="t('settings.sidebarPinDefaultDatabase')">
|
||||
{{ t("settings.sidebarPinDefaultDatabaseDescription") }}
|
||||
</HelpTooltip>
|
||||
</div>
|
||||
<Switch id="sidebar-pin-default-database" v-model="editSidebarPinDefaultDatabase" />
|
||||
</div>
|
||||
<div class="settings-item space-y-2 rounded-md border bg-muted/20 px-3 py-2">
|
||||
<div class="flex items-center gap-2">
|
||||
<Label for="open-tabs-restore-mode">{{ t("settings.openTabsRestoreMode") }}</Label>
|
||||
|
||||
@@ -1200,7 +1200,7 @@ function pinnedSortKey(): string {
|
||||
}
|
||||
|
||||
function canDragPinnedOrder(): boolean {
|
||||
return isPinned.value && !isNodeDefaultDatabase.value && !props.reorderDisabled;
|
||||
return isPinned.value && !(isNodeDefaultDatabase.value && settingsStore.editorSettings.sidebarPinDefaultDatabase) && !props.reorderDisabled;
|
||||
}
|
||||
|
||||
const {
|
||||
|
||||
@@ -7277,6 +7277,8 @@ export default withEnglishFallback({
|
||||
routineSourceOpenModeDialogDescription: "Sürətli baxış və redaktə üçün mənbə kodunu açılan dialoqda aç.",
|
||||
autoSelectActiveSidebarNode: "Həmişə açılmış elementi seç",
|
||||
autoSelectActiveSidebarNodeDescription: "Vərəqlər arasında keçid edərkən yan paneldə uyğun görünən cədvəli, kolleksiyanı və ya SQL faylını seç.",
|
||||
sidebarPinDefaultDatabase: "Varsayılan verilənlər bazasını yuxarıda bərkit",
|
||||
sidebarPinDefaultDatabaseDescription: "Aktiv olduqda, varsayılan verilənlər bazası siyahının yuxarısında göstərilir. Deaktiv olduqda, əlifba sırası ilə düzülür.",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "Verilənlər bazası aktivləşdirildikdə obyektlərə bax",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: 'Aktiv olduqda, seçilmiş tək və ya ikiqat klik rejimi ilə verilənlər bazası və ya sxem düyününün aktivləşdirilməsi "Obyektlərə bax" vərəqini də açır.',
|
||||
openTabsRestoreMode: "Başladıqda vərəqləri bərpa et",
|
||||
|
||||
@@ -8137,6 +8137,8 @@ export default {
|
||||
routineSourceOpenModeDialogDescription: "Open source in a popup dialog for quick viewing and editing.",
|
||||
autoSelectActiveSidebarNode: "Always select opened item",
|
||||
autoSelectActiveSidebarNodeDescription: "When switching tabs, select the matching visible table, collection, or SQL file in the sidebar.",
|
||||
sidebarPinDefaultDatabase: "Pin default database to top",
|
||||
sidebarPinDefaultDatabaseDescription: "When enabled, the default database appears at the top of the database list. When disabled, it is sorted alphabetically.",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "Browse objects when activating a database",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: 'When enabled, activating a database or schema node using the selected single- or double-click mode also opens the "Browse Objects" tab.',
|
||||
openTabsRestoreMode: "Restore tabs on launch",
|
||||
|
||||
@@ -7466,6 +7466,8 @@ export default withEnglishFallback({
|
||||
sidebarObjectDisplaySimpleDescription: "Muestra tablas y vistas directamente bajo cada base de datos o esquema para reducir niveles intermedios.",
|
||||
autoSelectActiveSidebarNode: "Seleccionar siempre el elemento abierto",
|
||||
autoSelectActiveSidebarNodeDescription: "Al cambiar de pestaña, selecciona la tabla, colección o archivo SQL visible correspondiente en la barra lateral.",
|
||||
sidebarPinDefaultDatabase: "Fijar base de datos predeterminada arriba",
|
||||
sidebarPinDefaultDatabaseDescription: "Cuando está habilitado, la base de datos predeterminada se muestra en la parte superior de la lista. Cuando está deshabilitado, se ordena alfabéticamente.",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "Explorar objetos al activar una base de datos",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: 'Si está activado, al activar un nodo de base de datos o esquema con el modo seleccionado de uno o dos clics también se abre la pestaña "Explorar objetos".',
|
||||
openTabsRestoreMode: "Restaurar pestañas al iniciar",
|
||||
|
||||
@@ -7947,6 +7947,8 @@ export default withEnglishFallback({
|
||||
routineSourceOpenModeDialogDescription: "Buka sumber pada dialog pop-up untuk melihat dan mengedit dengan cepat.",
|
||||
autoSelectActiveSidebarNode: "Selalu pilih item yang dibuka",
|
||||
autoSelectActiveSidebarNodeDescription: "Saat beralih tab, pilih tabel, koleksi, atau file SQL yang terlihat sesuai di bilah sisi.",
|
||||
sidebarPinDefaultDatabase: "Sematkan database default ke atas",
|
||||
sidebarPinDefaultDatabaseDescription: "Saat diaktifkan, database default akan muncul di bagian atas daftar database. Saat dinonaktifkan, akan diurutkan berdasarkan abjad.",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "Jelajahi objek saat mengaktifkan database",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: 'Jika diaktifkan, mengaktifkan node database atau skema menggunakan mode klik tunggal atau ganda yang dipilih juga membuka tab "Jelajahi Objek".',
|
||||
openTabsRestoreMode: "Pulihkan tab saat peluncuran",
|
||||
|
||||
@@ -7244,6 +7244,8 @@ export default withEnglishFallback({
|
||||
sidebarObjectDisplaySimpleDescription: "Elenca tabelle e viste direttamente sotto ogni database o schema per ridurre i livelli intermedi.",
|
||||
autoSelectActiveSidebarNode: "Seleziona sempre l'elemento aperto",
|
||||
autoSelectActiveSidebarNodeDescription: "Quando passi da una scheda all'altra, seleziona la tabella, la collezione o il file SQL visibile corrispondente nella barra laterale.",
|
||||
sidebarPinDefaultDatabase: "Fissa database predefinito in alto",
|
||||
sidebarPinDefaultDatabaseDescription: "Se abilitato, il database predefinito viene mostrato in cima all'elenco dei database. Se disabilitato, viene ordinato alfabeticamente.",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "Esplora oggetti all'attivazione di un database",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: "Se abilitato, l'attivazione di un nodo database o schema con la modalità a clic singolo o doppio selezionata apre anche la scheda «Esplora oggetti».",
|
||||
openTabsRestoreMode: "Ripristina schede all'avvio",
|
||||
|
||||
@@ -7261,6 +7261,8 @@ export default withEnglishFallback({
|
||||
sidebarObjectDisplaySimpleDescription: "中間レベルを減らすために、各データベースまたはスキーマの直下にテーブルとビューを一覧表示します。",
|
||||
autoSelectActiveSidebarNode: "開いた項目を常に選択",
|
||||
autoSelectActiveSidebarNodeDescription: "タブ切替時に、サイドバーで一致する表示中のテーブル、コレクション、またはSQLファイルを選択します。",
|
||||
sidebarPinDefaultDatabase: "デフォルトデータベースを先頭に固定",
|
||||
sidebarPinDefaultDatabaseDescription: "有効にすると、デフォルトデータベースがデータベース一覧の先頭に固定されます。無効にすると、アルファベット順に並べ替えられます。",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "データベースノードのアクティブ化時にオブジェクトを参照",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: "有効にすると、選択したシングルクリックまたはダブルクリック方式でデータベースまたはスキーマノードをアクティブ化した際に、サイドバーを展開すると同時に「オブジェクトを参照」タブを開きます。",
|
||||
openTabsRestoreMode: "起動時にタブを復元",
|
||||
|
||||
@@ -7046,6 +7046,8 @@ export default withEnglishFallback({
|
||||
sidebarObjectDisplaySimpleDescription: "중간 수준을 줄이기 위해 각 데이터베이스나 스키마 아래에 테이블과 뷰를 직접 나열합니다.",
|
||||
autoSelectActiveSidebarNode: "열린 항목 항상 선택",
|
||||
autoSelectActiveSidebarNodeDescription: "탭을 전환할 때 사이드바에서 일치하는 표시된 테이블, 컬렉션 또는 SQL 파일을 선택합니다.",
|
||||
sidebarPinDefaultDatabase: "기본 데이터베이스 상단 고정",
|
||||
sidebarPinDefaultDatabaseDescription: "활성화하면 기본 데이터베이스가 데이터베이스 목록 상단에 고정 표시됩니다. 비활성화하면 알파벳순으로 정렬됩니다.",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "데이터베이스 노드 활성화 시 객체 탐색",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: '활성화하면 선택한 한 번 클릭 또는 두 번 클릭 방식으로 데이터베이스나 스키마 노드를 활성화할 때 사이드바를 펼치면서 "객체 탐색" 탭을 엽니다.',
|
||||
openTabsRestoreMode: "실행 시 탭 복원",
|
||||
|
||||
@@ -7246,6 +7246,8 @@ export default withEnglishFallback({
|
||||
sidebarObjectDisplaySimpleDescription: "Listar tabelas e views diretamente sob cada banco de dados ou schema para reduzir os níveis intermediários.",
|
||||
autoSelectActiveSidebarNode: "Sempre selecionar o item aberto",
|
||||
autoSelectActiveSidebarNodeDescription: "Ao alternar abas, selecionar a tabela, coleção ou arquivo SQL correspondente visível na barra lateral.",
|
||||
sidebarPinDefaultDatabase: "Fixar banco de dados padrão no topo",
|
||||
sidebarPinDefaultDatabaseDescription: "Quando ativado, o banco de dados padrão aparece no topo da lista de bancos de dados. Quando desativado, é ordenado em ordem alfabética.",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "Explorar objetos ao ativar um banco de dados",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: 'Quando ativado, ativar um nó de banco de dados ou esquema com o modo selecionado de clique simples ou duplo também abre a aba "Explorar Objetos".',
|
||||
openTabsRestoreMode: "Restaurar abas ao iniciar",
|
||||
|
||||
@@ -8455,6 +8455,8 @@ export default withEnglishFallback({
|
||||
routineSourceOpenModeDialogDescription: "Открывать исходный код во всплывающем диалоге для быстрого просмотра и редактирования.",
|
||||
autoSelectActiveSidebarNode: "Всегда выделять открытый элемент",
|
||||
autoSelectActiveSidebarNodeDescription: "При переключении вкладок выделять соответствующую видимую таблицу, коллекцию или SQL-файл в боковой панели.",
|
||||
sidebarPinDefaultDatabase: "Закреплять базу данных по умолчанию вверху",
|
||||
sidebarPinDefaultDatabaseDescription: "Если включено, база данных по умолчанию отображается в начале списка. Если отключено, она сортируется по алфавиту.",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "Просматривать объекты при активации базы данных",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: "Если включено, активация узла базы данных или схемы выбранным режимом (один или двойной клик) также открывает вкладку «Просмотр объектов».",
|
||||
openTabsRestoreMode: "Восстанавливать вкладки при запуске",
|
||||
|
||||
@@ -7161,6 +7161,8 @@ export default withEnglishFallback({
|
||||
routineSourceOpenModeDialogDescription: "Hızlı görüntüleme ve düzenleme için kaynağı açılır bir iletişim kutusunda aç.",
|
||||
autoSelectActiveSidebarNode: "Açılan öğeyi her zaman seç",
|
||||
autoSelectActiveSidebarNodeDescription: "Sekmeler arasında geçiş yaparken kenar çubuğunda eşleşen görünür tabloyu, koleksiyonu veya SQL dosyasını seç.",
|
||||
sidebarPinDefaultDatabase: "Varsayılan veritabanını en üste sabitle",
|
||||
sidebarPinDefaultDatabaseDescription: "Etkinleştirildiğinde, varsayılan veritabanı veritabanı listesinin en üstünde görüntülenir. Devre dışı bırakıldığında alfabetik olarak sıralanır.",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "Veritabanı etkinleştirilirken nesnelere gözat",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: 'Etkinleştirildiğinde, seçili tek veya çift tıklama moduyla bir veritabanı ya da şema düğümünü etkinleştirmek "Nesnelere Gözat" sekmesini de açar.',
|
||||
openTabsRestoreMode: "Açılışta sekmeleri geri yükle",
|
||||
|
||||
@@ -8123,6 +8123,8 @@ export default withEnglishFallback({
|
||||
routineSourceOpenModeDialogDescription: "在弹出对话框中打开源码,方便快速查看和编辑。",
|
||||
autoSelectActiveSidebarNode: "始终选中已打开项目",
|
||||
autoSelectActiveSidebarNodeDescription: "切换标签页时,在侧边栏选中匹配的可见表、集合或 SQL 文件。",
|
||||
sidebarPinDefaultDatabase: "默认数据库置顶",
|
||||
sidebarPinDefaultDatabaseDescription: "开启后,默认数据库在数据库列表中置顶显示;关闭后按字母正常排序。",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "激活数据库节点时浏览对象",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: "开启后,按照所选的单击或双击激活方式操作数据库或模式节点时,会同时展开侧边栏并打开“浏览对象”标签页。",
|
||||
openTabsRestoreMode: "启动时恢复标签页",
|
||||
|
||||
@@ -6594,6 +6594,8 @@ export default withEnglishFallback({
|
||||
sidebarObjectDisplaySimpleDescription: "直接在每個資料庫或 schema 下列出資料表與檢視,減少中間層級。",
|
||||
autoSelectActiveSidebarNode: "一律選取已開啟項目",
|
||||
autoSelectActiveSidebarNodeDescription: "切換分頁時,在側邊欄選取相符的可見資料表、集合或 SQL 檔案。",
|
||||
sidebarPinDefaultDatabase: "預設資料庫置頂",
|
||||
sidebarPinDefaultDatabaseDescription: "開啟後,預設資料庫在資料庫清單中置頂顯示;關閉後依字母正常排序。",
|
||||
sidebarBrowseObjectsOnDatabaseActivation: "啟用資料庫節點時瀏覽物件",
|
||||
sidebarBrowseObjectsOnDatabaseActivationDescription: "開啟後,依照所選的單擊或雙擊啟用方式操作資料庫或結構描述節點時,會同時展開側邊欄並開啟「瀏覽物件」分頁。",
|
||||
openTabsRestoreMode: "啟動時還原分頁",
|
||||
|
||||
@@ -229,6 +229,19 @@ describe("sidebar pinned tree nodes", () => {
|
||||
expect(defaultNode.pinned).toBe(true);
|
||||
});
|
||||
|
||||
it("restores the natural order of the default database when fixed priority is disabled", () => {
|
||||
const nodeA: TreeNode = { id: "db-a", label: "A", type: "database", connectionId: "conn", database: "a" };
|
||||
const defaultNode: TreeNode = { id: "db-default", label: "B", type: "database", connectionId: "conn", database: "default" };
|
||||
const nodeC: TreeNode = { id: "db-c", label: "C", type: "database", connectionId: "conn", database: "c" };
|
||||
const nodes = [nodeA, defaultNode, nodeC];
|
||||
|
||||
syncPinnedTreeNodeStateInPlace(nodes, new Set(), [], (node) => node.id === defaultNode.id);
|
||||
expect(nodes.map((node) => node.id)).toEqual(["db-default", "db-a", "db-c"]);
|
||||
|
||||
syncPinnedTreeNodeStateInPlace(nodes, new Set(), [], () => false);
|
||||
expect(nodes.map((node) => node.id)).toEqual(["db-a", "db-default", "db-c"]);
|
||||
});
|
||||
|
||||
it("reorders pinned keys before and after a sibling without dropping unrelated keys", () => {
|
||||
const initial = ["scope:a", "other:x", "scope:b", "other:y", "scope:c"];
|
||||
|
||||
|
||||
@@ -94,6 +94,7 @@ export const EDITOR_SETTINGS_DRAFT_KEYS = [
|
||||
"sidebarTableSearchEnabled",
|
||||
"sidebarSearchOpenedDatabasesOnly",
|
||||
"autoSelectActiveSidebarNode",
|
||||
"sidebarPinDefaultDatabase",
|
||||
"sidebarBrowseObjectsOnDatabaseActivation",
|
||||
"openTabsRestoreMode",
|
||||
"autoReloadRestoredDataTabsOnOpen",
|
||||
|
||||
@@ -204,6 +204,7 @@ export const SETTINGS_SEARCH_DEFINITIONS: readonly SettingsSearchDefinition[] =
|
||||
{ id: "navigation-table-search", category: "navigation", titleKey: "settings.sidebarTableSearchEnabled", descriptionKey: "settings.sidebarTableSearchEnabledDescription", targetId: "navigation" },
|
||||
{ id: "navigation-search-opened-databases-only", category: "navigation", titleKey: "settings.sidebarSearchOpenedDatabasesOnly", descriptionKey: "settings.sidebarSearchOpenedDatabasesOnlyDescription", targetId: "navigation" },
|
||||
{ id: "navigation-active-node", category: "navigation", titleKey: "settings.autoSelectActiveSidebarNode", descriptionKey: "settings.autoSelectActiveSidebarNodeDescription", targetId: "navigation" },
|
||||
{ id: "navigation-sidebar-pin-default-database", category: "navigation", titleKey: "settings.sidebarPinDefaultDatabase", descriptionKey: "settings.sidebarPinDefaultDatabaseDescription", targetId: "navigation" },
|
||||
{ id: "navigation-browse-objects-on-database-activation", category: "navigation", titleKey: "settings.sidebarBrowseObjectsOnDatabaseActivation", descriptionKey: "settings.sidebarBrowseObjectsOnDatabaseActivationDescription", targetId: "navigation" },
|
||||
{ id: "navigation-tabs-restore", category: "navigation", titleKey: "settings.openTabsRestoreMode", descriptionKey: "settings.openTabsRestoreModeDescription", targetId: "navigation" },
|
||||
{ id: "navigation-sidebar-scroll", category: "navigation", titleKey: "settings.sidebarAllowHorizontalScroll", descriptionKey: "settings.sidebarAllowHorizontalScrollDescription", targetId: "navigation" },
|
||||
|
||||
@@ -125,6 +125,7 @@ const SETTINGS_TRANSFER_CATEGORY_KEYS: Record<SettingsTransferCategoryId, readon
|
||||
"sidebarTableSearchEnabled",
|
||||
"sidebarSearchOpenedDatabasesOnly",
|
||||
"autoSelectActiveSidebarNode",
|
||||
"sidebarPinDefaultDatabase",
|
||||
"sidebarBrowseObjectsOnDatabaseActivation",
|
||||
"openTabsRestoreMode",
|
||||
"autoReloadRestoredDataTabsOnOpen",
|
||||
@@ -291,6 +292,7 @@ const PASS_THROUGH_BOOLEAN_KEYS = [
|
||||
"infiniteScroll",
|
||||
"autoCalculateTotalRows",
|
||||
"autoSelectActiveSidebarNode",
|
||||
"sidebarPinDefaultDatabase",
|
||||
"sidebarAllowHorizontalScroll",
|
||||
"sidebarShowTooltips",
|
||||
"updateNotificationsEnabled",
|
||||
|
||||
@@ -335,4 +335,50 @@ describe("connectionStore pinned tree node removal", () => {
|
||||
expect(store.isTreeNodePinned(users)).toBe(false);
|
||||
expect(store.isTreeNodePinned(accounts)).toBe(false);
|
||||
});
|
||||
|
||||
it("pins default database to top when sidebarPinDefaultDatabase is true and restores natural order when false", async () => {
|
||||
vi.doMock("@/lib/backend/tauriRuntime", () => ({ isTauriRuntime: () => false }));
|
||||
|
||||
const { useConnectionStore } = await import("@/stores/connectionStore");
|
||||
const { useSettingsStore } = await import("@/stores/settingsStore");
|
||||
const settingsStore = useSettingsStore();
|
||||
const store = useConnectionStore();
|
||||
|
||||
store.connections = [
|
||||
{
|
||||
id: "conn",
|
||||
name: "Test Connection",
|
||||
db_type: "mysql",
|
||||
host: "localhost",
|
||||
database: "beta",
|
||||
},
|
||||
];
|
||||
|
||||
const dbAlpha: TreeNode = { id: "conn:alpha", label: "alpha", type: "database", connectionId: "conn", database: "alpha" };
|
||||
const dbBeta: TreeNode = { id: "conn:beta", label: "beta", type: "database", connectionId: "conn", database: "beta" };
|
||||
const dbGamma: TreeNode = { id: "conn:gamma", label: "gamma", type: "database", connectionId: "conn", database: "gamma" };
|
||||
|
||||
const connNode: TreeNode = {
|
||||
id: "conn",
|
||||
label: "Test Connection",
|
||||
type: "connection",
|
||||
connectionId: "conn",
|
||||
children: [dbAlpha, dbBeta, dbGamma],
|
||||
};
|
||||
store.treeNodes = [connNode];
|
||||
|
||||
expect(settingsStore.editorSettings.sidebarPinDefaultDatabase).toBe(true);
|
||||
store.syncPinnedTreeState(connNode.children);
|
||||
expect(connNode.children.map((node) => node.database)).toEqual(["beta", "alpha", "gamma"]);
|
||||
|
||||
settingsStore.updateEditorSettings({ sidebarPinDefaultDatabase: false });
|
||||
await vi.waitFor(() => {
|
||||
expect(connNode.children.map((node) => node.database)).toEqual(["alpha", "beta", "gamma"]);
|
||||
});
|
||||
|
||||
settingsStore.updateEditorSettings({ sidebarPinDefaultDatabase: true });
|
||||
await vi.waitFor(() => {
|
||||
expect(connNode.children.map((node) => node.database)).toEqual(["beta", "alpha", "gamma"]);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -889,6 +889,24 @@ describe("normalizeEditorSettings - tabLayout", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("normalizeEditorSettings - sidebarPinDefaultDatabase", () => {
|
||||
it("defaults sidebarPinDefaultDatabase to true", () => {
|
||||
expect(normalizeEditorSettings({}).sidebarPinDefaultDatabase).toBe(true);
|
||||
});
|
||||
|
||||
it("preserves explicit boolean values", () => {
|
||||
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: false }).sidebarPinDefaultDatabase).toBe(false);
|
||||
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: true }).sidebarPinDefaultDatabase).toBe(true);
|
||||
});
|
||||
|
||||
it("falls back to default for non-boolean values", () => {
|
||||
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: "false" } as any).sidebarPinDefaultDatabase).toBe(true);
|
||||
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: undefined } as any).sidebarPinDefaultDatabase).toBe(true);
|
||||
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: null } as any).sidebarPinDefaultDatabase).toBe(true);
|
||||
expect(normalizeEditorSettings({ sidebarPinDefaultDatabase: 0 } as any).sidebarPinDefaultDatabase).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
// --- Helpers for Pinia store tests ---
|
||||
|
||||
function makeTestConfig(overrides: Partial<AiConfigItem> & { id: string }): AiConfigItem {
|
||||
|
||||
@@ -1810,6 +1810,7 @@ export const useConnectionStore = defineStore("connection", () => {
|
||||
return !!node.connectionId && !!node.schema && isDefaultSchema(node.connectionId, node.schema);
|
||||
}
|
||||
if (node.type !== "database" && node.type !== "redis-db" && node.type !== "mongo-db") return false;
|
||||
if (!settingsStore.editorSettings.sidebarPinDefaultDatabase) return false;
|
||||
return !!node.connectionId && typeof node.database === "string" && isDefaultDatabase(node.connectionId, node.database);
|
||||
}
|
||||
|
||||
@@ -1821,6 +1822,14 @@ export const useConnectionStore = defineStore("connection", () => {
|
||||
syncPinnedTreeNodeStateInPlace(nodes, pinnedTreeNodeIds.value, pinnedTreeNodeOrder.value, isFixedPriorityTreeNode);
|
||||
}
|
||||
|
||||
watch(
|
||||
() => settingsStore.editorSettings.sidebarPinDefaultDatabase,
|
||||
() => {
|
||||
syncPinnedTreeState(treeNodes.value);
|
||||
},
|
||||
{ flush: "post" },
|
||||
);
|
||||
|
||||
function isConnectionUtilityNode(node: TreeNode): boolean {
|
||||
// dameng-users / dameng-roles must be here too: they are synthesized admin
|
||||
// nodes (fixed ids, rebuilt on every re-normalization). If they were treated
|
||||
@@ -10251,6 +10260,7 @@ export const useConnectionStore = defineStore("connection", () => {
|
||||
databaseCompatibilityModes,
|
||||
isTreeNodePinned,
|
||||
orderByPinnedTreeNodes,
|
||||
syncPinnedTreeState,
|
||||
toggleTreeNodePin,
|
||||
beginPinnedTreeNodeReorder,
|
||||
endPinnedTreeNodeReorder,
|
||||
|
||||
@@ -988,6 +988,7 @@ export interface EditorSettings {
|
||||
sidebarGlobalSearchLocal: boolean;
|
||||
sidebarSearchOpenedDatabasesOnly: boolean;
|
||||
autoSelectActiveSidebarNode: boolean;
|
||||
sidebarPinDefaultDatabase: boolean;
|
||||
sidebarBrowseObjectsOnDatabaseActivation: boolean;
|
||||
sidebarBrowseObjectsOnDatabaseActivationMigrationVersion: number;
|
||||
openTabsRestoreMode: OpenTabsRestoreMode;
|
||||
@@ -1283,6 +1284,7 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
|
||||
sidebarGlobalSearchLocal: false,
|
||||
sidebarSearchOpenedDatabasesOnly: true,
|
||||
autoSelectActiveSidebarNode: false,
|
||||
sidebarPinDefaultDatabase: true,
|
||||
sidebarBrowseObjectsOnDatabaseActivation: false,
|
||||
sidebarBrowseObjectsOnDatabaseActivationMigrationVersion: SIDEBAR_BROWSE_OBJECTS_MIGRATION_VERSION,
|
||||
openTabsRestoreMode: "all",
|
||||
@@ -1867,6 +1869,7 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
|
||||
sidebarGlobalSearchLocal: typeof settings.sidebarGlobalSearchLocal === "boolean" ? settings.sidebarGlobalSearchLocal : DEFAULT_EDITOR_SETTINGS.sidebarGlobalSearchLocal,
|
||||
sidebarSearchOpenedDatabasesOnly: typeof settings.sidebarSearchOpenedDatabasesOnly === "boolean" ? settings.sidebarSearchOpenedDatabasesOnly : DEFAULT_EDITOR_SETTINGS.sidebarSearchOpenedDatabasesOnly,
|
||||
autoSelectActiveSidebarNode: settings.autoSelectActiveSidebarNode ?? DEFAULT_EDITOR_SETTINGS.autoSelectActiveSidebarNode,
|
||||
sidebarPinDefaultDatabase: typeof settings.sidebarPinDefaultDatabase === "boolean" ? settings.sidebarPinDefaultDatabase : DEFAULT_EDITOR_SETTINGS.sidebarPinDefaultDatabase,
|
||||
sidebarBrowseObjectsOnDatabaseActivation:
|
||||
typeof settings.sidebarBrowseObjectsOnDatabaseActivation === "boolean"
|
||||
? settings.sidebarBrowseObjectsOnDatabaseActivation
|
||||
@@ -2720,6 +2723,7 @@ export const useSettingsStore = defineStore("settings", () => {
|
||||
if (partial.sidebarGlobalSearchLocal !== undefined) editorSettings.value.sidebarGlobalSearchLocal = partial.sidebarGlobalSearchLocal;
|
||||
if (partial.sidebarSearchOpenedDatabasesOnly !== undefined) editorSettings.value.sidebarSearchOpenedDatabasesOnly = partial.sidebarSearchOpenedDatabasesOnly;
|
||||
if (partial.autoSelectActiveSidebarNode !== undefined) editorSettings.value.autoSelectActiveSidebarNode = partial.autoSelectActiveSidebarNode;
|
||||
if (partial.sidebarPinDefaultDatabase !== undefined) editorSettings.value.sidebarPinDefaultDatabase = partial.sidebarPinDefaultDatabase === true;
|
||||
if (partial.sidebarBrowseObjectsOnDatabaseActivation !== undefined) editorSettings.value.sidebarBrowseObjectsOnDatabaseActivation = partial.sidebarBrowseObjectsOnDatabaseActivation === true;
|
||||
if (partial.openTabsRestoreMode !== undefined) editorSettings.value.openTabsRestoreMode = normalizeOpenTabsRestoreMode(partial.openTabsRestoreMode);
|
||||
if (partial.autoReloadRestoredDataTabsOnOpen !== undefined) editorSettings.value.autoReloadRestoredDataTabsOnOpen = partial.autoReloadRestoredDataTabsOnOpen === true;
|
||||
|
||||
Reference in new issue
Block a user