chore: Refactor quality factor level in results.

equinor · Dec 5, 2024 · 3d4030c · 3d4030c
1 parent ef8f9e2
commit 3d4030c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 27 deletions.
diff --git a/...CaseResultView/VariogramCaseResult/VariogramResultTable/SubRowResult/SubRowResultItem.tsx b/...CaseResultView/VariogramCaseResult/VariogramResultTable/SubRowResult/SubRowResultItem.tsx
@@ -1,7 +1,7 @@
 import { Table } from '@equinor/eds-core-react';
+import { roundResultString } from '../../../../../../../utils/RoundResultString';
 import { ResultObjectType } from '../TanStackTable/TanStackTable';
 import * as Styled from './SubRowResultItem.styled';
-
 export const SubRowResultItem = ({
   resultList,
 }: {
@@ -18,6 +18,7 @@ export const SubRowResultItem = ({
             <Table.Cell>Azimuth (deg)</Table.Cell>
             <Table.Cell>Range vertical (m)</Table.Cell>
             <Table.Cell>SILL/STD (m)</Table.Cell>
+            <Table.Cell>X/Y/Z quality factor</Table.Cell>
           </Styled.HeaderContent>
         </Table.Head>
         <Table.Body>
@@ -29,6 +30,13 @@ export const SubRowResultItem = ({
               <Table.Cell>{resultItem.azimuth}</Table.Cell>
               <Table.Cell>{resultItem.rvertical}</Table.Cell>
               <Table.Cell>{resultItem.sigma}</Table.Cell>
+              <Table.Cell>
+                <div>
+                  {roundResultString(resultItem.qualityX, 2)} {' / '}
+                  {roundResultString(resultItem.qualityY, 2)} {' / '}
+                  {roundResultString(resultItem.qualityZ, 2)}
+                </div>
+              </Table.Cell>
             </Table.Row>
           ))}
         </Table.Body>

diff --git a/...t/CaseResultView/VariogramCaseResult/VariogramResultTable/TanStackTable/TanStackTable.tsx b/...t/CaseResultView/VariogramCaseResult/VariogramResultTable/TanStackTable/TanStackTable.tsx
@@ -21,11 +21,10 @@ import {
   GetVariogramResultsVariogramResultFileDto,
 } from '../../../../../../../api/generated';
 import { usePepmContextStore } from '../../../../../../../hooks/GlobalState';
+import { roundResultString } from '../../../../../../../utils/RoundResultString';
 import { SubRowResult } from '../SubRowResult/SubRowResult';
 import * as Styled from './TanStackTable.styled';
 
-const NumberOfDecimals = 3;
-
 export interface ResultObjectType {
   variogramResultId: string;
   variogramResultFiles: Array<GetVariogramResultsVariogramResultFileDto>;
@@ -134,16 +133,6 @@ export const TanStackTable = ({
 }) => {
   const { computeCases } = usePepmContextStore();
 
-  const roundResultString = (
-    value: number,
-    numberDecimals: number = NumberOfDecimals,
-  ) => {
-    if (value) {
-      const res: string = value.toFixed(numberDecimals);
-      return Number(res);
-    } else return value;
-  };
-
   const getSubRows = (computeCaseId: string, identifier: number) => {
     const subRowArray: ResultObjectType[] = [];
     if (computeCaseId === undefined || resultList === undefined)
@@ -241,20 +230,6 @@ export const TanStackTable = ({
       header: () => <div>Model Area</div>,
       id: 'modelArea',
     },
-
-    {
-      accessorKey: 'quality',
-      header: () => <div>X/Y/Z quality factor</div>,
-      id: 'quality',
-      enableColumnFilter: false,
-      cell: ({ row }) => (
-        <div>
-          {roundResultString(row.original.qualityX, 2)} {' / '}
-          {roundResultString(row.original.qualityY, 2)} {' / '}
-          {roundResultString(row.original.qualityZ, 2)}
-        </div>
-      ),
-    },
   ];
 
   const getRows = () => {

diff --git a/src/utils/RoundResultString.ts b/src/utils/RoundResultString.ts
@@ -0,0 +1,11 @@
+const NumberOfDecimals = 3;
+
+export const roundResultString = (
+  value: number,
+  numberDecimals: number = NumberOfDecimals,
+) => {
+  if (value) {
+    const res: string = value.toFixed(numberDecimals);
+    return Number(res);
+  } else return value;
+};