Merge 'upstream/master' into graph-group-collapse

Author: MetRonnie

.yarn/releases/yarn-4.9.1.cjs renamed to .yarn/releases/yarn-4.9.2.cjs

@@ -10,4 +10,4 @@ networkSettings:
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.9.1.cjs
+yarnPath: .yarn/releases/yarn-4.9.2.cjs

.yarnrc.yml

@@ -0,0 +1 @@
+Fixed sorting controls appearing in wrong tab when multiple analysis view tabs are open.

changes.d/2163.fix.md

@@ -0,0 +1 @@
+Fixed spurious error when running a command on multiple workflows.

changes.d/2174.fix.md

@@ -33,4 +33,10 @@ module.exports = {
   },
   noInlineConfig: true,
   reportUnusedDisableDirectives: false, // doesn't seem to work
+  settings: {
+    polyfills: [
+      // Used by GraphiQL, shouldn't be a problem:
+      'navigator.userAgentData',
+    ],
+  },
 }

eslintrc-dist.cjs

@@ -25,42 +25,43 @@
   },
   "dependencies": {
     "@apollo/client": "3.13.8",
-    "@hpcc-js/wasm": "2.22.4",
+    "@hpcc-js/wasm": "2.23.0",
     "@lumino/default-theme": "2.1.10",
     "@lumino/widgets": "2.7.1",
     "@mdi/js": "7.4.47",
-    "@vueuse/core": "13.1.0",
+    "@vueuse/core": "13.3.0",
     "apexcharts": "3.54.1",
     "axios": "1.9.0",
     "dedent": "1.6.0",
     "enumify": "2.0.0",
-    "graphiql": "3.8.3",
+    "graphiql": "4.1.1",
     "graphql": "16.11.0",
     "graphql-tag": "2.12.6",
     "lodash-es": "4.17.21",
     "markdown-it": "14.1.0",
     "mitt": "3.0.1",
     "nprogress": "1.0.0-1",
-    "preact": "10.26.5",
-    "simple-icons": "2.19.0",
+    "preact": "10.26.8",
+    "simple-icons": "15.1.0",
     "subscriptions-transport-ws": "0.11.0",
     "svg-pan-zoom": "3.6.2",
-    "vue": "3.5.14",
+    "vue": "3.5.16",
     "vue-i18n": "11.1.3",
     "vue-router": "4.5.1",
     "vue-the-mask": "0.11.1",
     "vue3-apexcharts": "1.8.0",
-    "vuetify": "3.8.4",
+    "vuetify": "3.8.8",
     "vuex": "4.1.0"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.14.1",
+    "@cypress/code-coverage": "3.14.4",
+    "@vitejs/plugin-react": "4.5.1",
     "@vitejs/plugin-vue": "5.2.4",
-    "@vitest/coverage-istanbul": "3.1.3",
+    "@vitest/coverage-istanbul": "3.2.2",
     "@vue/test-utils": "2.4.6",
     "concurrently": "9.1.2",
     "cross-fetch": "4.1.0",
-    "cypress": "14.3.3",
+    "cypress": "14.4.1",
     "cypress-vite": "1.6.0",
     "eslint": "8.57.1",
     "eslint-config-standard": "17.1.0",
@@ -79,14 +80,14 @@
     "json-server": "0.17.4",
     "nodemon": "3.1.10",
     "nyc": "17.1.0",
-    "sass-embedded": "1.87.0",
+    "sass-embedded": "1.89.0",
     "sinon": "20.0.0",
     "standard": "17.1.2",
     "vite": "6.3.5",
     "vite-plugin-eslint": "1.8.1",
     "vite-plugin-istanbul": "7.0.0",
     "vite-plugin-vuetify": "2.1.1",
-    "vitest": "3.1.3"
+    "vitest": "3.2.2"
   },
   "peerDependenciesMeta": {
     "react": {
@@ -99,5 +100,5 @@
   "bugs": {
     "url": "https://github.com/cylc/cylc-ui/issues"
   },
-  "packageManager": "[email protected].1"
+  "packageManager": "[email protected].2"
 }

package.json

@@ -27,40 +27,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   >
     <template v-slot:actions>
       <v-btn
-        icon
+        :icon="mdiClose"
         @click="closeAlert"
         data-cy="snack-close"
-      >
-        <v-icon>{{ $options.icons.mdiClose }}</v-icon>
-      </v-btn>
+      />
     </template>
-    {{ alert.text }}
+    <p>
+      {{ alert.text }}
+    </p>
+    <p
+      v-if="alert.detail"
+      class="mt-2 opacity-80"
+    >
+      {{ alert.detail }}
+    </p>
   </v-snackbar>
 </template>
 
-<script>
+<script setup>
+import { computed } from 'vue'
+import { useStore } from 'vuex'
 import { mdiClose } from '@mdi/js'
-import { mapActions, mapState } from 'vuex'
 
-export default {
-  name: 'Alert',
+const store = useStore()
+const alert = computed(() => store.state.alert)
 
-  computed: {
-    ...mapState(['alert'])
-  },
-
-  methods: {
-    ...mapActions(['setAlert']),
-    /**
-     * Dismisses the alert from the UI, also removing it from the Vuex store.
-     */
-    closeAlert () {
-      this.setAlert(null)
-    }
-  },
-
-  icons: {
-    mdiClose
-  }
+/**
+ * Dismisses the alert from the UI, also removing it from the Vuex store.
+ */
+function closeAlert () {
+  store.dispatch('setAlert', null)
 }
 </script>

src/components/core/Alert.vue

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <template>
   <Teleport
     v-if="sortInputTeleportTarget"
-    :to="`#${sortInputTeleportTarget}`"
+    :to="sortInputTeleportTarget"
   >
     <div class="d-flex flex-grow-1 col-gap-1">
       <v-select
@@ -102,7 +102,7 @@ export default {
     },
     /** ID of element to teleport the sorting input (or don't render if null) */
     sortInputTeleportTarget: {
-      type: String,
+      type: HTMLElement,
       default: null,
     },
   },

src/components/cylc/analysis/BoxPlot.vue

@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 <template>
   <Teleport
     v-if="sortInputTeleportTarget"
-    :to="`#${sortInputTeleportTarget}`"
+    :to="sortInputTeleportTarget"
   >
     <div class="d-flex flex-grow-1 col-gap-1">
       <v-autocomplete
@@ -200,7 +200,7 @@ export default {
     },
     /** Where to teleport the sorting input (or don't render if null) */
     sortInputTeleportTarget: {
-      type: String,
+      type: HTMLElement,
       default: null,
     },
   },

src/components/cylc/analysis/TimeSeries.vue

@@ -226,6 +226,9 @@ export default {
         ret += ' • '
         if (this.node.type === 'workflow') {
           ret += upperFirst(this.node.node.statusMsg || this.node.node.status || 'state unknown')
+          if (this.node.node.cylcVersion) {
+            ret += ` • Cylc ${this.node.node.cylcVersion}`
+          }
         } else {
           ret += upperFirst(this.node.node.state || 'state unknown')
           if (this.node.node.isHeld) {