From e5b1c60055fc43c48f0cf10a108db8a5b6f882aa Mon Sep 17 00:00:00 2001 From: sabrine33 Date: Thu, 12 Mar 2026 12:22:33 +0000 Subject: [PATCH 1/2] update region name to use barcode instead of sgpNumber --- src/components/xeniumAnalyser/RegionDefiner.tsx | 4 ++-- src/pages/XeniumAnalyser.tsx | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/xeniumAnalyser/RegionDefiner.tsx b/src/components/xeniumAnalyser/RegionDefiner.tsx index c68137f1f..4af21a1a6 100644 --- a/src/components/xeniumAnalyser/RegionDefiner.tsx +++ b/src/components/xeniumAnalyser/RegionDefiner.tsx @@ -167,7 +167,7 @@ const RegionDefiner = ({ labwareIndex }: RegionDefinerProps) => { ...labware, selectedAddresses: undefined, selectedRegionColorIndex: undefined, - regions: reIndexAndRenameRegions(regions, runName, sgpNumber) + regions: reIndexAndRenameRegions(regions, runName, labware.labware.barcode) } : labware ) @@ -236,7 +236,7 @@ const RegionDefiner = ({ labwareIndex }: RegionDefinerProps) => { regions: reIndexAndRenameRegions( [...remainingRegions, ...splitSectionsIntoRegions], values.runName, - labware.workNumber + labware.labware.barcode ) } : labware diff --git a/src/pages/XeniumAnalyser.tsx b/src/pages/XeniumAnalyser.tsx index f84dd7514..b7749bcb2 100644 --- a/src/pages/XeniumAnalyser.tsx +++ b/src/pages/XeniumAnalyser.tsx @@ -115,13 +115,13 @@ type BarcodeDisplayerProps = { warningMessage?: string; }; -export const reIndexAndRenameRegions = (regions: Region[], runName: string, sgpNumber: string): Array => { +export const reIndexAndRenameRegions = (regions: Region[], runName: string, barcode: string): Array => { let index = 0; return regions.map((region) => { const roi: string = region.sectionGroups.length === 1 && region.sectionGroups[0].source.tissue?.externalName ? region.sectionGroups[0].source.tissue.externalName - : [sgpNumber, runName, `Region${index++ + 1}`].filter(Boolean).join('_'); + : [barcode, runName, `Region${index++ + 1}`].filter(Boolean).join('_'); return { ...region, roi: roi @@ -452,7 +452,7 @@ const XeniumAnalyser = () => { ...lw, workNumber, hasSgpNumberLink, - regions: reIndexAndRenameRegions(lw.regions, prev.runName, workNumber) + regions: reIndexAndRenameRegions(lw.regions, prev.runName, lw.labware.barcode) })) }; }); @@ -477,7 +477,7 @@ const XeniumAnalyser = () => { runName, labware: prev.labware.map((lw) => ({ ...lw, - regions: reIndexAndRenameRegions(lw.regions, runName, lw.workNumber) + regions: reIndexAndRenameRegions(lw.regions, runName, lw.labware.barcode) })) })); } @@ -573,7 +573,7 @@ const XeniumAnalyser = () => { regions: reIndexAndRenameRegions( lw.regions, prev.runName, - workNumber + lw.labware.barcode ) } ) From cd88b91af17389064f49c9d36412e1772846e062 Mon Sep 17 00:00:00 2001 From: sabrine33 Date: Thu, 12 Mar 2026 13:21:33 +0000 Subject: [PATCH 2/2] update tests accordingly --- cypress/e2e/pages/xeniumAnalyser.cy.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/pages/xeniumAnalyser.cy.ts b/cypress/e2e/pages/xeniumAnalyser.cy.ts index 6c393a54b..b7e2464ae 100644 --- a/cypress/e2e/pages/xeniumAnalyser.cy.ts +++ b/cypress/e2e/pages/xeniumAnalyser.cy.ts @@ -113,7 +113,7 @@ describe('Xenium Analyser', () => { cy.findByTestId('STAN-3111-regions-table').get('tbody tr').should('have.length', 4); }); it('updates the region name accordingly', () => { - cy.findByText('SGP1009_Region1').should('be.visible'); + cy.findByText('STAN-3111_Region1').should('be.visible'); }); }); @@ -133,7 +133,7 @@ describe('Xenium Analyser', () => { cy.findByTestId('STAN-3111-regions-table').get('tbody tr').should('have.length', 5); }); it('renames the region of interest with the sample external id', () => { - cy.findByText('SGP1009_Region1').should('not.exist'); + cy.findByText('STAN-3111_Region1').should('not.exist'); }); }); });