Merge branch 'main' into refactor/sidebar

equinor · Feb 8, 2024 · cfec431 · cfec431
2 parents 4d948b1 + 79daac1
commit cfec431
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 29 deletions.
diff --git a/src/api/generated/index.ts b/src/api/generated/index.ts
@@ -50,7 +50,6 @@ export type { ConvertAnalogueModelCommand } from './models/ConvertAnalogueModelC
 export type { Coordinate } from './models/Coordinate';
 export type { CoordinateDto } from './models/CoordinateDto';
 export type { CoordinateEqualityComparer } from './models/CoordinateEqualityComparer';
-export type { CoordinateM } from './models/CoordinateM';
 export type { CoordinateSequence } from './models/CoordinateSequence';
 export type { CoordinateSequenceFactory } from './models/CoordinateSequenceFactory';
 export type { CreateAnalogueCommand } from './models/CreateAnalogueCommand';

diff --git a/src/api/generated/models/CoordinateM.ts b/src/api/generated/models/CoordinateM.ts
diff --git a/src/api/generated/models/GetChannelResultsDto.ts b/src/api/generated/models/GetChannelResultsDto.ts
@@ -6,7 +6,7 @@
 import type { ChannelEstimationResultDto } from './ChannelEstimationResultDto';
 import type { ChannelHeightDto } from './ChannelHeightDto';
 import type { ComputeType } from './ComputeType';
-import type { CoordinateM } from './CoordinateM';
+import type { CoordinateDto } from './CoordinateDto';
 import type { GetChannelResultsFileDto } from './GetChannelResultsFileDto';
 
 export type GetChannelResultsDto = {
@@ -18,6 +18,6 @@ export type GetChannelResultsDto = {
     channelWidth?: ChannelEstimationResultDto;
     segmentHeight?: ChannelEstimationResultDto;
     channelHeight?: ChannelHeightDto;
-    box?: Array<CoordinateM> | null;
+    box?: Array<CoordinateDto> | null;
 };
 
diff --git a/src/api/generated/models/GetChannelResultsFileDto.ts b/src/api/generated/models/GetChannelResultsFileDto.ts
@@ -4,7 +4,7 @@
 /* eslint-disable */
 
 export type GetChannelResultsFileDto = {
-    name?: string | null;
+    fileName?: string | null;
     channelResultFileId?: string | null;
 };
 
diff --git a/src/api/generated/models/GetVariogramResultsDto.ts b/src/api/generated/models/GetVariogramResultsDto.ts
@@ -3,7 +3,7 @@
 /* tslint:disable */
 /* eslint-disable */
 
-import type { CoordinateM } from './CoordinateM';
+import type { CoordinateDto } from './CoordinateDto';
 import type { VariogramResultFile } from './VariogramResultFile';
 
 export type GetVariogramResultsDto = {
@@ -21,6 +21,6 @@ export type GetVariogramResultsDto = {
     archelFilter?: string | null;
     indicator?: string | null;
     attribute?: string | null;
-    box?: Array<CoordinateM> | null;
+    box?: Array<CoordinateDto> | null;
 };
 
diff --git a/src/pages/ModelPages/Compute/ComputeVariogram/ComputeVariogram.tsx b/src/pages/ModelPages/Compute/ComputeVariogram/ComputeVariogram.tsx
@@ -1,7 +1,14 @@
 /* eslint-disable max-lines-per-function */
 import { Button, Icon, Snackbar, Tooltip } from '@equinor/eds-core-react';
 import { add as ADD, play as PLAY } from '@equinor/eds-icons';
+import { useMutation } from '@tanstack/react-query';
 import { useState } from 'react';
+import { useParams } from 'react-router-dom';
+import {
+  EstimateVariogramCommand,
+  JobsService,
+} from '../../../../api/generated';
+import { queryClient } from '../../../../auth/queryClient';
 import { CaseGroup } from '../../../../features/Compute/CaseGroup/CaseGroup';
 import { ComputeHeader } from '../../../../features/Compute/ComputeHeader/ComputeHeader';
 import { useFetchCases } from '../../../../hooks/useFetchCases';
@@ -27,6 +34,7 @@ export const ComputeVariogram = () => {
   const [showAlert, setAlert] = useState<string>();
   const [triggerAddCase, setTriggerAddCase] = useState<string>();
   const [localCaseList, setLocalCaseList] = useState<Array<string>>([]);
+  const { modelId } = useParams<{ modelId: string }>();
 
   const updateLocalCaseList = (type: string, add: boolean) => {
     if (add) {
@@ -61,6 +69,27 @@ export const ComputeVariogram = () => {
     setTriggerAddCase(type);
   };
 
+  const computeVariogram = useMutation({
+    mutationFn: JobsService.postApiJobsComputeVariogramEstimations,
+    onSuccess: () => {
+      queryClient.refetchQueries({ queryKey: ['model-cases'] });
+    },
+  });
+
+  const runComputeVariogram = async (computeCaseId: string) => {
+    if (!modelId) return;
+    const requestBody: EstimateVariogramCommand = {
+      modelId: modelId,
+      computeCaseId: computeCaseId,
+    };
+
+    const res = await computeVariogram.mutateAsync(requestBody);
+
+    if (res.success) {
+      setAlertMessage('Started computing case');
+    }
+  };
+
   return (
     <>
       <Styled.Case>
@@ -107,7 +136,7 @@ export const ComputeVariogram = () => {
               <Button
                 variant="outlined"
                 // eslint-disable-next-line no-console
-                onClick={() => console.log('Running all')}
+                onClick={() => runComputeVariogram}
                 disabled
               >
                 <Icon data={PLAY} size={18}></Icon>
@@ -125,8 +154,7 @@ export const ComputeVariogram = () => {
           triggerAddCase={triggerAddCase}
           setAlertMessage={setAlertMessage}
           updateLocalCaseList={updateLocalCaseList}
-          // eslint-disable-next-line no-console
-          runCase={(id: string) => console.log('Running variogram case .... ')}
+          runCase={runComputeVariogram}
         />
         <CaseGroup
           caseList={
@@ -136,8 +164,7 @@ export const ComputeVariogram = () => {
           triggerAddCase={triggerAddCase}
           setAlertMessage={setAlertMessage}
           updateLocalCaseList={updateLocalCaseList}
-          // eslint-disable-next-line no-console
-          runCase={(id: string) => console.log(id)}
+          runCase={runComputeVariogram}
         />
 
         <CaseGroup
@@ -150,8 +177,7 @@ export const ComputeVariogram = () => {
           triggerAddCase={triggerAddCase}
           setAlertMessage={setAlertMessage}
           updateLocalCaseList={updateLocalCaseList}
-          // eslint-disable-next-line no-console
-          runCase={(id: string) => console.log(id)}
+          runCase={runComputeVariogram}
         />
       </Styled.Case>
       <Snackbar