diff --git a/.eslintrc.js b/.eslintrc.js index c83fa4d08..e5a316339 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -37,7 +37,7 @@ module.exports = { objects: 'only-multiline', imports: 'only-multiline', exports: 'only-multiline', - functions: 'never', + functions: 'only-multiline', }, ], 'template-curly-spacing': [ diff --git a/src/components/cylc/workflow/Lumino.vue b/src/components/cylc/workflow/Lumino.vue index 2bc067bfc..08149011e 100644 --- a/src/components/cylc/workflow/Lumino.vue +++ b/src/components/cylc/workflow/Lumino.vue @@ -18,23 +18,23 @@ along with this program. If not, see .
-
- - -
+ diff --git a/src/components/cylc/workflow/Toolbar.vue b/src/components/cylc/workflow/Toolbar.vue index 732a14811..eddf5f558 100644 --- a/src/components/cylc/workflow/Toolbar.vue +++ b/src/components/cylc/workflow/Toolbar.vue @@ -89,6 +89,7 @@ along with this program. If not, see . . - + > + - {{ view.name }} + {{ startCase(view.name) }} @@ -148,6 +147,7 @@ import { mdiStop, mdiViewList } from '@mdi/js' +import { startCase } from 'lodash' import toolbar from '@/mixins/toolbar' import WorkflowState from '@/model/WorkflowState.model' import graphql from '@/mixins/graphql' @@ -158,20 +158,24 @@ import { export default { name: 'Toolbar', + mixins: [ toolbar, graphql ], + props: { views: { type: Array, required: true } + }, + emits: ['add'], + data: () => ({ extended: false, - // FIXME: remove local state once we have this data in the workflow - https://github.com/cylc/cylc-ui/issues/221 svgPaths: { add: mdiPlusBoxMultiple, hold: mdiPause, @@ -187,6 +191,7 @@ export default { stop: null } }), + computed: { ...mapState('app', ['title']), ...mapState('user', ['user']), @@ -253,6 +258,7 @@ export default { } } }, + watch: { isRunning () { this.expecting.play = null @@ -264,6 +270,7 @@ export default { this.expecting.stop = null } }, + methods: { onClickPlay () { this.$workflowService.mutate( @@ -285,7 +292,7 @@ export default { } }) }, - async onClickStop () { + onClickStop () { this.$workflowService.mutate( 'stop', this.currentWorkflow.id @@ -297,7 +304,8 @@ export default { }, toggleExtended () { this.extended = !this.extended - } + }, + startCase, } } diff --git a/src/views/Analysis.vue b/src/views/Analysis.vue index b597755f1..b36426751 100644 --- a/src/views/Analysis.vue +++ b/src/views/Analysis.vue @@ -88,7 +88,6 @@ import { platformOptions } from '@/components/cylc/analysis/filter' import { - mdiChartLine, mdiRefresh } from '@mdi/js' @@ -185,10 +184,6 @@ export default { data () { const tasks = [] return { - widget: { - title: 'analysis', - icon: mdiChartLine - }, /** Defines controls which get added to the toolbar */ groups: [ { diff --git a/src/views/Graph.vue b/src/views/Graph.vue index f92a13d28..4ce46a434 100644 --- a/src/views/Graph.vue +++ b/src/views/Graph.vue @@ -108,7 +108,6 @@ import { import { Graphviz } from '@hpcc-js/wasm/graphviz' import svgPanZoom from 'svg-pan-zoom' import { - mdiGraph, mdiTimer, mdiImageFilterCenterFocus, mdiArrowCollapse, @@ -219,10 +218,6 @@ export default { data () { return { - widget: { - title: 'graph', - icon: mdiGraph - }, // the graph orientation orientation: 'TB', // the auto-refresh timer diff --git a/src/views/Log.vue b/src/views/Log.vue index bd16904ff..d1f225f21 100644 --- a/src/views/Log.vue +++ b/src/views/Log.vue @@ -141,7 +141,6 @@ along with this program. If not, see . + + diff --git a/src/views/Table.vue b/src/views/Table.vue index 6243ae458..4fa52d93e 100644 --- a/src/views/Table.vue +++ b/src/views/Table.vue @@ -27,7 +27,6 @@ along with this program. If not, see .