Skip to content

Commit d57e166

Browse files
MetRonnieMetRonnie
committed
Merge remote-tracking branch 'upstream/master' into graph-group-collapse
2 parents fee3f8f + 23cd418 commit d57e166

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3167
-2007
lines changed

‎.github/workflows/renovate_validate.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Validate Renovate config
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- renovate.json
7+
workflow_dispatch:
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
env:
14+
FORCE_COLOR: 2
15+
16+
jobs:
17+
validate:
18+
runs-on: ubuntu-latest
19+
timeout-minutes: 5
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v4
23+
24+
- name: Setup Node
25+
uses: actions/setup-node@v4
26+
with:
27+
node-version: 'lts/*'
28+
29+
- name: Validate config
30+
run: npx --yes --package renovate -- renovate-config-validator

‎.yarn/releases/yarn-4.8.1.cjs‎

Lines changed: 0 additions & 935 deletions
This file was deleted.

‎.yarn/releases/yarn-4.9.1.cjs‎

Lines changed: 948 additions & 0 deletions
Large diffs are not rendered by default.

‎.yarnrc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ networkSettings:
1010

1111
nodeLinker: node-modules
1212

13-
yarnPath: .yarn/releases/yarn-4.8.1.cjs
13+
yarnPath: .yarn/releases/yarn-4.9.1.cjs

‎changes.d/2025.feat.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Added conditional default log file based on job outcome

‎changes.d/2135.feat.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Show more Cylc version info in the sidebar.

