diff --git a/src/api/generated/index.ts b/src/api/generated/index.ts index 03ed4b20..7334deb2 100644 --- a/src/api/generated/index.ts +++ b/src/api/generated/index.ts @@ -7,19 +7,15 @@ export { CancelablePromise, CancelError } from './core/CancelablePromise'; export { OpenAPI } from './core/OpenAPI'; export type { OpenAPIConfig } from './core/OpenAPI'; -export type { AddAnalogueDto } from './models/AddAnalogueDto'; -export type { AddAnalogueModelAnalogueCommandForm } from './models/AddAnalogueModelAnalogueCommandForm'; -export type { AddAnalogueModelAnalogueCommandResponse } from './models/AddAnalogueModelAnalogueCommandResponse'; -export type { AddAnalogueModelAnalogueDto } from './models/AddAnalogueModelAnalogueDto'; export type { AddAnalogueModelAreaCommandForm } from './models/AddAnalogueModelAreaCommandForm'; export type { AddAnalogueModelAreaCommandResponse } from './models/AddAnalogueModelAreaCommandResponse'; export type { AddAnalogueModelMetadataCommandForm } from './models/AddAnalogueModelMetadataCommandForm'; export type { AddAnalogueModelMetadataCommandResponse } from './models/AddAnalogueModelMetadataCommandResponse'; export type { AddAnalogueModelMetadataDto } from './models/AddAnalogueModelMetadataDto'; +export type { AddAnalogueModelOutcropForm } from './models/AddAnalogueModelOutcropForm'; export type { AddAnalogueModelParameterCommandForm } from './models/AddAnalogueModelParameterCommandForm'; 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'; @@ -27,7 +23,6 @@ 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'; export { AnalogueModelSourceType } from './models/AnalogueModelSourceType'; @@ -40,9 +35,6 @@ 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'; export type { CreateAnalogueModelCommand } from './models/CreateAnalogueModelCommand'; export type { CreateAnalogueModelCommandResponse } from './models/CreateAnalogueModelCommandResponse'; export type { CreateAnalogueModelDto } from './models/CreateAnalogueModelDto'; @@ -60,7 +52,6 @@ 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'; export type { GetCurrentJobStatusCommandResponse } from './models/GetCurrentJobStatusCommandResponse'; @@ -71,6 +62,8 @@ export type { GetJobListQueryResponse } from './models/GetJobListQueryResponse'; export type { GetObjectResultsByModelIdQueryResponse } from './models/GetObjectResultsByModelIdQueryResponse'; export type { GetObjectResultsDto } from './models/GetObjectResultsDto'; export type { GetObjectResultsFileDto } from './models/GetObjectResultsFileDto'; +export type { GetOutcropsCommandResponse } from './models/GetOutcropsCommandResponse'; +export type { GetOutcropsDto } from './models/GetOutcropsDto'; export type { GetParameterDetailQueryResponse } from './models/GetParameterDetailQueryResponse'; export type { GetParameterListQueryResponse } from './models/GetParameterListQueryResponse'; export type { GetUploadDetailQueryResponse } from './models/GetUploadDetailQueryResponse'; @@ -107,6 +100,7 @@ export type { ObjectEstimationResultDto } from './models/ObjectEstimationResultD export type { ObjectHeightDto } from './models/ObjectHeightDto'; export type { Operation } from './models/Operation'; export { OperationType } from './models/OperationType'; +export type { OutcropDto } from './models/OutcropDto'; export type { ParameterDetail } from './models/ParameterDetail'; export type { ParameterList } from './models/ParameterList'; export type { PatchAnalogueModelCommandResponse } from './models/PatchAnalogueModelCommandResponse'; @@ -144,18 +138,17 @@ export { UploadFileType } from './models/UploadFileType'; export type { UploadList } from './models/UploadList'; export { UploadStatus } from './models/UploadStatus'; -export { AnalogueModelAnaloguesService } from './services/AnalogueModelAnaloguesService'; export { AnalogueModelComputeCasesService } from './services/AnalogueModelComputeCasesService'; export { AnalogueModelMetadataService } from './services/AnalogueModelMetadataService'; export { AnalogueModelParametersService } from './services/AnalogueModelParametersService'; export { AnalogueModelsService } from './services/AnalogueModelsService'; -export { AnaloguesService } from './services/AnaloguesService'; export { ComputeSettingsService } from './services/ComputeSettingsService'; export { ImagesService } from './services/ImagesService'; export { JobsService } from './services/JobsService'; export { MetadataService } from './services/MetadataService'; export { MetadataTypeService } from './services/MetadataTypeService'; export { ModelAreaTypeService } from './services/ModelAreaTypeService'; +export { OutcropsService } from './services/OutcropsService'; export { ParametersService } from './services/ParametersService'; export { ResultsService } from './services/ResultsService'; export { UploadsService } from './services/UploadsService'; diff --git a/src/api/generated/models/AddAnalogueModelAnalogueCommandForm.ts b/src/api/generated/models/AddAnalogueModelAnalogueCommandForm.ts deleted file mode 100644 index 96448c31..00000000 --- a/src/api/generated/models/AddAnalogueModelAnalogueCommandForm.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AddAnalogueDto } from './AddAnalogueDto'; - -export type AddAnalogueModelAnalogueCommandForm = { - analogues?: Array | null; -}; - diff --git a/src/api/generated/models/AddAnalogueModelAnalogueCommandResponse.ts b/src/api/generated/models/AddAnalogueModelAnalogueCommandResponse.ts deleted file mode 100644 index 0a4dc382..00000000 --- a/src/api/generated/models/AddAnalogueModelAnalogueCommandResponse.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AddAnalogueModelAnalogueDto } from './AddAnalogueModelAnalogueDto'; - -export type AddAnalogueModelAnalogueCommandResponse = { - success?: boolean; - count?: number | null; - message?: string | null; - validationErrors?: Array | null; - data: AddAnalogueModelAnalogueDto; -}; - diff --git a/src/api/generated/models/AddAnalogueModelAnalogueDto.ts b/src/api/generated/models/AddAnalogueModelAnalogueDto.ts deleted file mode 100644 index 99b12edf..00000000 --- a/src/api/generated/models/AddAnalogueModelAnalogueDto.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { AddAnalogueResponseDto } from './AddAnalogueResponseDto'; - -export type AddAnalogueModelAnalogueDto = { - analogueModelId: string; - name: string; - description: string; - sourceType: string; - analogues: Array; -}; - diff --git a/src/api/generated/models/AddAnalogueDto.ts b/src/api/generated/models/AddAnalogueModelOutcropForm.ts similarity index 66% rename from src/api/generated/models/AddAnalogueDto.ts rename to src/api/generated/models/AddAnalogueModelOutcropForm.ts index 7b379ab5..25da3972 100644 --- a/src/api/generated/models/AddAnalogueDto.ts +++ b/src/api/generated/models/AddAnalogueModelOutcropForm.ts @@ -3,7 +3,7 @@ /* tslint:disable */ /* eslint-disable */ -export type AddAnalogueDto = { - analogueId: string; +export type AddAnalogueModelOutcropForm = { + outcropId?: string; }; diff --git a/src/api/generated/models/AddAnalogueResponseDto.ts b/src/api/generated/models/AddAnalogueResponseDto.ts deleted file mode 100644 index 4fd78fdb..00000000 --- a/src/api/generated/models/AddAnalogueResponseDto.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export type AddAnalogueResponseDto = { - analogueId: string; - name: string; - descriprion: string; -}; - diff --git a/src/api/generated/models/AnalogueList.ts b/src/api/generated/models/AnalogueList.ts deleted file mode 100644 index 3aadee64..00000000 --- a/src/api/generated/models/AnalogueList.ts +++ /dev/null @@ -1,11 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export type AnalogueList = { - analogueId: string; - name: string; - description: string; -}; - diff --git a/src/api/generated/models/AnalogueModelDetail.ts b/src/api/generated/models/AnalogueModelDetail.ts index c5edcadc..073c5838 100644 --- a/src/api/generated/models/AnalogueModelDetail.ts +++ b/src/api/generated/models/AnalogueModelDetail.ts @@ -3,11 +3,11 @@ /* tslint:disable */ /* eslint-disable */ -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 { OutcropDto } from './OutcropDto'; import type { ParameterList } from './ParameterList'; import type { StratigraphicGroupDto } from './StratigraphicGroupDto'; import type { UploadList } from './UploadList'; @@ -18,12 +18,12 @@ export type AnalogueModelDetail = { description: string; isProcessed: boolean; sourceType: AnalogueModelSourceType; - analogues: Array; fileUploads: Array; parameters: Array; metadata: Array; modelAreas: Array; stratigraphicGroups: Array; geologicalGroups: Array; + outcrops: Array; }; diff --git a/src/api/generated/models/AnalogueModelList.ts b/src/api/generated/models/AnalogueModelList.ts index acf7aadb..9effc505 100644 --- a/src/api/generated/models/AnalogueModelList.ts +++ b/src/api/generated/models/AnalogueModelList.ts @@ -3,23 +3,23 @@ /* tslint:disable */ /* eslint-disable */ -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 { OutcropDto } from './OutcropDto'; import type { ParameterList } from './ParameterList'; import type { StratigraphicGroupDto } from './StratigraphicGroupDto'; import type { UploadList } from './UploadList'; export type AnalogueModelList = { - analogues: Array; uploads: Array; parameters: Array; metadata: Array; modelAreas: Array; stratigraphicGroups: Array; geologicalGroups: Array; + outcrops: Array; analogueModelId: string; name: string; description: string; diff --git a/src/api/generated/models/CreateAnalogueCommand.ts b/src/api/generated/models/CreateAnalogueCommand.ts deleted file mode 100644 index e88d8bf3..00000000 --- a/src/api/generated/models/CreateAnalogueCommand.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -export type CreateAnalogueCommand = { - name: string; - description?: string | null; -}; - diff --git a/src/api/generated/models/CreateAnalogueCommandResponse.ts b/src/api/generated/models/CreateAnalogueCommandResponse.ts deleted file mode 100644 index a5686a19..00000000 --- a/src/api/generated/models/CreateAnalogueCommandResponse.ts +++ /dev/null @@ -1,15 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ - -import type { CreateAnalogueDto } from './CreateAnalogueDto'; - -export type CreateAnalogueCommandResponse = { - success?: boolean; - count?: number | null; - message?: string | null; - validationErrors?: Array | null; - data: CreateAnalogueDto; -}; - diff --git a/src/api/generated/models/GetAnalogueListQueryResponse.ts b/src/api/generated/models/GetOutcropsCommandResponse.ts similarity index 66% rename from src/api/generated/models/GetAnalogueListQueryResponse.ts rename to src/api/generated/models/GetOutcropsCommandResponse.ts index cc87747a..91ff694a 100644 --- a/src/api/generated/models/GetAnalogueListQueryResponse.ts +++ b/src/api/generated/models/GetOutcropsCommandResponse.ts @@ -3,13 +3,13 @@ /* tslint:disable */ /* eslint-disable */ -import type { AnalogueList } from './AnalogueList'; +import type { GetOutcropsDto } from './GetOutcropsDto'; -export type GetAnalogueListQueryResponse = { +export type GetOutcropsCommandResponse = { success?: boolean; count?: number | null; message?: string | null; validationErrors?: Array | null; - data: Array; + data: Array; }; diff --git a/src/api/generated/models/GetOutcropsDto.ts b/src/api/generated/models/GetOutcropsDto.ts new file mode 100644 index 00000000..2f17edd5 --- /dev/null +++ b/src/api/generated/models/GetOutcropsDto.ts @@ -0,0 +1,13 @@ +/* generated using openapi-typescript-codegen -- do no edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ + +export type GetOutcropsDto = { + outcropId?: string; + name?: string | null; + outcropCategory?: string | null; + region?: string | null; + basins?: Array | null; +}; + diff --git a/src/api/generated/models/CreateAnalogueDto.ts b/src/api/generated/models/OutcropDto.ts similarity index 51% rename from src/api/generated/models/CreateAnalogueDto.ts rename to src/api/generated/models/OutcropDto.ts index 7d4d45a1..7dce1ebd 100644 --- a/src/api/generated/models/CreateAnalogueDto.ts +++ b/src/api/generated/models/OutcropDto.ts @@ -3,9 +3,11 @@ /* tslint:disable */ /* eslint-disable */ -export type CreateAnalogueDto = { - analogueId?: string; +export type OutcropDto = { + outcropId?: string; name?: string | null; - description?: string | null; + outcropCategory?: string | null; + region?: string | null; + basins?: Array | null; }; diff --git a/src/api/generated/services/AnalogueModelAnaloguesService.ts b/src/api/generated/services/AnalogueModelAnaloguesService.ts deleted file mode 100644 index ed444b31..00000000 --- a/src/api/generated/services/AnalogueModelAnaloguesService.ts +++ /dev/null @@ -1,35 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import type { AddAnalogueModelAnalogueCommandForm } from '../models/AddAnalogueModelAnalogueCommandForm'; -import type { AddAnalogueModelAnalogueCommandResponse } from '../models/AddAnalogueModelAnalogueCommandResponse'; - -import type { CancelablePromise } from '../core/CancelablePromise'; -import { OpenAPI } from '../core/OpenAPI'; -import { request as __request } from '../core/request'; - -export class AnalogueModelAnaloguesService { - - /** - * @param id - * @param requestBody - * @returns AddAnalogueModelAnalogueCommandResponse Success - * @throws ApiError - */ - public static putApiAnalogueModelsAnalogues( - id: string, - requestBody?: AddAnalogueModelAnalogueCommandForm, - ): CancelablePromise { - return __request(OpenAPI, { - method: 'PUT', - url: '/api/analogue-models/{id}/analogues', - path: { - 'id': id, - }, - body: requestBody, - mediaType: 'application/json-patch+json', - }); - } - -} diff --git a/src/api/generated/services/AnalogueModelsService.ts b/src/api/generated/services/AnalogueModelsService.ts index 183dc1ab..28becd6d 100644 --- a/src/api/generated/services/AnalogueModelsService.ts +++ b/src/api/generated/services/AnalogueModelsService.ts @@ -4,6 +4,7 @@ /* eslint-disable */ import type { AddAnalogueModelAreaCommandForm } from '../models/AddAnalogueModelAreaCommandForm'; import type { AddAnalogueModelAreaCommandResponse } from '../models/AddAnalogueModelAreaCommandResponse'; +import type { AddAnalogueModelOutcropForm } from '../models/AddAnalogueModelOutcropForm'; import type { AddGeologicalGroupCommandResponse } from '../models/AddGeologicalGroupCommandResponse'; import type { AddGeologicalGroupForm } from '../models/AddGeologicalGroupForm'; import type { AddStatigraphicGroupForm } from '../models/AddStatigraphicGroupForm'; @@ -245,6 +246,27 @@ export class AnalogueModelsService { }); } + /** + * @param id + * @param requestBody + * @returns AddStratigraphicGroupCommandResponse Success + * @throws ApiError + */ + public static postApiAnalogueModelsOutcrops( + id: string, + requestBody?: AddAnalogueModelOutcropForm, + ): CancelablePromise { + return __request(OpenAPI, { + method: 'POST', + url: '/api/analogue-models/{id}/outcrops', + path: { + 'id': id, + }, + body: requestBody, + mediaType: 'application/json-patch+json', + }); + } + /** * @param id * @param requestBody diff --git a/src/api/generated/services/AnaloguesService.ts b/src/api/generated/services/AnaloguesService.ts deleted file mode 100644 index ff50d1d7..00000000 --- a/src/api/generated/services/AnaloguesService.ts +++ /dev/null @@ -1,42 +0,0 @@ -/* generated using openapi-typescript-codegen -- do no edit */ -/* istanbul ignore file */ -/* tslint:disable */ -/* eslint-disable */ -import type { CreateAnalogueCommand } from '../models/CreateAnalogueCommand'; -import type { CreateAnalogueCommandResponse } from '../models/CreateAnalogueCommandResponse'; -import type { GetAnalogueListQueryResponse } from '../models/GetAnalogueListQueryResponse'; - -import type { CancelablePromise } from '../core/CancelablePromise'; -import { OpenAPI } from '../core/OpenAPI'; -import { request as __request } from '../core/request'; - -export class AnaloguesService { - - /** - * @returns GetAnalogueListQueryResponse Success - * @throws ApiError - */ - public static getApiAnalogues(): CancelablePromise { - return __request(OpenAPI, { - method: 'GET', - url: '/api/analogues', - }); - } - - /** - * @param requestBody - * @returns CreateAnalogueCommandResponse Success - * @throws ApiError - */ - public static postApiAnalogues( - requestBody?: CreateAnalogueCommand, - ): CancelablePromise { - return __request(OpenAPI, { - method: 'POST', - url: '/api/analogues', - body: requestBody, - mediaType: 'application/json-patch+json', - }); - } - -} diff --git a/src/api/generated/services/OutcropsService.ts b/src/api/generated/services/OutcropsService.ts new file mode 100644 index 00000000..29f2a637 --- /dev/null +++ b/src/api/generated/services/OutcropsService.ts @@ -0,0 +1,24 @@ +/* generated using openapi-typescript-codegen -- do no edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { GetOutcropsCommandResponse } from '../models/GetOutcropsCommandResponse'; + +import type { CancelablePromise } from '../core/CancelablePromise'; +import { OpenAPI } from '../core/OpenAPI'; +import { request as __request } from '../core/request'; + +export class OutcropsService { + + /** + * @returns GetOutcropsCommandResponse Success + * @throws ApiError + */ + public static getApiOutcrops(): CancelablePromise { + return __request(OpenAPI, { + method: 'GET', + url: '/api/outcrops', + }); + } + +} diff --git a/src/features/HandleModel/ModelMetadata/ModelMetadataComponent.test.tsx b/src/features/HandleModel/ModelMetadata/ModelMetadataComponent.test.tsx index 40e22cf2..3f76ef95 100644 --- a/src/features/HandleModel/ModelMetadata/ModelMetadataComponent.test.tsx +++ b/src/features/HandleModel/ModelMetadata/ModelMetadataComponent.test.tsx @@ -4,8 +4,8 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { cleanup, render, screen } from '@testing-library/react'; import { MsalReactTester } from 'msal-react-tester'; import { AnalogueModelSourceType } from '../../../api/generated'; -import { useFetchAnalogues } from '../../../hooks/useFetchAnalogues'; import { ModelMetadata } from './ModelMetadata'; +import { useFetchOutcrops } from '../../../hooks/useFetchOutcrops'; let msalTester: MsalReactTester; const mockMetadata = { @@ -17,7 +17,7 @@ const mockMetadata = { fileUploads: [], parameters: [], metadata: [], - analogues: [], + outcrops: [], modelAreas: [], stratigraphicGroups: [], geologicalGroups: [], @@ -37,22 +37,22 @@ afterEach(() => { jest.clearAllMocks(); }); -jest.mock('../../../hooks/useFetchAnalogues'); +jest.mock('../../../hooks/useFetchOutcrops'); const Render = () => { const testQueryClient = new QueryClient(); // @ts-ignore because of error - useFetchAnalogues.mockReturnValue({ + useFetchOutcrops.mockReturnValue({ data: { data: [ { - analogueId: 'test12', + outcropId: 'test12', description: 'string122', name: 'stringA1', }, { - analogueId: 'test13', + outcropId: 'test13', description: 'string123', name: 'stringA2', }, diff --git a/src/features/HandleModel/ModelMetadata/ModelMetadataHooks.test.tsx b/src/features/HandleModel/ModelMetadata/ModelMetadataHooks.test.tsx index 8af8db72..db67ae79 100644 --- a/src/features/HandleModel/ModelMetadata/ModelMetadataHooks.test.tsx +++ b/src/features/HandleModel/ModelMetadata/ModelMetadataHooks.test.tsx @@ -6,8 +6,8 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { cleanup, renderHook, waitFor } from '@testing-library/react'; import { MsalReactTester } from 'msal-react-tester'; import { AnalogueModelSourceType } from '../../../api/generated'; -import { useFetchAnalogues } from '../../../hooks/useFetchAnalogues'; import { ModelMetadata } from './ModelMetadata'; +import { useFetchOutcrops } from '../../../hooks/useFetchOutcrops'; let msalTester: MsalReactTester; const mockMetadata = { @@ -19,7 +19,7 @@ const mockMetadata = { fileUploads: [], parameters: [], metadata: [], - analogues: [], + outcrops: [], modelAreas: [], stratigraphicGroups: [], geologicalGroups: [], @@ -41,8 +41,15 @@ function wrapper(props: { children: React.ReactNode }) { ); } -const mockAnalogueList = { - analogueId: 'test2', +// const mockAnalogueList = { +// analogueId: 'test2', +// name: 'string', +// description: 'string', +// success: true, +// }; + +const mockOutcropList = { + outcropId: 'test2', name: 'string', description: 'string', success: true, @@ -81,12 +88,12 @@ afterEach(() => { }); test('Calls Mocked analogue api with mock data', async () => { - const mock = await mockGetData(mockAnalogueList); + const mock = await mockGetData(mockOutcropList); - const { result } = renderHook(() => useFetchAnalogues(), { wrapper }); + const { result } = renderHook(() => useFetchOutcrops(), { wrapper }); const res = await result.current; await waitFor(() => expect(mock).toHaveBeenCalled()); - await waitFor(() => expect(res.data).toBe(mockAnalogueList)); + await waitFor(() => expect(res.data).toBe(mockOutcropList)); }); diff --git a/src/features/ModelTable/ModelTable.tsx b/src/features/ModelTable/ModelTable.tsx index 0cd1d882..48f695e2 100644 --- a/src/features/ModelTable/ModelTable.tsx +++ b/src/features/ModelTable/ModelTable.tsx @@ -110,16 +110,16 @@ export const ModelTable = () => { columns={[ { accessorKey: 'name', header: 'Model name', id: 'name' }, { - accessorKey: 'analogues', - id: 'analogues', - header: 'Analogue', + accessorKey: 'outcrops', + id: 'outcrops', + header: 'Outcrop', enableColumnFilter: false, size: 100, cell: ({ row }) => ( - {row.original.analogues.length > 0 ?? - row.original.analogues.map((a) => ( -

