feat: new create scheduler tabs

antares-sql · Sep 10, 2021 · 3c5a69a · 3c5a69a
1 parent 0203f69
commit 3c5a69a
Show file tree

Hide file tree

Showing 8 changed files with 358 additions and 297 deletions.
diff --git a/src/renderer/components/ModalNewFunction.vue b/src/renderer/components/ModalNewFunction.vue
diff --git a/src/renderer/components/ModalNewScheduler.vue b/src/renderer/components/ModalNewScheduler.vue
diff --git a/src/renderer/components/Workspace.vue b/src/renderer/components/Workspace.vue
@@ -187,6 +187,23 @@
                   </span>
                </a>
 
+               <a
+                  v-else-if="tab.type === 'new-scheduler'"
+                  class="tab-link"
+                  :class="{'badge': tab.isChanged}"
+               >
+                  <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                  <span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
+                     {{ $t('message.newScheduler') }}
+                     <span
+                        class="btn btn-clear"
+                        :title="$t('word.close')"
+                        @mousedown.left.stop
+                        @click.stop="closeTab(tab)"
+                     />
+                  </span>
+               </a>
+
                <a
                   v-else-if="tab.type.includes('temp-')"
                   class="tab-link"
@@ -378,6 +395,15 @@
                :function="tab.elementName"
                :schema="tab.schema"
             />
+            <WorkspaceTabNewScheduler
+               v-else-if="tab.type === 'new-scheduler'"
+               :key="tab.uid"
+               :tab="tab"
+               :connection="connection"
+               :is-selected="selectedTab === tab.uid"
+               :trigger="tab.elementName"
+               :schema="tab.schema"
+            />
             <WorkspaceTabPropsScheduler
                v-else-if="['temp-scheduler-props', 'scheduler-props'].includes(tab.type)"
                :key="tab.uid"
@@ -418,6 +444,7 @@ import WorkspaceTabNewView from '@/components/WorkspaceTabNewView';
 import WorkspaceTabNewTrigger from '@/components/WorkspaceTabNewTrigger';
 import WorkspaceTabNewRoutine from '@/components/WorkspaceTabNewRoutine';
 import WorkspaceTabNewFunction from '@/components/WorkspaceTabNewFunction';
+import WorkspaceTabNewScheduler from '@/components/WorkspaceTabNewScheduler';
 
 import WorkspaceTabPropsTable from '@/components/WorkspaceTabPropsTable';
 import WorkspaceTabPropsView from '@/components/WorkspaceTabPropsView';
@@ -449,6 +476,7 @@ export default {
       WorkspaceTabNewFunction,
       WorkspaceTabPropsRoutine,
       WorkspaceTabPropsFunction,
+      WorkspaceTabNewScheduler,
       WorkspaceTabPropsScheduler,
       ModalProcessesList,
       ModalDiscardChanges

diff --git a/src/renderer/components/WorkspaceExploreBar.vue b/src/renderer/components/WorkspaceExploreBar.vue
@@ -73,12 +73,6 @@
          @close="hideCreateTriggerFunctionModal"
          @open-create-function-editor="openCreateTriggerFunctionEditor"
       />
-      <ModalNewScheduler
-         v-if="isNewSchedulerModal"
-         :workspace="workspace"
-         @close="hideCreateSchedulerModal"
-         @open-create-scheduler-editor="openCreateSchedulerEditor"
-      />
       <DatabaseContext
          v-if="isDatabaseContext"
          :selected-schema="selectedSchema"
@@ -90,7 +84,7 @@
          @open-create-routine-tab="openCreateElementTab('routine')"
          @open-create-function-tab="openCreateElementTab('function')"
          @show-create-trigger-function-modal="showCreateTriggerFunctionModal"
-         @show-create-scheduler-modal="showCreateSchedulerModal"
+         @open-create-scheduler-tab="openCreateElementTab('scheduler')"
          @reload="refresh"
       />
       <TableContext
@@ -120,7 +114,7 @@
          @open-create-routine-tab="openCreateElementTab('routine')"
          @open-create-function-tab="openCreateElementTab('function')"
          @show-create-trigger-function-modal="showCreateTriggerFunctionModal"
-         @show-create-scheduler-modal="showCreateSchedulerModal"
+         @open-create-scheduler-tab="openCreateElementTab('scheduler')"
          @close-context="closeMiscFolderContext"
          @reload="refresh"
       />
@@ -142,9 +136,7 @@ import MiscContext from '@/components/WorkspaceExploreBarMiscContext';
 import MiscFolderContext from '@/components/WorkspaceExploreBarMiscFolderContext';
 import ModalNewSchema from '@/components/ModalNewSchema';
 
-import ModalNewFunction from '@/components/ModalNewFunction';
 import ModalNewTriggerFunction from '@/components/ModalNewTriggerFunction';
-import ModalNewScheduler from '@/components/ModalNewScheduler';
 
 export default {
    name: 'WorkspaceExploreBar',
@@ -156,9 +148,7 @@ export default {
       MiscFolderContext,
       ModalNewSchema,
 
-      ModalNewFunction,
-      ModalNewTriggerFunction,
-      ModalNewScheduler
+      ModalNewTriggerFunction
    },
    props: {
       connection: Object,

diff --git a/src/renderer/components/WorkspaceExploreBarMiscFolderContext.vue b/src/renderer/components/WorkspaceExploreBarMiscFolderContext.vue
@@ -34,7 +34,7 @@
       <div
          v-if="selectedMisc === 'scheduler'"
          class="context-element"
-         @click="$emit('show-create-scheduler-modal')"
+         @click="$emit('open-create-scheduler-tab')"
       >
          <span class="d-flex"><i class="mdi mdi-18px mdi-calendar-clock text-light pr-1" /> {{ $t('message.createNewScheduler') }}</span>
       </div>