- {{ $t('word.total') }}:
{{ tableInfo.rows | localeString }} ({{ $t('word.approximately') }})
+
+ {{ $t('word.total') }}: ≈ {{ approximateCount | localeString }}
{{ schema }}
@@ -175,7 +175,7 @@ export default {
},
filters: {
localeString (val) {
- if (val)
+ if (val !== null)
return val.toLocaleString();
}
},
@@ -200,7 +200,8 @@ export default {
refreshInterval: null,
sortParams: {},
page: 1,
- pageProxy: 1
+ pageProxy: 1,
+ approximateCount: 0
};
},
computed: {
@@ -232,15 +233,15 @@ export default {
hasApproximately () {
return this.results.length &&
this.results[0].rows &&
- this.tableInfo &&
this.results[0].rows.length === this.limit &&
- this.results[0].rows.length < this.tableInfo.rows;
+ this.results[0].rows.length < this.approximateCount;
}
},
watch: {
schema () {
if (this.isSelected) {
this.page = 1;
+ this.approximateCount = 0;
this.sortParams = {};
this.getTableData();
this.lastTable = this.table;
@@ -250,6 +251,7 @@ export default {
table () {
if (this.isSelected) {
this.page = 1;
+ this.approximateCount = 0;
this.sortParams = {};
this.getTableData();
this.lastTable = this.table;
@@ -315,6 +317,20 @@ export default {
this.addNotification({ status: 'error', message: err.stack });
}
+ if (this.results.length && this.results[0].rows.length === this.limit) {
+ try { // Table approximate count
+ const { status, response } = await Tables.getTableApproximateCount(params);
+
+ if (status === 'success')
+ this.approximateCount = response;
+ else
+ this.addNotification({ status: 'error', message: response });
+ }
+ catch (err) {
+ this.addNotification({ status: 'error', message: err.stack });
+ }
+ }
+
this.isQuering = false;
},
getTable () {
diff --git a/src/renderer/i18n/en-US.js b/src/renderer/i18n/en-US.js
index 18d7aae4..43aba2e3 100644
--- a/src/renderer/i18n/en-US.js
+++ b/src/renderer/i18n/en-US.js
@@ -115,7 +115,8 @@ module.exports = {
cell: 'Cell | Cells',
triggerFunction: 'Trigger function | Trigger functions',
all: 'All',
- duplicate: 'Duplicate'
+ duplicate: 'Duplicate',
+ routine: 'Routine'
},
message: {
appWelcome: 'Welcome to Antares SQL Client!',
@@ -227,7 +228,8 @@ module.exports = {
duplicateTable: 'Duplicate table',
noOpenTabs: 'There are no open tabs, navigate on the left bar or:',
noSchema: 'No schema',
- restorePreviourSession: 'Restore previous session'
+ restorePreviourSession: 'Restore previous session',
+ runQuery: 'Run query'
},
faker: {
address: 'Address',
diff --git a/src/renderer/i18n/it-IT.js b/src/renderer/i18n/it-IT.js
index b70b9e7b..f84f1782 100644
--- a/src/renderer/i18n/it-IT.js
+++ b/src/renderer/i18n/it-IT.js
@@ -106,7 +106,16 @@ module.exports = {
array: 'Array',
changelog: 'Changelog',
format: 'Formatta',
- sshTunnel: 'SSH tunnel'
+ sshTunnel: 'SSH tunnel',
+ structure: 'Structure',
+ small: 'Piccolo',
+ medium: 'Medio',
+ large: 'Largo',
+ row: 'Riga | Righe',
+ cell: 'Cella | Celle',
+ triggerFunction: 'Funzione di trigger | Funzioni di trigger',
+ all: 'Tutto',
+ duplicate: 'Duplica'
},
message: {
appWelcome: 'Benvenuto in Antares SQL Client!',
@@ -212,7 +221,13 @@ module.exports = {
deleteSchema: 'Elimina schema',
markdownSupported: 'Markdown supportato',
plantATree: 'Pianta un albero',
- enableSsh: 'Abilita SSH'
+ dataTabPageSize: 'Grandezza pagina tab DATI',
+ enableSsh: 'Abilita SSH',
+ pageNumber: 'Numero pagina',
+ duplicateTable: 'Duplica tabella',
+ noOpenTabs: 'Non ci sono tab aperte, naviga nella barra sinistra o:',
+ noSchema: 'Nessuno schema',
+ restorePreviourSession: 'Ripristina sessione precedente'
},
faker: {
address: 'Indirizzo',
diff --git a/src/renderer/ipc-api/Tables.js b/src/renderer/ipc-api/Tables.js
index 25dd8d27..56e93328 100644
--- a/src/renderer/ipc-api/Tables.js
+++ b/src/renderer/ipc-api/Tables.js
@@ -10,6 +10,10 @@ export default class {
return ipcRenderer.invoke('get-table-data', params);
}
+ static getTableApproximateCount (params) {
+ return ipcRenderer.invoke('get-table-count', params);
+ }
+
static getTableIndexes (params) {
return ipcRenderer.invoke('get-table-indexes', params);
}
diff --git a/src/renderer/scss/themes/dark-theme.scss b/src/renderer/scss/themes/dark-theme.scss
index 7c323e16..fcf9780c 100644
--- a/src/renderer/scss/themes/dark-theme.scss
+++ b/src/renderer/scss/themes/dark-theme.scss
@@ -135,6 +135,11 @@
background: $bg-color-light-dark;
}
+ code {
+ background-color: #000;
+ color: $body-font-color-dark;
+ }
+
// Antares
.workspace {
.workspace-explorebar {
@@ -162,7 +167,8 @@
}
.menu-item {
- &:hover {
+ &:hover,
+ &.selected {
color: $body-font-color-dark;
background: rgba($color: #fff, $alpha: 0.05);
}
diff --git a/src/renderer/scss/themes/light-theme.scss b/src/renderer/scss/themes/light-theme.scss
index 10e23ff4..eba79eed 100644
--- a/src/renderer/scss/themes/light-theme.scss
+++ b/src/renderer/scss/themes/light-theme.scss
@@ -18,20 +18,11 @@
background: #ababab;
}
- #titlebar {
- background: $bg-color-light;
- box-shadow: 0 0 1px 0 #000;
-
- .titlebar-elements {
- .titlebar-element {
- &:hover {
- opacity: 1;
- background: rgba($color: rgb(172, 172, 172), $alpha: 0.2);
- }
-
- &.close-button:hover {
- background: red;
- }
+ .menu {
+ .menu-item a {
+ &:hover {
+ color: $body-font-color;
+ background: rgba($color: #000, $alpha: 0.1);
}
}
}
@@ -111,6 +102,24 @@
}
}
+ #titlebar {
+ background: $bg-color-light;
+ box-shadow: 0 0 1px 0 #000;
+
+ .titlebar-elements {
+ .titlebar-element {
+ &:hover {
+ opacity: 1;
+ background: rgba($color: rgb(172, 172, 172), $alpha: 0.2);
+ }
+
+ &.close-button:hover {
+ background: red;
+ }
+ }
+ }
+ }
+
#settingbar {
width: $settingbar-width;
height: calc(100vh - #{$excluding-size});
@@ -180,6 +189,13 @@
background: $bg-color-light-gray;
}
+ .menu-item {
+ &:hover,
+ &.selected {
+ background: rgba($color: #000, $alpha: 0.05);
+ }
+ }
+
.table-size {
opacity: 0.4;
}
diff --git a/src/renderer/store/modules/workspaces.store.js b/src/renderer/store/modules/workspaces.store.js
index dc73c307..4145c67b 100644
--- a/src/renderer/store/modules/workspaces.store.js
+++ b/src/renderer/store/modules/workspaces.store.js
@@ -35,14 +35,14 @@ export default {
},
getConnected: state => {
return state.workspaces
- .filter(workspace => workspace.connection_status === 'connected')
+ .filter(workspace => workspace.connectionStatus === 'connected')
.map(workspace => workspace.uid);
},
getLoadedSchemas: state => uid => {
- return state.workspaces.find(workspace => workspace.uid === uid).loaded_schemas;
+ return state.workspaces.find(workspace => workspace.uid === uid).loadedSchemas;
},
getSearchTerm: state => uid => {
- return state.workspaces.find(workspace => workspace.uid === uid).search_term;
+ return state.workspaces.find(workspace => workspace.uid === uid).searchTerm;
}
},
mutations: {
@@ -72,9 +72,9 @@ export default {
indexTypes,
customizations,
structure,
- connection_status: 'connected',
+ connectionStatus: 'connected',
tabs: cachedTabs,
- selected_tab: cachedTabs.length ? cachedTabs[0].uid : null,
+ selectedTab: cachedTabs.length ? cachedTabs[0].uid : null,
version
}
: workspace);
@@ -85,8 +85,8 @@ export default {
...workspace,
structure: {},
breadcrumbs: {},
- loaded_schemas: new Set(),
- connection_status: 'connecting'
+ loadedSchemas: new Set(),
+ connectionStatus: 'connecting'
}
: workspace);
},
@@ -96,8 +96,8 @@ export default {
...workspace,
structure: {},
breadcrumbs: {},
- loaded_schemas: new Set(),
- connection_status: 'failed'
+ loadedSchemas: new Set(),
+ connectionStatus: 'failed'
}
: workspace);
},
@@ -107,8 +107,8 @@ export default {
...workspace,
structure: {},
breadcrumbs: {},
- loaded_schemas: new Set(),
- connection_status: 'disconnected'
+ loadedSchemas: new Set(),
+ connectionStatus: 'disconnected'
}
: workspace);
},
@@ -180,7 +180,7 @@ export default {
state.workspaces = state.workspaces.map(workspace => workspace.uid === uid
? {
...workspace,
- search_term: term
+ searchTerm: term
}
: workspace);
},
@@ -292,7 +292,7 @@ export default {
persistentStore.set(uid, state.workspaces.find(workspace => workspace.uid === uid).tabs);
},
SELECT_TAB (state, { uid, tab }) {
- state.workspaces = state.workspaces.map(workspace => workspace.uid === uid ? { ...workspace, selected_tab: tab } : workspace);
+ state.workspaces = state.workspaces.map(workspace => workspace.uid === uid ? { ...workspace, selectedTab: tab } : workspace);
},
UPDATE_TABS (state, { uid, tabs }) {
state.workspaces = state.workspaces.map(workspace => workspace.uid === uid ? { ...workspace, tabs } : workspace);
@@ -356,7 +356,28 @@ export default {
ADD_LOADED_SCHEMA (state, payload) {
state.workspaces = state.workspaces.map(workspace => {
if (workspace.uid === payload.uid)
- workspace.loaded_schemas.add(payload.schema);
+ workspace.loadedSchemas.add(payload.schema);
+ return workspace;
+ });
+ },
+ ADD_LOADING_ELEMENT (state, payload) {
+ state.workspaces = state.workspaces.map(workspace => {
+ if (workspace.uid === payload.uid)
+ workspace.loadingElements.push(payload.element);
+ return workspace;
+ });
+ },
+ REMOVE_LOADING_ELEMENT (state, payload) {
+ state.workspaces = state.workspaces.map(workspace => {
+ if (workspace.uid === payload.uid) {
+ const loadingElements = workspace.loadingElements.filter(el =>
+ el.schema !== payload.element.schema &&
+ el.name !== payload.element.name &&
+ el.type !== payload.element.type
+ );
+
+ workspace = { ...workspace, loadingElements };
+ }
return workspace;
});
}
@@ -513,16 +534,17 @@ export default {
addWorkspace ({ commit }, uid) {
const workspace = {
uid,
- connection_status: 'disconnected',
- selected_tab: 0,
- search_term: '',
+ connectionStatus: 'disconnected',
+ selectedTab: 0,
+ searchTerm: '',
tabs: [],
structure: {},
variables: [],
collations: [],
users: [],
breadcrumbs: {},
- loaded_schemas: new Set()
+ loadingElements: [],
+ loadedSchemas: new Set()
};
commit('ADD_WORKSPACE', workspace);
@@ -545,6 +567,12 @@ export default {
addLoadedSchema ({ commit, getters }, schema) {
commit('ADD_LOADED_SCHEMA', { uid: getters.getSelected, schema });
},
+ addLoadingElement ({ commit, getters }, element) {
+ commit('ADD_LOADING_ELEMENT', { uid: getters.getSelected, element });
+ },
+ removeLoadingElement ({ commit, getters }, element) {
+ commit('REMOVE_LOADING_ELEMENT', { uid: getters.getSelected, element });
+ },
setSearchTerm ({ commit, getters }, term) {
commit('SET_SEARCH_TERM', { uid: getters.getSelected, term });
},
@@ -697,7 +725,7 @@ export default {
checkSelectedTabExists ({ state, commit }, uid) {
const workspace = state.workspaces.find(workspace => workspace.uid === uid);
const isSelectedExistent = workspace
- ? workspace.tabs.some(tab => tab.uid === workspace.selected_tab)
+ ? workspace.tabs.some(tab => tab.uid === workspace.selectedTab)
: false;
if (!isSelectedExistent && workspace.tabs.length)
