dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-20 15:56:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

getConnectionLabel refactor

Browse Source
This commit is contained in:
Jan Prochazka
2024-08-02 11:49:45 +02:00
parent cf39fd59f9
commit 7fcebedcdd
21 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/web/src/appobj/ConnectionAppObject.svelte
View File

@@ -98,7 +98,6 @@
import openNewTab from '../utility/openNewTab';
import { getDatabaseMenuItems } from './DatabaseAppObject.svelte';
import getElectron from '../utility/getElectron';
import getConnectionLabel from '../utility/getConnectionLabel';
import { getDatabaseList, useUsedApps } from '../utility/metadataLoaders';
import { getLocalStorage } from '../utility/storageCache';
import { apiCall, removeVolatileMapping } from '../utility/api';
@@ -106,6 +105,7 @@
import { closeMultipleTabs } from '../tabpanel/TabsPanel.svelte';
import AboutModal from '../modals/AboutModal.svelte';
import { tick } from 'svelte';
import { getConnectionLabel } from 'dbgate-tools';
export let data;
export let passProps;

3
packages/web/src/appobj/DatabaseAppObject.svelte
View File

@@ -340,7 +340,6 @@
</script>
<script lang="ts">
import getConnectionLabel from '../utility/getConnectionLabel';
import uuidv1 from 'uuid/v1';
import _, { find } from 'lodash';
@@ -365,7 +364,7 @@
import openNewTab from '../utility/openNewTab';
import AppObjectCore from './AppObjectCore.svelte';
import { showSnackbarError, showSnackbarSuccess } from '../utility/snackbar';
import { findEngineDriver } from 'dbgate-tools';
import { findEngineDriver, getConnectionLabel } from 'dbgate-tools';
import InputTextModal from '../modals/InputTextModal.svelte';
import { getDatabaseInfo, useUsedApps } from '../utility/metadataLoaders';
import { openJsonDocument } from '../tabs/JsonTab.svelte';

3
packages/web/src/appobj/DatabaseObjectAppObject.svelte
View File

@@ -776,7 +776,7 @@
pinnedTables,
} from '../stores';
import openNewTab from '../utility/openNewTab';
import { filterName, generateDbPairingId, getAlterDatabaseScript } from 'dbgate-tools';
import { filterName, generateDbPairingId, getAlterDatabaseScript, getConnectionLabel } from 'dbgate-tools';
import { getConnectionInfo, getDatabaseInfo } from '../utility/metadataLoaders';
import fullDisplayName from '../utility/fullDisplayName';
import ImportExportModal from '../modals/ImportExportModal.svelte';
@@ -784,7 +784,6 @@
import { findEngineDriver } from 'dbgate-tools';
import uuidv1 from 'uuid/v1';
import SqlGeneratorModal from '../modals/SqlGeneratorModal.svelte';
import getConnectionLabel from '../utility/getConnectionLabel';
import { exportQuickExportFile } from '../utility/exportFileTools';
import createQuickExportMenu from '../utility/createQuickExportMenu';
import ConfirmSqlModal, { saveScriptToDatabase } from '../modals/ConfirmSqlModal.svelte';

3
packages/web/src/appobj/SavedFileAppObject.svelte
View File

@@ -1,5 +1,5 @@
<script lang="ts" context="module">
import { filterName } from 'dbgate-tools';
import { filterName, getConnectionLabel } from 'dbgate-tools';
interface FileTypeHandler {
icon: string;
@@ -100,7 +100,6 @@
import { currentDatabase } from '../stores';
import { apiCall } from '../utility/api';
import getConnectionLabel from '../utility/getConnectionLabel';
import hasPermission from '../utility/hasPermission';
import openNewTab from '../utility/openNewTab';

3
packages/web/src/commands/CommandPalette.svelte
View File

@@ -60,7 +60,7 @@
</script>
<script>
import { filterName } from 'dbgate-tools';
import { filterName, getConnectionLabel } from 'dbgate-tools';
import _ from 'lodash';
import { onMount } from 'svelte';
@@ -75,7 +75,6 @@
visibleCommandPalette,
} from '../stores';
import clickOutside from '../utility/clickOutside';
import getConnectionLabel from '../utility/getConnectionLabel';
import { isElectronAvailable } from '../utility/getElectron';
import keycodes from '../utility/keycodes';
import { useConnectionList, useDatabaseInfo } from '../utility/metadataLoaders';

