Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ $ towncrier create <PR-number>.<feat|fix>.md --content "Short description"

<!-- towncrier release notes start -->

## cylc-ui-2.14.0 (Released 2026-05-06)

### 🔧 Fixes

[#2386](https://github.com/cylc/cylc-ui/pull/2386) - Fixed occasional empty cycle point bug in the tree view.

[#2507](https://github.com/cylc/cylc-ui/pull/2507) - Tree view: ensured task icon modifiers (e.g. held, retrying) also show on their parent families and cycle icons.

[#2519](https://github.com/cylc/cylc-ui/pull/2519) - Fix an issue in the "info" view where task outputs which contain hyphens were missing from completion expressions.

## cylc-ui-2.13.0 (Released 2026-02-24)

### 🚀 Enhancements
Expand Down
1 change: 0 additions & 1 deletion changes.d/2386.fix.md

This file was deleted.

1 change: 0 additions & 1 deletion changes.d/2507.fix.md

This file was deleted.

1 change: 0 additions & 1 deletion changes.d/2519.fix.md

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cylc-ui",
"version": "2.14.0-0",
"version": "2.14.0",
"private": true,
"license": "GPL-3.0-only",
"type": "module",
Expand Down
11 changes: 5 additions & 6 deletions src/components/cylc/Toolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ component. Note: this is not used for the workflow view, see
<template>
<v-toolbar
id="core-app-bar"
absolute
:height="toolbarHeight"
flat
class="c-toolbar"
Expand All @@ -34,7 +35,7 @@ component. Note: this is not used for the workflow view, see
@click.stop="toggleDrawer"
id="toggle-drawer"
>
<v-icon>{{ drawer ? $options.icons.mdiArrowLeft : $options.icons.mdiViewList }}</v-icon>
<v-icon>{{ $options.icons.mdiViewList }}</v-icon>
</v-btn>
<v-toolbar-title>
{{ title }}
Expand All @@ -46,14 +47,13 @@ component. Note: this is not used for the workflow view, see
import { mapState } from 'vuex'
import { useDrawer, toolbarHeight } from '@/utils/toolbar'
import {
mdiViewList,
mdiArrowLeft,
mdiViewList
} from '@mdi/js'

export default {
setup () {
const { drawer, toggleDrawer } = useDrawer()
return { drawer, toggleDrawer, toolbarHeight }
const { toggleDrawer } = useDrawer()
return { toggleDrawer, toolbarHeight }
},

computed: {
Expand All @@ -62,7 +62,6 @@ export default {

icons: {
mdiViewList,
mdiArrowLeft,
},
}
</script>
11 changes: 5 additions & 6 deletions src/components/cylc/workspace/Toolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<!-- TODO: duplicated in workflow/Toolbar.vue and cylc/Toolbar.vue -->
<!-- burger button for mobile -->
<v-btn
v-if="showNavBtn"
icon
@click.stop="toggleDrawer"
id="toggle-drawer"
>
<v-icon>{{ drawer ? icons.arrowLeft : icons.list }}</v-icon>
<v-icon>{{ icons.list }}</v-icon>
</v-btn>
<!-- title -->
<v-toolbar-title
class="c-toolbar-title text-md-h6 text-subtitle-1 font-weight-medium text-primary ml-0"
class="c-toolbar-title text-md-h6 text-subtitle-1 font-weight-medium text-primary"
:class="showNavBtn ? 'ml-0' : null"
>
{{ title }}
</v-toolbar-title>
Expand Down Expand Up @@ -263,7 +265,6 @@ import {
mdiAccount,
mdiChevronDown,
mdiArrowULeftTop,
mdiArrowLeft,
mdiInformationOutline,
} from '@mdi/js'
import { startCase } from 'lodash'
Expand Down Expand Up @@ -329,14 +330,13 @@ export default {

setup () {
const { showNavBtn } = useNavBtn()
const { drawer, toggleDrawer } = useDrawer()
const { toggleDrawer } = useDrawer()

const uisVersionInfo = inject('versionInfo')
const uisFlowVersion = uisVersionInfo?.value?.['cylc-flow'] ?? ''

return {
eventBus,
drawer,
showNavBtn,
toggleDrawer,
toolbarHeight,
Expand All @@ -346,7 +346,6 @@ export default {
hold: mdiPause,
info: mdiInformationOutline,
list: mdiViewList,
arrowLeft: mdiArrowLeft,
menu: mdiMicrosoftXboxControllerMenu,
run: mdiPlay,
stop: mdiStop,
Expand Down
7 changes: 4 additions & 3 deletions src/layouts/Default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<template>
<div>
<ConnectionStatus :is-offline="offline" />
<Toolbar v-if="showToolbar" />
<Drawer v-if="showSidebar" />
<CommandMenu/>

<v-main>
<Toolbar v-if="showToolbar" />
<alert />
<div
id="core-view"
Expand All @@ -45,7 +45,7 @@ import { Alert as AlertModel } from '@/model/Alert.model'
import Alert from '@/components/core/Alert.vue'
import Drawer from '@/components/cylc/Drawer.vue'
import Toolbar from '@/components/cylc/Toolbar.vue'
import { toolbarHeight } from '@/utils/toolbar'
import { useNavBtn, toolbarHeight } from '@/utils/toolbar'
import ConnectionStatus from '@/components/cylc/ConnectionStatus.vue'
import CommandMenu from '@/components/cylc/commandMenu/Menu.vue'

Expand All @@ -66,10 +66,11 @@ export default {
...allViews.keys(),
'Workspace',
]
const { showNavBtn } = useNavBtn()

/** Whether to show app toolbar (not the workspace view toolbar). */
const showToolbar = computed(
() => !workflowViews.includes(route.name)
() => showNavBtn.value && !workflowViews.includes(route.name)
)
const coreViewStyle = computed(() => ({
marginTop: showToolbar.value ? `${toolbarHeight}px` : 0,
Expand Down
9 changes: 4 additions & 5 deletions tests/unit/components/cylc/workspace/toolbar.vue.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,8 @@ describe('Workspace toolbar component', () => {
drawerState.value = false
})

it('shows nav button', async () => {
// TODO Add test for when workflow toolbar is shown
// and when navbar should be hidden
it('hides/shows nav button according to viewport size & whether drawer is collapsed', async () => {
// TODO: actually just show nav btn at all times?
const wrapper = mount(Toolbar, {
global: {
plugins: [store, vuetify, CommandMenuPlugin],
Expand All @@ -57,10 +56,10 @@ describe('Workspace toolbar component', () => {
wrapper.vm.$vuetify.display.mobile = false
await wrapper.vm.$nextTick()
expect(wrapper.find('#toggle-drawer').exists()).to.equal(true)
// Btn should show when drawer is visible on large viewport
// Btn should not show when drawer is visible on large viewport
drawerState.value = true
await wrapper.vm.$nextTick()
expect(wrapper.find('#toggle-drawer').exists()).to.equal(true)
expect(wrapper.find('#toggle-drawer').exists()).to.equal(false)
// Btn should show when drawer is visible on small viewport
wrapper.vm.$vuetify.display.mobile = true
await wrapper.vm.$nextTick()
Expand Down
Loading