diff --git a/src/locales/de.json b/src/locales/de.json index 88e5cabe..c76a01f3 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/en.json b/src/locales/en.json index cd6f47ec..acacb40f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/es.json b/src/locales/es.json index f8b913be..9e294073 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/fr.json b/src/locales/fr.json index 2e9fb7a8..efe8f99a 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/it.json b/src/locales/it.json index 510959ee..0ecb2f70 100644 --- a/src/locales/it.json +++ b/src/locales/it.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/ja.json b/src/locales/ja.json index 581af74e..27bf223a 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/kn.json b/src/locales/kn.json index 38ff3e3d..df677081 100644 --- a/src/locales/kn.json +++ b/src/locales/kn.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/ko.json b/src/locales/ko.json index ceb87671..bc7bcb23 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/nl.json b/src/locales/nl.json index 0acf62dc..4ac5d47d 100644 --- a/src/locales/nl.json +++ b/src/locales/nl.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/pt_BR.json b/src/locales/pt_BR.json index 6c37394f..43956a66 100644 --- a/src/locales/pt_BR.json +++ b/src/locales/pt_BR.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/ru.json b/src/locales/ru.json index f924f852..b48fb558 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/sl.json b/src/locales/sl.json index 88462227..0d215bd3 100644 --- a/src/locales/sl.json +++ b/src/locales/sl.json @@ -1722,7 +1722,6 @@ "No available explorer": "Na voljo ni nobenega raziskovanja", "New Explorer": "Novo raziskovanje", "Untitled Explorer": "Neimenovano raziskovanje", - "More Explorer": "Več raziskovanj", "Save Explorer": "Shrani raziskovanje", "Save As New Explorer": "Shrani kot novo raziskovanje", "Restore to Last Saved": "Povrni na zadnje shranjeno stanje", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Skrij raziskovanje", "Unhide Explorer": "Razkrij raziskovanje", "Delete Explorer": "Izbriši raziskovanje", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Ime raziskovanja", "Add Query": "Dodaj poizvedbo", "Remove Query": "Odstrani poizvedbo", diff --git a/src/locales/th.json b/src/locales/th.json index 8deeb770..b1a27a0b 100644 --- a/src/locales/th.json +++ b/src/locales/th.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/tr.json b/src/locales/tr.json index 7da3cdc9..52bc64c5 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/uk.json b/src/locales/uk.json index 628f1b93..80fb4eae 100644 --- a/src/locales/uk.json +++ b/src/locales/uk.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/vi.json b/src/locales/vi.json index c8bbdb3b..0f92059f 100644 --- a/src/locales/vi.json +++ b/src/locales/vi.json @@ -1722,7 +1722,6 @@ "No available explorer": "No available explorer", "New Explorer": "New Explorer", "Untitled Explorer": "Untitled Explorer", - "More Explorer": "More Explorer", "Save Explorer": "Save Explorer", "Save As New Explorer": "Save As New Explorer", "Restore to Last Saved": "Restore to Last Saved", @@ -1732,6 +1731,7 @@ "Hide Explorer": "Hide Explorer", "Unhide Explorer": "Unhide Explorer", "Delete Explorer": "Delete Explorer", + "Change Explorer Display Order": "Change Explorer Display Order", "Explorer Name": "Explorer Name", "Add Query": "Add Query", "Remove Query": "Remove Query", diff --git a/src/locales/zh_Hans.json b/src/locales/zh_Hans.json index 558adf00..ec5249a8 100644 --- a/src/locales/zh_Hans.json +++ b/src/locales/zh_Hans.json @@ -1722,7 +1722,6 @@ "No available explorer": "没有可用的探索", "New Explorer": "新的探索", "Untitled Explorer": "未命名的探索", - "More Explorer": "更多探索", "Save Explorer": "保存探索", "Save As New Explorer": "另存为新的探索", "Restore to Last Saved": "恢复到上次保存", @@ -1732,6 +1731,7 @@ "Hide Explorer": "隐藏探索", "Unhide Explorer": "取消隐藏探索", "Delete Explorer": "删除探索", + "Change Explorer Display Order": "修改探索显示顺序", "Explorer Name": "探索名称", "Add Query": "添加查询", "Remove Query": "移除查询", diff --git a/src/locales/zh_Hant.json b/src/locales/zh_Hant.json index d57da58a..18982c68 100644 --- a/src/locales/zh_Hant.json +++ b/src/locales/zh_Hant.json @@ -1722,7 +1722,6 @@ "No available explorer": "沒有可用的探索", "New Explorer": "新的探索", "Untitled Explorer": "無標題的探索", - "More Explorer": "更多探索", "Save Explorer": "儲存探索", "Save As New Explorer": "另存新探索", "Restore to Last Saved": "還原到上次儲存", @@ -1732,6 +1731,7 @@ "Hide Explorer": "隱藏探索", "Unhide Explorer": "取消隱藏探索", "Delete Explorer": "刪除探索", + "Change Explorer Display Order": "變更探索顯示順序", "Explorer Name": "探索名稱", "Add Query": "新增查詢", "Remove Query": "移除查詢", diff --git a/src/styles/desktop/global.scss b/src/styles/desktop/global.scss index 2144383c..b5704e34 100644 --- a/src/styles/desktop/global.scss +++ b/src/styles/desktop/global.scss @@ -423,6 +423,17 @@ html[dir="rtl"] .v-img.img-with-direction > img { } } +.scrollable-vertical-tabs.v-tabs { + .v-slide-group__prev, + .v-slide-group__next { + max-height: 16px; + } + + &:not(:has(.v-slide-group__prev)) { + margin-top: 16px; + } +} + body .v-tabs:not(.v-tabs-pill) { &.v-tabs--vertical { border-right: inherit; diff --git a/src/views/desktop/insights/ExplorerPage.vue b/src/views/desktop/insights/ExplorerPage.vue index d9251291..01971e30 100644 --- a/src/views/desktop/insights/ExplorerPage.vue +++ b/src/views/desktop/insights/ExplorerPage.vue @@ -8,8 +8,13 @@ - + {{ tt('New Explorer') }} @@ -19,11 +24,10 @@ @click="loadExplorer(explorer.id)"> {{ explorer.name || tt('Untitled Explorer') }} - - {{ tt('More Explorer') }} - + @@ -127,6 +131,11 @@ {{ tt('Delete Explorer') }} + + @@ -215,6 +224,8 @@ import { mdiMenu, mdiArrowLeft, mdiArrowRight, + mdiMenuUp, + mdiMenuDown, mdiCheck, mdiRefresh, mdiDotsVertical, @@ -222,6 +233,7 @@ import { mdiEyeOutline, mdiEyeOffOutline, mdiDeleteOutline, + mdiSort, mdiHomeClockOutline, mdiInvoiceTextClockOutline, mdiExport @@ -293,15 +305,10 @@ const firstDayOfWeek = computed(() => userStore.currentUserFirstDa const fiscalYearStart = computed(() => userStore.currentUserFiscalYearStart); const allExplorers = computed(() => { - const maximumExplorersToShow = 14; const ret: InsightsExplorerBasicInfo[] = []; let hasCurrentExplorer = false; for (const explorer of explorersStore.allInsightsExplorerBasicInfos) { - if (ret.length >= maximumExplorersToShow) { - break; - } - if (!explorer.hidden || (explorer.id && explorer.id === currentExplorer.value.id)) { ret.push(explorer); @@ -312,23 +319,7 @@ const allExplorers = computed(() => { } if (!hasCurrentExplorer && currentExplorer.value && currentExplorer.value.id) { - if (ret.length >= maximumExplorersToShow) { - ret.pop(); - } - - let foundCurrentExplorer = false; - - for (const explorer of explorersStore.allInsightsExplorerBasicInfos) { - if (explorer.id === currentExplorer.value.id) { - ret.push(explorer); - foundCurrentExplorer = true; - break; - } - } - - if (!foundCurrentExplorer) { - ret.push(InsightsExplorerBasicInfo.of(currentExplorer.value)); - } + ret.push(InsightsExplorerBasicInfo.of(currentExplorer.value)); } return ret; @@ -506,12 +497,8 @@ function loadExplorer(explorerId: string, force?: boolean, init?: boolean): Prom }); } -function showAllExplorers(): void { - explorerListDialog.value?.open().then((selectedExplorer: InsightsExplorerBasicInfo) => { - if (selectedExplorer) { - loadExplorer(selectedExplorer.id); - } - }).catch(() => { +function showChangeExplorerDisplayOrderDialog(): void { + explorerListDialog.value?.open().then(() => { if (explorersStore.insightsExplorerListStateInvalid) { loading.value = true; diff --git a/src/views/desktop/insights/dialogs/ExplorerListDialog.vue b/src/views/desktop/insights/dialogs/ExplorerListDialog.vue index e34efd7b..543cba6d 100644 --- a/src/views/desktop/insights/dialogs/ExplorerListDialog.vue +++ b/src/views/desktop/insights/dialogs/ExplorerListDialog.vue @@ -63,8 +63,7 @@
- {{ element.name }} + {{ element.name }}
@@ -131,8 +130,7 @@ const { tt } = useI18n(); const explorersStore = useExplorersStore(); -let resolveFunc: ((explorer: InsightsExplorerBasicInfo) => void) | null = null; -let rejectFunc: ((reason?: unknown) => void) | null = null; +let resolveFunc: (() => void) | null = null; const snackbar = useTemplateRef('snackbar'); @@ -155,7 +153,7 @@ const noAvailableExplorer = computed(() => { return true; }); -function open(): Promise { +function open(): Promise { showHidden.value = false; showState.value = true; loading.value = true; @@ -173,9 +171,8 @@ function open(): Promise { } }); - return new Promise((resolve, reject) => { + return new Promise((resolve) => { resolveFunc = resolve; - rejectFunc = reject; }); } @@ -241,21 +238,12 @@ function saveDisplayOrder(): void { }); } -function switchToExplorer(explorer: InsightsExplorerBasicInfo): void { - if (loading.value || updating.value) { - return; - } - - resolveFunc?.(explorer); - showState.value = false; -} - function close(): void { if (loading.value || updating.value) { return; } - rejectFunc?.(); + resolveFunc?.(); showState.value = false; }