fabio286/antares
1
1
Fork 0
mirror of https://github.com/Fabio286/antares.git synced 2025-06-05 21:59:22 +02:00
Code Issues Releases Wiki Activity

feat: option to select schema in query tabs

Browse Source
This commit is contained in:
Fabio Di Stasio
2021-07-20 19:19:54 +02:00
parent 0a9983d30d
commit a73a2f483e
4 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/renderer/components/WorkspaceEmptyState.vue
View File

@ -21,11 +21,16 @@ export default {
name: 'WorkspaceEmptyState',
computed: {
...mapGetters({
applicationTheme: 'settings/getApplicationTheme'
})
applicationTheme: 'settings/getApplicationTheme',
getWorkspace: 'workspaces/getWorkspace',
selectedWorkspace: 'workspaces/getSelected'
}),
workspace () {
return this.getWorkspace(this.selectedWorkspace);
}
},
created () {
this.changeBreadcrumbs({});
this.changeBreadcrumbs({ schema: this.workspace.breadcrumbs.schema });
},
methods: {
...mapActions({

43
src/renderer/components/WorkspaceQueryTab.vue
View File

@ -14,7 +14,7 @@
:auto-focus="true"
:value.sync="query"
:workspace="workspace"
:schema="schema"
:schema="breadcrumbsSchema"
:is-selected="isSelected"
:height="editorHeight"
/>
@ -86,12 +86,16 @@
<div v-if="affectedCount">
{{ $t('message.affectedRows') }}: <b>{{ affectedCount }}</b>
</div>
<div
v-if="workspace.breadcrumbs.schema"
class="d-flex"
:title="$t('word.schema')"
>
<i class="mdi mdi-18px mdi-database mr-1" /><b>{{ workspace.breadcrumbs.schema }}</b>
<div class="input-group" :title="$t('word.schema')">
<i class="input-group-addon addon-sm mdi mdi-24px mdi-database" />
<select v-model="selectedSchema" class="form-select select-sm text-bold">
<option :value="null">
{{ $t('message.noSchema') }}
</option>
<option v-for="schemaName in databaseSchemas" :key="schemaName">
{{ schemaName }}
</option>
</select>
</div>
</div>
</div>
@ -142,6 +146,7 @@ export default {
lastQuery: '',
isQuering: false,
results: [],
selectedSchema: null,
resultsCount: 0,
durationsCount: 0,
affectedCount: 0,
@ -156,9 +161,15 @@ export default {
workspace () {
return this.getWorkspace(this.connection.uid);
},
schema () {
breadcrumbsSchema () {
return this.workspace.breadcrumbs.schema;
},
databaseSchemas () {
return this.workspace.structure.reduce((acc, curr) => {
acc.push(curr.name);
return acc;
}, []);
},
isWorkspaceSelected () {
return this.workspace.uid === this.selectedWorkspace;
}
@ -166,12 +177,16 @@ export default {
watch: {
isSelected (val) {
if (val)
this.changeBreadcrumbs({ schema: this.schema, query: `Query #${this.tab.index}` });
this.changeBreadcrumbs({ schema: this.selectedSchema, query: `Query #${this.tab.index}` });
},
selectedSchema () {
this.changeBreadcrumbs({ schema: this.selectedSchema, query: `Query #${this.tab.index}` });
}
},
created () {
this.query = this.tab.content;
this.changeBreadcrumbs({ schema: this.schema, query: `Query #${this.tab.index}` });
this.selectedSchema = this.breadcrumbsSchema;
this.changeBreadcrumbs({ schema: this.selectedSchema, query: `Query #${this.tab.index}` });
window.addEventListener('keydown', this.onKey);
},
@ -205,7 +220,7 @@ export default {
try { // Query Data
const params = {
uid: this.connection.uid,
schema: this.schema,
schema: this.selectedSchema,
query
};
@ -314,8 +329,10 @@ export default {
align-items: center;
height: 42px;
.workspace-query-buttons {
.workspace-query-buttons,
.workspace-query-info {
display: flex;
align-items: center;
.btn {
display: flex;
@ -325,7 +342,7 @@ export default {
}
.workspace-query-info {
display: flex;
overflow: visible;
> div + div {
padding-left: 0.6rem;