Merge pull request #244 from wtsi-npg/devel

Merge Release 2.4.0

.github/dependabot.yml

@@ -0,0 +1,10 @@
+# Referenced from:
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

CHANGELOG.md

@@ -5,6 +5,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [2.4.0] - 2024-10-17
+
+### Added
+
+* Added .github/dependabot.yml file to auto-update GitHub actions
+* Clickable icon next to run names to change to the view of all wells in that run
+
+### Removed
+
+* Retired publishing of OpenAPI docs to Github page. It has been broken for more than a year.
+
 ## [2.3.0] - 2024-07-30
 
 ### Added

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npg-longue-vue",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "UI for LangQC",
   "author": "Kieron Taylor <[email protected]>",
   "license": "GPL-3.0-or-later",

frontend/src/components/WellTable.vue

@@ -3,16 +3,18 @@
 * Renders a table for a list of wells and generates buttons for selecting wells
 */
 import { combineLabelWithPlate, listStudiesForTooltip } from "../utils/text.js"
-import { ElTooltip, ElButton } from "element-plus";
+import { ElTooltip, ElButton } from "element-plus"
+import { Top } from "@element-plus/icons-vue"
 
 const tooltipDelay = 500
 const studyNameHighlight = 'BIOSCAN UK for flying insects'
 
 defineProps({
-  wellCollection: Object
+  wellCollection: Object,
+  allowNav: Boolean,
 })
 
-defineEmits(['wellSelected'])
+defineEmits(['wellSelected', 'runSelected'])
 </script>
 
 <template>
@@ -30,7 +32,7 @@ defineEmits(['wellSelected'])
       <th>Well time complete</th>
     </tr>
     <tr :key="wellObj.id_product" v-for="wellObj in wellCollection">
-      <td :id="wellObj.run_name">{{ wellObj.run_name }}</td>
+      <td :id="wellObj.run_name">{{ wellObj.run_name }}<el-icon v-if="allowNav" :size="10" v-on:click="$emit('runSelected', wellObj.run_name)"><Top /></el-icon></td>
       <td class="well_selector">
         <el-tooltip placement="top" effect="light" :show-after="tooltipDelay"
           :content="'<span>'.concat(listStudiesForTooltip(wellObj.study_names)).concat('</span>')"

frontend/src/components/__tests__/WellTable.spec.js

@@ -74,4 +74,15 @@ describe('Rows of data give rows in the table', () => {
     expect(wellButton.classes('el-tooltip__trigger')).toBeTruthy()
     expect(wellButton.classes('el-button--warning')).toBeTruthy()
   })
+
+  test('No run selection icons appear by default', () => {
+    expect(() => table.get('el-icon')).toThrowError()
+  })
+
+  test('Setting allowNav property causes buttons to appear', async () => {
+    await table.setProps({'allowNav': true})
+    let icon = table.get('el-icon')
+    await icon.trigger('click')
+    expect(table.emitted().runSelected[0][0]).toEqual('TEST1')
+  })
 })

frontend/src/views/WellsByStatus.vue

@@ -128,6 +128,10 @@ function updateUrlQuery(newParams) {
   }
 }
 
+function showRun(runName) {
+  router.push({ name: 'WellsByRun', params: { runName: [runName] } })
+}
+
 onMounted(() => {
   // If there are no query properties in the URL, we can "redirect" to a
   // sensible default
@@ -141,7 +145,7 @@ onMounted(() => {
 <template>
   <el-tabs v-model="activeTab" type="border-card" @tab-change="clickTabChange">
     <el-tab-pane v-for="tab in appConfig.qc_flow_statuses" :key="tab.param" :label="tab.label" :name="tab.param">
-      <WellTable :wellCollection="wellCollection" @wellSelected="updateUrlQuery"/>
+      <WellTable allowNav :wellCollection="wellCollection" @wellSelected="updateUrlQuery" @runSelected="showRun"/>
     </el-tab-pane>
     <el-pagination v-model:currentPage="activePage" layout="prev, pager, next" v-bind:total="totalNumberOfWells"
       background :pager-count="5" :page-size="pageSize" :hide-on-single-page="true"