diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/OverviewImagesModal.component.test.tsx b/src/components/FunctionalArea/Modal/OverviewImagesModal/OverviewImagesModal.component.test.tsx
index 5b7ed93ec271b0a2f1cdb22bb76ee8f38feb0e3e..c13cc7a9112ce05bb872d21ae56e39fd17fa8893 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/OverviewImagesModal.component.test.tsx
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/OverviewImagesModal.component.test.tsx
@@ -78,7 +78,7 @@ describe('OverviewImagesModal - component', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImage.test.ts b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImage.test.ts
index f5ae9c32e2391b4331d69a60d184d318192a7d22..702a3d48826f3b61aec54a7df6ca01b7ee885fd7 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImage.test.ts
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImage.test.ts
@@ -56,7 +56,7 @@ describe('useOverviewImage - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
@@ -96,7 +96,7 @@ describe('useOverviewImage - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.test.ts b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.test.ts
index 375cd187e778f6bde32a59de14f341dce953d63d..afcf6cb18d7c9f9e4a657c13f07737988490ed97 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.test.ts
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.test.ts
@@ -98,7 +98,7 @@ describe('useOverviewImageLinkActions - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
map: {
@@ -155,7 +155,7 @@ describe('useOverviewImageLinkActions - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
map: {
@@ -233,7 +233,7 @@ describe('useOverviewImageLinkActions - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
map: {
@@ -337,7 +337,7 @@ describe('useOverviewImageLinkActions - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
map: {
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.ts b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.ts
index 5059ea594c02245a181a02f3e0fe8e00407c82db..3d0967ca3b948c63d65ad1b2d1e417d58412c07e 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.ts
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.ts
@@ -25,7 +25,7 @@ export const useOverviewImageLinkActions = (): UseOverviewImageLinkActionsResult
const currentMapModelId = useAppSelector(currentModelIdSelector);
const checkIfImageIsAvailable = (imageId: number): boolean =>
- overviewImages.some(image => image.idObject === imageId);
+ overviewImages.some(image => image.id === imageId);
const checkIfMapAlreadyOpened = (modelId: number): boolean =>
openedMaps.some(map => map.modelId === modelId);
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkElements.test.ts b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkElements.test.ts
index 61169d09657b1c2fe0672cb10e928733067d71c4..298ee2e9c11c445e6daf65ec863849e77f4c100a 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkElements.test.ts
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkElements.test.ts
@@ -59,7 +59,7 @@ describe('useOverviewImageLinkConfigs - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
@@ -96,7 +96,7 @@ describe('useOverviewImageLinkConfigs - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageSize.test.tsx b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageSize.test.tsx
index f1cfe2e75b46061f6149f2e1a03b121d0bf9bb34..0ba9f9696473f82e9b2863a44ff02e70dc343d80 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageSize.test.tsx
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageSize.test.tsx
@@ -55,7 +55,7 @@ describe('useOverviewImageSize - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
@@ -84,7 +84,7 @@ describe('useOverviewImageSize - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
diff --git a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageUrl.test.ts b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageUrl.test.ts
index b257be4c01c5af410019f0e4699a8fbecf063ff3..da3d6a6ab93353a6b3e38f456e291e0cf11652ed 100644
--- a/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageUrl.test.ts
+++ b/src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageUrl.test.ts
@@ -49,7 +49,7 @@ describe('useOverviewImageUrl - hook', () => {
modal: {
...MODAL_INITIAL_STATE_MOCK,
overviewImagesState: {
- imageId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
},
},
});
diff --git a/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx b/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx
index 0fb6117915a0eae1c6631f65133822a9bf64fc12..f87cc56c7303a0402a97b44dc6fb9c41c8a24b01 100644
--- a/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx
+++ b/src/components/FunctionalArea/TopBar/TopBar.component.test.tsx
@@ -129,7 +129,7 @@ describe('TopBar - component', () => {
const actions = store.getActions();
expect(actions[FIRST_ARRAY_ELEMENT]).toStrictEqual({
- payload: projectFixture.topOverviewImage?.idObject,
+ payload: projectFixture.topOverviewImage?.id,
type: 'modal/openOverviewImagesModalById',
});
});
diff --git a/src/models/mocks/overviewImageMocks.ts b/src/models/mocks/overviewImageMocks.ts
index 999063908b5595dc0575d00eaaec26bc089f1713..a86766b98aa49cc2625ee7a13613f846cb44c64f 100644
--- a/src/models/mocks/overviewImageMocks.ts
+++ b/src/models/mocks/overviewImageMocks.ts
@@ -4,7 +4,7 @@ import { OverviewImageLinkImage, OverviewImageLinkModel } from '@/types/models';
export const OVERVIEW_LINK_IMAGE_MOCK: OverviewImageLinkImage = {
idObject: 1,
polygon: [],
- imageLinkId: PROJECT_OVERVIEW_IMAGE_MOCK.idObject,
+ imageLinkId: PROJECT_OVERVIEW_IMAGE_MOCK.id,
type: 'OverviewImageLink',
};
diff --git a/src/models/overviewImageView.ts b/src/models/overviewImageView.ts
index 1c1da19a31a2309c3cf1127e4a9f0de54baf1930..c012cd979f56fd3e869112dc5271b4b9ac45ecfe 100644
--- a/src/models/overviewImageView.ts
+++ b/src/models/overviewImageView.ts
@@ -2,7 +2,7 @@ import { z } from 'zod';
import { overviewImageLink } from './overviewImageLink';
export const overviewImageView = z.object({
- idObject: z.number(),
+ id: z.number(),
filename: z.string(),
width: z.number(),
height: z.number(),
diff --git a/src/redux/project/project.mock.ts b/src/redux/project/project.mock.ts
index 0b8da5ef09076244c11c3621e9d82abd8428cc54..1e3dc15aaf639034cb60e1a363b8d3e8139514aa 100644
--- a/src/redux/project/project.mock.ts
+++ b/src/redux/project/project.mock.ts
@@ -10,7 +10,7 @@ export const PROJECT_STATE_INITIAL_MOCK: ProjectState = {
};
export const PROJECT_OVERVIEW_IMAGE_MOCK: NonNullable<OverviewImageView> = {
- idObject: 440,
+ id: 440,
filename: '9d4911bdeeea752f076e57a91d9b1f45/biolayout_main_root.png',
width: 5776,
height: 4040,
diff --git a/src/redux/project/project.selectors.ts b/src/redux/project/project.selectors.ts
index 7ab9a0c284f2677f824887e702c7f2eaa334b859..c009c3c484281be0171234ca818ba6870b38d63d 100644
--- a/src/redux/project/project.selectors.ts
+++ b/src/redux/project/project.selectors.ts
@@ -10,16 +10,14 @@ export const projectDataSelector = createSelector(projectSelector, project => pr
export const projectDefaultOverviewImageIdSelector = createSelector(
projectDataSelector,
- projectData => projectData?.topOverviewImage?.idObject || OVERVIEW_IMAGE_ID_DEFAULT,
+ projectData => projectData?.topOverviewImage?.id || OVERVIEW_IMAGE_ID_DEFAULT,
);
export const currentOverviewImageSelector = createSelector(
projectDataSelector,
currentOverviewImageIdSelector,
(projectData, imageId): OverviewImageView | undefined =>
- (projectData?.overviewImageViews || []).find(
- overviewImage => overviewImage.idObject === imageId,
- ),
+ (projectData?.overviewImageViews || []).find(overviewImage => overviewImage.id === imageId),
);
export const projectOverviewImagesSelector = createSelector(
diff --git a/src/services/pluginsManager/overviewImage/selectOverviewImage.test.ts b/src/services/pluginsManager/overviewImage/selectOverviewImage.test.ts
index 500bfae94ebce30954ce2b772a67a4c12b224917..e38b1c0a6e8c4a1c1b497eae0ce4f223cd4b653a 100644
--- a/src/services/pluginsManager/overviewImage/selectOverviewImage.test.ts
+++ b/src/services/pluginsManager/overviewImage/selectOverviewImage.test.ts
@@ -29,11 +29,9 @@ describe('selectOverviewImage - plugin method', () => {
});
it('should dispatch action set overview image', () => {
- selectOverviewImage(PROJECT_OVERVIEW_IMAGE_MOCK.idObject);
+ selectOverviewImage(PROJECT_OVERVIEW_IMAGE_MOCK.id);
- expect(dispatchSpy).toHaveBeenCalledWith(
- setOverviewImageId(PROJECT_OVERVIEW_IMAGE_MOCK.idObject),
- );
+ expect(dispatchSpy).toHaveBeenCalledWith(setOverviewImageId(PROJECT_OVERVIEW_IMAGE_MOCK.id));
});
});
@@ -55,7 +53,7 @@ describe('selectOverviewImage - plugin method', () => {
});
it('should throw error', () => {
- expect(() => selectOverviewImage(PROJECT_OVERVIEW_IMAGE_MOCK.idObject)).toThrow(
+ expect(() => selectOverviewImage(PROJECT_OVERVIEW_IMAGE_MOCK.id)).toThrow(
OVERVIEW_IMAGE_ERRORS.IMAGE_ID_IS_INVALID,
);
});
diff --git a/src/services/pluginsManager/overviewImage/selectOverviewImage.ts b/src/services/pluginsManager/overviewImage/selectOverviewImage.ts
index 71ef40f1ff80adc6892ac6621a62562750cd3be4..2172b3e916ffd05eb3b5045efbee422f8b002250 100644
--- a/src/services/pluginsManager/overviewImage/selectOverviewImage.ts
+++ b/src/services/pluginsManager/overviewImage/selectOverviewImage.ts
@@ -6,7 +6,7 @@ import { store } from '@/redux/store';
export const selectOverviewImage = (imageId: number): void => {
const { dispatch, getState } = store;
const overviewImages = projectOverviewImagesSelector(getState());
- const foundOverviewImage = overviewImages.find(o => o.idObject === imageId);
+ const foundOverviewImage = overviewImages.find(o => o.id === imageId);
const isImageIdValid = Boolean(foundOverviewImage);
if (!isImageIdValid) {
diff --git a/src/services/pluginsManager/overviewImage/showOverviewImageModal.test.ts b/src/services/pluginsManager/overviewImage/showOverviewImageModal.test.ts
index f829470b22eb062f67a5e17a6641ffdbde72cbe7..cddb6f0d251045f3c269c319dc59d031d7420710 100644
--- a/src/services/pluginsManager/overviewImage/showOverviewImageModal.test.ts
+++ b/src/services/pluginsManager/overviewImage/showOverviewImageModal.test.ts
@@ -31,12 +31,12 @@ describe('showOverviewImageModal - plugin method', () => {
PROJECT_OVERVIEW_IMAGE_MOCK,
{
...PROJECT_OVERVIEW_IMAGE_MOCK,
- idObject: defaultImageId,
+ id: defaultImageId,
},
],
topOverviewImage: {
...PROJECT_OVERVIEW_IMAGE_MOCK,
- idObject: defaultImageId,
+ id: defaultImageId,
},
},
},
@@ -70,10 +70,10 @@ describe('showOverviewImageModal - plugin method', () => {
});
it('should dispatch action set overview image', () => {
- showOverviewImageModal(PROJECT_OVERVIEW_IMAGE_MOCK.idObject);
+ showOverviewImageModal(PROJECT_OVERVIEW_IMAGE_MOCK.id);
expect(dispatchSpy).toHaveBeenCalledWith(
- openOverviewImagesModalById(PROJECT_OVERVIEW_IMAGE_MOCK.idObject),
+ openOverviewImagesModalById(PROJECT_OVERVIEW_IMAGE_MOCK.id),
);
});
});
@@ -97,7 +97,7 @@ describe('showOverviewImageModal - plugin method', () => {
});
it('should throw error', () => {
- expect(() => showOverviewImageModal(PROJECT_OVERVIEW_IMAGE_MOCK.idObject)).toThrow(
+ expect(() => showOverviewImageModal(PROJECT_OVERVIEW_IMAGE_MOCK.id)).toThrow(
OVERVIEW_IMAGE_ERRORS.IMAGE_ID_IS_INVALID,
);
});
diff --git a/src/services/pluginsManager/overviewImage/showOverviewImageModal.ts b/src/services/pluginsManager/overviewImage/showOverviewImageModal.ts
index ac4351069bceb73d3a136dfe8a11d357ee7ba165..bd4bcfd7abe83c3800c4945baf75a9fcbfc813b8 100644
--- a/src/services/pluginsManager/overviewImage/showOverviewImageModal.ts
+++ b/src/services/pluginsManager/overviewImage/showOverviewImageModal.ts
@@ -12,7 +12,7 @@ export const showOverviewImageModal = (imageId?: number): void => {
const defaultImageId = projectDefaultOverviewImageIdSelector(getState());
const selectedImageId = imageId || defaultImageId;
- const foundOverviewImage = overviewImages.find(o => o.idObject === selectedImageId);
+ const foundOverviewImage = overviewImages.find(o => o.id === selectedImageId);
const isImageIdValid = Boolean(foundOverviewImage);
if (!isImageIdValid) {