[ARVADOS-WORKBENCH2] updated: 2.2.1-27-g38d27e97
Git user
git at public.arvados.org
Tue Jul 13 12:58:42 UTC 2021
Summary of changes:
cypress/integration/favorites.spec.js | 45 +++++++++++++++++++++-
cypress/integration/sharing.spec.js | 22 +++++++++++
cypress/integration/side-panel.spec.js | 22 +++++++++++
cypress/support/commands.js | 26 +++++++++++++
src/store/context-menu/context-menu-actions.ts | 2 +
src/views/favorite-panel/favorite-panel.tsx | 35 +++++++++++++----
src/views/project-panel/project-panel.tsx | 3 +-
.../public-favorites-panel.tsx | 20 ++++++----
.../shared-with-me-panel/shared-with-me-panel.tsx | 3 +-
9 files changed, 160 insertions(+), 18 deletions(-)
via 38d27e9783f7f760cee84cc225e86144069848c4 (commit)
via 7edd5a7c86af0814f8a2282aa266a9d1a604a45f (commit)
via 49708fe59337193ec9d00034ccd765a90536f69e (commit)
via 40ad26356794ff381c4cecb35141417dad0807ea (commit)
via 78e3c7b8d6a4fe84989182745267d1af468dfa7f (commit)
via 7bbd67535b2ee9e8abd3342d5a9de5a22ef786a3 (commit)
via 836dde381f828481fd0dc20ab1356bd4c877a236 (commit)
from c32095f06a2e2843386120bf21402974b0066954 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 38d27e9783f7f760cee84cc225e86144069848c4
Merge: c32095f0 7edd5a7c
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Jul 13 09:56:50 2021 -0300
17782: Merge branch 'main' into 17782-react-scripts-ts-migration
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
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";
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list