Fix errors after merge

frontend/src/framework/WorkbenchSession.ts

@@ -79,7 +79,7 @@ export class WorkbenchSession {
     }
 }
 
-function createEnsembleRealizationFilterFuncForWorkbenchSession(workbenchSession: WorkbenchSession) {
+export function createEnsembleRealizationFilterFuncForWorkbenchSession(workbenchSession: WorkbenchSession) {
     return function ensembleRealizationFilterFunc(
         ensembleIdent: RegularEnsembleIdent | DeltaEnsembleIdent
     ): readonly number[] {

frontend/src/modules/2DViewer/layers/framework/LayerManager/LayerManager.ts

@@ -1,4 +1,4 @@
-import { Ensemble } from "@framework/Ensemble";
+import { RegularEnsemble } from "@framework/RegularEnsemble";
 import {
     EnsembleRealizationFilterFunction,
     WorkbenchSession,
@@ -36,7 +36,7 @@ export type LayerManagerTopicPayload = {
 
 export type GlobalSettings = {
     fieldId: string | null;
-    ensembles: readonly Ensemble[];
+    ensembles: readonly RegularEnsemble[];
     realizationFilterFunction: EnsembleRealizationFilterFunction;
 };
 
@@ -194,7 +194,7 @@ export class LayerManager implements Group, PublishSubscribe<LayerManagerTopic,
     }
 
     private initializeGlobalSettings(): GlobalSettings {
-        const ensembles = this._workbenchSession.getEnsembleSet().getEnsembleArr();
+        const ensembles = this._workbenchSession.getEnsembleSet().getRegularEnsembleArray();
         return {
             fieldId: null,
             ensembles,
@@ -211,7 +211,7 @@ export class LayerManager implements Group, PublishSubscribe<LayerManagerTopic,
     }
 
     private handleEnsembleSetChanged() {
-        const ensembles = this._workbenchSession.getEnsembleSet().getEnsembleArr();
+        const ensembles = this._workbenchSession.getEnsembleSet().getRegularEnsembleArray();
         this._globalSettings.ensembles = ensembles;
 
         this.publishTopic(LayerManagerTopic.GLOBAL_SETTINGS_CHANGED);

frontend/src/modules/2DViewer/layers/layers/implementations/DrilledWellTrajectoriesLayer/types.ts

@@ -1,8 +1,8 @@
 import { WellboreHeader_api } from "@api";
-import { EnsembleIdent } from "@framework/EnsembleIdent";
+import { RegularEnsembleIdent } from "@framework/RegularEnsembleIdent";
 import { SettingType } from "@modules/2DViewer/layers/settings/settingsTypes";
 
 export type DrilledWellTrajectoriesSettings = {
-    [SettingType.ENSEMBLE]: EnsembleIdent | null;
+    [SettingType.ENSEMBLE]: RegularEnsembleIdent | null;
     [SettingType.SMDA_WELLBORE_HEADERS]: WellboreHeader_api[] | null;
 };

frontend/src/modules/2DViewer/layers/layers/implementations/DrilledWellborePicksLayer/types.ts

@@ -1,9 +1,9 @@
 import { WellboreHeader_api } from "@api";
-import { EnsembleIdent } from "@framework/EnsembleIdent";
+import { RegularEnsembleIdent } from "@framework/RegularEnsembleIdent";
 import { SettingType } from "@modules/2DViewer/layers/settings/settingsTypes";
 
 export type DrilledWellborePicksSettings = {
-    [SettingType.ENSEMBLE]: EnsembleIdent | null;
+    [SettingType.ENSEMBLE]: RegularEnsembleIdent | null;
     [SettingType.SMDA_WELLBORE_HEADERS]: WellboreHeader_api[] | null;
     [SettingType.SURFACE_NAME]: string | null;
 };

frontend/src/modules/2DViewer/layers/layers/implementations/ObservedSurfaceLayer/ObservedSurfaceSettingsContext.ts

@@ -48,7 +48,7 @@ export class ObservedSurfaceSettingsContext implements SettingsContext<ObservedS
             const ensembleSet = workbenchSession.getEnsembleSet();
 
             const ensembleIdents = ensembleSet
-                .getEnsembleArr()
+                .getRegularEnsembleArray()
                 .filter((ensemble) => ensemble.getFieldIdentifier() === fieldIdentifier)
                 .map((ensemble) => ensemble.getIdent());
 

frontend/src/modules/2DViewer/layers/layers/implementations/ObservedSurfaceLayer/types.ts

@@ -1,8 +1,8 @@
-import { EnsembleIdent } from "@framework/EnsembleIdent";
+import { RegularEnsembleIdent } from "@framework/RegularEnsembleIdent";
 import { SettingType } from "@modules/2DViewer/layers/settings/settingsTypes";
 
 export type ObservedSurfaceSettings = {
-    [SettingType.ENSEMBLE]: EnsembleIdent | null;
+    [SettingType.ENSEMBLE]: RegularEnsembleIdent | null;
     [SettingType.SURFACE_ATTRIBUTE]: string | null;
     [SettingType.SURFACE_NAME]: string | null;
     [SettingType.TIME_OR_INTERVAL]: string | null;

frontend/src/modules/2DViewer/layers/layers/implementations/RealizationGridLayer/types.ts

@@ -1,8 +1,8 @@
-import { EnsembleIdent } from "@framework/EnsembleIdent";
+import { RegularEnsembleIdent } from "@framework/RegularEnsembleIdent";
 import { SettingType } from "@modules/2DViewer/layers/settings/settingsTypes";
 
 export type RealizationGridSettings = {
-    [SettingType.ENSEMBLE]: EnsembleIdent | null;
+    [SettingType.ENSEMBLE]: RegularEnsembleIdent | null;
     [SettingType.REALIZATION]: number | null;
     [SettingType.GRID_ATTRIBUTE]: string | null;
     [SettingType.GRID_NAME]: string | null;

frontend/src/modules/2DViewer/layers/layers/implementations/RealizationPolygonsLayer/types.ts

@@ -1,9 +1,9 @@
-import { EnsembleIdent } from "@framework/EnsembleIdent";
+import { RegularEnsembleIdent } from "@framework/RegularEnsembleIdent";
 
 import { SettingType } from "../../../settings/settingsTypes";
 
 export type RealizationPolygonsSettings = {
-    [SettingType.ENSEMBLE]: EnsembleIdent | null;
+    [SettingType.ENSEMBLE]: RegularEnsembleIdent | null;
     [SettingType.REALIZATION]: number | null;
     [SettingType.POLYGONS_ATTRIBUTE]: string | null;
     [SettingType.POLYGONS_NAME]: string | null;

frontend/src/modules/2DViewer/layers/layers/implementations/RealizationSurfaceLayer/types.ts

@@ -1,9 +1,9 @@
-import { EnsembleIdent } from "@framework/EnsembleIdent";
+import { RegularEnsembleIdent } from "@framework/RegularEnsembleIdent";
 
 import { SettingType } from "../../../settings/settingsTypes";
 
 export type RealizationSurfaceSettings = {
-    [SettingType.ENSEMBLE]: EnsembleIdent | null;
+    [SettingType.ENSEMBLE]: RegularEnsembleIdent | null;
     [SettingType.REALIZATION]: number | null;
     [SettingType.SURFACE_ATTRIBUTE]: string | null;
     [SettingType.SURFACE_NAME]: string | null;

frontend/src/modules/2DViewer/layers/layers/implementations/StatisticalSurfaceLayer/types.ts

@@ -1,11 +1,11 @@
 import { SurfaceStatisticFunction_api } from "@api";
-import { EnsembleIdent } from "@framework/EnsembleIdent";
+import { RegularEnsembleIdent } from "@framework/RegularEnsembleIdent";
 import { SettingType } from "@modules/2DViewer/layers/settings/settingsTypes";
 
 import { SensitivityNameCasePair } from "../../../settings/implementations/SensitivitySetting";
 
 export type StatisticalSurfaceSettings = {
-    [SettingType.ENSEMBLE]: EnsembleIdent | null;
+    [SettingType.ENSEMBLE]: RegularEnsembleIdent | null;
     [SettingType.STATISTIC_FUNCTION]: SurfaceStatisticFunction_api;
     [SettingType.SENSITIVITY]: SensitivityNameCasePair | null;
     [SettingType.SURFACE_ATTRIBUTE]: string | null;

frontend/src/modules/2DViewer/layers/settings/implementations/EnsembleSetting.tsx

@@ -1,18 +1,18 @@
 import React from "react";
 
-import { EnsembleIdent } from "@framework/EnsembleIdent";
+import { RegularEnsembleIdent } from "@framework/RegularEnsembleIdent";
 import { EnsembleDropdown } from "@framework/components/EnsembleDropdown";
 
 import { SettingDelegate } from "../../delegates/SettingDelegate";
 import { Setting, SettingComponentProps, ValueToStringArgs } from "../../interfaces";
 import { SettingRegistry } from "../SettingRegistry";
 import { SettingType } from "../settingsTypes";
 
-export class EnsembleSetting implements Setting<EnsembleIdent | null> {
-    private _delegate: SettingDelegate<EnsembleIdent | null>;
+export class EnsembleSetting implements Setting<RegularEnsembleIdent | null> {
+    private _delegate: SettingDelegate<RegularEnsembleIdent | null>;
 
     constructor() {
-        this._delegate = new SettingDelegate<EnsembleIdent | null>(null, this);
+        this._delegate = new SettingDelegate<RegularEnsembleIdent | null>(null, this);
     }
 
     getType(): SettingType {
@@ -23,20 +23,20 @@ export class EnsembleSetting implements Setting<EnsembleIdent | null> {
         return "Ensemble";
     }
 
-    getDelegate(): SettingDelegate<EnsembleIdent | null> {
+    getDelegate(): SettingDelegate<RegularEnsembleIdent | null> {
         return this._delegate;
     }
 
-    serializeValue(value: EnsembleIdent | null): string {
+    serializeValue(value: RegularEnsembleIdent | null): string {
         return value?.toString() ?? "";
     }
 
-    deserializeValue(serializedValue: string): EnsembleIdent | null {
-        return serializedValue !== "" ? EnsembleIdent.fromString(serializedValue) : null;
+    deserializeValue(serializedValue: string): RegularEnsembleIdent | null {
+        return serializedValue !== "" ? RegularEnsembleIdent.fromString(serializedValue) : null;
     }
 
-    makeComponent(): (props: SettingComponentProps<EnsembleIdent | null>) => React.ReactNode {
-        return function Ensemble(props: SettingComponentProps<EnsembleIdent | null>) {
+    makeComponent(): (props: SettingComponentProps<RegularEnsembleIdent | null>) => React.ReactNode {
+        return function Ensemble(props: SettingComponentProps<RegularEnsembleIdent | null>) {
             const ensembles = props.globalSettings.ensembles.filter((ensemble) =>
                 props.availableValues.includes(ensemble.getIdent())
             );
@@ -53,7 +53,7 @@ export class EnsembleSetting implements Setting<EnsembleIdent | null> {
         };
     }
 
-    valueToString(args: ValueToStringArgs<EnsembleIdent | null>): string {
+    valueToString(args: ValueToStringArgs<RegularEnsembleIdent | null>): string {
         const { value, workbenchSession } = args;
         if (value === null) {
             return "-";

frontend/src/modules/2DViewer/settings/atoms/derivedAtoms.ts

@@ -10,9 +10,9 @@ export const selectedFieldIdentifierAtom = atom((get) => {
 
     if (
         !userSelectedField ||
-        !ensembleSet.getEnsembleArr().some((ens) => ens.getFieldIdentifier() === userSelectedField)
+        !ensembleSet.getRegularEnsembleArray().some((ens) => ens.getFieldIdentifier() === userSelectedField)
     ) {
-        return ensembleSet.getEnsembleArr().at(0)?.getFieldIdentifier() ?? null;
+        return ensembleSet.getRegularEnsembleArray().at(0)?.getFieldIdentifier() ?? null;
     }
 
     return userSelectedField;