Skip to content

Commit d63c596

Browse files
authored
feat: 1896 purity for seedlot screen impurity section (#2074)
1 parent 1981356 commit d63c596

File tree

22 files changed

+1023
-210
lines changed

22 files changed

+1023
-210
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import ApiConfig from '../ApiConfig';
2+
import api from '../api';
3+
import { ImpurityPayload, RichImpurityType } from '../../views/CONSEP/TestingActivities/PurityContent/definitions';
4+
5+
export const patchImpurities = (
6+
riaKey: string,
7+
payload: ImpurityPayload
8+
) => {
9+
const url = `${ApiConfig.purityTest}/debris/${riaKey}`;
10+
return api.patch(url, payload).then((res): RichImpurityType[] => res.data);
11+
};
12+
13+
export const deleteImpurity = (
14+
riaKey: string,
15+
replicateNumber: string,
16+
debrisRank: string
17+
) => {
18+
const url = `${ApiConfig.purityTest}/debris/${riaKey}/${replicateNumber}/${debrisRank}`;
19+
return api.delete(url).then((res): RichImpurityType[] => res.data);
20+
};

frontend/src/api-service/testingActivitiesAPI.ts renamed to frontend/src/api-service/consep/testingActivitiesAPI.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import ApiConfig from './ApiConfig';
2-
import api from './api';
3-
import { ReplicateType, TestingTypes } from '../types/consep/TestingActivityType';
1+
import ApiConfig from '../ApiConfig';
2+
import api from '../api';
3+
import { ReplicateType, TestingTypes } from '../../types/consep/TestingActivityType';
44

55
type TestingParams = Record<string, any>;
66

frontend/src/views/CONSEP/TestingActivities/ActivityResult/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { AxiosError } from 'axios';
88

99
import GenericTable from '../../../../components/GenericTable';
1010
import { ReplicateType, TestingTypes } from '../../../../types/consep/TestingActivityType';
11-
import testingActivitiesAPI from '../../../../api-service/testingActivitiesAPI';
11+
import testingActivitiesAPI from '../../../../api-service/consep/testingActivitiesAPI';
1212
import { getMccColumns, getPurityColumns, TABLE_TITLE } from './constants';
1313

1414
import './styles.scss';

frontend/src/views/CONSEP/TestingActivities/MoistureContent/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import {
2323

2424
import ROUTES from '../../../../routes/constants';
2525
import { calculateAverage } from '../../../../api-service/moistureContentAPI';
26-
import testingActivitiesAPI from '../../../../api-service/testingActivitiesAPI';
26+
import testingActivitiesAPI from '../../../../api-service/consep/testingActivitiesAPI';
2727
import { getSeedlotById } from '../../../../api-service/seedlotAPI';
2828
import { TestingActivityType, ActivityRecordType, ActivitySummaryType } from '../../../../types/consep/TestingActivityType';
2929
import { utcToIsoSlashStyle } from '../../../../utils/DateUtils';

frontend/src/views/CONSEP/TestingActivities/PurityContent/constants.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ export const fieldsConfig = {
66
},
77
impuritySection: {
88
title: 'Impurities',
9-
firstSubtitle: 'Replicate 1',
10-
secondSubtitle: 'Replicate 2',
119
buttonText: 'Add Impurities',
1210
primaryfieldName: 'Rank',
1311
secondaryfieldName: 'Impurity type',
14-
placeholder: 'Select an option',
12+
placeholder: 'Choose an option',
1513
label: 'impurityType',
1614
options: ['Impurity1', 'Impurity2', 'Impurity3']
1715

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
export type ImpurityType = {
2-
id: string;
3-
value: string;
1+
export type RichImpurityType = {
2+
riaKey: number;
3+
replicateNumber: number;
4+
debrisSeqNumber: number;
5+
debrisRank: number;
6+
debrisTypeCode: string;
7+
};
8+
9+
export type SingleImpurityType = {
10+
debrisRank: number;
11+
debrisCategory: string;
12+
}
13+
14+
export type ImpurityDisplayType = {
15+
[replicateNumber: number]: SingleImpurityType[]
16+
};
17+
18+
export type ImpurityPayload = {
19+
replicateNumber: number;
20+
debrisRank: number;
21+
debrisTypeCode: string;
422
};

0 commit comments

Comments
 (0)