Skip to content

Commit

Permalink
fix(ui): editor source was not loading due to setup script
Browse files Browse the repository at this point in the history
  • Loading branch information
tchiotludo committed Dec 22, 2022
1 parent 7d48b51 commit 1a1b32c
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 27 deletions.
1 change: 0 additions & 1 deletion ui/src/components/Tabs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
v-bind="activeTab.props"
ref="tabContent"
:is="activeTab.component"
:class="{'p-3': activeTab.background === undefined || activeTab.background !== false}"
:prevent-route-info="true"
/>
</div>
Expand Down
21 changes: 12 additions & 9 deletions ui/src/components/flows/FlowEdit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
<bottom-line v-if="canSave || canDelete || canExecute">
<ul>
<li>
<el-button :icon="Delete" type="danger" v-if="canDelete" @click="deleteFile">
<el-button :icon="icon.Delete" type="danger" v-if="canDelete" @click="deleteFile">
{{ $t('delete') }}
</el-button>
</li>

<li>
<router-link v-if="flow" :to="{name: 'flows/create', query: {copy: true}}">
<el-button :icon="ContentCopy">
<el-button :icon="icon.ContentCopy">
{{ $t('copy') }}
</el-button>
</router-link>
Expand All @@ -22,7 +22,7 @@
</li>

<li>
<el-button :icon="ContentSave" @click="save" v-if="canSave" type="primary">
<el-button :icon="icon.ContentSave" @click="save" v-if="canSave" type="primary">
{{ $t('save') }}
</el-button>
</li>
Expand All @@ -31,16 +31,14 @@
</div>
</template>

<script setup>
import ContentCopy from "vue-material-design-icons/ContentCopy.vue";
import ContentSave from "vue-material-design-icons/ContentSave.vue";
import Delete from "vue-material-design-icons/Delete.vue";
</script>

<script>
import flowTemplateEdit from "../../mixins/flowTemplateEdit";
import {mapGetters} from "vuex";
import TriggerFlow from "./TriggerFlow.vue"
import ContentCopy from "vue-material-design-icons/ContentCopy.vue";
import ContentSave from "vue-material-design-icons/ContentSave.vue";
import Delete from "vue-material-design-icons/Delete.vue";
import {shallowRef} from "vue";
export default {
components: {
Expand All @@ -50,6 +48,11 @@
data() {
return {
dataType: "flow",
icon: {
ContentCopy: shallowRef(ContentCopy),
ContentSave: shallowRef(ContentSave),
Delete: shallowRef(Delete),
}
};
},
computed: {
Expand Down
2 changes: 0 additions & 2 deletions ui/src/components/flows/FlowRoot.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
name: "executions",
component: FlowExecutions,
title: this.$t("executions"),
background: false,
});
}
Expand Down Expand Up @@ -120,7 +119,6 @@
name: "logs",
component: FlowLogs,
title: this.$t("logs"),
background: false,
});
}
Expand Down
3 changes: 3 additions & 0 deletions ui/src/components/flows/FlowSource.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
<script>
import {mapGetters} from "vuex";
import FlowEdit from "override/components/flows/FlowEdit.vue";
import RouteContext from "../../mixins/routeContext";
export default {
mixins: [RouteContext],
name: "FlowSource",
components: {FlowEdit},
computed: {
Expand Down
12 changes: 7 additions & 5 deletions ui/src/components/flows/TriggerFlow.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="trigger-flow-wrapper">
<el-button :icon="Flash" :disabled="disabled" @click="onClick">
<el-button :icon="icon.Flash" :disabled="disabled" @click="onClick">
{{ $t('New execution') }}
</el-button>
<el-dialog v-if="isOpen" v-model="isOpen" :title="$t('execute the flow')" destroy-on-close :append-to-body="true">
Expand All @@ -9,14 +9,13 @@
</div>
</template>

<script setup>
import Flash from "vue-material-design-icons/Flash.vue";
</script>

<script>
import FlowRun from "./FlowRun.vue";
import {mapState} from "vuex";
import {executeTask} from "../../utils/submitTask"
import Flash from "vue-material-design-icons/Flash.vue";
import {shallowRef} from "vue";
export default {
components: {
Expand All @@ -38,7 +37,10 @@
},
data() {
return {
isOpen: false
isOpen: false,
icon: {
Flash: shallowRef(Flash)
}
};
},
mounted() {
Expand Down
10 changes: 0 additions & 10 deletions ui/src/override/components/flows/FlowEdit.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
<script setup>
/* eslint-disable no-unused-vars */
import ContentCopy from "vue-material-design-icons/ContentCopy.vue";
import ContentSave from "vue-material-design-icons/ContentSave.vue";
import Delete from "vue-material-design-icons/Delete.vue";
import TriggerFlow from "../../../components/flows/TriggerFlow.vue"
/* eslint-disable no-unused-vars */
</script>


<script>
import FlowEdit from "../../../components/flows/FlowEdit.vue";
export default {
Expand Down

0 comments on commit 1a1b32c

Please sign in to comment.