2
packages/web/src/commands/recentDatabaseSwitch.ts
View File

@@ -1,7 +1,7 @@
import _ from 'lodash';
import { recentDatabases, currentDatabase, getRecentDatabases } from '../stores';
import getConnectionLabel from '../utility/getConnectionLabel';
import registerCommand from './registerCommand';
import { getConnectionLabel } from 'dbgate-tools';
currentDatabase.subscribe(value => {
if (!value) return;

2
packages/web/src/commands/stdCommands.ts
View File

@@ -121,7 +121,7 @@ registerCommand({
toolbarName: 'Add connection folder',
category: 'New',
toolbarOrder: 1,
name: 'Connection',
name: 'Connection folder',
testEnabled: () => !getCurrentConfig()?.runAsPortal,
onClick: () => {
showModal(InputTextModal, {

2
packages/web/src/impexp/FormConnectionSelect.svelte
View File

@@ -1,8 +1,8 @@
<script lang="ts">
import _ from 'lodash';
import FormSelectField from '../forms/FormSelectField.svelte';
import getConnectionLabel from '../utility/getConnectionLabel';
import { useConnectionList } from '../utility/metadataLoaders';
import { getConnectionLabel } from 'dbgate-tools';
export let allowChooseModel = false;
export let direction;

2
packages/web/src/modals/ExportDatabaseDumpModal.svelte
View File

@@ -15,7 +15,7 @@
import { closeCurrentModal, showModal } from './modalTools';
import InputTextModal from './InputTextModal.svelte';
import { apiCall } from '../utility/api';
import getConnectionLabel from '../utility/getConnectionLabel';
import { getConnectionLabel } from 'dbgate-tools';
export let connection;

2
packages/web/src/modals/ImportDatabaseDumpModal.svelte
View File

@@ -9,12 +9,12 @@
import { currentDropDownMenu } from '../stores';
import { apiCall } from '../utility/api';
import { importSqlDump } from '../utility/exportFileTools';
import getConnectionLabel from '../utility/getConnectionLabel';
import getElectron from '../utility/getElectron';
import { setUploadListener } from '../utility/uploadFiles';
import ChangeDownloadUrlModal from './ChangeDownloadUrlModal.svelte';
import ModalBase from './ModalBase.svelte';
import { closeCurrentModal, showModal } from './modalTools';
import { getConnectionLabel } from 'dbgate-tools';
export let connection;

3
packages/web/src/perspectives/CustomJoinModal.svelte
View File

@@ -5,7 +5,7 @@
import FormSubmit from '../forms/FormSubmit.svelte';
import ModalBase from '../modals/ModalBase.svelte';
import { closeCurrentModal } from '../modals/modalTools';
import { fullNameFromString, fullNameToLabel, fullNameToString } from 'dbgate-tools';
import { fullNameFromString, fullNameToLabel, fullNameToString, getConnectionLabel } from 'dbgate-tools';
import SelectField from '../forms/SelectField.svelte';
import _ from 'lodash';
import {
@@ -18,7 +18,6 @@
import { onMount, tick } from 'svelte';
import { createPerspectiveNodeConfig, PerspectiveTreeNode } from 'dbgate-datalib';
import type { ChangePerspectiveConfigFunc, PerspectiveConfig, PerspectiveCustomJoinConfig } from 'dbgate-datalib';
import getConnectionLabel from '../utility/getConnectionLabel';
import uuidv1 from 'uuid/v1';
import TextField from '../forms/TextField.svelte';

2
packages/web/src/query/newQuery.ts
View File

@@ -1,6 +1,6 @@
import _ from 'lodash';
import { getCurrentDatabase } from '../stores';
import getConnectionLabel from '../utility/getConnectionLabel';
import { getConnectionLabel } from 'dbgate-tools';
import openNewTab from '../utility/openNewTab';
export default function newQuery({

2
packages/web/src/tabpanel/TabsPanel.svelte
View File

@@ -287,7 +287,6 @@
import tabs from '../tabs';
import { setSelectedTab } from '../utility/common';
import contextMenu from '../utility/contextMenu';
import getConnectionLabel from '../utility/getConnectionLabel';
import { isElectronAvailable } from '../utility/getElectron';
import { getConnectionInfo, useConnectionList } from '../utility/metadataLoaders';
import { duplicateTab, getTabDbKey, sortTabs, groupTabs } from '../utility/openNewTab';
@@ -295,6 +294,7 @@
import TabCloseButton from '../elements/TabCloseButton.svelte';
import CloseTabModal from '../modals/CloseTabModal.svelte';
import SwitchDatabaseModal from '../modals/SwitchDatabaseModal.svelte';
import { getConnectionLabel } from 'dbgate-tools';
export let multiTabIndex;
export let shownTab;

2
packages/web/src/tabs/ConnectionTab.svelte
View File

@@ -28,7 +28,7 @@
import { apiCall } from '../utility/api';
import { showSnackbarError, showSnackbarSuccess } from '../utility/snackbar';
import { changeTab } from '../utility/common';
import getConnectionLabel from '../utility/getConnectionLabel';
import { getConnectionLabel } from 'dbgate-tools';
import { onMount } from 'svelte';
import { disconnectServerConnection, openConnection } from '../appobj/ConnectionAppObject.svelte';
import { disconnectDatabaseConnection } from '../appobj/DatabaseAppObject.svelte';

42
packages/web/src/utility/getConnectionLabel.ts
View File

@@ -1,42 +0,0 @@
export function getDatabaseFileLabel(databaseFile) {
if (!databaseFile) return databaseFile;
const m = databaseFile.match(/[\/]([^\/]+)$/);
if (m) return m[1];
return databaseFile;
}
function getConnectionLabelCore(connection, { allowExplicitDatabase = true } = {}) {
if (!connection) {
return null;
}
if (connection.displayName) {
return connection.displayName;
}
if (connection.singleDatabase && connection.server && allowExplicitDatabase && connection.defaultDatabase) {
return `${connection.defaultDatabase} on ${connection.server}`;
}
if (connection.databaseFile) {
return getDatabaseFileLabel(connection.databaseFile);
}
if (connection.server) {
return connection.server;
}
if (connection.singleDatabase && connection.defaultDatabase) {
return `${connection.defaultDatabase}`;
}
if (connection.useDatabaseUrl) {
return `${connection.databaseUrl}`;
}
return '';
}
export default function getConnectionLabel(connection, { allowExplicitDatabase = true, showUnsaved = false } = {}) {
const res = getConnectionLabelCore(connection, { allowExplicitDatabase });
if (res && showUnsaved && connection?.unsaved) {
return `${res} - unsaved`;
}
return res;
}

2
packages/web/src/utility/openElectronFile.ts
View File

@@ -5,7 +5,7 @@ import ImportExportModal from '../modals/ImportExportModal.svelte';
import getElectron from './getElectron';
import { currentDatabase, extensions, getCurrentDatabase } from '../stores';
import { getUploadListener } from './uploadFiles';
import getConnectionLabel, { getDatabaseFileLabel } from './getConnectionLabel';
import {getConnectionLabel, getDatabaseFileLabel } from 'dbgate-tools';
import { apiCall } from './api';
import openNewTab from './openNewTab';
import { openJsonDocument } from '../tabs/JsonTab.svelte';

2
packages/web/src/widgets/ConnectionList.svelte
View File

@@ -18,7 +18,7 @@
collapsedConnectionGroupNames,
} from '../stores';
import runCommand from '../commands/runCommand';
import getConnectionLabel from '../utility/getConnectionLabel';
import { getConnectionLabel } from 'dbgate-tools';
import { useConnectionColorFactory } from '../utility/useConnectionColor';
import FontIcon from '../icons/FontIcon.svelte';
import CloseSearchButton from '../buttons/CloseSearchButton.svelte';

2
packages/web/src/widgets/StatusBar.svelte
View File

@@ -14,7 +14,7 @@
selectedWidget,
visibleCommandPalette,
} from '../stores';
import getConnectionLabel from '../utility/getConnectionLabel';
import { getConnectionLabel } from 'dbgate-tools';
import { useConnectionList, useDatabaseServerVersion, useDatabaseStatus } from '../utility/metadataLoaders';
import { findCommand } from '../commands/runCommand';
import { useConnectionColor } from '../utility/useConnectionColor';