mirror of https://github.com/Fabio286/antares.git
feat: new create routine tabs
This commit is contained in:
parent
e217d5181b
commit
3fd26a0523
|
@ -1,168 +0,0 @@
|
||||||
<template>
|
|
||||||
<ConfirmModal
|
|
||||||
:confirm-text="$t('word.confirm')"
|
|
||||||
size="400"
|
|
||||||
@confirm="confirmNewRoutine"
|
|
||||||
@hide="$emit('close')"
|
|
||||||
>
|
|
||||||
<template :slot="'header'">
|
|
||||||
<div class="d-flex">
|
|
||||||
<i class="mdi mdi-24px mdi-plus mr-1" /> {{ $t('message.createNewRoutine') }}
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<div :slot="'body'">
|
|
||||||
<form class="form-horizontal">
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="form-label col-4">
|
|
||||||
{{ $t('word.name') }}
|
|
||||||
</label>
|
|
||||||
<div class="column">
|
|
||||||
<input
|
|
||||||
ref="firstInput"
|
|
||||||
v-model="localRoutine.name"
|
|
||||||
class="form-input"
|
|
||||||
type="text"
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="customizations.languages" class="form-group">
|
|
||||||
<label class="form-label col-4">
|
|
||||||
{{ $t('word.language') }}
|
|
||||||
</label>
|
|
||||||
<div class="column">
|
|
||||||
<select v-model="localRoutine.language" class="form-select">
|
|
||||||
<option v-for="language in customizations.languages" :key="language">
|
|
||||||
{{ language }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="customizations.definer" class="form-group">
|
|
||||||
<label class="form-label col-4">
|
|
||||||
{{ $t('word.definer') }}
|
|
||||||
</label>
|
|
||||||
<div class="column">
|
|
||||||
<select
|
|
||||||
v-if="workspace.users.length"
|
|
||||||
v-model="localRoutine.definer"
|
|
||||||
class="form-select"
|
|
||||||
>
|
|
||||||
<option value="">
|
|
||||||
{{ $t('message.currentUser') }}
|
|
||||||
</option>
|
|
||||||
<option
|
|
||||||
v-for="user in workspace.users"
|
|
||||||
:key="`${user.name}@${user.host}`"
|
|
||||||
:value="`\`${user.name}\`@\`${user.host}\``"
|
|
||||||
>
|
|
||||||
{{ user.name }}@{{ user.host }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
<select v-if="!workspace.users.length" class="form-select">
|
|
||||||
<option value="">
|
|
||||||
{{ $t('message.currentUser') }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="customizations.comment" class="form-group">
|
|
||||||
<label class="form-label col-4">
|
|
||||||
{{ $t('word.comment') }}
|
|
||||||
</label>
|
|
||||||
<div class="column">
|
|
||||||
<input
|
|
||||||
v-model="localRoutine.comment"
|
|
||||||
class="form-input"
|
|
||||||
type="text"
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="form-label col-4">
|
|
||||||
{{ $t('message.sqlSecurity') }}
|
|
||||||
</label>
|
|
||||||
<div class="column">
|
|
||||||
<select v-model="localRoutine.security" class="form-select">
|
|
||||||
<option>DEFINER</option>
|
|
||||||
<option>INVOKER</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="customizations.comment" class="form-group">
|
|
||||||
<label class="form-label col-4">
|
|
||||||
{{ $t('message.dataAccess') }}
|
|
||||||
</label>
|
|
||||||
<div class="column">
|
|
||||||
<select v-model="localRoutine.dataAccess" class="form-select">
|
|
||||||
<option>CONTAINS SQL</option>
|
|
||||||
<option>NO SQL</option>
|
|
||||||
<option>READS SQL DATA</option>
|
|
||||||
<option>MODIFIES SQL DATA</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="customizations.procedureDeterministic" class="form-group">
|
|
||||||
<div class="col-4" />
|
|
||||||
<div class="column">
|
|
||||||
<label class="form-checkbox form-inline">
|
|
||||||
<input v-model="localRoutine.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</ConfirmModal>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
import ConfirmModal from '@/components/BaseConfirmModal';
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'ModalNewRoutine',
|
|
||||||
components: {
|
|
||||||
ConfirmModal
|
|
||||||
},
|
|
||||||
props: {
|
|
||||||
workspace: Object
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
localRoutine: {
|
|
||||||
definer: '',
|
|
||||||
sql: '',
|
|
||||||
parameters: [],
|
|
||||||
name: '',
|
|
||||||
comment: '',
|
|
||||||
language: null,
|
|
||||||
security: 'DEFINER',
|
|
||||||
deterministic: false,
|
|
||||||
dataAccess: 'CONTAINS SQL'
|
|
||||||
},
|
|
||||||
isOptionsChanging: false
|
|
||||||
};
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
schema () {
|
|
||||||
return this.workspace.breadcrumbs.schema;
|
|
||||||
},
|
|
||||||
customizations () {
|
|
||||||
return this.workspace.customizations;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
mounted () {
|
|
||||||
if (this.customizations.languages)
|
|
||||||
this.localRoutine.language = this.customizations.languages[0];
|
|
||||||
|
|
||||||
if (this.customizations.procedureSql)
|
|
||||||
this.localRoutine.sql = this.customizations.procedureSql;
|
|
||||||
setTimeout(() => {
|
|
||||||
this.$refs.firstInput.focus();
|
|
||||||
}, 20);
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
confirmNewRoutine () {
|
|
||||||
this.$emit('open-create-routine-editor', this.localRoutine);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
</script>
|
|
|
@ -1,183 +0,0 @@
|
||||||
<template>
|
|
||||||
<ConfirmModal
|
|
||||||
:confirm-text="$t('word.confirm')"
|
|
||||||
size="400"
|
|
||||||
@confirm="confirmNewTrigger"
|
|
||||||
@hide="$emit('close')"
|
|
||||||
>
|
|
||||||
<template :slot="'header'">
|
|
||||||
<div class="d-flex">
|
|
||||||
<i class="mdi mdi-24px mdi-plus mr-1" /> {{ $t('message.createNewTrigger') }}
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<div :slot="'body'">
|
|
||||||
<form class="form-horizontal">
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="form-label col-4">
|
|
||||||
{{ $t('word.name') }}
|
|
||||||
</label>
|
|
||||||
<div class="column">
|
|
||||||
<input
|
|
||||||
ref="firstInput"
|
|
||||||
v-model="localTrigger.name"
|
|
||||||
class="form-input"
|
|
||||||
type="text"
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-if="customizations.definer" class="form-group">
|
|
||||||
<label class="form-label col-4">
|
|
||||||
{{ $t('word.definer') }}
|
|
||||||
</label>
|
|
||||||
<div class="column">
|
|
||||||
<select
|
|
||||||
v-if="workspace.users.length"
|
|
||||||
v-model="localTrigger.definer"
|
|
||||||
class="form-select"
|
|
||||||
>
|
|
||||||
<option value="">
|
|
||||||
{{ $t('message.currentUser') }}
|
|
||||||
</option>
|
|
||||||
<option
|
|
||||||
v-for="user in workspace.users"
|
|
||||||
:key="`${user.name}@${user.host}`"
|
|
||||||
:value="`\`${user.name}\`@\`${user.host}\``"
|
|
||||||
>
|
|
||||||
{{ user.name }}@{{ user.host }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
<select v-if="!workspace.users.length" class="form-select">
|
|
||||||
<option value="">
|
|
||||||
{{ $t('message.currentUser') }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="form-label col-4">
|
|
||||||
{{ $t('word.table') }}
|
|
||||||
</label>
|
|
||||||
<div class="column">
|
|
||||||
<select v-model="localTrigger.table" class="form-select">
|
|
||||||
<option v-for="table in schemaTables" :key="table.name">
|
|
||||||
{{ table.name }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="form-label col-4">
|
|
||||||
{{ $t('word.event') }}
|
|
||||||
</label>
|
|
||||||
<div class="column">
|
|
||||||
<div class="input-group">
|
|
||||||
<select v-model="localTrigger.activation" class="form-select">
|
|
||||||
<option>BEFORE</option>
|
|
||||||
<option>AFTER</option>
|
|
||||||
</select>
|
|
||||||
<select
|
|
||||||
v-if="!customizations.triggerMultipleEvents"
|
|
||||||
v-model="localTrigger.event"
|
|
||||||
class="form-select"
|
|
||||||
>
|
|
||||||
<option v-for="event in Object.keys(localEvents)" :key="event">
|
|
||||||
{{ event }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
<div v-if="customizations.triggerMultipleEvents" class="px-4">
|
|
||||||
<label
|
|
||||||
v-for="event in Object.keys(localEvents)"
|
|
||||||
:key="event"
|
|
||||||
class="form-checkbox form-inline"
|
|
||||||
@change.prevent="changeEvents(event)"
|
|
||||||
>
|
|
||||||
<input :checked="localEvents[event]" type="checkbox"><i class="form-icon" /> {{ event }}
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
<div v-if="customizations.triggerStatementInCreation" class="workspace-query-results column col-12 mt-2">
|
|
||||||
<label class="form-label ml-2">{{ $t('message.triggerStatement') }}</label>
|
|
||||||
<QueryEditor
|
|
||||||
ref="queryEditor"
|
|
||||||
:value.sync="localTrigger.sql"
|
|
||||||
:workspace="workspace"
|
|
||||||
:schema="schema"
|
|
||||||
:height="editorHeight"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</ConfirmModal>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
import ConfirmModal from '@/components/BaseConfirmModal';
|
|
||||||
import QueryEditor from '@/components/QueryEditor';
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'ModalNewTrigger',
|
|
||||||
components: {
|
|
||||||
ConfirmModal,
|
|
||||||
QueryEditor
|
|
||||||
},
|
|
||||||
props: {
|
|
||||||
workspace: Object
|
|
||||||
},
|
|
||||||
data () {
|
|
||||||
return {
|
|
||||||
localTrigger: {
|
|
||||||
definer: '',
|
|
||||||
sql: '',
|
|
||||||
name: '',
|
|
||||||
table: '',
|
|
||||||
activation: 'BEFORE',
|
|
||||||
event: 'INSERT'
|
|
||||||
},
|
|
||||||
isOptionsChanging: false,
|
|
||||||
localEvents: { INSERT: false, UPDATE: false, DELETE: false },
|
|
||||||
editorHeight: 150
|
|
||||||
};
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
schema () {
|
|
||||||
return this.workspace.breadcrumbs.schema;
|
|
||||||
},
|
|
||||||
schemaTables () {
|
|
||||||
const schemaTables = this.workspace.structure
|
|
||||||
.filter(schema => schema.name === this.schema)
|
|
||||||
.map(schema => schema.tables);
|
|
||||||
|
|
||||||
return schemaTables.length ? schemaTables[0].filter(table => table.type === 'table') : [];
|
|
||||||
},
|
|
||||||
customizations () {
|
|
||||||
return this.workspace.customizations;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
created () {
|
|
||||||
this.localTrigger.table = this.schemaTables.length ? this.schemaTables[0].name : '';
|
|
||||||
this.localTrigger.sql = this.customizations.triggerSql;
|
|
||||||
},
|
|
||||||
mounted () {
|
|
||||||
setTimeout(() => {
|
|
||||||
this.$refs.firstInput.focus();
|
|
||||||
}, 20);
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
confirmNewTrigger () {
|
|
||||||
this.$emit('open-create-trigger-editor', this.localTrigger);
|
|
||||||
},
|
|
||||||
changeEvents (event) {
|
|
||||||
if (this.customizations.triggerMultipleEvents) {
|
|
||||||
this.localEvents[event] = !this.localEvents[event];
|
|
||||||
this.localTrigger.event = [];
|
|
||||||
for (const key in this.localEvents) {
|
|
||||||
if (this.localEvents[key])
|
|
||||||
this.localTrigger.event.push(key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
</script>
|
|
|
@ -102,6 +102,23 @@
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
<a
|
||||||
|
v-else-if="tab.type === 'view-props'"
|
||||||
|
class="tab-link"
|
||||||
|
:class="{'badge': tab.isChanged}"
|
||||||
|
>
|
||||||
|
<i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
|
||||||
|
<span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.view`)}`">
|
||||||
|
{{ tab.elementName | cutText }}
|
||||||
|
<span
|
||||||
|
class="btn btn-clear"
|
||||||
|
:title="$t('word.close')"
|
||||||
|
@mousedown.left.stop
|
||||||
|
@click.stop="closeTab(tab)"
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
</a>
|
||||||
|
|
||||||
<a
|
<a
|
||||||
v-else-if="tab.type === 'new-view'"
|
v-else-if="tab.type === 'new-view'"
|
||||||
class="tab-link"
|
class="tab-link"
|
||||||
|
@ -137,13 +154,13 @@
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a
|
<a
|
||||||
v-else-if="tab.type === 'view-props'"
|
v-else-if="tab.type === 'new-routine'"
|
||||||
class="tab-link"
|
class="tab-link"
|
||||||
:class="{'badge': tab.isChanged}"
|
:class="{'badge': tab.isChanged}"
|
||||||
>
|
>
|
||||||
<i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
|
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
|
||||||
<span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.view`)}`">
|
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
|
||||||
{{ tab.elementName | cutText }}
|
{{ $t('message.newRoutine') }}
|
||||||
<span
|
<span
|
||||||
class="btn btn-clear"
|
class="btn btn-clear"
|
||||||
:title="$t('word.close')"
|
:title="$t('word.close')"
|
||||||
|
@ -310,6 +327,15 @@
|
||||||
:function="tab.elementName"
|
:function="tab.elementName"
|
||||||
:schema="tab.schema"
|
:schema="tab.schema"
|
||||||
/>
|
/>
|
||||||
|
<WorkspaceTabNewRoutine
|
||||||
|
v-else-if="tab.type === 'new-routine'"
|
||||||
|
:key="tab.uid"
|
||||||
|
:tab="tab"
|
||||||
|
:connection="connection"
|
||||||
|
:is-selected="selectedTab === tab.uid"
|
||||||
|
:trigger="tab.elementName"
|
||||||
|
:schema="tab.schema"
|
||||||
|
/>
|
||||||
<WorkspaceTabPropsRoutine
|
<WorkspaceTabPropsRoutine
|
||||||
v-else-if="['temp-routine-props', 'routine-props'].includes(tab.type)"
|
v-else-if="['temp-routine-props', 'routine-props'].includes(tab.type)"
|
||||||
:key="tab.uid"
|
:key="tab.uid"
|
||||||
|
@ -364,6 +390,7 @@ import WorkspaceTabTable from '@/components/WorkspaceTabTable';
|
||||||
import WorkspaceTabNewTable from '@/components/WorkspaceTabNewTable';
|
import WorkspaceTabNewTable from '@/components/WorkspaceTabNewTable';
|
||||||
import WorkspaceTabNewView from '@/components/WorkspaceTabNewView';
|
import WorkspaceTabNewView from '@/components/WorkspaceTabNewView';
|
||||||
import WorkspaceTabNewTrigger from '@/components/WorkspaceTabNewTrigger';
|
import WorkspaceTabNewTrigger from '@/components/WorkspaceTabNewTrigger';
|
||||||
|
import WorkspaceTabNewRoutine from '@/components/WorkspaceTabNewRoutine';
|
||||||
|
|
||||||
import WorkspaceTabPropsTable from '@/components/WorkspaceTabPropsTable';
|
import WorkspaceTabPropsTable from '@/components/WorkspaceTabPropsTable';
|
||||||
import WorkspaceTabPropsView from '@/components/WorkspaceTabPropsView';
|
import WorkspaceTabPropsView from '@/components/WorkspaceTabPropsView';
|
||||||
|
@ -391,6 +418,7 @@ export default {
|
||||||
WorkspaceTabNewTrigger,
|
WorkspaceTabNewTrigger,
|
||||||
WorkspaceTabPropsTrigger,
|
WorkspaceTabPropsTrigger,
|
||||||
WorkspaceTabPropsTriggerFunction,
|
WorkspaceTabPropsTriggerFunction,
|
||||||
|
WorkspaceTabNewRoutine,
|
||||||
WorkspaceTabPropsRoutine,
|
WorkspaceTabPropsRoutine,
|
||||||
WorkspaceTabPropsFunction,
|
WorkspaceTabPropsFunction,
|
||||||
WorkspaceTabPropsScheduler,
|
WorkspaceTabPropsScheduler,
|
||||||
|
|
|
@ -61,12 +61,6 @@
|
||||||
@close="hideNewDBModal"
|
@close="hideNewDBModal"
|
||||||
@reload="refresh"
|
@reload="refresh"
|
||||||
/>
|
/>
|
||||||
<ModalNewRoutine
|
|
||||||
v-if="isNewRoutineModal"
|
|
||||||
:workspace="workspace"
|
|
||||||
@close="hideCreateRoutineModal"
|
|
||||||
@open-create-routine-editor="openCreateRoutineEditor"
|
|
||||||
/>
|
|
||||||
<ModalNewFunction
|
<ModalNewFunction
|
||||||
v-if="isNewFunctionModal"
|
v-if="isNewFunctionModal"
|
||||||
:workspace="workspace"
|
:workspace="workspace"
|
||||||
|
@ -93,7 +87,7 @@
|
||||||
@open-create-table-tab="openCreateElementTab('table')"
|
@open-create-table-tab="openCreateElementTab('table')"
|
||||||
@open-create-view-tab="openCreateElementTab('view')"
|
@open-create-view-tab="openCreateElementTab('view')"
|
||||||
@open-create-trigger-tab="openCreateElementTab('trigger')"
|
@open-create-trigger-tab="openCreateElementTab('trigger')"
|
||||||
@show-create-routine-modal="showCreateRoutineModal"
|
@open-create-routine-tab="openCreateElementTab('routine')"
|
||||||
@show-create-function-modal="showCreateFunctionModal"
|
@show-create-function-modal="showCreateFunctionModal"
|
||||||
@show-create-trigger-function-modal="showCreateTriggerFunctionModal"
|
@show-create-trigger-function-modal="showCreateTriggerFunctionModal"
|
||||||
@show-create-scheduler-modal="showCreateSchedulerModal"
|
@show-create-scheduler-modal="showCreateSchedulerModal"
|
||||||
|
@ -120,8 +114,8 @@
|
||||||
:selected-misc="selectedMisc"
|
:selected-misc="selectedMisc"
|
||||||
:selected-schema="selectedSchema"
|
:selected-schema="selectedSchema"
|
||||||
:context-event="miscContextEvent"
|
:context-event="miscContextEvent"
|
||||||
@show-create-trigger-modal="showCreateTriggerModal"
|
@open-create-trigger-tab="openCreateElementTab('trigger')"
|
||||||
@show-create-routine-modal="showCreateRoutineModal"
|
@open-create-routine-tab="openCreateElementTab('routine')"
|
||||||
@show-create-function-modal="showCreateFunctionModal"
|
@show-create-function-modal="showCreateFunctionModal"
|
||||||
@show-create-trigger-function-modal="showCreateTriggerFunctionModal"
|
@show-create-trigger-function-modal="showCreateTriggerFunctionModal"
|
||||||
@show-create-scheduler-modal="showCreateSchedulerModal"
|
@show-create-scheduler-modal="showCreateSchedulerModal"
|
||||||
|
@ -134,6 +128,7 @@
|
||||||
<script>
|
<script>
|
||||||
import { mapGetters, mapActions } from 'vuex';
|
import { mapGetters, mapActions } from 'vuex';
|
||||||
|
|
||||||
|
// import Tables from '@/ipc-api/Tables';
|
||||||
import Triggers from '@/ipc-api/Triggers';
|
import Triggers from '@/ipc-api/Triggers';
|
||||||
import Routines from '@/ipc-api/Routines';
|
import Routines from '@/ipc-api/Routines';
|
||||||
import Functions from '@/ipc-api/Functions';
|
import Functions from '@/ipc-api/Functions';
|
||||||
|
@ -146,7 +141,6 @@ import MiscContext from '@/components/WorkspaceExploreBarMiscContext';
|
||||||
import MiscFolderContext from '@/components/WorkspaceExploreBarMiscFolderContext';
|
import MiscFolderContext from '@/components/WorkspaceExploreBarMiscFolderContext';
|
||||||
import ModalNewSchema from '@/components/ModalNewSchema';
|
import ModalNewSchema from '@/components/ModalNewSchema';
|
||||||
|
|
||||||
import ModalNewRoutine from '@/components/ModalNewRoutine';
|
|
||||||
import ModalNewFunction from '@/components/ModalNewFunction';
|
import ModalNewFunction from '@/components/ModalNewFunction';
|
||||||
import ModalNewTriggerFunction from '@/components/ModalNewTriggerFunction';
|
import ModalNewTriggerFunction from '@/components/ModalNewTriggerFunction';
|
||||||
import ModalNewScheduler from '@/components/ModalNewScheduler';
|
import ModalNewScheduler from '@/components/ModalNewScheduler';
|
||||||
|
@ -161,7 +155,6 @@ export default {
|
||||||
MiscFolderContext,
|
MiscFolderContext,
|
||||||
ModalNewSchema,
|
ModalNewSchema,
|
||||||
|
|
||||||
ModalNewRoutine,
|
|
||||||
ModalNewFunction,
|
ModalNewFunction,
|
||||||
ModalNewTriggerFunction,
|
ModalNewTriggerFunction,
|
||||||
ModalNewScheduler
|
ModalNewScheduler
|
||||||
|
@ -284,6 +277,7 @@ export default {
|
||||||
},
|
},
|
||||||
openCreateElementTab (element) {
|
openCreateElementTab (element) {
|
||||||
this.closeDatabaseContext();
|
this.closeDatabaseContext();
|
||||||
|
this.closeMiscFolderContext();
|
||||||
|
|
||||||
this.newTab({
|
this.newTab({
|
||||||
uid: this.workspace.uid,
|
uid: this.workspace.uid,
|
||||||
|
|
|
@ -6,14 +6,14 @@
|
||||||
<div
|
<div
|
||||||
v-if="selectedMisc === 'trigger'"
|
v-if="selectedMisc === 'trigger'"
|
||||||
class="context-element"
|
class="context-element"
|
||||||
@click="$emit('show-create-trigger-modal')"
|
@click="$emit('open-create-trigger-tab')"
|
||||||
>
|
>
|
||||||
<span class="d-flex"><i class="mdi mdi-18px mdi-table-cog text-light pr-1" /> {{ $t('message.createNewTrigger') }}</span>
|
<span class="d-flex"><i class="mdi mdi-18px mdi-table-cog text-light pr-1" /> {{ $t('message.createNewTrigger') }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="selectedMisc === 'procedure'"
|
v-if="selectedMisc === 'procedure'"
|
||||||
class="context-element"
|
class="context-element"
|
||||||
@click="$emit('show-create-routine-modal')"
|
@click="$emit('open-create-routine-tab')"
|
||||||
>
|
>
|
||||||
<span class="d-flex"><i class="mdi mdi-18px mdi-sync-circle text-light pr-1" /> {{ $t('message.createNewRoutine') }}</span>
|
<span class="d-flex"><i class="mdi mdi-18px mdi-sync-circle text-light pr-1" /> {{ $t('message.createNewRoutine') }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
<div
|
<div
|
||||||
v-if="workspace.customizations.routineAdd"
|
v-if="workspace.customizations.routineAdd"
|
||||||
class="context-element"
|
class="context-element"
|
||||||
@click="showCreateRoutineModal"
|
@click="openCreateRoutineTab"
|
||||||
>
|
>
|
||||||
<span class="d-flex"><i class="mdi mdi-18px mdi-sync-circle pr-1" /> {{ $tc('word.storedRoutine', 1) }}</span>
|
<span class="d-flex"><i class="mdi mdi-18px mdi-sync-circle pr-1" /> {{ $tc('word.storedRoutine', 1) }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -141,8 +141,8 @@ export default {
|
||||||
openCreateTriggerTab () {
|
openCreateTriggerTab () {
|
||||||
this.$emit('open-create-trigger-tab');
|
this.$emit('open-create-trigger-tab');
|
||||||
},
|
},
|
||||||
showCreateRoutineModal () {
|
openCreateRoutineTab () {
|
||||||
this.$emit('show-create-routine-modal');
|
this.$emit('open-create-routine-tab');
|
||||||
},
|
},
|
||||||
showCreateFunctionModal () {
|
showCreateFunctionModal () {
|
||||||
this.$emit('show-create-function-modal');
|
this.$emit('show-create-function-modal');
|
||||||
|
|
|
@ -0,0 +1,351 @@
|
||||||
|
<template>
|
||||||
|
<div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless">
|
||||||
|
<div class="workspace-query-runner column col-12">
|
||||||
|
<div class="workspace-query-runner-footer">
|
||||||
|
<div class="workspace-query-buttons">
|
||||||
|
<button
|
||||||
|
class="btn btn-primary btn-sm"
|
||||||
|
:disabled="!isChanged"
|
||||||
|
:class="{'loading':isSaving}"
|
||||||
|
title="CTRL+S"
|
||||||
|
@click="saveChanges"
|
||||||
|
>
|
||||||
|
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||||
|
<span>{{ $t('word.save') }}</span>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
:disabled="!isChanged"
|
||||||
|
class="btn btn-link btn-sm mr-0"
|
||||||
|
:title="$t('message.clearChanges')"
|
||||||
|
@click="clearChanges"
|
||||||
|
>
|
||||||
|
<i class="mdi mdi-24px mdi-delete-sweep mr-1" />
|
||||||
|
<span>{{ $t('word.clear') }}</span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<div class="divider-vert py-3" />
|
||||||
|
|
||||||
|
<button class="btn btn-dark btn-sm" @click="showParamsModal">
|
||||||
|
<i class="mdi mdi-24px mdi-dots-horizontal mr-1" />
|
||||||
|
<span>{{ $t('word.parameters') }}</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div class="workspace-query-info">
|
||||||
|
<div class="d-flex" :title="$t('word.schema')">
|
||||||
|
<i class="mdi mdi-18px mdi-database mr-1" /><b>{{ schema }}</b>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="container">
|
||||||
|
<div class="columns">
|
||||||
|
<div class="column col-auto">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="form-label">
|
||||||
|
{{ $t('word.name') }}
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
ref="firstInput"
|
||||||
|
v-model="localRoutine.name"
|
||||||
|
class="form-input"
|
||||||
|
type="text"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-if="customizations.languages" class="column col-auto">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="form-label">
|
||||||
|
{{ $t('word.language') }}
|
||||||
|
</label>
|
||||||
|
<select v-model="localRoutine.language" class="form-select">
|
||||||
|
<option v-for="language in customizations.languages" :key="language">
|
||||||
|
{{ language }}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-if="customizations.definer" class="column col-auto">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="form-label">
|
||||||
|
{{ $t('word.definer') }}
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
v-if="workspace.users.length"
|
||||||
|
v-model="localRoutine.definer"
|
||||||
|
class="form-select"
|
||||||
|
>
|
||||||
|
<option value="">
|
||||||
|
{{ $t('message.currentUser') }}
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
v-for="user in workspace.users"
|
||||||
|
:key="`${user.name}@${user.host}`"
|
||||||
|
:value="`\`${user.name}\`@\`${user.host}\``"
|
||||||
|
>
|
||||||
|
{{ user.name }}@{{ user.host }}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<select v-if="!workspace.users.length" class="form-select">
|
||||||
|
<option value="">
|
||||||
|
{{ $t('message.currentUser') }}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-if="customizations.comment" class="column">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="form-label">
|
||||||
|
{{ $t('word.comment') }}
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
v-model="localRoutine.comment"
|
||||||
|
class="form-input"
|
||||||
|
type="text"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="column col-auto">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="form-label">
|
||||||
|
{{ $t('message.sqlSecurity') }}
|
||||||
|
</label>
|
||||||
|
<select v-model="localRoutine.security" class="form-select">
|
||||||
|
<option>DEFINER</option>
|
||||||
|
<option>INVOKER</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-if="customizations.procedureDataAccess" class="column col-auto">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="form-label">
|
||||||
|
{{ $t('message.dataAccess') }}
|
||||||
|
</label>
|
||||||
|
<select v-model="localRoutine.dataAccess" class="form-select">
|
||||||
|
<option>CONTAINS SQL</option>
|
||||||
|
<option>NO SQL</option>
|
||||||
|
<option>READS SQL DATA</option>
|
||||||
|
<option>MODIFIES SQL DATA</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div v-if="customizations.procedureDeterministic" class="column col-auto">
|
||||||
|
<div class="form-group">
|
||||||
|
<label class="form-label d-invisible">.</label>
|
||||||
|
<label class="form-checkbox form-inline">
|
||||||
|
<input v-model="localRoutine.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="workspace-query-results column col-12 mt-2 p-relative">
|
||||||
|
<BaseLoader v-if="isLoading" />
|
||||||
|
<label class="form-label ml-2">{{ $t('message.routineBody') }}</label>
|
||||||
|
<QueryEditor
|
||||||
|
v-show="isSelected"
|
||||||
|
:key="`new-${_uid}`"
|
||||||
|
ref="queryEditor"
|
||||||
|
:value.sync="localRoutine.sql"
|
||||||
|
:workspace="workspace"
|
||||||
|
:schema="schema"
|
||||||
|
:height="editorHeight"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<WorkspaceTabPropsRoutineParamsModal
|
||||||
|
v-if="isParamsModal"
|
||||||
|
:local-parameters="localRoutine.parameters"
|
||||||
|
:workspace="workspace"
|
||||||
|
routine="new"
|
||||||
|
@hide="hideParamsModal"
|
||||||
|
@parameters-update="parametersUpdate"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { mapGetters, mapActions } from 'vuex';
|
||||||
|
import QueryEditor from '@/components/QueryEditor';
|
||||||
|
import BaseLoader from '@/components/BaseLoader';
|
||||||
|
import WorkspaceTabPropsRoutineParamsModal from '@/components/WorkspaceTabPropsRoutineParamsModal';
|
||||||
|
import Routines from '@/ipc-api/Routines';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'WorkspaceTabNewRoutine',
|
||||||
|
components: {
|
||||||
|
QueryEditor,
|
||||||
|
BaseLoader,
|
||||||
|
WorkspaceTabPropsRoutineParamsModal
|
||||||
|
},
|
||||||
|
props: {
|
||||||
|
connection: Object,
|
||||||
|
tab: Object,
|
||||||
|
isSelected: Boolean,
|
||||||
|
schema: String
|
||||||
|
},
|
||||||
|
data () {
|
||||||
|
return {
|
||||||
|
isLoading: false,
|
||||||
|
isSaving: false,
|
||||||
|
isParamsModal: false,
|
||||||
|
originalRoutine: {},
|
||||||
|
localRoutine: {},
|
||||||
|
lastRoutine: null,
|
||||||
|
sqlProxy: '',
|
||||||
|
editorHeight: 300
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
...mapGetters({
|
||||||
|
selectedWorkspace: 'workspaces/getSelected',
|
||||||
|
getWorkspace: 'workspaces/getWorkspace'
|
||||||
|
}),
|
||||||
|
workspace () {
|
||||||
|
return this.getWorkspace(this.connection.uid);
|
||||||
|
},
|
||||||
|
customizations () {
|
||||||
|
return this.workspace.customizations;
|
||||||
|
},
|
||||||
|
tabUid () {
|
||||||
|
return this.$vnode.key;
|
||||||
|
},
|
||||||
|
isChanged () {
|
||||||
|
return JSON.stringify(this.originalRoutine) !== JSON.stringify(this.localRoutine);
|
||||||
|
},
|
||||||
|
isDefinerInUsers () {
|
||||||
|
return this.originalRoutine ? this.workspace.users.some(user => this.originalRoutine.definer === `\`${user.name}\`@\`${user.host}\``) : true;
|
||||||
|
},
|
||||||
|
schemaTables () {
|
||||||
|
const schemaTables = this.workspace.structure
|
||||||
|
.filter(schema => schema.name === this.schema)
|
||||||
|
.map(schema => schema.tables);
|
||||||
|
|
||||||
|
return schemaTables.length ? schemaTables[0].filter(table => table.type === 'table') : [];
|
||||||
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
async isSelected (val) {
|
||||||
|
if (val)
|
||||||
|
this.changeBreadcrumbs({ schema: this.schema });
|
||||||
|
},
|
||||||
|
isChanged (val) {
|
||||||
|
this.setUnsavedChanges({ uid: this.connection.uid, tUid: this.tabUid, isChanged: val });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created () {
|
||||||
|
this.originalRoutine = {
|
||||||
|
sql: this.customizations.procedureSql,
|
||||||
|
language: this.customizations.languages ? this.customizations.languages[0] : null,
|
||||||
|
name: '',
|
||||||
|
definer: '',
|
||||||
|
comment: '',
|
||||||
|
security: 'DEFINER',
|
||||||
|
dataAccess: 'CONTAINS SQL',
|
||||||
|
deterministic: false
|
||||||
|
};
|
||||||
|
|
||||||
|
this.localRoutine = JSON.parse(JSON.stringify(this.originalRoutine));
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
this.resizeQueryEditor();
|
||||||
|
}, 50);
|
||||||
|
|
||||||
|
window.addEventListener('keydown', this.onKey);
|
||||||
|
},
|
||||||
|
mounted () {
|
||||||
|
if (this.isSelected)
|
||||||
|
this.changeBreadcrumbs({ schema: this.schema });
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
this.$refs.firstInput.focus();
|
||||||
|
}, 100);
|
||||||
|
},
|
||||||
|
destroyed () {
|
||||||
|
window.removeEventListener('resize', this.resizeQueryEditor);
|
||||||
|
},
|
||||||
|
beforeDestroy () {
|
||||||
|
window.removeEventListener('keydown', this.onKey);
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
...mapActions({
|
||||||
|
addNotification: 'notifications/addNotification',
|
||||||
|
refreshStructure: 'workspaces/refreshStructure',
|
||||||
|
changeBreadcrumbs: 'workspaces/changeBreadcrumbs',
|
||||||
|
setUnsavedChanges: 'workspaces/setUnsavedChanges',
|
||||||
|
newTab: 'workspaces/newTab',
|
||||||
|
removeTab: 'workspaces/removeTab',
|
||||||
|
renameTabs: 'workspaces/renameTabs'
|
||||||
|
}),
|
||||||
|
async saveChanges () {
|
||||||
|
if (this.isSaving) return;
|
||||||
|
this.isSaving = true;
|
||||||
|
const params = {
|
||||||
|
uid: this.connection.uid,
|
||||||
|
schema: this.schema,
|
||||||
|
...this.localRoutine
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const { status, response } = await Routines.createRoutine(params);
|
||||||
|
|
||||||
|
if (status === 'success') {
|
||||||
|
await this.refreshStructure(this.connection.uid);
|
||||||
|
|
||||||
|
this.newTab({
|
||||||
|
uid: this.connection.uid,
|
||||||
|
schema: this.schema,
|
||||||
|
elementName: this.localRoutine.name,
|
||||||
|
elementType: 'routine',
|
||||||
|
type: 'routine-props'
|
||||||
|
});
|
||||||
|
|
||||||
|
this.removeTab({ uid: this.connection.uid, tab: this.tab.uid });
|
||||||
|
this.changeBreadcrumbs({ schema: this.schema, routine: this.localRoutine.name });
|
||||||
|
}
|
||||||
|
else
|
||||||
|
this.addNotification({ status: 'error', message: response });
|
||||||
|
}
|
||||||
|
catch (err) {
|
||||||
|
this.addNotification({ status: 'error', message: err.stack });
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isSaving = false;
|
||||||
|
},
|
||||||
|
clearChanges () {
|
||||||
|
this.localRoutine = JSON.parse(JSON.stringify(this.originalRoutine));
|
||||||
|
this.$refs.queryEditor.editor.session.setValue(this.localRoutine.sql);
|
||||||
|
},
|
||||||
|
resizeQueryEditor () {
|
||||||
|
if (this.$refs.queryEditor) {
|
||||||
|
const footer = document.getElementById('footer');
|
||||||
|
const size = window.innerHeight - this.$refs.queryEditor.$el.getBoundingClientRect().top - footer.offsetHeight;
|
||||||
|
this.editorHeight = size;
|
||||||
|
this.$refs.queryEditor.editor.resize();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
parametersUpdate (parameters) {
|
||||||
|
this.localRoutine = { ...this.localRoutine, parameters };
|
||||||
|
},
|
||||||
|
showParamsModal () {
|
||||||
|
this.isParamsModal = true;
|
||||||
|
},
|
||||||
|
hideParamsModal () {
|
||||||
|
this.isParamsModal = false;
|
||||||
|
},
|
||||||
|
showAskParamsModal () {
|
||||||
|
this.isAskingParameters = true;
|
||||||
|
},
|
||||||
|
hideAskParamsModal () {
|
||||||
|
this.isAskingParameters = false;
|
||||||
|
},
|
||||||
|
onKey (e) {
|
||||||
|
if (this.isSelected) {
|
||||||
|
e.stopPropagation();
|
||||||
|
if (e.ctrlKey && e.keyCode === 83) { // CTRL + S
|
||||||
|
if (this.isChanged)
|
||||||
|
this.saveChanges();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
|
@ -202,7 +202,7 @@ export default {
|
||||||
this.originalTrigger = {
|
this.originalTrigger = {
|
||||||
sql: this.customizations.triggerSql,
|
sql: this.customizations.triggerSql,
|
||||||
definer: '',
|
definer: '',
|
||||||
table: 'elements',
|
table: this.schemaTables.length ? this.schemaTables[0].name : null,
|
||||||
activation: 'BEFORE',
|
activation: 'BEFORE',
|
||||||
event: this.customizations.triggerMultipleEvents ? ['INSERT'] : 'INSERT',
|
event: this.customizations.triggerMultipleEvents ? ['INSERT'] : 'INSERT',
|
||||||
name: ''
|
name: ''
|
||||||
|
@ -274,6 +274,7 @@ export default {
|
||||||
});
|
});
|
||||||
|
|
||||||
this.removeTab({ uid: this.connection.uid, tab: this.tab.uid });
|
this.removeTab({ uid: this.connection.uid, tab: this.tab.uid });
|
||||||
|
this.changeBreadcrumbs({ schema: this.schema, trigger: this.localTrigger.name });
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
this.addNotification({ status: 'error', message: response });
|
this.addNotification({ status: 'error', message: response });
|
||||||
|
|
|
@ -234,7 +234,8 @@ module.exports = {
|
||||||
thereAreNoTableFields: 'There are no table fields',
|
thereAreNoTableFields: 'There are no table fields',
|
||||||
newTable: 'New table',
|
newTable: 'New table',
|
||||||
newView: 'New view',
|
newView: 'New view',
|
||||||
newTrigger: 'New trigger'
|
newTrigger: 'New trigger',
|
||||||
|
newRoutine: 'New routine'
|
||||||
},
|
},
|
||||||
faker: {
|
faker: {
|
||||||
address: 'Address',
|
address: 'Address',
|
||||||
|
|
Loading…
Reference in New Issue