Feature color cylc message bubbles

cypress/component/viewMessageChip.cy.js

@@ -0,0 +1,48 @@
+/**
+ * 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/>.
+ */
+
+import MessageChip from '@/components/cylc/MessageChip.vue'
+
+describe('View MessageChip Component', () => {
+  const mountMessageChip = (props) => {
+    cy.vmount(
+      MessageChip,
+      {
+        props
+      }
+    ).as('wrapper')
+    // add the classes Vuetify requires
+    cy.addVuetifyStyles(cy)
+  }
+
+  it('checks messageChip colors', () => {
+    // mount the toolbar with a couple of controls
+    mountMessageChip(
+      {
+        level: 'this is a debug message',
+        message: 'Task Message :this is a debug message',
+        isMessage: true
+      }
+    )
+
+    // are the messages the correct colours?
+    cy
+      .get('.v-chip')
+      .should('have.class', 'bg-blue')
+      .contains('this is a debug message')
+  })
+})

src/components/cylc/MessageChip.vue

@@ -0,0 +1,56 @@
+<!--
+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>
+  <div>
+    <v-tooltip :activator="null">
+      <template v-slot:activator="{ props }">
+        <v-chip
+          v-bind="props"
+          :class="chipClass"
+          class="ml-2 message-output"
+          size="small"
+        >
+          {{ level }}
+        </v-chip>
+      </template>
+      <span>{{ message }}</span>
+    </v-tooltip>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+const props = defineProps({
+  level: String,
+  message: String,
+  isMessage: Boolean
+})
+
+const classMap = new Map([
+  ['DEBUG', ''],
+  ['INFO', 'bg-grey'],
+  ['WARNING', 'bg-warning'],
+  ['ERROR', 'bg-error'],
+  ['CRITICAL', 'bg-black font-weight-bold'],
+])
+
+const chipClass = computed(() => (
+  classMap.get(props.level) ?? (props.isMessage ? 'bg-grey-lighten-5' : 'bg-grey')
+))
+
+</script>

src/components/cylc/tree/TreeItem.vue

@@ -115,29 +115,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               prefix).
               @see https://github.com/cylc/cylc-ui/pull/530#issuecomment-781076619
             -->
-            <v-tooltip
+            <MessageChip
               v-for="(customOutput, index) of [...jobMessageOutputs].slice(0, 5)"
               :key="`output-chip-${index}`"
-              :activator="null"
-            >
-              <template v-slot:activator="{ props }">
-                <v-chip
-                  v-bind="props"
-                  :class="customOutput.isMessage ? 'bg-light-grey text-black' : 'bg-grey text-white'"
-                  class="ml-2 message-output"
-                  size="small"
-                >
-                  {{ customOutput.label }}
-                </v-chip>
-              </template>
-              <span>{{ customOutput.message }}</span>
-            </v-tooltip>
+              :level="customOutput.level"
+              :message="customOutput.message"
+              :isMessage="customOutput.isMessage"
+              location="bottom">
+            </MessageChip>
             <v-chip
               v-if="jobMessageOutputs.length > 5"
               class="ml-2 bg-grey text-white"
               size="small"
               link
               @click="toggleExpandCollapse"
+              data-cy="chip-overflow"
             >
               +{{ jobMessageOutputs.length - 5 }}
             </v-chip>
@@ -229,6 +221,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { mdiChevronRight } from '@mdi/js'
 import Task from '@/components/cylc/Task.vue'
 import Job from '@/components/cylc/Job.vue'
+import MessageChip from '@/components/cylc/MessageChip.vue'
 import { WorkflowState } from '@/model/WorkflowState.model'
 import {
   formatDuration,
@@ -261,7 +254,8 @@ export default {
 
   components: {
     Task,
-    Job
+    Job,
+    MessageChip
   },
 
   props: {

src/utils/tasks.js

@@ -71,7 +71,8 @@ function jobMessageOutputs (jobNode) {
   const ret = []
   let messageOutput
 
-  for (const message of jobNode.node.messages || []) {
+  for (const messageString of jobNode.node.messages || []) {
+    const [level, message] = messageString.split(':')
     if (TASK_OUTPUT_NAMES.includes(message)) {
       continue
     }
@@ -88,6 +89,7 @@ function jobMessageOutputs (jobNode) {
     } else {
       // add a message to the list and make it look like an output
       ret.push({
+        level,
         label: message,
         message: `Task Message: ${message}`,
         isMessage: true

tests/e2e/specs/tree.cy.js

@@ -163,17 +163,16 @@ describe('Tree view', () => {
       .should('be.visible')
 
       // the first job should have 5 outputs (the maximum number we display)
-      .first()
+      .first().as('firstJobNode')
       .find('.message-output')
       .should('have.length', 5)
 
       // the remainder should be referenced in an overflow counter +2
-      .parent()
+      .get('@firstJobNode')
+      .find('[data-cy=chip-overflow]')
       .contains('+2')
-      .parent()
-      .parent()
-      .parent()
-      .parent()
+      .parents('.treeitem')
+      .first()
 
       // expand the job details node
       .find('.node-expand-collapse-button')