chore: resolve merge conflicts
No related branches found
No related tags found
Checking pipeline status
Showing
- CHANGELOG 11 additions, 0 deletionsCHANGELOG
- docs/plugins/plugins.md 7 additions, 5 deletionsdocs/plugins/plugins.md
- index.d.ts 1 addition, 3 deletionsindex.d.ts
- src/components/FunctionalArea/MapNavigation/MapNavigation.component.test.tsx 1 addition, 3 deletions...tionalArea/MapNavigation/MapNavigation.component.test.tsx
- src/components/FunctionalArea/Modal/ToSModal/ToSModal.component.tsx 4 additions, 3 deletions...ents/FunctionalArea/Modal/ToSModal/ToSModal.component.tsx
- src/components/Map/Drawer/AvailablePluginsDrawer/LoadPlugin/LoadPlugin.component.tsx 3 additions, 1 deletion...vailablePluginsDrawer/LoadPlugin/LoadPlugin.component.tsx
- src/components/Map/Drawer/AvailablePluginsDrawer/LoadPlugin/hooks/useLoadPlugin.ts 3 additions, 3 deletions.../AvailablePluginsDrawer/LoadPlugin/hooks/useLoadPlugin.ts
- src/components/Map/Drawer/BioEntityDrawer/AssociatedSubmap/AssociatedSubmap.component.tsx 1 addition, 1 deletion...ityDrawer/AssociatedSubmap/AssociatedSubmap.component.tsx
- src/components/Map/Drawer/SearchDrawerWrapper/GroupedSearchResults/BioEntitiesAccordion/BioEntitiesAccordion.component.test.tsx 17 additions, 4 deletions...EntitiesAccordion/BioEntitiesAccordion.component.test.tsx
- src/components/Map/Drawer/SearchDrawerWrapper/ResultsList/PinsList/PinsListItem/PinsListItem.component.test.tsx 5 additions, 0 deletions...ist/PinsList/PinsListItem/PinsListItem.component.test.tsx
- src/components/Map/Drawer/SubmapsDrawer/SubmapItem/DownloadSubmap/DownloadSubmap.component.tsx 33 additions, 9 deletions...er/SubmapItem/DownloadSubmap/DownloadSubmap.component.tsx
- src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleAliasResults.test.ts 0 additions, 2 deletions...utils/listeners/mapSingleClick/handleAliasResults.test.ts
- src/components/Map/PluginsDrawer/PluginsHeader/PluginHeaderInfo/PluginHeaderInfo.component.tsx 3 additions, 1 deletion...insHeader/PluginHeaderInfo/PluginHeaderInfo.component.tsx
- src/components/Map/PluginsDrawer/PluginsHeader/PluginOpenButton/LoadPluginElement/LoadPluginElement.component.tsx 3 additions, 1 deletion...nButton/LoadPluginElement/LoadPluginElement.component.tsx
- src/components/Map/PluginsDrawer/PluginsTabs/PluginSingleTab/PluginSingleTab.component.tsx 3 additions, 1 deletion...PluginsTabs/PluginSingleTab/PluginSingleTab.component.tsx
- src/components/Map/PluginsDrawer/PluginsTabs/PluginsTabs.component.tsx 2 additions, 2 deletions...s/Map/PluginsDrawer/PluginsTabs/PluginsTabs.component.tsx
- src/constants/mocks.ts 4 additions, 2 deletionssrc/constants/mocks.ts
- src/models/bioEntitySchema.ts 4 additions, 4 deletionssrc/models/bioEntitySchema.ts
- src/models/compartmentPathwaySchema.ts 1 addition, 1 deletionsrc/models/compartmentPathwaySchema.ts
- src/models/mapBackground.ts 1 addition, 1 deletionsrc/models/mapBackground.ts
Loading
Please register or sign in to comment