chore: merge conflict resolve (a1692deb) · Commits · minerva / frontend

Commit a1692deb authored 1 month ago by Miłosz Grocholewski

Browse files

chore: merge conflict resolve

parents 70547634 ca65fbc4

No related branches found

No related tags found

1 merge request!400feat(layers): add layers zIndex editing

Pipeline #101731 passed 1 month ago

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 8 additions, 1 deletion

CHANGELOG
public/config.js 2 additions, 0 deletions

public/config.js
src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.test.tsx 297 additions, 0 deletions

...verlayGroupModal/EditOverlayGroupModal.component.test.tsx
src/components/FunctionalArea/Modal/EditOverlayGroupModal/EditOverlayGroupModal.component.tsx 76 additions, 0 deletions

...EditOverlayGroupModal/EditOverlayGroupModal.component.tsx
src/components/FunctionalArea/Modal/EditOverlayGroupModal/hooks/useEditOverlayGroup.test.ts 217 additions, 0 deletions

...l/EditOverlayGroupModal/hooks/useEditOverlayGroup.test.ts
src/components/FunctionalArea/Modal/EditOverlayGroupModal/hooks/useEditOverlayGroup.ts 101 additions, 0 deletions

.../Modal/EditOverlayGroupModal/hooks/useEditOverlayGroup.ts
src/components/FunctionalArea/Modal/EditOverlayGroupModal/index.ts 1 addition, 0 deletions

...nents/FunctionalArea/Modal/EditOverlayGroupModal/index.ts
src/components/FunctionalArea/Modal/EditOverlayModal/EditOverlayModal.component.test.tsx 21 additions, 13 deletions

...odal/EditOverlayModal/EditOverlayModal.component.test.tsx
src/components/FunctionalArea/Modal/EditOverlayModal/EditOverlayModal.component.tsx 10 additions, 0 deletions

...rea/Modal/EditOverlayModal/EditOverlayModal.component.tsx
src/components/FunctionalArea/Modal/EditOverlayModal/hooks/useEditOverlay.test.ts 11 additions, 4 deletions

...lArea/Modal/EditOverlayModal/hooks/useEditOverlay.test.ts
src/components/FunctionalArea/Modal/EditOverlayModal/hooks/useEditOverlay.ts 25 additions, 3 deletions

...tionalArea/Modal/EditOverlayModal/hooks/useEditOverlay.ts
src/components/FunctionalArea/Modal/LayerImageObjectModal/LayerImageObjectEditFactoryModal.component.test.tsx 2 additions, 0 deletions

...Modal/LayerImageObjectEditFactoryModal.component.test.tsx
src/components/FunctionalArea/Modal/LayerImageObjectModal/LayerImageObjectFactoryModal.component.test.tsx 2 additions, 0 deletions

...jectModal/LayerImageObjectFactoryModal.component.test.tsx
src/components/FunctionalArea/Modal/LayerTextFactoryModal/LayerTextFactoryModal.component.test.tsx 2 additions, 0 deletions

...TextFactoryModal/LayerTextFactoryModal.component.test.tsx
src/components/FunctionalArea/Modal/Modal.component.tsx 6 additions, 0 deletions

src/components/FunctionalArea/Modal/Modal.component.tsx
src/components/Map/Drawer/BioEntityDrawer/BioEntityDrawer.component.test.tsx 13 additions, 0 deletions

...Drawer/BioEntityDrawer/BioEntityDrawer.component.test.tsx
src/components/Map/Drawer/BioEntityDrawer/BioEntityDrawer.component.tsx 14 additions, 2 deletions

.../Map/Drawer/BioEntityDrawer/BioEntityDrawer.component.tsx
src/components/Map/Drawer/BioEntityDrawer/OverlayData/GroupedOverlayAxes/GroupedOverlayAxes.components.test.tsx 1 addition, 1 deletion

...GroupedOverlayAxes/GroupedOverlayAxes.components.test.tsx
src/components/Map/Drawer/BioEntityDrawer/OverlayData/GroupedOverlayAxes/GroupedOverlayAxes.components.tsx 2 additions, 2 deletions

...Data/GroupedOverlayAxes/GroupedOverlayAxes.components.tsx
src/components/Map/Drawer/BioEntityDrawer/OverlayData/OverlayData.component.test.tsx 3 additions, 3 deletions

...ioEntityDrawer/OverlayData/OverlayData.component.test.tsx

with 814 additions and 29 deletions

Please register or to comment