Adjustments according to review comments

frontend/src/modules/3DViewer/view/atoms/derivedAtoms.ts

@@ -1,42 +1,11 @@
 import { IntersectionReferenceSystem } from "@equinor/esv-intersection";
-import { apiService } from "@framework/ApiService";
-import { EnsembleSetAtom } from "@framework/GlobalAtoms";
 import { IntersectionType } from "@framework/types/intersection";
 import { IntersectionPolylinesAtom } from "@framework/userCreatedItems/IntersectionPolylines";
 
 import { atom } from "jotai";
-import { atomWithQuery } from "jotai-tanstack-query";
 
-import {
-    customIntersectionPolylineIdAtom,
-    ensembleIdentAtom,
-    highlightedWellboreUuidAtom,
-    intersectionTypeAtom,
-} from "./baseAtoms";
-
-const STALE_TIME = 60 * 1000;
-const CACHE_TIME = 60 * 1000;
-
-export const fieldWellboreTrajectoriesQueryAtom = atomWithQuery((get) => {
-    const ensembleIdent = get(ensembleIdentAtom);
-    const ensembleSet = get(EnsembleSetAtom);
-
-    let fieldIdentifier: string | null = null;
-    if (ensembleIdent) {
-        const ensemble = ensembleSet.findEnsemble(ensembleIdent);
-        if (ensemble) {
-            fieldIdentifier = ensemble.getFieldIdentifier();
-        }
-    }
-
-    return {
-        queryKey: ["getFieldWellboreTrajectories", fieldIdentifier ?? ""],
-        queryFn: () => apiService.well.getFieldWellTrajectories(fieldIdentifier ?? ""),
-        staleTime: STALE_TIME,
-        gcTime: CACHE_TIME,
-        enabled: Boolean(fieldIdentifier),
-    };
-});
+import { customIntersectionPolylineIdAtom, highlightedWellboreUuidAtom, intersectionTypeAtom } from "./baseAtoms";
+import { fieldWellboreTrajectoriesQueryAtom } from "./queryAtoms";
 
 export const intersectionReferenceSystemAtom = atom((get) => {
     const fieldWellboreTrajectories = get(fieldWellboreTrajectoriesQueryAtom);

frontend/src/modules/3DViewer/view/atoms/queryAtoms.ts

@@ -0,0 +1,30 @@
+import { apiService } from "@framework/ApiService";
+import { EnsembleSetAtom } from "@framework/GlobalAtoms";
+
+import { atomWithQuery } from "jotai-tanstack-query";
+
+import { ensembleIdentAtom } from "./baseAtoms";
+
+const STALE_TIME = 60 * 1000;
+const CACHE_TIME = 60 * 1000;
+
+export const fieldWellboreTrajectoriesQueryAtom = atomWithQuery((get) => {
+    const ensembleIdent = get(ensembleIdentAtom);
+    const ensembleSet = get(EnsembleSetAtom);
+
+    let fieldIdentifier: string | null = null;
+    if (ensembleIdent) {
+        const ensemble = ensembleSet.findEnsemble(ensembleIdent);
+        if (ensemble) {
+            fieldIdentifier = ensemble.getFieldIdentifier();
+        }
+    }
+
+    return {
+        queryKey: ["getFieldWellboreTrajectories", fieldIdentifier ?? ""],
+        queryFn: () => apiService.well.getFieldWellTrajectories(fieldIdentifier ?? ""),
+        staleTime: STALE_TIME,
+        gcTime: CACHE_TIME,
+        enabled: Boolean(fieldIdentifier),
+    };
+});

frontend/src/modules/Intersection/view/atoms/derivedAtoms.ts

@@ -1,24 +1,18 @@
-import { WellboreTrajectory_api } from "@api";
 import { IntersectionReferenceSystem } from "@equinor/esv-intersection";
-import { apiService } from "@framework/ApiService";
 import { IntersectionType } from "@framework/types/intersection";
 import { IntersectionPolylinesAtom } from "@framework/userCreatedItems/IntersectionPolylines";
 import { point2Distance, vec2FromArray } from "@lib/utils/vec2";
 import { CURVE_FITTING_EPSILON } from "@modules/Intersection/typesAndEnums";
 import { calcExtendedSimplifiedWellboreTrajectoryInXYPlane } from "@modules/_shared/utils/wellbore";
 
 import { atom } from "jotai";
-import { atomWithQuery } from "jotai-tanstack-query";
 
 import {
     intersectionExtensionLengthAtom,
     intersectionTypeAtom,
     selectedCustomIntersectionPolylineIdAtom,
-    wellboreHeaderAtom,
 } from "./baseAtoms";
-
-const STALE_TIME = 60 * 1000;
-const CACHE_TIME = 60 * 1000;
+import { wellboreTrajectoryQueryAtom } from "./queryAtoms";
 
 export const selectedCustomIntersectionPolylineAtom = atom((get) => {
     const customIntersectionPolylineId = get(selectedCustomIntersectionPolylineIdAtom);
@@ -27,19 +21,6 @@ export const selectedCustomIntersectionPolylineAtom = atom((get) => {
     return customIntersectionPolylines.find((el) => el.id === customIntersectionPolylineId);
 });
 
-export const wellboreTrajectoryQueryAtom = atomWithQuery((get) => {
-    const wellbore = get(wellboreHeaderAtom);
-
-    return {
-        queryKey: ["getWellboreTrajectory", wellbore?.uuid ?? ""],
-        queryFn: () => apiService.well.getWellTrajectories(wellbore?.uuid ? [wellbore.uuid] : []),
-        staleTime: STALE_TIME,
-        gcTime: CACHE_TIME,
-        select: (data: WellboreTrajectory_api[]) => data[0],
-        enabled: wellbore?.uuid ? true : false,
-    };
-});
-
 export const intersectionReferenceSystemAtom = atom((get) => {
     const wellboreTrajectoryQuery = get(wellboreTrajectoryQueryAtom);
     const customIntersectionPolyline = get(selectedCustomIntersectionPolylineAtom);

frontend/src/modules/Intersection/view/atoms/queryAtoms.ts

@@ -0,0 +1,22 @@
+import { WellboreTrajectory_api } from "@api";
+import { apiService } from "@framework/ApiService";
+
+import { atomWithQuery } from "jotai-tanstack-query";
+
+import { wellboreHeaderAtom } from "./baseAtoms";
+
+const STALE_TIME = 60 * 1000;
+const CACHE_TIME = 60 * 1000;
+
+export const wellboreTrajectoryQueryAtom = atomWithQuery((get) => {
+    const wellbore = get(wellboreHeaderAtom);
+
+    return {
+        queryKey: ["getWellboreTrajectory", wellbore?.uuid ?? ""],
+        queryFn: () => apiService.well.getWellTrajectories(wellbore?.uuid ? [wellbore.uuid] : []),
+        staleTime: STALE_TIME,
+        gcTime: CACHE_TIME,
+        select: (data: WellboreTrajectory_api[]) => data[0],
+        enabled: wellbore?.uuid ? true : false,
+    };
+});

frontend/src/modules/Intersection/view/view.tsx

@@ -9,7 +9,8 @@ import { resolveClassNames } from "@lib/utils/resolveClassNames";
 
 import { useAtomValue } from "jotai";
 
-import { intersectionReferenceSystemAtom, polylineAtom, wellboreTrajectoryQueryAtom } from "./atoms/derivedAtoms";
+import { intersectionReferenceSystemAtom, polylineAtom } from "./atoms/derivedAtoms";
+import { wellboreTrajectoryQueryAtom } from "./atoms/queryAtoms";
 import { LayersWrapper } from "./components/layersWrapper";
 import { useWellboreCasingsQuery } from "./queries/wellboreSchematicsQueries";