Fix subsurface map module

equinor · Sep 23, 2023 · 175d75e · 175d75e
1 parent e7b73bf
commit 175d75e
Show file tree

Hide file tree

Showing 7 changed files with 220 additions and 302 deletions.
diff --git a/frontend/src/modules/TopographicMap/SurfaceAddress.ts b/frontend/src/modules/TopographicMap/SurfaceAddress.ts
diff --git a/frontend/src/modules/TopographicMap/queryHooks.tsx b/frontend/src/modules/TopographicMap/queryHooks.tsx
@@ -1,35 +1,19 @@
 import {
     PolygonData_api,
-    StaticSurfaceDirectory_api,
-    SumoContent_api,
     SurfaceData_api,
     SurfacePolygonDirectory_api,
     WellBoreHeader_api,
     WellBoreTrajectory_api,
 } from "@api";
 import { apiService } from "@framework/ApiService";
+import { SurfaceAddress } from "@modules/_shared/SurfaceDirectory";
 import { QueryFunction, QueryKey, UseQueryResult, useQuery } from "@tanstack/react-query";
 
-import { SurfAddr } from "./SurfaceAddress";
 import { SurfacePolygonsAddress } from "./SurfacePolygonsAddress";
 
 const STALE_TIME = 60 * 1000;
 const CACHE_TIME = 60 * 1000;
 
-export function useSurfaceDirectoryQuery(
-    caseUuid: string | undefined,
-    ensembleName: string | undefined,
-    contentFilter?: SumoContent_api[]
-): UseQueryResult<StaticSurfaceDirectory_api> {
-    return useQuery({
-        queryKey: ["getStaticSurfaceDirectory", caseUuid, ensembleName, contentFilter],
-        queryFn: () => apiService.surface.getStaticSurfaceDirectory(caseUuid ?? "", ensembleName ?? "", contentFilter),
-        staleTime: STALE_TIME,
-        cacheTime: STALE_TIME,
-        enabled: caseUuid && ensembleName ? true : false,
-    });
-}
-
 export function usePolygonDirectoryQuery(
     caseUuid: string | undefined,
     ensembleName: string | undefined
@@ -72,80 +56,9 @@ export function useGetFieldWellsTrajectories(caseUuid: string | undefined): UseQ
     });
 }
 
-export function useSurfaceDataQueryByAddress(
-    surfAddr: SurfAddr | null,
-    enabled: boolean
-): UseQueryResult<SurfaceData_api> {
-    function dummyApiCall(): Promise<SurfaceData_api> {
-        return new Promise((_resolve, reject) => {
-            reject(null);
-        });
-    }
-
-    if (!surfAddr) {
-        return useQuery({
-            queryKey: ["getSurfaceData_DUMMY_ALWAYS_DISABLED"],
-            queryFn: () => dummyApiCall,
-            enabled: false,
-        });
-    }
-
-    let queryFn: QueryFunction<SurfaceData_api> | null = null;
-    let queryKey: QueryKey | null = null;
-
-    // Static, per realization surface
-    if (surfAddr.addressType === "static") {
-        queryKey = [
-            "getStaticSurfaceData",
-            surfAddr.caseUuid,
-            surfAddr.ensemble,
-            surfAddr.realizationNum,
-            surfAddr.name,
-            surfAddr.attribute,
-        ];
-        queryFn = () =>
-            apiService.surface.getStaticSurfaceData(
-                surfAddr.caseUuid,
-                surfAddr.ensemble,
-                surfAddr.realizationNum,
-                surfAddr.name,
-                surfAddr.attribute
-            );
-    }
-
-    // Static, statistical surface
-    else if (surfAddr.addressType === "statistical-static") {
-        queryKey = [
-            "getStatisticalStaticSurfaceData",
-            surfAddr.caseUuid,
-            surfAddr.ensemble,
-            surfAddr.statisticFunction,
-            surfAddr.name,
-            surfAddr.attribute,
-        ];
-        queryFn = () =>
-            apiService.surface.getStatisticalStaticSurfaceData(
-                surfAddr.caseUuid,
-                surfAddr.ensemble,
-                surfAddr.statisticFunction,
-                surfAddr.name,
-                surfAddr.attribute
-            );
-    } else {
-        throw new Error("Invalid surface address type");
-    }
-
-    return useQuery({
-        queryKey: queryKey,
-        queryFn: queryFn,
-        staleTime: STALE_TIME,
-        cacheTime: CACHE_TIME,
-        enabled: enabled,
-    });
-}
 export function usePropertySurfaceDataByQueryAddress(
-    meshSurfAddr: SurfAddr | null,
-    propertySurfAddr: SurfAddr | null,
+    meshSurfAddr: SurfaceAddress | null,
+    propertySurfAddr: SurfaceAddress | null,
     enabled: boolean
 ): UseQueryResult<SurfaceData_api> {
     function dummyApiCall(): Promise<SurfaceData_api> {
@@ -166,7 +79,7 @@ export function usePropertySurfaceDataByQueryAddress(
     let queryKey: QueryKey | null = null;
 
     // Static, per realization surface
-    if (meshSurfAddr.addressType === "static" && propertySurfAddr.addressType === "static") {
+    if (meshSurfAddr.addressType === "realization" && propertySurfAddr.addressType === "realization") {
         queryKey = [
             "getPropertySurfaceResampledToStaticSurface",
             meshSurfAddr.caseUuid,
@@ -189,10 +102,7 @@ export function usePropertySurfaceDataByQueryAddress(
                 propertySurfAddr.name,
                 propertySurfAddr.attribute
             );
-    } else if (
-        meshSurfAddr.addressType === "statistical-static" &&
-        propertySurfAddr.addressType === "statistical-static"
-    ) {
+    } else if (meshSurfAddr.addressType === "statistical" && propertySurfAddr.addressType === "statistical") {
         queryKey = [
             "getPropertySurfaceResampledToStaticSurface",
             meshSurfAddr.caseUuid,