Merge branch '17426-plug-ins' refs #17426
authorPeter Amstutz <peter.amstutz@curii.com>
Mon, 5 Apr 2021 14:32:46 +0000 (10:32 -0400)
committerPeter Amstutz <peter.amstutz@curii.com>
Mon, 5 Apr 2021 14:32:46 +0000 (10:32 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

1  2 
src/index.tsx
src/store/context-menu/context-menu-actions.ts
src/store/side-panel-tree/side-panel-tree-actions.ts
src/views-components/side-panel-button/side-panel-button.tsx

diff --cc src/index.tsx
Simple merge
index bf03bf6cb0e9f2b7bcf7be2872debd42fba5363e,151cfb68ab7f68638a12d1d67993bfde89168984..fb5ea11f5f0710afd51fd766c40b82691487ffc4
@@@ -15,9 -15,12 +15,12 @@@ import { navigateToRunProcess } from '~
  import { runProcessPanelActions } from '~/store/run-process-panel/run-process-panel-actions';
  import { getUserUuid } from '~/common/getuser';
  import { matchProjectRoute } from '~/routes/routes';
 -import { GroupResource } from '~/models/group';
 +import { GroupClass, GroupResource } from '~/models/group';
  import { ResourcesState, getResource } from '~/store/resources/resources';
  import { extractUuidKind, ResourceKind } from '~/models/resource';
+ import { pluginConfig } from '~/plugins';
+ import { ElementListReducer } from '~/common/plugintypes';
+ import { Location } from 'history';
  
  type CssRules = 'button' | 'menuItem' | 'icon';