Skip to content

Commit

Permalink
Merge pull request #278 from FNNDSC/case-sensitive
Browse files Browse the repository at this point in the history
Case sensitive plugin names
  • Loading branch information
jennydaman authored Jul 7, 2021
2 parents 095d947 + 985b0fe commit 8887970
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/containers/Layout/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const Header: React.FC<IHeaderProps> = ({ onNavToggle, user }: IHeaderProps) =>
<React.Fragment>
<Brand src={brandImg} alt="ChRIS Logo" />
<Badge key={4} style={BadgeStyle}>
<span>Version: 1.4.6</span>
<span>Version: 1.4.7</span>
</Badge>
<Badge key={3} style={BadgeStyle}>
<span>
Expand Down
6 changes: 3 additions & 3 deletions src/store/workflows/setup/create workflows/fastsurfer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function* runFastsurferWorkflow(
imageFile: "'m:%_nospc|-_ProtocolName.jpg'",
imageScale: "3:none",
};
const pfdicomTagExtract = pluginList["pl-pfdicom_tagextract"];
const pfdicomTagExtract = pluginList["pl-pfdicom_tagExtract"];

yield client.createPluginInstance(
pfdicomTagExtract.data.id,
Expand All @@ -32,7 +32,7 @@ export function* runFastsurferWorkflow(
tagInfo:
"'PatientName:%_name|patientID_PatientName ++ PatientID:%_md5|7_PatientID ++ PatientID:%_md5|7_PatientID ++ AccessionNumber:%_md5|8_AccessionNumber ++ PatientBirthDate:%_strmsk|******01_PatientBirthDate ++ re:.*hysician:%_md5|4_#tag ++ re:.*stitution:#tag ++ re:.*stitution:#tag'",
};
const pfdicomTagSub = pluginList["pl-pfdicom_tagsub"];
const pfdicomTagSub = pluginList["pl-pfdicom_tagSub"];
const pfdicomTagSubInstance: PluginInstance =
yield client.createPluginInstance(pfdicomTagSub.data.id, pfdicomTagSubArgs);

Expand Down Expand Up @@ -101,7 +101,7 @@ export function* runFastsurferWorkflow(
};
yield client.createPluginInstance(plPfdoRun.data.id, plPfdoRunArgs);

const plMgz2LutReport = pluginList["pl-mgz2lut_report"];
const plMgz2LutReport = pluginList["pl-mgz2LUT_report"];
const plMgz2LutReportArgs = {
title: "aseg-report",
previous_id: plFastsurferInstance.data.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function* runFetalReconstructionWorkflow(
);

const plAntsN4BiasFieldCorrection =
pluginList["pl-ants_n4biasfieldcorrection"];
pluginList["pl-ANTs_N4BiasFieldCorrection"];
const plAntsN4BiasFieldCorrectionArgs = {
previous_id: plFetalBrainMaskInstance.data.id,
inputPathFilter: "extracted/0.0/*.nii",
Expand Down
6 changes: 3 additions & 3 deletions src/store/workflows/setup/create workflows/freesurfer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function* runFreesurferWorkflow(
imageFile: "m:%_nospc|-_ProtocolName.jpg",
imageScale: "3:none",
};
const pfdicomTagExtract = pluginList["pl-pfdicom_tagextract"];
const pfdicomTagExtract = pluginList["pl-pfdicom_tagExtract"];

yield client.createPluginInstance(
pfdicomTagExtract.data.id,
Expand All @@ -33,7 +33,7 @@ export function* runFreesurferWorkflow(
tagInfo:
"'PatientName:%_name|patientID_PatientName ++ PatientID:%_md5|7_PatientID ++ PatientID:%_md5|7_PatientID ++ AccessionNumber:%_md5|8_AccessionNumber ++ PatientBirthDate:%_strmsk|******01_PatientBirthDate ++ re:.*hysician:%_md5|4_#tag ++ re:.*stitution:#tag ++ re:.*stitution:#tag'",
};
const pfdicomTagSub = pluginList["pl-pfdicom_tagsub"];
const pfdicomTagSub = pluginList["pl-pfdicom_tagSub"];
const pfdicomTagSubInstance: PluginInstance =
yield client.createPluginInstance(pfdicomTagSub.data.id, pfdicomTagSubArgs);

Expand Down Expand Up @@ -108,7 +108,7 @@ export function* runFreesurferWorkflow(
};
yield client.createPluginInstance(plPfdoRun.data.id, plPfdoRunArgs);

const plMgz2LutReport = pluginList["pl-mgz2lut_report"];
const plMgz2LutReport = pluginList["pl-mgz2LUT_report"];
const plMgz2LutReportArgs = {
title: "segmentation-report",
previous_id: plFsHackInstance.data.id,
Expand Down
20 changes: 10 additions & 10 deletions src/store/workflows/setup/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -246,39 +246,39 @@ export function* setupCovidnet(action: IActionTypeParam) {
export function* setupInfantFreesurfer(action: IActionTypeParam) {
const infantFreesurferPlugins = [
"pl-dircopy",
"pl-pfdicom_tagsub",
"pl-pfdicom_tagextract",
"pl-pfdicom_tagSub",
"pl-pfdicom_tagExtract",
"pl-fshack-infant",
"pl-multipass",
"pl-pfdorun",
"pl-mgz2lut_report",
"pl-mgz2LUT_report",
];
yield setupFeedDetails(action, infantFreesurferPlugins, "infant-freesurfer");
}

export function* setupAdultFreesurfer(action: IActionTypeParam) {
const adultFreesurferPlugins: string[] = [
"pl-dircopy",
"pl-pfdicom_tagsub",
"pl-pfdicom_tagextract",
"pl-pfdicom_tagSub",
"pl-pfdicom_tagExtract",
"pl-fshack",
"pl-multipass",
"pl-pfdorun",
"pl-mgz2lut_report",
"pl-mgz2LUT_report",
];
yield setupFeedDetails(action, adultFreesurferPlugins, "adult-freesurfer");
}

export function* setupFastsurfer(action: IActionTypeParam) {
const fastsurferPlugins = [
"pl-dircopy",
"pl-pfdicom_tagextract",
"pl-pfdicom_tagsub",
"pl-pfdicom_tagExtract",
"pl-pfdicom_tagSub",
"pl-fshack",
"pl-fastsurfer_inference",
"pl-multipass",
"pl-pfdorun",
"pl-mgz2lut_report",
"pl-mgz2LUT_report",
];
yield setupFeedDetails(action, fastsurferPlugins, "fastsurfer");
}
Expand All @@ -287,7 +287,7 @@ export function* setupFetalReconstruction(action: IActionTypeParam) {
const fetalReconstructionPlugins = [
"pl-dircopy",
"pl-fetal-brain-mask",
"pl-ants_n4biasfieldcorrection",
"pl-ANTs_N4BiasFieldCorrection",
"pl-fetal-brain-assessment",
"pl-irtk-reconstruction",
];
Expand Down

0 comments on commit 8887970

Please sign in to comment.