Merge pull request #19 from WorldHealthOrganization/feature/not_used_…

…columns Add new functionality to show unused columns.
WorldHealthOrganization · Jan 17, 2025 · 0e18e8b · 0e18e8b
2 parents e31e92b + d7c111e
commit 0e18e8b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/features/dataSubmission/components/PackagePage/PackagePage.tsx b/src/features/dataSubmission/components/PackagePage/PackagePage.tsx
@@ -200,6 +200,13 @@ export const PackagePage = () => {
 
   const breadcrumbsConfig = getBreadcrumbsConfig(packageId, packageData.name);
 
+  const attachments = match<ResistanceSampleType, typeof packageData['attachments'][number] | undefined>(activeTab)
+    .with('PDST', () => packageData?.attachments.find((item) => item.type === 'PDS'))
+    .with('MIC', () => packageData?.attachments.find((item) => item.type === 'MIC'))
+    .exhaustive();
+  const notUsedColumns = attachments?.metadata && 'notUsedColumns' in attachments.metadata
+    ? attachments.metadata.notUsedColumns
+    : [];
   const samplesByActiveTab = activeTab === 'PDST' ? packageData.pdsSamples : packageData.micSamples;
   const controlsDisabled = packageData.state === 'ACCEPTED' || packageData.state === 'PENDING';
   const syncAllowed = packageData.matchingState !== 'MATCHED';
@@ -246,6 +253,7 @@ export const PackagePage = () => {
           activeTab={activeTab}
           handleTabChange={handleTabChange}
           tabs={tabs}
+          notUsedColumns={notUsedColumns}
         />
         <SequencingData
           isSomethingInSequencingDataLoading={isSomethingInSequencingDataLoading}

diff --git a/...atures/dataSubmission/components/PackagePage/components/ResistanceData/ResistanceData.tsx b/...atures/dataSubmission/components/PackagePage/components/ResistanceData/ResistanceData.tsx
@@ -1,7 +1,7 @@
 /** @jsxImportSource @emotion/react */
 import React from 'react';
 import {
-  Tab, Tabs,
+  Tab, Tabs, Alert,
 } from '@mui/material';
 import * as styles from './styles';
 import type { ITab } from '../../PackagePage';
@@ -30,14 +30,15 @@ interface Props {
   controlsDisabled: boolean;
   packageId: number;
   resistanceFileLabel: string;
-  fileError: IHttpError
+  fileError: IHttpError;
+  notUsedColumns: string[]
 }
 
 export const ResistanceData = ({
   tabs, activeTab, handleTabChange, samplesData, isLoading,
   onRemoveFileClick, isTabFileUploadError, errorFileName,
   onRemoveErrorClick, controlsDisabled, packageId,
-  resistanceFileLabel, fileError,
+  resistanceFileLabel, fileError, notUsedColumns,
 }: Props) => {
   const renderSamplesContent = () => {
     if (isLoading) {
@@ -73,6 +74,13 @@ export const ResistanceData = ({
               fileName={resistanceFileLabel}
             />
           )}
+          {notUsedColumns.length > 0 && (
+            <Alert variant="filled" severity="warning">
+              The following columns are not used:
+              &nbsp;
+              {notUsedColumns.join(', ')}
+            </Alert>
+          )}
           {shouldRenderUnprocessedTable && (
             <ResistanceDataTable
               activeTab={activeTab}

diff --git a/src/services/submissionApi/models.ts b/src/services/submissionApi/models.ts
@@ -37,6 +37,9 @@ interface IPackageAttachment {
   pk: number;
   size: number;
   type: PackageAttachmentType;
+  metadata: {
+    notUsedColumns: string[]
+  };
 }
 
 export interface IPackage {