Merge upstream/master into tree-view

Author: MetRonnie

package.json

@@ -50,7 +50,7 @@
     "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": {

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}`)

yarn.lock

@@ -4478,7 +4478,7 @@ __metadata:
     vue-router: "npm:4.5.1"
     vue-the-mask: "npm:0.11.1"
     vue3-apexcharts: "npm:1.8.0"
-    vuetify: "npm:3.9.0"
+    vuetify: "npm:3.9.5"
     vuex: "npm:4.1.0"
   peerDependenciesMeta:
     react:
@@ -11668,9 +11668,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vuetify@npm:3.9.0":
-  version: 3.9.0
-  resolution: "vuetify@npm:3.9.0"
+"vuetify@npm:3.9.5":
+  version: 3.9.5
+  resolution: "vuetify@npm:3.9.5"
   peerDependencies:
     typescript: ">=4.7"
     vite-plugin-vuetify: ">=2.1.0"
@@ -11683,7 +11683,7 @@ __metadata:
       optional: true
     webpack-plugin-vuetify:
       optional: true
-  checksum: 10c0/4a70a856dbd980439ca9766bed0cd950713982c028c1e0923b5ca3da38f609329e2761b2efaeb549984a8b28c26d3861dcaffde80636c968726f2da8d54dac21
+  checksum: 10c0/fc8e96c8fd1394b68121ec803a10d17f8ca4a8f68ac77bd2e9c583f3c16aac554e83df07ca86133d34bf286395d44cb41d9a50933c930c050a89bae025236b40
   languageName: node
   linkType: hard