Merge remote-tracking branch 'upstream/master' into graph-group-collapse

Author: MetRonnie

.mailmap

@@ -25,3 +25,5 @@ Jamie Allen           <[email protected]>           JAllen42
 Jamie Allen           <[email protected]>
 Christopher Bennett   <[email protected]>   ChrisPaulBennett
 Mark Dawson           <[email protected]>       Mark Dawson         <[email protected]>
+Harleen Kaur          <[email protected]>                  harleenkaur2003         <[email protected]>
+

CONTRIBUTING.md

@@ -61,6 +61,7 @@ below.
  - Christopher Bennett
  - Mark Dawson
  - Min RK
+ - Harleen Kaur
 <!-- end-shortlog -->
 
 (All contributors are identifiable with email addresses in the git version

changes.d/2176.feat.md

@@ -0,0 +1 @@
+Workspace tab layout is now remembered beyond the current browser session.

changes.d/2222.feat.md

@@ -0,0 +1 @@
+The Edit Runtime form now supports multi-line environment variables.

package.json

@@ -25,49 +25,49 @@
   },
   "dependencies": {
     "@apollo/client": "3.13.8",
-    "@hpcc-js/wasm": "2.23.0",
+    "@hpcc-js/wasm": "2.24.3",
     "@lumino/default-theme": "2.1.10",
     "@lumino/widgets": "2.7.1",
     "@mdi/js": "7.4.47",
-    "@vueuse/core": "13.3.0",
+    "@vueuse/core": "13.5.0",
     "apexcharts": "3.54.1",
-    "axios": "1.9.0",
+    "axios": "1.10.0",
     "dedent": "1.6.0",
     "enumify": "2.0.0",
-    "graphiql": "4.1.1",
+    "graphiql": "4.1.2",
     "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.8",
-    "simple-icons": "15.1.0",
+    "preact": "10.26.9",
+    "simple-icons": "15.2.0",
     "subscriptions-transport-ws": "0.11.0",
     "svg-pan-zoom": "3.6.2",
-    "vue": "3.5.16",
-    "vue-i18n": "11.1.3",
+    "vue": "3.5.17",
+    "vue-i18n": "11.1.5",
     "vue-router": "4.5.1",
     "vue-the-mask": "0.11.1",
     "vue3-apexcharts": "1.8.0",
-    "vuetify": "3.8.8",
+    "vuetify": "3.9.0",
     "vuex": "4.1.0"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.14.4",
-    "@vitejs/plugin-react": "4.5.1",
+    "@cypress/code-coverage": "3.14.5",
+    "@vitejs/plugin-react": "4.6.0",
     "@vitejs/plugin-vue": "5.2.4",
-    "@vitest/coverage-istanbul": "3.2.2",
+    "@vitest/coverage-istanbul": "3.2.4",
     "@vue/test-utils": "2.4.6",
-    "concurrently": "9.1.2",
+    "concurrently": "9.2.0",
     "cross-fetch": "4.1.0",
-    "cypress": "14.4.1",
+    "cypress": "14.5.1",
     "cypress-vite": "1.6.0",
     "eslint": "8.57.1",
     "eslint-config-standard": "17.1.0",
     "eslint-plugin-compat": "4.2.0",
     "eslint-plugin-cypress": "2.15.2",
-    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-import": "2.32.0",
     "eslint-plugin-n": "16.6.2",
     "eslint-plugin-no-only-tests": "3.3.0",
     "eslint-plugin-promise": "6.6.0",
@@ -80,14 +80,14 @@
     "json-server": "0.17.4",
     "nodemon": "3.1.10",
     "nyc": "17.1.0",
-    "sass-embedded": "1.89.0",
-    "sinon": "20.0.0",
+    "sass-embedded": "1.89.2",
+    "sinon": "21.0.0",
     "standard": "17.1.2",
     "vite": "6.3.5",
     "vite-plugin-eslint": "1.8.1",
-    "vite-plugin-istanbul": "7.0.0",
+    "vite-plugin-istanbul": "7.1.0",
     "vite-plugin-vuetify": "2.1.1",
-    "vitest": "3.2.2"
+    "vitest": "3.2.4"
   },
   "peerDependenciesMeta": {
     "react": {

src/components/cylc/Drawer.vue

@@ -87,7 +87,7 @@ import Header from '@/components/cylc/Header.vue'
 import Workflows from '@/views/Workflows.vue'
 import { mdiHome, mdiInformationOutline } from '@mdi/js'
 import pkg from '@/../package.json'
-import { when } from '@/utils'
+import { when } from '@/utils/reactivity'
 import { useDrawer } from '@/utils/toolbar'
 
 export const initialWidth = 260

src/components/cylc/EventChip.vue

@@ -0,0 +1,51 @@
+<!--
+Copyright (C) NIWA & British Crown (Met Office) & Contributors.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <v-chip size="x-small" v-bind="props">{{ level }}</v-chip>
+</template>
+
+<script>
+export default {
+  name: 'LogLevelChip',
+
+  props: {
+    level: {
+      type: String,
+      required: true,
+    },
+  },
+
+  computed: {
+    props () {
+      if (this.level === 'CRITICAL') {
+        return { color: 'red', variant: 'flat' }
+      }
+      if (this.level === 'ERROR') {
+        return { color: 'red-darken-4', variant: 'flat' }
+      }
+      if (this.level === 'WARNING') {
+        return { color: 'amber-darken-4', variant: 'flat' }
+      }
+      if (this.level === 'INFO') {
+        return { color: 'grey', variant: 'flat' }
+      }
+      return { color: 'grey', variant: 'outlined' }
+    }
+  }
+}
+</script>

src/components/cylc/Info.vue

@@ -84,6 +84,42 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         </v-expansion-panel-text>
       </v-expansion-panel>
 
+      <v-expansion-panel class="run-mode-panel">
+        <v-expansion-panel-title color="blue-grey-lighten-2">
+          Run Mode
+        </v-expansion-panel-title>
+        <v-expansion-panel-text>
+          <v-icon>{{ runModeIcon }}</v-icon>  {{ runMode }}
+        </v-expansion-panel-text>
+      </v-expansion-panel>
+
+      <v-expansion-panel
+        v-if="xtriggers.length"
+        class="xtriggers-panel"
+      >
+        <v-expansion-panel-title color="blue-grey-lighten-1">
+          Xtriggers
+        </v-expansion-panel-title>
+        <v-expansion-panel-text>
+          <v-table density="compact">
+            <thead>
+              <tr>
+                <th>Label</th>
+                <th>ID</th>
+                <th>Is satisfied</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="xt in xtriggers" :key="xt.id">
+                <td>{{ xt.label }}</td>
+                <td>{{ xt.id }}</td>
+                <td><v-icon>{{ xt.satisfactionIcon }}</v-icon></td>
+              </tr>
+            </tbody>
+          </v-table>
+          </v-expansion-panel-text>
+      </v-expansion-panel>
+
       <!-- The prereqs -->
       <v-expansion-panel class="prerequisites-panel">
         <v-expansion-panel-title color="blue-grey-lighten-2">
@@ -169,6 +205,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { useJobTheme } from '@/composables/localStorage'
 import GraphNode from '@/components/cylc/GraphNode.vue'
 import { formatCompletion } from '@/utils/outputs'
+import {
+  mdiSkipForward,
+  mdiChatQuestion,
+  mdiGhostOutline,
+  mdiPlay,
+  mdiDramaMasks,
+  mdiCheckboxOutline,
+  mdiCheckboxBlankOutline
+} from '@mdi/js'
+import { cloneDeep } from 'lodash-es'
 
 export default {
   name: 'InfoComponent',
@@ -226,6 +272,47 @@ export default {
     completion () {
       // Task output completion expression stuff.
       return this.task?.node?.runtime.completion
+    },
+
+    runModeIcon () {
+      // Task Run Mode:
+      if (this.task?.node?.runtime.runMode === 'Skip') {
+        return mdiSkipForward
+      } else if (this.task?.node?.runtime.runMode === 'Live') {
+        return mdiPlay
+      } else if (this.task?.node?.runtime.runMode === 'Simulation') {
+        return mdiGhostOutline
+      } else if (this.task?.node?.runtime.runMode === 'Dummy') {
+        return mdiDramaMasks
+      }
+      return mdiChatQuestion
+    },
+
+    runMode () {
+      // Task Run Mode:
+      return this.task?.node?.runtime.runMode
+    },
+
+    xtriggers () {
+      const xtriggers = this.task?.node?.xtriggers?.map((item) => {
+        const xtrigger = cloneDeep(item)
+        xtrigger.satisfactionIcon = xtrigger.satisfied ? mdiCheckboxOutline : mdiCheckboxBlankOutline
+        // Extract the trigger time from the ID
+        // Since we've created this date from a Unix timestamp, we can safely assume it is in UTC:
+        xtrigger.id = xtrigger.id.replace(
+          /trigger_time=(?<unixTime>[0-9.]+)/,
+          (match, p1) => `trigger_time=${new Date(p1 * 1000).toISOString().slice(0, -5)}Z`
+        )
+        return xtrigger
+      })
+      // Sort the xtriggers by label, then by ID:
+      xtriggers.sort(function (a, b) {
+        if (a.label === b.label) {
+          return a.id > b.id ? 1 : -1
+        }
+        return a.label > b.label ? 1 : -1
+      })
+      return xtriggers
     }
 
   },

src/components/cylc/WarningIcon.vue

@@ -17,39 +17,67 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 <!--
     WarningIcon - A dismiss-able warning icon
+
+    states:
+    * no warnings: grey + translucent
+    * new warnings: yellow
+    * warnings dismissed: grey
 -->
 
 <template>
   <span
     class="c-warn"
-    style="display:inline-block; vertical-align:middle"
+    :class="{'active': workflow.node.warningActive}"
+    style="display: inline-block;"
   >
     <v-tooltip
       :activator="null"
       location="bottom"
-      :disabled="!message"
+      :disabled="!workflow.node.logRecords?.length"
     >
       <template
         v-slot:activator="{ props }"
       >
+        <!-- NOTE: the click.prevent suppresses router navigation -->
         <svg
           viewBox="0 0 100 100"
           v-bind="props"
           @click="deactivate"
+          @click.prevent
+          style="
+            vertical-align: middle;
+            cursor: pointer;
+          "
+          :style="[workflow.node.logRecords?.length ? {opacity: 1} : {opacity: 0.3}]"
         >
           <path
-            :d="path()"
-            :stroke-width="strokeWidth()"
-            v-bind:class="{'active': active}"
+            :d="$options.path"
+            :stroke-width="$options.strokeWidth"
+            v-bind:class="{'active': workflow.node.warningActive}"
           />
         </svg>
       </template>
-      <span>{{ message }}</span>
+      Recent warnings (click to dismiss):
+      <table>
+        <tr
+          v-for="(event, index) in (workflow.node.logRecords || []).slice().reverse()"
+          :key="index"
+        >
+          <td style="padding-right: 0.5em; vertical-align: top;">
+            <EventChip :level="event.level" />
+          </td><td>
+            <span>{{ event.message }}</span>
+          </td>
+        </tr>
+      </table>
     </v-tooltip>
   </span>
 </template>
 
 <script>
+import EventChip from '@/components/cylc/EventChip.vue'
+import { store } from '@/store/index'
+
 /* stuff we want to do once, when the component is loaded, rather than
  * every time it is used. */
 // stroke
@@ -85,34 +113,25 @@ function pathJoin (list) {
 }
 
 export default {
-  name: 'Warning',
-  data: function () {
-    return {
-      active: this.startActive
-    }
+  name: 'WarningIcon',
+
+  components: {
+    EventChip,
   },
+
   props: {
-    message: {
-      type: String,
-      required: false
-    },
-    startActive: {
-      type: Boolean,
-      required: false
+    workflow: {
+      required: true,
     }
   },
-  methods: {
-    path () {
-      return PATH
-    },
 
-    strokeWidth () {
-      return sw
+  methods: {
+    deactivate () {
+      store.commit('workflows/UPDATE', { id: this.workflow.id, warningActive: false })
     },
+  },
 
-    deactivate () {
-      this.active = false
-    }
-  }
+  strokeWidth: sw,
+  path: PATH,
 }
 </script>