Chore/metadata cleanup (#332)

* chore: Sort analouge list in outcrop. * chore: Sort lists in Stratigraphic column. * chore: Sort lists in GDE. * chore: Refactor by seperating sort into seperat util function.
equinor · Oct 10, 2024 · 65ee09b · 65ee09b
1 parent e067b92
commit 65ee09b
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 43 deletions.
diff --git a/src/components/GrossDepositionEnviroment/GdeSelect/GdeSelect.tsx b/src/components/GrossDepositionEnviroment/GdeSelect/GdeSelect.tsx
@@ -3,6 +3,7 @@ import { Autocomplete, AutocompleteChanges } from '@equinor/eds-core-react';
 import { GeologicalStandardDto } from '../../../api/generated';
 import { useFetchGrossDepData } from '../../../hooks/useFetchGrossDepData';
 import * as StyledDialog from '../../../styles/addRowDialog/AddRowDialog.styled';
+import { sortList } from '../../../utils/SortList';
 import { GdeType } from '../GrossDepositionEnviromentGroup/GrossDepositionEnviromentGroup';
 
 export const GdeSelect = ({
@@ -42,7 +43,7 @@ export const GdeSelect = ({
     <StyledDialog.AutocompleteList>
       <Autocomplete
         label="Gross Depositional Environment (GDE)"
-        options={Gde}
+        options={sortList(Gde)}
         optionLabel={(option) => option.identifier}
         onOptionsChange={(e: AutocompleteChanges<GeologicalStandardDto>) => {
           setGdeObject({
@@ -56,7 +57,7 @@ export const GdeSelect = ({
       <Autocomplete
         label="Depositional Environment"
         disabled={gdeObject.grossDepEnv?.geologicalStandardId === undefined}
-        options={De}
+        options={sortList(De)}
         optionLabel={(option) => option.identifier}
         onOptionsChange={(e: AutocompleteChanges<GeologicalStandardDto>) => {
           setGdeObject({
@@ -70,7 +71,7 @@ export const GdeSelect = ({
       <Autocomplete
         label="Subenvironment"
         disabled={gdeObject.grossDepEnv?.geologicalStandardId === undefined}
-        options={SubEnvironment}
+        options={sortList(SubEnvironment)}
         optionLabel={(option) => option.identifier}
         onOptionsChange={(e: AutocompleteChanges<GeologicalStandardDto>) => {
           setGdeObject({
@@ -84,7 +85,7 @@ export const GdeSelect = ({
       <Autocomplete
         label="Architectural Element"
         multiple
-        options={ArchitecturalElement}
+        options={sortList(ArchitecturalElement)}
         optionLabel={(option) => option.identifier}
         onOptionsChange={(e: AutocompleteChanges<GeologicalStandardDto>) => {
           setGdeObject({

diff --git a/src/components/OutcropAnalogue/OutcropSelect/OutcropSelect.tsx b/src/components/OutcropAnalogue/OutcropSelect/OutcropSelect.tsx
@@ -3,6 +3,7 @@ import { Autocomplete, AutocompleteChanges } from '@equinor/eds-core-react';
 import { OutcropDto } from '../../../api/generated';
 import { useFetchOutcropData } from '../../../hooks/useFetchOutcropData';
 import * as StyledDialog from '../../../styles/addRowDialog/AddRowDialog.styled';
+import { sortList } from '../../../utils/SortList';
 import { OutcropType } from '../OutcropAnalogueGroup/OutcropAnalogueGroup';
 
 export const OutcropSelect = ({
@@ -29,7 +30,7 @@ export const OutcropSelect = ({
     <StyledDialog.AutocompleteList>
       <Autocomplete
         label="Analogue"
-        options={OutcropData.data.data}
+        options={sortList(OutcropData.data.data)}
         optionLabel={(option) => option.name}
         onOptionsChange={(e: AutocompleteChanges<OutcropDto>) => {
           const copyObject: OutcropType = {

diff --git a/src/components/StrategraphicColumn/StratigraphicColumnSelect/StratigraphicColumnSelect.tsx b/src/components/StrategraphicColumn/StratigraphicColumnSelect/StratigraphicColumnSelect.tsx
@@ -14,6 +14,7 @@ import {
   useFetchSmdaStratigraphicColumns,
 } from '../../../hooks/useFetchStratColData';
 import * as StyledDialog from '../../../styles/addRowDialog/AddRowDialog.styled';
+import { sortList } from '../../../utils/SortList';
 
 export const StratigraphicColumnSelect = ({
   stratColumnObject,
@@ -61,9 +62,7 @@ export const StratigraphicColumnSelect = ({
     <StyledDialog.AutocompleteList>
       <Autocomplete
         label="Country"
-        options={filterCountries.sort((a, b) =>
-          a.identifier.localeCompare(b.identifier),
-        )}
+        options={sortList(filterCountries)}
         optionLabel={(option) => option.identifier}
         onOptionsChange={(e: AutocompleteChanges<CountryDto>) => {
           setStratColumnObject({
@@ -82,8 +81,10 @@ export const StratigraphicColumnSelect = ({
       <Autocomplete
         disabled={stratColumnObject.country === undefined}
         label="Field"
-        options={fieldData.data.data.filter(
-          (field) => field.countryId === stratColumnObject.country?.countryId,
+        options={sortList(
+          fieldData.data.data.filter(
+            (field) => field.countryId === stratColumnObject.country?.countryId,
+          ),
         )}
         optionLabel={(option) => option.identifier}
         onOptionsChange={(e: AutocompleteChanges<FieldDto>) => {
@@ -101,13 +102,15 @@ export const StratigraphicColumnSelect = ({
       <Autocomplete
         disabled={stratColumnObject.country === undefined}
         label="Stratigraphic column"
-        options={stratColumnData.data.data.filter(
-          (c) =>
-            stratColumnObject.country !== undefined &&
-            c.countries.filter(
-              (country) =>
-                country.countryId === stratColumnObject.country?.countryId,
-            ).length !== 0,
+        options={sortList(
+          stratColumnData.data.data.filter(
+            (c) =>
+              stratColumnObject.country !== undefined &&
+              c.countries.filter(
+                (country) =>
+                  country.countryId === stratColumnObject.country?.countryId,
+              ).length !== 0,
+          ),
         )}
         optionLabel={(option) => option.identifier}
         onOptionsChange={(e: AutocompleteChanges<StratColumnDto>) => {
@@ -128,12 +131,15 @@ export const StratigraphicColumnSelect = ({
       <Autocomplete
         disabled={stratColumnObject.stratColumn === undefined}
         label="Level 1 (group)"
-        options={stratUnitData.data.data
-          .filter((s) => s.level === 1)
-          .filter(
-            (c) =>
-              c.stratColumnId === stratColumnObject.stratColumn?.stratColumnId,
-          )}
+        options={sortList(
+          stratUnitData.data.data
+            .filter((s) => s.level === 1)
+            .filter(
+              (c) =>
+                c.stratColumnId ===
+                stratColumnObject.stratColumn?.stratColumnId,
+            ),
+        )}
         optionLabel={(option) => option.identifier}
         onOptionsChange={(e: AutocompleteChanges<StratUnitDto>) =>
           setStratColumnObject({
@@ -152,16 +158,19 @@ export const StratigraphicColumnSelect = ({
       <Autocomplete
         disabled={stratColumnObject.level1 === undefined}
         label="Level 2 (formation)"
-        options={stratUnitData.data.data
-          .filter((s) => s.level === 2)
-          .filter(
-            (c) =>
-              c.stratColumnId === stratColumnObject.stratColumn?.stratColumnId,
-          )
-          .filter(
-            (x) =>
-              x.stratUnitParentId === stratColumnObject.level1?.stratUnitId,
-          )}
+        options={sortList(
+          stratUnitData.data.data
+            .filter((s) => s.level === 2)
+            .filter(
+              (c) =>
+                c.stratColumnId ===
+                stratColumnObject.stratColumn?.stratColumnId,
+            )
+            .filter(
+              (x) =>
+                x.stratUnitParentId === stratColumnObject.level1?.stratUnitId,
+            ),
+        )}
         optionLabel={(option) => option.identifier}
         onOptionsChange={(e: AutocompleteChanges<StratUnitDto>) =>
           setStratColumnObject({
@@ -179,16 +188,19 @@ export const StratigraphicColumnSelect = ({
       <Autocomplete
         disabled={stratColumnObject.level2 === undefined}
         label="Level 3 (formation/subzone)"
-        options={stratUnitData.data.data
-          .filter((s) => s.level === 3)
-          .filter(
-            (c) =>
-              c.stratColumnId === stratColumnObject.stratColumn?.stratColumnId,
-          )
-          .filter(
-            (x) =>
-              x.stratUnitParentId === stratColumnObject.level2?.stratUnitId,
-          )}
+        options={sortList(
+          stratUnitData.data.data
+            .filter((s) => s.level === 3)
+            .filter(
+              (c) =>
+                c.stratColumnId ===
+                stratColumnObject.stratColumn?.stratColumnId,
+            )
+            .filter(
+              (x) =>
+                x.stratUnitParentId === stratColumnObject.level2?.stratUnitId,
+            ),
+        )}
         optionLabel={(option) => option.identifier}
         onOptionsChange={(e: AutocompleteChanges<StratUnitDto>) =>
           setStratColumnObject({

diff --git a/src/utils/SortList.ts b/src/utils/SortList.ts
@@ -0,0 +1,15 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+export const sortList = (data: any) => {
+  if (data.length === 0) {
+    return data;
+  } else if (data.length !== 0 && data[0]['identifier'] !== undefined) {
+    return data.sort((a: any, b: any) =>
+      a.identifier.localeCompare(b.identifier),
+    );
+  } else if (data[0]['name'] !== undefined) {
+    return data.sort((a: any, b: any) => a.name.localeCompare(b.name));
+  } else {
+    console.log('Data has no identifier or name');
+    return data;
+  }
+};