‎package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,43 +24,43 @@
2424
"test": "vitest run && yarn run serve cy:run"
2525
},
2626
"dependencies": {
27-
"@apollo/client": "3.13.5",
27+
"@apollo/client": "3.13.8",
2828
"@hpcc-js/wasm": "2.22.4",
29-
"@lumino/default-theme": "2.1.8",
30-
"@lumino/widgets": "2.6.0",
29+
"@lumino/default-theme": "2.1.10",
30+
"@lumino/widgets": "2.7.1",
3131
"@mdi/js": "7.4.47",
32-
"@vueuse/core": "12.8.2",
32+
"@vueuse/core": "13.1.0",
3333
"apexcharts": "3.54.1",
34-
"axios": "1.8.4",
35-
"dedent": "1.5.3",
34+
"axios": "1.9.0",
35+
"dedent": "1.6.0",
3636
"enumify": "2.0.0",
3737
"graphiql": "3.8.3",
38-
"graphql": "16.10.0",
38+
"graphql": "16.11.0",
3939
"graphql-tag": "2.12.6",
4040
"lodash-es": "4.17.21",
4141
"markdown-it": "14.1.0",
4242
"mitt": "3.0.1",
4343
"nprogress": "1.0.0-1",
44-
"preact": "10.26.4",
44+
"preact": "10.26.5",
4545
"simple-icons": "2.19.0",
4646
"subscriptions-transport-ws": "0.11.0",
4747
"svg-pan-zoom": "3.6.2",
48-
"vue": "3.5.13",
49-
"vue-i18n": "11.1.2",
50-
"vue-router": "4.5.0",
48+
"vue": "3.5.14",
49+
"vue-i18n": "11.1.3",
50+
"vue-router": "4.5.1",
5151
"vue-the-mask": "0.11.1",
5252
"vue3-apexcharts": "1.8.0",
53-
"vuetify": "3.7.15",
53+
"vuetify": "3.8.4",
5454
"vuex": "4.1.0"
5555
},
5656
"devDependencies": {
57-
"@cypress/code-coverage": "3.14.0",
58-
"@vitejs/plugin-vue": "5.2.3",
59-
"@vitest/coverage-istanbul": "3.0.9",
57+
"@cypress/code-coverage": "3.14.1",
58+
"@vitejs/plugin-vue": "5.2.4",
59+
"@vitest/coverage-istanbul": "3.1.3",
6060
"@vue/test-utils": "2.4.6",
6161
"concurrently": "9.1.2",
6262
"cross-fetch": "4.1.0",
63-
"cypress": "13.17.0",
63+
"cypress": "14.3.3",
6464
"cypress-vite": "1.6.0",
6565
"eslint": "8.57.1",
6666
"eslint-config-standard": "17.1.0",
@@ -72,21 +72,21 @@
7272
"eslint-plugin-promise": "6.6.0",
7373
"eslint-plugin-vue": "9.33.0",
7474
"eslint-plugin-vuetify": "2.5.2",
75-
"express": "4.21.2",
75+
"express": "5.1.0",
7676
"express-ws": "5.0.2",
7777
"istanbul-lib-coverage": "3.2.2",
78-
"jsdom": "26.0.0",
78+
"jsdom": "26.1.0",
7979
"json-server": "0.17.4",
80-
"nodemon": "3.1.9",
80+
"nodemon": "3.1.10",
8181
"nyc": "17.1.0",
82-
"sass-embedded": "1.86.0",
83-
"sinon": "19.0.5",
82+
"sass-embedded": "1.87.0",
83+
"sinon": "20.0.0",
8484
"standard": "17.1.2",
85-
"vite": "6.2.4",
85+
"vite": "6.3.5",
8686
"vite-plugin-eslint": "1.8.1",
87-
"vite-plugin-istanbul": "6.0.2",
88-
"vite-plugin-vuetify": "2.1.0",
89-
"vitest": "3.0.9"
87+
"vite-plugin-istanbul": "7.0.0",
88+
"vite-plugin-vuetify": "2.1.1",
89+
"vitest": "3.1.3"
9090
},
9191
"peerDependenciesMeta": {
9292
"react": {
@@ -99,5 +99,5 @@
9999
"bugs": {
100100
"url": "https://github.com/cylc/cylc-ui/issues"
101101
},
102-
"packageManager": "yarn@4.8.1"
102+
"packageManager": "yarn@4.9.1"
103103
}

‎renovate.json‎

Lines changed: 77 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,36 @@
22
"extends": [
33
"config:js-app"
44
],
5-
"labels": ["dependencies", "javascript"],
5+
"labels": [
6+
"dependencies",
7+
"javascript"
8+
],
69
"platformAutomerge": true,
710
"automergeStrategy": "squash",
811
"packageRules": [
912
{
10-
"matchDepNames": ["yarn"],
13+
"matchDepNames": [
14+
"yarn"
15+
],
1116
"automerge": true
1217
},
1318
{
14-
"matchPackageNames": ["vue"],
19+
"matchPackageNames": [
20+
"vue"
21+
],
1522
"automerge": true
1623
},
1724
{
1825
"groupName": "vite packages",
1926
"matchPackageNames": [
2027
"vite",
21-
"vite-plugin-vuetify"
22-
],
23-
"matchPackagePatterns": [
24-
"^@vitejs/"
28+
"vite-plugin-vuetify",
29+
"@vitejs/**"
2530
],
2631
"automerge": true,
27-
"schedule": ["on saturday"]
32+
"schedule": [
33+
"on saturday"
34+
]
2835
},
2936
{
3037
"groupName": "dev server packages",
@@ -36,34 +43,58 @@
3643
"nodemon"
3744
],
3845
"automerge": true,
39-
"schedule": ["on the 5th and 20th day of the month"]
46+
"schedule": [
47+
"on the 5th and 20th day of the month"
48+
]
4049
},
4150
{
42-
"matchPackageNames": ["vuetify"],
43-
"schedule": ["on the 7th day of the month"]
51+
"matchPackageNames": [
52+
"vuetify"
53+
],
54+
"schedule": [
55+
"on the 7th day of the month"
56+
]
4457
},
4558
{
4659
"groupName": "lumino packages",
47-
"matchPackagePatterns": ["^@lumino/"]
60+
"matchPackageNames": [
61+
"@lumino/**"
62+
]
4863
},
4964
{
5065
"groupName": "apollo packages",
51-
"matchPackagePatterns": ["^@apollo/"],
52-
"schedule": ["on the 10th day of the month"]
66+
"schedule": [
67+
"on the 10th day of the month"
68+
],
69+
"matchPackageNames": [
70+
"@apollo/**"
71+
]
5372
},
5473
{
55-
"matchPackageNames": ["sass-embedded"],
56-
"schedule": ["on the 25th day of the month"]
74+
"matchPackageNames": [
75+
"sass-embedded"
76+
],
77+
"schedule": [
78+
"on the 25th day of the month"
79+
]
5780
},
5881
{
59-
"matchPackageNames": ["@vueuse/core"],
82+
"matchPackageNames": [
83+
"@vueuse/core"
84+
],
6085
"automerge": true,
61-
"schedule": ["on the 9th day of the month"]
86+
"schedule": [
87+
"on the 9th day of the month"
88+
]
6289
},
6390
{
64-
"matchPackageNames": ["vue-i18n"],
91+
"matchPackageNames": [
92+
"vue-i18n"
93+
],
6594
"automerge": true,
66-
"schedule": ["on the 15th day of the month"]
95+
"schedule": [
96+
"on the 15th day of the month"
97+
]
6798
},
6899
{
69100
"groupName": "graphiql packages",
@@ -72,14 +103,20 @@
72103
"preact"
73104
],
74105
"automerge": true,
75-
"schedule": ["on the 12th day of the month"]
106+
"schedule": [
107+
"on the 12th day of the month"
108+
]
76109
},
77110
{
78111
"groupName": "eslint packages",
79-
"matchPackageNames": ["standard"],
80-
"matchPackagePatterns": ["^eslint"],
112+
"matchPackageNames": [
113+
"standard",
114+
"eslint*"
115+
],
81116
"automerge": true,
82-
"schedule": ["on the first day of the month"]
117+
"schedule": [
118+
"on the first day of the month"
119+
]
83120
},
84121
{
85122
"groupName": "tests packages",
@@ -88,28 +125,32 @@
88125
"cross-fetch",
89126
"jsdom",
90127
"nyc",
91-
"sinon"
92-
],
93-
"matchPackagePatterns": [
94-
"^@?cypress",
95-
"^@?vitest",
96-
"coverage",
97-
"istanbul"
128+
"sinon",
129+
"/^@?cypress/",
130+
"/^@?vitest/",
131+
"/coverage/",
132+
"/istanbul/"
98133
],
99134
"automerge": true,
100-
"schedule": ["on sunday"]
135+
"schedule": [
136+
"on sunday"
137+
]
101138
},
102139
{
103140
"groupName": "analysis view packages",
104141
"matchPackageNames": [
105-
"apexcharts",
106-
"vue3-apexcharts"
142+
"apexcharts",
143+
"vue3-apexcharts"
107144
],
108-
"addLabels": ["data workflows team"]
145+
"addLabels": [
146+
"data workflows team"
147+
]
109148
}
110149
],
111150
"vulnerabilityAlerts": {
112-
"addLabels": ["security"]
151+
"addLabels": [
152+
"security"
153+
]
113154
},
114155
"github-actions": {
115156
"enabled": false

‎src/App.vue‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2828
<script setup>
2929
import { computed, onMounted } from 'vue'
3030
import { useRoute } from 'vue-router'
31-
import { useJobTheme, useReducedAnimation } from '@/composables/localStorage'
31+
import { useJobTheme } from '@/composables/localStorage'
32+
import { useDynamicVuetifyDefaults } from '@/plugins/vuetify'
3233
3334
const DEFAULT_LAYOUT = 'empty'
3435
const route = useRoute()
@@ -39,14 +40,7 @@ const showSidebar = computed(() => route.meta.showSidebar ?? true)
3940
4041
const jobTheme = useJobTheme()
4142
42-
const reducedAnimation = useReducedAnimation()
43-
44-
const vuetifyDefaults = computed(() => ({
45-
global: {
46-
transition: reducedAnimation.value ? 'no' : undefined,
47-
ripple: reducedAnimation.value ? false : undefined,
48-
}
49-
}))
43+
const vuetifyDefaults = useDynamicVuetifyDefaults()
5044
5145
onMounted(() => {
5246
// apply stored application font-size

0 commit comments

Comments
 (0)