chore: resolve merge conflicts (6156f7fa) · Commits · minerva / frontend

Commit 6156f7fa authored 3 months ago by Miłosz Grocholewski

Browse files

chore: resolve merge conflicts

parents d39f024c cdc1e7cf

No related branches found

No related tags found

1 merge request!350Resolve MIN-89 "Feat/ crud operations on the layers"

Pipeline #99912 passed 3 months ago

Hide whitespace changes

Inline Side-by-side

Showing

src/components/FunctionalArea/ContextMenu/ContextMenu.component.tsx 1 addition, 1 deletion

...ents/FunctionalArea/ContextMenu/ContextMenu.component.tsx
src/components/FunctionalArea/MapNavigation/MapNavigation.component.test.tsx 50 additions, 7 deletions

...tionalArea/MapNavigation/MapNavigation.component.test.tsx
src/components/FunctionalArea/MapNavigation/MapNavigation.component.tsx 2 additions, 2 deletions

.../FunctionalArea/MapNavigation/MapNavigation.component.tsx
src/components/FunctionalArea/Modal/EditOverlayModal/EditOverlayModal.component.test.tsx 13 additions, 2 deletions

...odal/EditOverlayModal/EditOverlayModal.component.test.tsx
src/components/FunctionalArea/Modal/LayerFactoryModal/LayerFactoryModal.component.test.tsx 0 additions, 1 deletion

...al/LayerFactoryModal/LayerFactoryModal.component.test.tsx
src/components/FunctionalArea/Modal/LayerFactoryModal/LayerFactoryModal.component.tsx 0 additions, 1 deletion

...a/Modal/LayerFactoryModal/LayerFactoryModal.component.tsx
src/components/FunctionalArea/Modal/LicenseModal/LicenseModal.component.tsx 1 addition, 0 deletions

...ctionalArea/Modal/LicenseModal/LicenseModal.component.tsx
src/components/FunctionalArea/Modal/LoginModal/LoginModal.component.test.tsx 22 additions, 17 deletions

...tionalArea/Modal/LoginModal/LoginModal.component.test.tsx
src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.test.ts 11 additions, 10 deletions

...viewImagesModal/utils/useOverviewImageLinkActions.test.ts
src/components/FunctionalArea/Modal/OverviewImagesModal/utils/useOverviewImageLinkActions.ts 2 additions, 2 deletions

.../OverviewImagesModal/utils/useOverviewImageLinkActions.ts
src/components/FunctionalArea/Modal/PublicationsModal/PublicationsModal.tsx 6 additions, 6 deletions

...ctionalArea/Modal/PublicationsModal/PublicationsModal.tsx
src/components/FunctionalArea/Modal/PublicationsModal/PublicationsModalLayout/PublicationsModalLayout.component.test.tsx 13 additions, 13 deletions

...onsModalLayout/PublicationsModalLayout.component.test.tsx
src/components/FunctionalArea/Modal/PublicationsModal/PublicationsModalLayout/utils/getBasePublications.test.ts 9 additions, 7 deletions

...PublicationsModalLayout/utils/getBasePublications.test.ts
src/components/FunctionalArea/Modal/PublicationsModal/PublicationsModalLayout/utils/getBasePublications.ts 10 additions, 6 deletions

...odal/PublicationsModalLayout/utils/getBasePublications.ts
src/components/FunctionalArea/Modal/PublicationsModal/PublicationsModalLayout/utils/getStandarizedPublications.ts 4 additions, 4 deletions

...blicationsModalLayout/utils/getStandarizedPublications.ts
src/components/FunctionalArea/Modal/PublicationsModal/PublicationsModalLayout/utils/mapBasePublicationToStandarized.test.ts 7 additions, 7 deletions

...ModalLayout/utils/mapBasePublicationToStandarized.test.ts
src/components/FunctionalArea/Modal/PublicationsModal/PublicationsModalLayout/utils/mapBasePublicationToStandarized.ts 2 additions, 5 deletions

...tionsModalLayout/utils/mapBasePublicationToStandarized.ts
src/components/FunctionalArea/Modal/PublicationsModal/PublicationsModalLayout/utils/useDownloadPublicationsAsCSVFile.ts 2 additions, 2 deletions

...ionsModalLayout/utils/useDownloadPublicationsAsCSVFile.ts
src/components/FunctionalArea/Modal/PublicationsModal/PublicationsSearch/PublicationsSearch.component.tsx 1 addition, 1 deletion

...Modal/PublicationsSearch/PublicationsSearch.component.tsx
src/components/FunctionalArea/Modal/PublicationsModal/PublicationsTable/ElementsOnMapCell/ElementLink/ElementLink.component.test.tsx 45 additions, 51 deletions

...mentsOnMapCell/ElementLink/ElementLink.component.test.tsx

with 201 additions and 145 deletions

Please register or to comment