fix: updated name mapping for results, added required for ini-file

src/features/AreaCoordinates/ImageView/ModelImageCanvas/ModelImageCanvas.tsx

@@ -2,6 +2,7 @@
 import { useEffect, useRef } from 'react';
 import { AreaCoordinateType } from '../../../AreaCoordinates/AreaCoordinates';
 import { ImageMetadataDto } from '../../../../api/generated';
+import { archelFilterMaps } from '../../../../utils/ArchelFilterMapping';
 
 export const ModelImageCanvas = ({
   imageData,
@@ -194,7 +195,9 @@ export const ModelImageCanvas = ({
           context.font = '16px Arial';
           context.textBaseline = 'middle';
           context.fillText(
-            `${key}`,
+            `${
+              archelFilterMaps[key] !== undefined ? archelFilterMaps[key] : key
+            }`,
             legendX + legendBoxSize + 10,
             currentY + legendBoxSize / 2,
           );

src/features/Compute/Components/CaseGroup/CaseRow/CaseRow.tsx

@@ -267,10 +267,23 @@ export const CaseRow = ({
   };
 
   const filterSettings = (
-    setting: ListComputeSettingsModelDto[] | undefined,
-    method: string,
+    settings: ListComputeSettingsModelDto[] | undefined,
+    inputValueType: InputValueType,
   ) => {
-    return setting?.filter((value) => value.inputValueType === method);
+    switch (inputValueType) {
+      case InputValueType.INDICATOR:
+        return settings
+          ?.filter((setting) => setting.inputValueType === inputValueType)
+          .filter((setting) => setting.value !== '0');
+      case InputValueType.ARCHEL:
+        return settings
+          ?.filter((setting) => setting.inputValueType === inputValueType)
+          .filter((setting) => setting.value !== '0');
+      default:
+        return settings?.filter(
+          (setting) => setting.inputValueType === inputValueType,
+        );
+    }
   };
 
   const indicatorFamilySettings = filterSettings(

src/features/HandleModel/HandleModelComponent/HandleModelComponent.hooks.ts

@@ -29,8 +29,8 @@ export const validateValues = (
   }
 
   if (files && !isEdit) {
-    if (!files.NC) {
-      errors.file = 'You must select an NC file to upload';
+    if (!(files.NC && files.INI)) {
+      errors.file = 'You must select an NC file and an INI file to upload';
     }
   }
 

src/features/HandleModel/HandleModelComponent/HandleModelComponent.tsx

@@ -24,7 +24,7 @@ import { IniFileTextField } from './HandleModelComponent.styled';
 Icon.add({ error_outlined });
 
 interface AddModelDialogProps {
-  confirm?: (file: File, iniFile?: File) => Promise<void>;
+  confirm?: (file: File, iniFile: File) => Promise<void>;
   progress?: number;
   uploading?: boolean;
   isAddUploading?: boolean;
@@ -103,7 +103,7 @@ export const HandleModelComponent = ({
     const finishSubmit = () => {
       if (files.NC && confirm && files.INI) {
         confirm(files.NC, files.INI);
-      } else if (files.NC && confirm) confirm(files.NC);
+      }
       cleanupStates();
     };
 

src/features/Results/CaseResult/CaseResultView/VariogramCaseResult/VariogramResultTable/TanStackTable/TanStackTable.tsx

@@ -31,6 +31,7 @@ import { SubRowResult } from '../SubRowResult/SubRowResult';
 import * as Styled from './TanStackTable.styled';
 import { useIsOwnerOrAdmin } from '../../../../../../../hooks/useIsOwnerOrAdmin';
 import { useMutateVariogramResult } from '../../../../../../../hooks/useMutateResults';
+import { archelFilterMaps } from '../../../../../../../utils/ArchelFilterMapping';
 // import { useMutateVariogramResult } from '../../../../../../../hooks/useMutateResults';
 
 export interface ResultObjectType {
@@ -363,8 +364,15 @@ export const TanStackTable = ({
         qualityY: roundResultString(e.qualityY),
         qualityZ: roundResultString(e.qualityZ),
         method: method ? method : '',
-        parameter: parameter,
-        archelFilter: e.archelFilter ? e.archelFilter : '',
+        parameter:
+          archelFilterMaps[parameter] !== undefined
+            ? archelFilterMaps[parameter]
+            : parameter,
+        archelFilter: e.archelFilter
+          ? archelFilterMaps[e.archelFilter] !== undefined
+            ? archelFilterMaps[e.archelFilter]
+            : e.archelFilter
+          : '',
         modelArea: modelArea ? modelArea.name : '',
         variogramModel: e.family ? e.family : '',
         quality: roundResultString(e.quality),

src/pages/AddModel/AddModel.tsx

@@ -95,8 +95,8 @@ export const AddModel = () => {
     },
   });
 
-  async function uploadModel(file: File, iniFile?: File) {
-    if (file === undefined) return;
+  async function uploadModel(file: File, iniFile: File) {
+    if (file === undefined && iniFile === undefined) return;
     setUploading(true);
     setProgress(1);
 

src/utils/ArchelFilterMapping.ts

@@ -0,0 +1,6 @@
+export const archelFilterMaps: Record<string, string> = {
+  dtaqua: 'deltatop aqua',
+  dtair: 'deltatop air',
+  'diameter<0.25': 'Fine sand (0.250)',
+  'diameter<0.125': 'Very fine sand (0.125)',
+};