From: Lucas Di Pentima <lucas.dipentima@curii.com>
Date: Tue, 13 Jul 2021 12:56:50 +0000 (-0300)
Subject: 17782: Merge branch 'main' into 17782-react-scripts-ts-migration
X-Git-Tag: 2.2.2~29^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/38d27e9783f7f760cee84cc225e86144069848c4

17782: Merge branch 'main' into 17782-react-scripts-ts-migration

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>
---

38d27e9783f7f760cee84cc225e86144069848c4
diff --cc src/views/favorite-panel/favorite-panel.tsx
index 19f17138,dcae6807..82336b4a
--- a/src/views/favorite-panel/favorite-panel.tsx
+++ b/src/views/favorite-panel/favorite-panel.tsx
@@@ -25,16 -25,20 +25,20 @@@ import { FavoriteIcon } from 'component
  import {
      openContextMenu,
      resourceUuidToContextMenuKind
 -} from '~/store/context-menu/context-menu-actions';
 -import { loadDetailsPanel } from '~/store/details-panel/details-panel-action';
 -import { navigateTo } from '~/store/navigation/navigation-action';
 -import { ContainerRequestState } from "~/models/container-request";
 -import { FavoritesState } from '~/store/favorites/favorites-reducer';
 -import { RootState } from '~/store/store';
 -import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view';
 -import { createTree } from '~/models/tree';
 -import { getSimpleObjectTypeFilters } from '~/store/resource-type-filters/resource-type-filters';
 -import { getResource, ResourcesState } from '~/store/resources/resources';
 -import { GroupContentsResource } from '~/services/groups-service/groups-service';
 -import { GroupClass, GroupResource } from '~/models/group';
 -import { getProperty } from '~/store/properties/properties';
 -import { PROJECT_PANEL_CURRENT_UUID } from '~/store/project-panel/project-panel-action';
 +} from 'store/context-menu/context-menu-actions';
 +import { loadDetailsPanel } from 'store/details-panel/details-panel-action';
 +import { navigateTo } from 'store/navigation/navigation-action';
 +import { ContainerRequestState } from "models/container-request";
 +import { FavoritesState } from 'store/favorites/favorites-reducer';
 +import { RootState } from 'store/store';
 +import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view';
 +import { createTree } from 'models/tree';
 +import { getSimpleObjectTypeFilters } from 'store/resource-type-filters/resource-type-filters';
- import { ResourcesState } from 'store/resources/resources';
++import { getResource, ResourcesState } from 'store/resources/resources';
++import { GroupContentsResource } from 'services/groups-service/groups-service';
++import { GroupClass, GroupResource } from 'models/group';
++import { getProperty } from 'store/properties/properties';
++import { PROJECT_PANEL_CURRENT_UUID } from 'store/project-panel/project-panel-action';
  
  type CssRules = "toolbar" | "button";
  
@@@ -133,14 -139,27 +139,27 @@@ export const FavoritePanel = withStyles
          class extends React.Component<FavoritePanelProps> {
  
              handleContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) => {
-                 const menuKind = this.props.dispatch<any>(resourceUuidToContextMenuKind(resourceUuid));
-                 if (menuKind) {
+                 const { resources } = this.props;
+                 const resource = getResource<GroupContentsResource>(resourceUuid)(resources);
 -                
++
+                 let readonly = false;
+                 const project = getResource<GroupResource>(this.props.currentItemId)(resources);
 -                
++
+                 if (project && project.groupClass === GroupClass.FILTER) {
+                     readonly = true;
+                 }
+ 
+                 const menuKind = this.props.dispatch<any>(resourceUuidToContextMenuKind(resourceUuid, readonly));
+ 
+                 if (menuKind&& resource) {
                      this.props.dispatch<any>(openContextMenu(event, {
-                         name: '',
-                         uuid: resourceUuid,
-                         ownerUuid: '',
-                         kind: ResourceKind.NONE,
-                         menuKind
+                         name: resource.name,
+                         uuid: resource.uuid,
+                         ownerUuid: resource.ownerUuid,
+                         isTrashed: ('isTrashed' in resource) ? resource.isTrashed: false,
+                         kind: resource.kind,
+                         menuKind,
+                         description: resource.description,
                      }));
                  }
                  this.props.dispatch<any>(loadDetailsPanel(resourceUuid));
diff --cc src/views/public-favorites-panel/public-favorites-panel.tsx
index c174bca4,7e845d6c..1b7185de
--- a/src/views/public-favorites-panel/public-favorites-panel.tsx
+++ b/src/views/public-favorites-panel/public-favorites-panel.tsx
@@@ -25,16 -25,18 +25,18 @@@ import { Dispatch } from 'redux'
  import {
      openContextMenu,
      resourceUuidToContextMenuKind
 -} from '~/store/context-menu/context-menu-actions';
 -import { loadDetailsPanel } from '~/store/details-panel/details-panel-action';
 -import { navigateTo } from '~/store/navigation/navigation-action';
 -import { ContainerRequestState } from "~/models/container-request";
 -import { RootState } from '~/store/store';
 -import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view';
 -import { createTree } from '~/models/tree';
 -import { getSimpleObjectTypeFilters } from '~/store/resource-type-filters/resource-type-filters';
 -import { PUBLIC_FAVORITE_PANEL_ID } from '~/store/public-favorites-panel/public-favorites-action';
 -import { PublicFavoritesState } from '~/store/public-favorites/public-favorites-reducer';
 -import { getResource, ResourcesState } from '~/store/resources/resources';
 -import { GroupContentsResource } from '~/services/groups-service/groups-service';
 +} from 'store/context-menu/context-menu-actions';
 +import { loadDetailsPanel } from 'store/details-panel/details-panel-action';
 +import { navigateTo } from 'store/navigation/navigation-action';
 +import { ContainerRequestState } from "models/container-request";
 +import { RootState } from 'store/store';
 +import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view';
 +import { createTree } from 'models/tree';
 +import { getSimpleObjectTypeFilters } from 'store/resource-type-filters/resource-type-filters';
 +import { PUBLIC_FAVORITE_PANEL_ID } from 'store/public-favorites-panel/public-favorites-action';
 +import { PublicFavoritesState } from 'store/public-favorites/public-favorites-reducer';
++import { getResource, ResourcesState } from 'store/resources/resources';
++import { GroupContentsResource } from 'services/groups-service/groups-service';
  
  type CssRules = "toolbar" | "button";