Merge upstream/master into tree-view

Author: MetRonnie

.github/workflows/main.yml

@@ -123,7 +123,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
 
       - name: Codecov upload
         uses: codecov/codecov-action@v5

package.json

@@ -29,7 +29,7 @@
     "@lumino/default-theme": "2.1.10",
     "@lumino/widgets": "2.7.1",
     "@mdi/js": "7.4.47",
-    "@vueuse/core": "13.5.0",
+    "@vueuse/core": "13.6.0",
     "apexcharts": "3.54.1",
     "axios": "1.11.0",
     "dedent": "1.6.0",
@@ -41,7 +41,7 @@
     "markdown-it": "14.1.0",
     "mitt": "3.0.1",
     "nprogress": "1.0.0-1",
-    "preact": "10.26.9",
+    "preact": "10.27.0",
     "simple-icons": "15.2.0",
     "subscriptions-transport-ws": "0.11.0",
     "svg-pan-zoom": "3.6.2",
@@ -50,18 +50,18 @@
     "vue-router": "4.5.1",
     "vue-the-mask": "0.11.1",
     "vue3-apexcharts": "1.8.0",
-    "vuetify": "3.9.0",
+    "vuetify": "3.9.5",
     "vuex": "4.1.0"
   },
   "devDependencies": {
     "@cypress/code-coverage": "3.14.5",
-    "@vitejs/plugin-react": "4.7.0",
+    "@vitejs/plugin-react": "5.0.0",
     "@vitejs/plugin-vue": "6.0.1",
     "@vitest/coverage-istanbul": "3.2.4",
     "@vue/test-utils": "2.4.6",
     "concurrently": "9.2.0",
     "cross-fetch": "4.1.0",
-    "cypress": "14.5.3",
+    "cypress": "14.5.4",
     "cypress-vite": "1.6.0",
     "eslint": "8.57.1",
     "eslint-config-standard": "17.1.0",
@@ -83,7 +83,7 @@
     "sass-embedded": "1.89.2",
     "sinon": "21.0.0",
     "standard": "17.1.2",
-    "vite": "7.0.6",
+    "vite": "7.1.1",
     "vite-plugin-eslint": "1.8.1",
     "vite-plugin-istanbul": "7.1.0",
     "vite-plugin-vuetify": "2.1.2",

src/components/cylc/ViewToolbar.vue

@@ -72,15 +72,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <script>
 import { btnProps } from '@/utils/viewToolbar'
-import { VTreeview } from 'vuetify/labs/VTreeview'
 
 export default {
   name: 'ViewToolbar',
 
-  components: {
-    VTreeview,
-  },
-
   emits: [
     'setOption'
   ],

tests/e2e/specs/analysis.cy.js

@@ -46,10 +46,10 @@ describe('Analysis view', () => {
           .should('be.empty')
         cy
           .get('input#c-analysis-filter-task-platforms')
-          .should('have.value', '-1')
+          .should('have.value', 'All')
         cy
           .get('input#c-analysis-filter-task-timings')
-          .should('have.value', 'totalTimes')
+          .should('have.value', 'Total times')
       })
 
       it('Should filter by task name', () => {
@@ -507,7 +507,7 @@ describe('Filters and Options save state', () => {
       cy.get('.c-table .v-data-table-footer__items-per-page .v-select')
         .as('itemsPerPage')
         .find('input')
-        .should('not.have.value', -1)
+        .should('not.have.value', 'All')
         .get('@itemsPerPage')
         .click()
         .get('[role="listbox"] .v-list-item')
@@ -516,7 +516,7 @@ describe('Filters and Options save state', () => {
         // Wait for menu to close
         .should('not.exist')
         .get('@itemsPerPage').find('input')
-        .should('have.value', -1)
+        .should('have.value', 'All')
       // Navigate away
       cy.visit('/#/')
         .get('.c-dashboard')
@@ -525,7 +525,7 @@ describe('Filters and Options save state', () => {
       cy.get('@platformCol')
         .should('have.class', sortedClass)
       cy.get('@itemsPerPage').find('input')
-        .should('have.value', -1)
+        .should('have.value', 'All')
     })
 
     it('remembers box and whisker sorting options when switching between workflows', () => {

tests/e2e/specs/table.cy.js

@@ -183,7 +183,7 @@ describe('State saving', () => {
     cy.get('.c-table .v-data-table-footer__items-per-page .v-select')
       .as('itemsPerPage')
       .find('input')
-      .should('not.have.value', -1)
+      .should('not.have.value', 'All')
       .get('@itemsPerPage')
       .click()
       .get('[role="listbox"] .v-list-item')
@@ -192,7 +192,7 @@ describe('State saving', () => {
       // Wait for menu to close
       .should('not.exist')
       .get('@itemsPerPage').find('input')
-      .should('have.value', -1)
+      .should('have.value', 'All')
     // Navigate away
     cy.visit('/#/')
       .get('.c-dashboard')
@@ -201,7 +201,7 @@ describe('State saving', () => {
     cy.get('@platformCol')
       .should('have.class', sortedClass)
     cy.get('@itemsPerPage').find('input')
-      .should('have.value', -1)
+      .should('have.value', 'All')
   })
 
   describe('Flow nums', () => {

tests/e2e/specs/toolbar.cy.js

@@ -110,7 +110,7 @@ describe('N-window selector', () => {
     cy.get('[data-cy=n-win-selector]')
       .click()
       .get('[data-cy=n-win-popup]')
-      .find('[role=combobox]')
+      .find('.v-field[role=combobox]')
       .click()
       .invoke('attr', 'aria-controls').then((dropdownID) => {
         cy.get(`#${dropdownID}`)