{a.name + ', '}

+ {row.original.outcrops.length > 0 ?? + row.original.outcrops.map((a) => ( +

{a.name + ', '}

))}
), diff --git a/src/features/ModelView/ModelMetadataView/ModelMetadataView.tsx b/src/features/ModelView/ModelMetadataView/ModelMetadataView.tsx index 8a6700bc..a61fa4ff 100644 --- a/src/features/ModelView/ModelMetadataView/ModelMetadataView.tsx +++ b/src/features/ModelView/ModelMetadataView/ModelMetadataView.tsx @@ -5,13 +5,10 @@ import { useMutation } from '@tanstack/react-query'; import { useState } from 'react'; import { useParams } from 'react-router-dom'; import { - AddAnalogueDto, - AddAnalogueModelAnalogueCommandForm, AddAnalogueModelMetadataCommandForm, + // AddAnalogueModelOutcropForm, AddMetadataDto, AddStatigraphicGroupForm, - AnalogueList, - AnalogueModelAnaloguesService, AnalogueModelDetail, AnalogueModelMetadataService, AnalogueModelSourceType, @@ -60,7 +57,7 @@ export const ModelMetadataView = ({ description: data?.data.description ? data?.data.description : '', isProcessed: data?.data.isProcessed ? data?.data.isProcessed : false, sourceType: AnalogueModelSourceType.DELTARES, - analogues: data?.data.analogues ? data?.data.analogues : [], + outcrops: data?.data.outcrops ? data?.data.outcrops : [], fileUploads: data?.data.fileUploads ? data?.data.fileUploads : [], parameters: [], metadata: data?.data.metadata ? data?.data.metadata : [], @@ -104,26 +101,26 @@ export const ModelMetadataView = ({ }, }); - const uploadModelAnalouges = useMutation({ - mutationFn: ({ - id, - requestBody, - }: { - id: string; - requestBody: AddAnalogueModelAnalogueCommandForm; - }) => { - return AnalogueModelAnaloguesService.putApiAnalogueModelsAnalogues( - id, - requestBody, - ); - }, - onSuccess: () => { - queryClient.refetchQueries(); - }, - }); + // const uploadModelAnalouges = useMutation({ + // mutationFn: ({ + // id, + // requestBody, + // }: { + // id: string; + // requestBody: AddAnalogueModelOutcropForm; + // }) => { + // return AnalogueModelsService.postApiAnalogueModelsOutcrops( + // id, + // requestBody, + // ); + // }, + // onSuccess: () => { + // queryClient.refetchQueries(); + // }, + // }); const metadataList: AddMetadataDto[] = []; - const analougueList: AddAnalogueDto[] = []; + // const outcropList: AddAnalogueModelOutcropForm[] = []; function addMetadataFields(metadata?: MetadataDto[]) { const filteredMetadata = metadata?.filter( @@ -134,11 +131,11 @@ export const ModelMetadataView = ({ metadataList.push(...obj); } - function addAnalogueFields(metadata?: AnalogueList[]) { - if (!metadata) return; - const obj = metadata.map((x) => ({ analogueId: x.analogueId })); - analougueList.push(...obj); - } + // function addAnalogueFields(metadata?: OutcropDto[]) { + // if (!metadata) return; + // const obj = metadata.map((x) => ({ outcropId: x.outcropId! })); + // analougueList.push(...obj); + // } const updateModelMetadata = async (metadata: AnalogueModelDetail) => { const id = data?.data.analogueModelId ? data?.data.analogueModelId : ''; @@ -154,23 +151,21 @@ export const ModelMetadataView = ({ }); addMetadataFields(metadata.metadata); - addAnalogueFields(metadata.analogues); + // addAnalogueFields(metadata.outcrops); const readyMetadata: AddAnalogueModelMetadataCommandForm = { metadata: metadataList, }; - const readyAnalogue: AddAnalogueModelAnalogueCommandForm = { - analogues: analougueList, - }; await uploadModelMetadata.mutateAsync({ id: id, requestBody: readyMetadata, }); - await uploadModelAnalouges.mutateAsync({ - id: id, - requestBody: readyAnalogue, - }); + + // await uploadModelAnalouges.mutateAsync({ + // id: id, + // requestBody: readyAnalogue, + // }); toggleEditMetadata(); }; diff --git a/src/hooks/useFetchAnalogues.ts b/src/hooks/useFetchOutcrops.ts similarity index 70% rename from src/hooks/useFetchAnalogues.ts rename to src/hooks/useFetchOutcrops.ts index 9b17dd47..492aec53 100644 --- a/src/hooks/useFetchAnalogues.ts +++ b/src/hooks/useFetchOutcrops.ts @@ -1,15 +1,15 @@ import { useMsal } from '@azure/msal-react'; import { useQuery } from '@tanstack/react-query'; -import { AnaloguesService } from '../api/generated'; +import { OutcropsService } from '../api/generated'; import { useAccessToken } from './useAccessToken'; -export const useFetchAnalogues = () => { +export const useFetchOutcrops = () => { const { instance, accounts } = useMsal(); const token = useAccessToken(instance, accounts[0]); const query = useQuery({ queryKey: ['apiParameters'], - queryFn: () => AnaloguesService.getApiAnalogues(), + queryFn: () => OutcropsService.getApiOutcrops(), enabled: !!token, }); return query; diff --git a/src/pages/AddModel/AddModel.tsx b/src/pages/AddModel/AddModel.tsx index 01a658ac..96028d00 100644 --- a/src/pages/AddModel/AddModel.tsx +++ b/src/pages/AddModel/AddModel.tsx @@ -4,12 +4,8 @@ import { Snackbar } from '@equinor/eds-core-react'; import { useMutation } from '@tanstack/react-query'; import { useEffect, useState } from 'react'; import { - AddAnalogueDto, - AddAnalogueModelAnalogueCommandForm, AddAnalogueModelMetadataCommandForm, AddMetadataDto, - AnalogueList, - AnalogueModelAnaloguesService, AnalogueModelDetail, AnalogueModelMetadataService, AnalogueModelSourceType, @@ -67,7 +63,7 @@ export const AddModel = () => { description: '', isProcessed: false, sourceType: AnalogueModelSourceType.DELTARES, - analogues: [], + outcrops: [], fileUploads: [], parameters: [], metadata: [], @@ -119,23 +115,23 @@ export const AddModel = () => { }, }); - const uploadModelAnalouges = useMutation({ - mutationFn: ({ - id, - requestBody, - }: { - id: string; - requestBody: AddAnalogueModelAnalogueCommandForm; - }) => { - return AnalogueModelAnaloguesService.putApiAnalogueModelsAnalogues( - id, - requestBody, - ); - }, - }); + // const uploadModelAnalouges = useMutation({ + // mutationFn: ({ + // id, + // requestBody, + // }: { + // id: string; + // requestBody: AddAnalogueModelAnalogueCommandForm; + // }) => { + // return AnalogueModelAnaloguesService.putApiAnalogueModelsAnalogues( + // id, + // requestBody, + // ); + // }, + // }); const metadataList: AddMetadataDto[] = []; - const analougueList: AddAnalogueDto[] = []; + // const analougueList: AddAnalogueDto[] = []; function addMetadataFields(metadata?: MetadataDto[]) { if (!metadata) return; @@ -143,36 +139,36 @@ export const AddModel = () => { metadataList.push(...obj); } - function addAnalogueFields(metadata?: AnalogueList[]) { - if (!metadata) return; - const obj = metadata.map((x) => ({ analogueId: x.analogueId })); - analougueList.push(...obj); - } + // function addAnalogueFields(metadata?: AnalogueList[]) { + // if (!metadata) return; + // const obj = metadata.map((x) => ({ analogueId: x.analogueId })); + // analougueList.push(...obj); + // } async function uploadMetadata( modelId: string, metadata: AnalogueModelDetail, ) { addMetadataFields(metadata.metadata); - addAnalogueFields(metadata.analogues); + // addAnalogueFields(metadata.analogues); const readyMetadata: AddAnalogueModelMetadataCommandForm = { metadata: metadataList, }; - const readyAnalogue: AddAnalogueModelAnalogueCommandForm = { - analogues: analougueList, - }; + // const readyAnalogue: AddAnalogueModelAnalogueCommandForm = { + // analogues: analougueList, + // }; await uploadModelMetadata.mutateAsync({ id: modelId, requestBody: readyMetadata, }); - await uploadModelAnalouges.mutateAsync({ - id: modelId, - requestBody: readyAnalogue, - }); + // await uploadModelAnalouges.mutateAsync({ + // id: modelId, + // requestBody: readyAnalogue, + // }); } async function uploadModel(file: File, metadata: AnalogueModelDetail) {