feat: 1887 purity screen activity results table returning user (#2015)

Co-authored-by: DustyD <xiao_peng0202@hotmail.com>

Author: mgaseta

frontend/src/api-service/ApiConfig.ts

@@ -59,7 +59,9 @@ const ApiConfig = {
 
   seedlotFromOracleDbBySeedlotNumber: `${oracleServerHost}/api/seedlot/{seedlotNumber}`,
 
-  moistureContent: `${oracleServerHost}/api/moisture-content-cone`
+  moistureContent: `${oracleServerHost}/api/moisture-content-cone`,
+
+  purityTest: `${oracleServerHost}/api/purity-tests`
 };
 
 export default ApiConfig;

frontend/src/api-service/moistureContentAPI.ts

@@ -1,41 +1,5 @@
 import ApiConfig from './ApiConfig';
 import api from './api';
-import { ReplicateType } from '../types/consep/TestingActivityType';
-
-export const getMccByRiaKey = (riaKey: string) => {
-  const url = `${ApiConfig.moistureContent}/${riaKey}`;
-  return api.get(url).then((res) => res.data);
-};
-
-export const updateReplicates = (riaKey: number, replicates: ReplicateType[]) => {
-  const url = `${ApiConfig.moistureContent}/replicate/${riaKey}`;
-  return api.patch(url, replicates);
-};
-
-export const deleteReplicate = (riaKey: number, replicateNumber: number) => {
-  const url = `${ApiConfig.moistureContent}/${riaKey}/${replicateNumber}`;
-  return api.delete(url);
-};
-
-export const deleteReplicates = (riaKey: number, replicateNumbers: number[]) => {
-  const url = `${ApiConfig.moistureContent}/${riaKey}/replicates`;
-  return api.post(url, replicateNumbers);
-};
-
-export const updateActivityRecord = (riaKey: number, activityRecord: any) => {
-  const url = `${ApiConfig.moistureContent}/${riaKey}`;
-  return api.patch(url, activityRecord);
-};
-
-export const validateResult = (riaKey: string) => {
-  const url = `${ApiConfig.moistureContent}/validate/${riaKey}`;
-  return api.get(url);
-};
-
-export const acceptResult = (riaKey: string) => {
-  const url = `${ApiConfig.moistureContent}/accept/${riaKey}`;
-  return api.get(url);
-};
 
 export const calculateAverage = (riaKey: string, mcValues: number[]) => {
   const url = `${ApiConfig.moistureContent}/${riaKey}/calculate-average`;

frontend/src/api-service/testingActivitiesAPI.ts

@@ -0,0 +1,49 @@
+import ApiConfig from './ApiConfig';
+import api from './api';
+import { ReplicateType, TestingTypes } from '../types/consep/TestingActivityType';
+
+type TestingParams = Record<string, any>;
+
+type TestingActivitiesApiType =
+  | 'getDataByRiaKey'
+  | 'updateMultipleReplicates'
+  | 'deleteSingleReplicate'
+  | 'deleteMultipleReplicates'
+  | 'updateActivityRecord'
+  | 'validateTestResult'
+  | 'acceptResult';
+
+const testingActivitiesAPI = async (
+  testType: TestingTypes,
+  fn: TestingActivitiesApiType,
+  params: TestingParams
+): Promise<any> => {
+  let url = '';
+
+  switch (testType) {
+    case 'moistureTest':
+      url = ApiConfig.moistureContent;
+      break;
+    case 'purityTest':
+      url = ApiConfig.purityTest;
+      break;
+    default:
+      throw new Error('Invalid test type');
+  }
+
+  const testingApiFn: Record<TestingActivitiesApiType, (...args: any[]) => Promise<any>> = {
+    getDataByRiaKey: (riaKey: string) => api.get(`${url}/${riaKey}`).then((res) => res.data),
+    updateMultipleReplicates: (riaKey: string, replicates: ReplicateType[]) => api.patch(`${url}/replicate/${riaKey}`, replicates),
+    deleteSingleReplicate: (riaKey: string, replicateNumber: number) => api.delete(`${url}/${riaKey}/${replicateNumber}`),
+    deleteMultipleReplicates: (riaKey: string, replicateNumbers: number[]) => api.post(`${url}/${riaKey}/replicates`, replicateNumbers),
+    updateActivityRecord: (riaKey: string, activityRecord: any) => api.patch(`${url}/${riaKey}`, activityRecord),
+    validateTestResult: (riaKey: string) => api.get(`${url}/validate/${riaKey}`),
+    acceptResult: (riaKey: string) => api.get(`${url}/accept/${riaKey}`)
+  };
+
+  const calledFn = testingApiFn[fn];
+
+  return calledFn(...Object.values(params));
+};
+
+export default testingActivitiesAPI;

frontend/src/components/CONSEP/ActivitySummary/index.tsx

@@ -5,7 +5,7 @@ import {
   RadioButtonSkeleton
 } from '@carbon/react';
 
-import { ActivitySummaryType } from '../../../types/ActivitySummaryType';
+import { ActivitySummaryType } from '../../../types/consep/TestingActivityType';
 
 import './styles.scss';
 

frontend/src/routes/constants.ts

@@ -39,7 +39,7 @@ const ROUTES = {
   MAINTAIN_STAT_HOLIDAYS: '/consep/maintain-stat-holidays',
   MAINTAIN_WORK_PLANS: '/consep/maintain-work-plans',
   MANUAL_MOISTURE_CONTENT: '/consep/manual-moisture-content/:riaKey',
-  MANUAL_PURITY_CONTENT: '/consep/manual-purity-content',
+  MANUAL_PURITY_CONTENT: '/consep/manual-purity-content/:riaKey',
   PROCESSING_ACTIVITIES: '/consep/processing-activities',
   RECORD_STOCK_COUNT_RESULTS: '/consep/record-stock-count-results',
   REQUEST_CHANGES_REPORT: '/consep/request-changes-report',

frontend/src/types/ActivitySummaryType.ts

@@ -1,17 +1,34 @@
-export type ReplicateType = {
+export type TestingTypes = 'moistureTest' | 'purityTest';
+
+type DefaultReplicateFieldsType = {
   riaKey: number;
   replicateNumber: number;
   replicateAccInd: number;
+  overrideReason?: string;
+}
+
+export type PurityReplicateType = DefaultReplicateFieldsType &
+{
+  pureSeedWeight?: number;
+  otherSeedWeight?: number;
+  inertMttrWeight?: number;
+};
+
+export type MccReplicateType = DefaultReplicateFieldsType &
+{
   containerId?: string;
   containerWeight?: number;
   freshSeed?: number;
   containerAndDryWeight?: number;
   dryWeight?: number;
   mcValue?: number;
   replicateComment?: string;
-  overrideReason?: string;
 };
 
+export type ReplicateType = PurityReplicateType | MccReplicateType;
+
+export type ReplicateKeys = keyof PurityReplicateType | keyof MccReplicateType;
+
 export type ActivityRecordType = {
   testCategoryCode?: string;
   riaComment?: string;
@@ -30,3 +47,11 @@ export type TestingActivityType = ActivityRecordType & {
   activityType: string;
   replicatesList: ReplicateType[];
 };
+
+export type ActivitySummaryType = {
+  activity: string;
+  seedlotNumber: string;
+  requestId: string;
+  speciesAndClass: string;
+  testResult: string;
+}

frontend/src/types/consep/TestingActivityType.ts

@@ -0,0 +1,18 @@
+/**
+ * This function creates a new empty replicate list for
+ * testing activities
+ *
+ * @param {string} activityRiaKey the activity riakey to generate the list
+ * @returns {any} a list of empty rows
+ */
+export const initReplicatesList = (activityRiaKey: string): any => {
+  const emptyRows = [];
+  for (let i = 0; i < 4; i += 1) {
+    emptyRows.push({
+      riaKey: activityRiaKey,
+      replicateNumber: i + 1,
+      replicateAccInd: 1
+    });
+  }
+  return emptyRows;
+};

frontend/src/utils/TestActivitiesUtils.ts

@@ -3,15 +3,17 @@ import React from 'react';
 import { MRT_ColumnDef } from 'material-react-table';
 import { Checkbox } from '@mui/material';
 import * as Icons from '@carbon/icons-react';
-import { ReplicateType } from '../../../../types/consep/TestingActivityType';
+import { ReplicateKeys, ReplicateType } from '../../../../types/consep/TestingActivityType';
+
+export const TABLE_TITLE = 'Activity results per replicate';
 
 const alignRight = {
   muiTableHeadCellProps: { align: 'right' as const },
   muiTableBodyCellProps: { align: 'right' as const }
 };
 
 const createEditableNumberColumn = (
-  accessorKey: keyof ReplicateType,
+  accessorKey: ReplicateKeys,
   header: string,
   validationMsg: string,
   updateRow: (row: ReplicateType) => void,
@@ -22,7 +24,7 @@ const createEditableNumberColumn = (
   header,
   size: 120,
   muiEditTextFieldProps: ({ cell, row }) => {
-    const value = row.original[accessorKey] ?? '';
+    const value = row.original[accessorKey as keyof typeof row.original] ?? '';
     return {
       type: 'number',
       value,
@@ -60,7 +62,7 @@ const createEditableNumberColumn = (
 });
 
 const createEditableTextColumn = (
-  accessorKey: keyof ReplicateType,
+  accessorKey: ReplicateKeys,
   header: string,
   maxLength: number,
   validationMsg: string,
@@ -72,7 +74,7 @@ const createEditableTextColumn = (
   header,
   size: 80,
   muiEditTextFieldProps: ({ cell, row }) => {
-    const value = row.original[accessorKey] ?? '';
+    const value = row.original[accessorKey as keyof typeof row.original] ?? '';
     return {
       type: 'text',
       value,
@@ -96,7 +98,7 @@ const createEditableTextColumn = (
   ...alignRight
 });
 
-export const getColumns = (
+export const getMccColumns = (
   disableEditing: boolean,
   handleClearOne: (replicateNumber: number) => void,
   updateRow: (row: ReplicateType) => void,
@@ -153,7 +155,7 @@ export const getColumns = (
     enableEditing: false,
     muiEditTextFieldProps: ({ row }) => ({
       type: 'text',
-      value: row.original.dryWeight ?? ''
+      value: 'dryWeight' in row.original ? row.original.dryWeight : ''
     })
   },
   {
@@ -162,7 +164,7 @@ export const getColumns = (
     size: 80,
     muiEditTextFieldProps: ({ row }) => ({
       type: 'text',
-      value: row.original.mcValue ?? ''
+      value: 'mcValue' in row.original ? row.original.mcValue : ''
     }),
     enableEditing: false,
     ...alignRight
@@ -193,7 +195,7 @@ export const getColumns = (
     size: 300,
     muiEditTextFieldProps: ({ row }) => ({
       type: 'text',
-      value: row.original.replicateComment ?? '',
+      value: 'replicateComment' in row.original ? row.original.replicateComment : '',
       onChange: (event) => {
         updateRow({
           ...row.original,
@@ -217,3 +219,97 @@ export const getColumns = (
     ...alignRight
   }
 ];
+
+export const getPurityColumns = (
+  disableEditing: boolean,
+  handleClearOne: (replicateNumber: number) => void,
+  updateRow: (row: ReplicateType) => void,
+  validationErrors: Record<string, string | undefined>,
+  setValidationErrors: React.Dispatch<React.SetStateAction<Record<string, string | undefined>>>
+): MRT_ColumnDef<ReplicateType>[] => [
+  {
+    accessorKey: 'replicateNumber',
+    header: 'Replicate',
+    size: 40,
+    enableEditing: false,
+    ...alignRight
+  },
+  createEditableNumberColumn(
+    'pureSeedWeight',
+    'Pure seed weight (g)',
+    'Pure Seed Weight must be greater than or equal to 0 and less than 1,000',
+    updateRow,
+    validationErrors,
+    setValidationErrors
+  ),
+  createEditableNumberColumn(
+    'inertMttrWeight',
+    'Inert matter weight (g)',
+    'Inert Matter Weight must be greater than or equal to 0 and less than 1,000',
+    updateRow,
+    validationErrors,
+    setValidationErrors
+  ),
+  createEditableNumberColumn(
+    'otherSeedWeight',
+    'Other seed weight (g)',
+    'Other Seed Weight must be greater than or equal to 0 and less than 1,000',
+    updateRow,
+    validationErrors,
+    setValidationErrors
+  ),
+  {
+    accessorKey: 'purityValue',
+    header: 'Purity',
+    size: 80,
+    ...alignRight
+  },
+  {
+    accessorKey: 'replicateAccInd',
+    header: 'Acc',
+    Cell: ({ row }: { row: { original: ReplicateType } }) => (
+      <Checkbox
+        checked={!!row.original.replicateAccInd}
+        disabled={disableEditing}
+        onClick={() => {
+          updateRow({
+            ...row.original,
+            replicateAccInd: row.original.replicateAccInd === 1 ? 0 : 1
+          });
+        }}
+      />
+    ),
+    size: 40,
+    muiTableHeadCellProps: { align: 'center' },
+    muiTableBodyCellProps: { align: 'center' },
+    enableEditing: false
+  },
+  {
+    accessorKey: 'overrideReason',
+    header: 'Comments',
+    size: 300,
+    muiEditTextFieldProps: ({ row }) => ({
+      type: 'text',
+      onChange: (event) => {
+        updateRow({
+          ...row.original,
+          replicateComment: event.currentTarget.value
+        });
+      }
+    })
+  },
+  {
+    accessorKey: 'actions',
+    header: '',
+    Cell: ({ row }: { row: { original: ReplicateType } }) => (
+      <Icons.TrashCan
+        size={15}
+        style={{ cursor: 'pointer' }}
+        onClick={() => handleClearOne(row.original.replicateNumber)}
+      />
+    ),
+    enableEditing: false,
+    size: 40,
+    ...alignRight
+  }
+];