Skip to content

fix visium lp cytAssist hp external barcode format #1198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khelwood merged 3 commits into from
May 14, 2026
Merged

fix visium lp cytAssist hp external barcode format #1198

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9caeafb
fix visium lp cytAssist hp external barcode format
sabrine33 May 14, 2026
3ff7e8d
update error message
sabrine33 May 14, 2026
bfe212e
update error message
sabrine33 May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/components/slotMapper/MultipleLabwareSlotMapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import WhiteButton from '../buttons/WhiteButton';
import SlotMapperTable, { SlotMapperTableProps } from './SlotMapperTable';
import Warning from '../notifications/Warning';
import { useFormikContext } from 'formik';
import { CytAssistOutputLabwareForm } from '../../pages/CytAssist';
import { CytAssistOutputLabwareForm, isVisiumLpCytAssistHdLabware } from '../../pages/CytAssist';
import { flaggedLabwareLayout } from '../../lib/factories/labwareFactory';
import { eventBus } from '../../eventBus';
import { SavedDraft } from '../../lib/machines/slotCopy/slotCopyMachine';
Expand All @@ -47,17 +47,17 @@ type SelectedSlot = {
type SlotPassFail = Map<string, Set<SlotPassFailFieldsFragment>>; // key labware barcode, failedSlots array of failed slots

const validatePreBarcode = (preBarcode: string, labwareType: string) => {
if (labwareType === LabwareTypeName.VISIUM_LP_CYTASSIST_HD) {
if (isVisiumLpCytAssistHdLabware(labwareType)) {
const isValid = /^[A-Z0-9]{2}-[A-Z0-9]{7}$/.test(preBarcode);
return {
valid: isValid,
errorMessage: isValid ? undefined : 'Invalid format for VISIUM LP CYTASSIST HD. Example: H1-9D8VN2V'
errorMessage: isValid ? undefined : `Invalid format for ${labwareType}. Example: H1-9D8VN2V`
};
}
const isValid = /^[A-Z]\d{2}[A-Z]\d{2}-\d{7}-\d{2}-\d{2}$/.test(preBarcode);
return {
valid: isValid,
errorMessage: isValid ? undefined : 'Invalid format. Example: V42A20-3752023-10-20'
errorMessage: isValid ? undefined : `Invalid format for ${labwareType}. Example: V42A20-3752023-10-20`
};
};

Expand Down
20 changes: 16 additions & 4 deletions src/pages/CytAssist.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,30 @@ const isCytAssistThreePointLabware = (labwareType: string) => {
);
};

export const isVisiumLpCytAssistHdLabware = (labwareType: string) => {
return (
labwareType === LabwareTypeName.VISIUM_LP_CYTASSIST_HD ||
labwareType === LabwareTypeName.VISIUM_LP_CYTASSIST_HD_11 ||
labwareType === LabwareTypeName.VISIUM_LP_CYTASSIST_HD_3_6_5 ||
labwareType === LabwareTypeName.VISIUM_LP_CYTASSIST_HD_3_11
);
};

const validationSchema = () => {
return Yup.object().shape({
labwareType: Yup.string().required('Required field'),
preBarcode: Yup.string().when('labwareType', (labwareType, schema) => {
const val = labwareType[0] as unknown as string;
return val === LabwareTypeName.VISIUM_LP_CYTASSIST_HD
const lt = labwareType[0] as unknown as string;
return isVisiumLpCytAssistHdLabware(lt)
? Yup.string()
.required('Required field')
.matches(/[A-Z0-9]{2}-[A-Z0-9]{7}/, 'Invalid format for a labware type of VISIUM_LP_CYTASSIST_HD')
.matches(/[A-Z0-9]{2}-[A-Z0-9]{7}/, `Invalid format for ${labwareType}. Example: H1-9D8VN2V`)
: Yup.string()
.required('Required field')
.matches(/[A-Z]\d{2}[A-Z]\d{2}-\d{7}-\d{2}-\d{2}/, 'Invalid format for this labware type');
.matches(
/[A-Z]\d{2}[A-Z]\d{2}-\d{7}-\d{2}-\d{2}/,
`Invalid format for ${labwareType}. Example: H1-9D8VN2V`
);
}),
lpNumber: Yup.string().oneOf(LP_NUMBERS).required('Required field'),
costing: Yup.string().required('Required field'),
Expand Down
Loading