Skip to content

Commit

Permalink
Feat/strat column modal (#275)
Browse files Browse the repository at this point in the history
* chore: update generated files.

* chore: update eds version to 0.37.0

* feat: Add Stratigraphic column dialog.

* chore: Fix page layout styling of hight, width and scroll.

* fix: Bug in variogram result table.

* chore: Update generated api files.

* fix: Adapt components to new analogueModel data.

* feat: Fetch stratigraphic column metadata and display in tabel.

* fix: Add and view model page, handle metadata flow.

* refactor: seperate add-model sidePane into own component.

* chore: Add navigation to "view model" button. Add info text to add metadata. Styling fixes.

* feat: Delete StratColumn row.

* chore: Removed components no longer in use.
  • Loading branch information
mheggelund authored May 31, 2024
1 parent c963cd7 commit 78b3403
Show file tree
Hide file tree
Showing 47 changed files with 2,499 additions and 620 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dependencies": {
"@azure/msal-browser": "^2.32.2",
"@azure/msal-react": "^1.5.2",
"@equinor/eds-core-react": "0.36.0",
"@equinor/eds-core-react": "0.37.0",
"@equinor/eds-data-grid-react": "0.3.0",
"@equinor/eds-icons": "0.21.0",
"@equinor/eds-tokens": "0.9.2",
Expand Down
17 changes: 17 additions & 0 deletions src/api/generated/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ export type { AddAnalogueModelParameterCommandForm } from './models/AddAnalogueM
export type { AddAnalogueModelParameterCommandResponse } from './models/AddAnalogueModelParameterCommandResponse';
export type { AddAnalogueModelParameterDto } from './models/AddAnalogueModelParameterDto';
export type { AddAnalogueResponseDto } from './models/AddAnalogueResponseDto';
export type { AddGeologicalGroupCommandResponse } from './models/AddGeologicalGroupCommandResponse';
export type { AddGeologicalGroupForm } from './models/AddGeologicalGroupForm';
export type { AddMetadataDto } from './models/AddMetadataDto';
export type { AddMetadataResponseDto } from './models/AddMetadataResponseDto';
export type { AddParameterDto } from './models/AddParameterDto';
export type { AddStatigraphicGroupForm } from './models/AddStatigraphicGroupForm';
export type { AddStratigraphicGroupCommandResponse } from './models/AddStratigraphicGroupCommandResponse';
export type { AnalogueList } from './models/AnalogueList';
export type { AnalogueModelDetail } from './models/AnalogueModelDetail';
export type { AnalogueModelList } from './models/AnalogueModelList';
Expand All @@ -37,6 +41,7 @@ export { ComputeJobStatus } from './models/ComputeJobStatus';
export { ComputeType } from './models/ComputeType';
export type { ConvertAnalogueModelCommand } from './models/ConvertAnalogueModelCommand';
export type { CoordinateDto } from './models/CoordinateDto';
export type { CountryDto } from './models/CountryDto';
export type { CreateAnalogueCommand } from './models/CreateAnalogueCommand';
export type { CreateAnalogueCommandResponse } from './models/CreateAnalogueCommandResponse';
export type { CreateAnalogueDto } from './models/CreateAnalogueDto';
Expand All @@ -51,7 +56,10 @@ export type { CreateParameterCommand } from './models/CreateParameterCommand';
export type { ErrorResponse } from './models/ErrorResponse';
export type { EstimateChannelCommand } from './models/EstimateChannelCommand';
export type { EstimateVariogramCommand } from './models/EstimateVariogramCommand';
export type { FieldDto } from './models/FieldDto';
export type { File } from './models/File';
export type { GeologicalGroupDto } from './models/GeologicalGroupDto';
export type { GeologicalStandardDto } from './models/GeologicalStandardDto';
export type { GetAnalogueListQueryResponse } from './models/GetAnalogueListQueryResponse';
export type { GetAnalogueModelListQueryResponse } from './models/GetAnalogueModelListQueryResponse';
export type { GetAnalogueModelQueryResponse } from './models/GetAnalogueModelQueryResponse';
Expand All @@ -75,14 +83,20 @@ export type { JobList } from './models/JobList';
export type { JobListUploadsDto } from './models/JobListUploadsDto';
export { JobStatus } from './models/JobStatus';
export { JobType } from './models/JobType';
export type { ListAllQueryResponse } from './models/ListAllQueryResponse';
export type { ListComputeCasesByAnalogueModelIdQueryResponse } from './models/ListComputeCasesByAnalogueModelIdQueryResponse';
export type { ListComputeSettingsInputDto } from './models/ListComputeSettingsInputDto';
export type { ListComputeSettingsInputValueDto } from './models/ListComputeSettingsInputValueDto';
export type { ListComputeSettingsMethodDto } from './models/ListComputeSettingsMethodDto';
export type { ListComputeSettingsQueryResponse } from './models/ListComputeSettingsQueryResponse';
export type { ListCountriesQueryResponse } from './models/ListCountriesQueryResponse';
export type { ListFieldsQueryResponse } from './models/ListFieldsQueryResponse';
export type { ListGeoStandardsQueryResponse } from './models/ListGeoStandardsQueryResponse';
export type { ListMetadataQueryResponse } from './models/ListMetadataQueryResponse';
export type { ListMetadataTypesQueryResponse } from './models/ListMetadataTypesQueryResponse';
export type { ListModelAreaTypesQueryResponse } from './models/ListModelAreaTypesQueryResponse';
export type { ListStratColumnQueryResponse } from './models/ListStratColumnQueryResponse';
export type { ListStratUnitsQueryResponse } from './models/ListStratUnitsQueryResponse';
export type { MergeModelCommandResponse } from './models/MergeModelCommandResponse';
export type { MergeModelDto } from './models/MergeModelDto';
export type { MetadataDto } from './models/MetadataDto';
Expand All @@ -100,6 +114,9 @@ export type { PatchParameterDto } from './models/PatchParameterDto';
export type { PrepareChunkedUploadCommandResponse } from './models/PrepareChunkedUploadCommandResponse';
export type { PrepareChunkedUploadDto } from './models/PrepareChunkedUploadDto';
export type { RadixJobDto } from './models/RadixJobDto';
export type { StratColumnDto } from './models/StratColumnDto';
export type { StratigraphicGroupDto } from './models/StratigraphicGroupDto';
export type { StratUnitDto } from './models/StratUnitDto';
export type { UpdateAnalogueModelAreaCommandForm } from './models/UpdateAnalogueModelAreaCommandForm';
export type { UpdateAnalogueModelCommandBody } from './models/UpdateAnalogueModelCommandBody';
export type { UpdateAnalogueModelCommandResponse } from './models/UpdateAnalogueModelCommandResponse';
Expand Down
15 changes: 15 additions & 0 deletions src/api/generated/models/AddGeologicalGroupCommandResponse.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { GeologicalGroupDto } from './GeologicalGroupDto';

export type AddGeologicalGroupCommandResponse = {
success?: boolean;
count?: number | null;
message?: string | null;
validationErrors?: Array<string> | null;
data: GeologicalGroupDto;
};

12 changes: 12 additions & 0 deletions src/api/generated/models/AddGeologicalGroupForm.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

export type AddGeologicalGroupForm = {
grossDepEnvId: string;
depEnvId: string;
subEnvId: string;
architecturalElements: Array<string>;
};

12 changes: 12 additions & 0 deletions src/api/generated/models/AddStatigraphicGroupForm.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

export type AddStatigraphicGroupForm = {
countryId: string;
fieldId: string;
stratigraphicColumnId: string;
stratigraphicUnitIds: Array<string>;
};

15 changes: 15 additions & 0 deletions src/api/generated/models/AddStratigraphicGroupCommandResponse.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { StratigraphicGroupDto } from './StratigraphicGroupDto';

export type AddStratigraphicGroupCommandResponse = {
success?: boolean;
count?: number | null;
message?: string | null;
validationErrors?: Array<string> | null;
data: StratigraphicGroupDto;
};

4 changes: 4 additions & 0 deletions src/api/generated/models/AnalogueModelDetail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

import type { AnalogueList } from './AnalogueList';
import type { AnalogueModelSourceType } from './AnalogueModelSourceType';
import type { GeologicalGroupDto } from './GeologicalGroupDto';
import type { MetadataDto } from './MetadataDto';
import type { ModelAreaDto } from './ModelAreaDto';
import type { ParameterList } from './ParameterList';
import type { StratigraphicGroupDto } from './StratigraphicGroupDto';
import type { UploadList } from './UploadList';

export type AnalogueModelDetail = {
Expand All @@ -21,5 +23,7 @@ export type AnalogueModelDetail = {
parameters: Array<ParameterList>;
metadata: Array<MetadataDto>;
modelAreas: Array<ModelAreaDto>;
stratigraphicGroups: Array<StratigraphicGroupDto>;
geologicalGroups: Array<GeologicalGroupDto>;
};

4 changes: 4 additions & 0 deletions src/api/generated/models/AnalogueModelList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@

import type { AnalogueList } from './AnalogueList';
import type { AnalogueModelSourceType } from './AnalogueModelSourceType';
import type { GeologicalGroupDto } from './GeologicalGroupDto';
import type { MetadataDto } from './MetadataDto';
import type { ModelAreaDto } from './ModelAreaDto';
import type { ParameterList } from './ParameterList';
import type { StratigraphicGroupDto } from './StratigraphicGroupDto';
import type { UploadList } from './UploadList';

export type AnalogueModelList = {
Expand All @@ -16,6 +18,8 @@ export type AnalogueModelList = {
parameters: Array<ParameterList>;
metadata: Array<MetadataDto>;
modelAreas: Array<ModelAreaDto>;
stratigraphicGroups: Array<StratigraphicGroupDto>;
geologicalGroups: Array<GeologicalGroupDto>;
analogueModelId: string;
name: string;
description: string;
Expand Down
10 changes: 10 additions & 0 deletions src/api/generated/models/CountryDto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

export type CountryDto = {
countryId: string;
identifier: string;
};

11 changes: 11 additions & 0 deletions src/api/generated/models/FieldDto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

export type FieldDto = {
fieldId: string;
identifier: string;
countryId: string;
};

15 changes: 15 additions & 0 deletions src/api/generated/models/GeologicalGroupDto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { GeologicalStandardDto } from './GeologicalStandardDto';

export type GeologicalGroupDto = {
geologicalGroupId: string;
grossDepEnv: GeologicalStandardDto;
depEnv: GeologicalStandardDto;
subenv: GeologicalStandardDto;
architecturalElements: Array<GeologicalStandardDto>;
};

13 changes: 13 additions & 0 deletions src/api/generated/models/GeologicalStandardDto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

export type GeologicalStandardDto = {
geologicalStandardId: string;
identifier: string;
geologicalStandardParentId?: string | null;
geologyGroup: string;
equinorCode: number;
};

19 changes: 19 additions & 0 deletions src/api/generated/models/ListAllQueryResponse.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { CountryDto } from './CountryDto';
import type { FieldDto } from './FieldDto';
import type { GeologicalStandardDto } from './GeologicalStandardDto';
import type { StratColumnDto } from './StratColumnDto';
import type { StratUnitDto } from './StratUnitDto';

export type ListAllQueryResponse = {
countries: Array<CountryDto>;
fields: Array<FieldDto>;
stratUnits: Array<StratUnitDto>;
stratColumns: Array<StratColumnDto>;
geologicalStandards: Array<GeologicalStandardDto>;
};

15 changes: 15 additions & 0 deletions src/api/generated/models/ListCountriesQueryResponse.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { CountryDto } from './CountryDto';

export type ListCountriesQueryResponse = {
success?: boolean;
count?: number | null;
message?: string | null;
validationErrors?: Array<string> | null;
data: Array<CountryDto>;
};

15 changes: 15 additions & 0 deletions src/api/generated/models/ListFieldsQueryResponse.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { FieldDto } from './FieldDto';

export type ListFieldsQueryResponse = {
success?: boolean;
count?: number | null;
message?: string | null;
validationErrors?: Array<string> | null;
data: Array<FieldDto>;
};

15 changes: 15 additions & 0 deletions src/api/generated/models/ListGeoStandardsQueryResponse.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { GeologicalStandardDto } from './GeologicalStandardDto';

export type ListGeoStandardsQueryResponse = {
success?: boolean;
count?: number | null;
message?: string | null;
validationErrors?: Array<string> | null;
data: Array<GeologicalStandardDto>;
};

15 changes: 15 additions & 0 deletions src/api/generated/models/ListStratColumnQueryResponse.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { StratColumnDto } from './StratColumnDto';

export type ListStratColumnQueryResponse = {
success?: boolean;
count?: number | null;
message?: string | null;
validationErrors?: Array<string> | null;
data: Array<StratColumnDto>;
};

15 changes: 15 additions & 0 deletions src/api/generated/models/ListStratUnitsQueryResponse.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { StratUnitDto } from './StratUnitDto';

export type ListStratUnitsQueryResponse = {
success?: boolean;
count?: number | null;
message?: string | null;
validationErrors?: Array<string> | null;
data: Array<StratUnitDto>;
};

13 changes: 13 additions & 0 deletions src/api/generated/models/StratColumnDto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { CountryDto } from './CountryDto';

export type StratColumnDto = {
stratColumnId: string;
identifier: string;
countries: Array<CountryDto>;
};

14 changes: 14 additions & 0 deletions src/api/generated/models/StratUnitDto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

export type StratUnitDto = {
stratUnitId: string;
identifier: string;
stratColumnId: string;
stratUnitParentId?: string | null;
level: number;
stratUnitType: string;
};

18 changes: 18 additions & 0 deletions src/api/generated/models/StratigraphicGroupDto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/* generated using openapi-typescript-codegen -- do no edit */
/* istanbul ignore file */
/* tslint:disable */
/* eslint-disable */

import type { CountryDto } from './CountryDto';
import type { FieldDto } from './FieldDto';
import type { StratColumnDto } from './StratColumnDto';
import type { StratUnitDto } from './StratUnitDto';

export type StratigraphicGroupDto = {
stratigraphicGroupId: string;
country: CountryDto;
field: FieldDto;
stratColumn: StratColumnDto;
stratUnits: Array<StratUnitDto>;
};

Loading

0 comments on commit 78b3403

Please sign in to comment.