[LIMS-360] Fix: Show sample groups with no samples (#497)

* Merge 2023-R1.8 into master (#486)

* LIMS-213: Update regex to enable creating Block-4 containers

* LIMS-405: Update list of container types to include block-4 as a puck

* LIMS-216: Fix message for industrial archived visits

* Processing results aren't deleted from disk

* Data from SW visits are archived, not deleted

* Make clearer the status of raw data

* LIMS-449: Left-align column headings in data processing tables

* LIMS-453: Email container owners as well as dewar lab contacts when a dewar returns to the dewar store

* LIMS-475: Assign SCHEDULINGRESTRICTIONS to

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Richard Gildea <[email protected]>
Co-authored-by: NKatti2011 <[email protected]>

* LIMS-558: Set country as the lab contact country (#495)

* Add Joins and adjust JS accordingly

---------

Co-authored-by: Matthew Pritchard <[email protected]>
Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Richard Gildea <[email protected]>
Co-authored-by: NKatti2011 <[email protected]>
Co-authored-by: John Holt <[email protected]>
Co-authored-by: Shah, Hussain (-,RAL,LSCI) <[email protected]>

api/src/Page/Sample.php

@@ -2357,8 +2357,8 @@ function _sample_groups() {
                 $from_table = 'FROM blsamplegroup bsg';
                 $joins = '
                     LEFT JOIN blsamplegroup_has_blsample bshg ON bshg.blsamplegroupid = bsg.blsamplegroupid
-                    INNER JOIN blsample bs on bshg.blsampleid = bs.blsampleid
-                    INNER JOIN container c on bs.containerid = c.containerid
+                    LEFT JOIN blsample bs on bshg.blsampleid = bs.blsampleid
+                    LEFT JOIN container c on bs.containerid = c.containerid
                 ';
                 $group_by .= 'GROUP BY bsg.blsamplegroupid';
 

client/src/js/modules/samples/components/sample-groups.vue

@@ -167,15 +167,15 @@ export default {
         const uniqueContainer = {}
 
         this.groups = result.map(group => {
-          const containerList = group['CONTAINERIDS'].split(',')
+          const containerList = group['CONTAINERIDS']? group['CONTAINERIDS'].split(',') : []
           containerList.forEach(container => {
             uniqueContainer[container] = container
           })
 
           return {
             ...group,
             CONTAINERIDS: containerList,
-            CONTAINERS: group['CONTAINERS'].replace(/,/g, ', ')
+            CONTAINERS: group['CONTAINERS']? group['CONTAINERS'].replace(/,/g, ', '): group['CONTAINERS']
           }
         })