[ARVADOS-WORKBENCH2] created: 1.3.1-425-g1147590d
Git user
git at public.curoverse.com
Tue Apr 2 08:14:40 UTC 2019
at 1147590dd93204fd4d286b48f2573fcb46d7cd9d (commit)
commit 1147590dd93204fd4d286b48f2573fcb46d7cd9d
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Apr 2 10:14:08 2019 +0200
render-icon-if-public-favorite-and-actions-for-processes-and-projects
Feature #14941
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/views-components/context-menu/action-sets/process-resource-admin-action-set.ts b/src/views-components/context-menu/action-sets/process-resource-admin-action-set.ts
index e0cb796b..5bac51fb 100644
--- a/src/views-components/context-menu/action-sets/process-resource-admin-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-resource-admin-action-set.ts
@@ -14,6 +14,8 @@ import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions
import { openRemoveProcessDialog } from "~/store/processes/processes-actions";
import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action';
import { TogglePublicFavoriteAction } from "~/views-components/context-menu/actions/public-favorite-action";
+import { togglePublicFavorite } from "~/store/public-favorites/public-favorites-actions";
+import { publicFavoritePanelActions } from "~/store/public-favorites-panel/public-favorites-action";
export const processResourceAdminActionSet: ContextMenuActionSet = [[
{
@@ -41,8 +43,8 @@ export const processResourceAdminActionSet: ContextMenuActionSet = [[
{
component: TogglePublicFavoriteAction,
execute: (dispatch, resource) => {
- dispatch<any>(toggleFavorite(resource)).then(() => {
- dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
+ dispatch<any>(togglePublicFavorite(resource)).then(() => {
+ dispatch<any>(publicFavoritePanelActions.REQUEST_ITEMS());
});
}
},
diff --git a/src/views-components/context-menu/action-sets/project-admin-action-set.ts b/src/views-components/context-menu/action-sets/project-admin-action-set.ts
index 1076696a..f6185804 100644
--- a/src/views-components/context-menu/action-sets/project-admin-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-admin-action-set.ts
@@ -17,6 +17,8 @@ import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions
import { openAdvancedTabDialog } from "~/store/advanced-tab/advanced-tab";
import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action';
import { TogglePublicFavoriteAction } from "~/views-components/context-menu/actions/public-favorite-action";
+import { togglePublicFavorite } from "~/store/public-favorites/public-favorites-actions";
+import { publicFavoritePanelActions } from "~/store/public-favorites-panel/public-favorites-action";
export const projectAdminActionSet: ContextMenuActionSet = [[
{
@@ -51,8 +53,8 @@ export const projectAdminActionSet: ContextMenuActionSet = [[
{
component: TogglePublicFavoriteAction,
execute: (dispatch, resource) => {
- dispatch<any>(toggleFavorite(resource)).then(() => {
- dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
+ dispatch<any>(togglePublicFavorite(resource)).then(() => {
+ dispatch<any>(publicFavoritePanelActions.REQUEST_ITEMS());
});
}
},
diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index be0fc793..8ca4deff 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -25,7 +25,8 @@ import { UserResource } from '~/models/user';
import { toggleIsActive, toggleIsAdmin } from '~/store/users/users-actions';
import { LinkResource } from '~/models/link';
import { navigateTo } from '~/store/navigation/navigation-action';
-import { withResource, getDataFromResource, withResourceData } from '~/views-components/data-explorer/with-resources';
+import { withResourceData } from '~/views-components/data-explorer/with-resources';
+import { PublicFavorite } from '~/views-components/public-favorite-icon/public-favorite-icon';
const renderName = (item: { name: string; uuid: string, kind: string }) =>
<Grid container alignItems="center" wrap="nowrap" spacing={16}>
@@ -42,6 +43,11 @@ const renderName = (item: { name: string; uuid: string, kind: string }) =>
<FavoriteStar resourceUuid={item.uuid} />
</Typography>
</Grid>
+ <Grid item>
+ <Typography variant="caption">
+ <PublicFavorite resourceUuid={item.uuid} />
+ </Typography>
+ </Grid>
</Grid>;
export const ResourceName = connect(
@@ -284,13 +290,13 @@ const renderLinkTail = (dispatch: Dispatch, item: { uuid: string, tailUuid: stri
const currentLabel = resourceLabel(item.tailKind);
const isUnknow = currentLabel === "Unknown";
return (<div>
- { !isUnknow ? (
- renderLink(dispatch, item.tailUuid, currentLabel)
- ) : (
+ {!isUnknow ? (
+ renderLink(dispatch, item.tailUuid, currentLabel)
+ ) : (
<Typography noWrap color="default">
{item.tailUuid}
</Typography>
- )}
+ )}
</div>);
};
diff --git a/src/views-components/public-favorite-icon/public-favorite-icon.tsx b/src/views-components/public-favorite-icon/public-favorite-icon.tsx
new file mode 100644
index 00000000..30b3aa9d
--- /dev/null
+++ b/src/views-components/public-favorite-icon/public-favorite-icon.tsx
@@ -0,0 +1,27 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as React from "react";
+import { FavoriteIcon } from "~/components/icon/icon";
+import { connect } from "react-redux";
+import { RootState } from "~/store/store";
+import { withStyles, StyleRulesCallback, WithStyles } from "@material-ui/core";
+
+type CssRules = "icon";
+
+const styles: StyleRulesCallback<CssRules> = theme => ({
+ icon: {
+ fontSize: "inherit"
+ }
+});
+
+const mapStateToProps = (state: RootState, props: { resourceUuid: string; className?: string; }) => ({
+ ...props,
+ visible: state.publicFavorites[props.resourceUuid],
+});
+
+export const PublicFavorite = connect(mapStateToProps)(
+ withStyles(styles)((props: { visible: boolean; className?: string; } & WithStyles<CssRules>) =>
+ props.visible ? <FavoriteIcon className={props.className || props.classes.icon} /> : null
+ ));
commit 50510c9d0d5f7ffcc46ec2bb1b14200de7569e24
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Fri Mar 29 12:55:52 2019 +0100
adding/removing-from-public-favorites
Feature #14941
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/context-menu/context-menu-actions.ts b/src/store/context-menu/context-menu-actions.ts
index 121ea50b..b21ca0a7 100644
--- a/src/store/context-menu/context-menu-actions.ts
+++ b/src/store/context-menu/context-menu-actions.ts
@@ -17,7 +17,6 @@ import { RepositoryResource } from '~/models/repositories';
import { SshKeyResource } from '~/models/ssh-key';
import { VirtualMachinesResource } from '~/models/virtual-machines';
import { KeepServiceResource } from '~/models/keep-services';
-import { ApiClientAuthorization } from '~/models/api-client-authorization';
import { ProcessResource } from '~/models/process';
export const contextMenuActions = unionize({
diff --git a/src/store/project-panel/project-panel-middleware-service.ts b/src/store/project-panel/project-panel-middleware-service.ts
index d0964c8f..361825d4 100644
--- a/src/store/project-panel/project-panel-middleware-service.ts
+++ b/src/store/project-panel/project-panel-middleware-service.ts
@@ -33,6 +33,7 @@ import { CollectionResource } from "~/models/collection";
import { resourcesDataActions } from "~/store/resources-data/resources-data-actions";
import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
import { serializeResourceTypeFilters } from '~/store/resource-type-filters/resource-type-filters';
+import { updatePublicFavorites } from '~/store/public-favorites/public-favorites-actions';
export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@ -55,6 +56,7 @@ export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
const resourceUuids = response.items.map(item => item.uuid);
api.dispatch<any>(updateFavorites(resourceUuids));
+ api.dispatch<any>(updatePublicFavorites(resourceUuids));
api.dispatch(updateResources(response.items));
api.dispatch<any>(updateResourceData(resourceUuids));
await api.dispatch<any>(loadMissingProcessesInformation(response.items));
diff --git a/src/store/public-favorites-panel/public-favorites-middleware-service.ts b/src/store/public-favorites-panel/public-favorites-middleware-service.ts
index 4e68ddc6..3f686498 100644
--- a/src/store/public-favorites-panel/public-favorites-middleware-service.ts
+++ b/src/store/public-favorites-panel/public-favorites-middleware-service.ts
@@ -21,7 +21,7 @@ import { LinkResource } from '~/models/link';
import { GroupContentsResource, GroupContentsResourcePrefix } from '~/services/groups-service/groups-service';
import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
import { loadMissingProcessesInformation } from '~/store/project-panel/project-panel-middleware-service';
-import { updateFavorites } from '~/store/favorites/favorites-actions';
+import { updatePublicFavorites } from '~/store/public-favorites/public-favorites-actions';
export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@ -75,7 +75,7 @@ export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareServ
page: Math.floor(response.offset / response.limit),
rowsPerPage: response.limit
}));
- api.dispatch<any>(updateFavorites(response.items.map(item => item.uuid)));
+ api.dispatch<any>(updatePublicFavorites(response.items.map(item => item.uuid)));
} catch (e) {
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
api.dispatch(publicFavoritePanelActions.SET_ITEMS({
diff --git a/src/store/public-favorites/public-favorites-actions.ts b/src/store/public-favorites/public-favorites-actions.ts
new file mode 100644
index 00000000..ae6815b6
--- /dev/null
+++ b/src/store/public-favorites/public-favorites-actions.ts
@@ -0,0 +1,68 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { unionize, ofType, UnionOf } from "~/common/unionize";
+import { Dispatch } from "redux";
+import { RootState } from "../store";
+import { checkPublicFavorite } from "./public-favorites-reducer";
+import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions";
+import { ServiceRepository } from "~/services/services";
+import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions";
+
+export const publicFavoritesActions = unionize({
+ TOGGLE_PUBLIC_FAVORITE: ofType<{ resourceUuid: string }>(),
+ CHECK_PRESENCE_IN_PUBLIC_FAVORITES: ofType<string[]>(),
+ UPDATE_PUBLIC_FAVORITES: ofType<Record<string, boolean>>()
+});
+
+export type PublicFavoritesAction = UnionOf<typeof publicFavoritesActions>;
+
+export const togglePublicFavorite = (resource: { uuid: string; name: string }) =>
+ (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<any> => {
+ dispatch(progressIndicatorActions.START_WORKING("togglePublicFavorite"));
+ const uuidPrefix = getState().config.uuidPrefix;
+ const uuid = `${uuidPrefix}-j7d0g-fffffffffffffff`;
+ dispatch(publicFavoritesActions.TOGGLE_PUBLIC_FAVORITE({ resourceUuid: resource.uuid }));
+ const isPublicFavorite = checkPublicFavorite(resource.uuid, getState().publicFavorites);
+ dispatch(snackbarActions.OPEN_SNACKBAR({
+ message: isPublicFavorite
+ ? "Removing from public favorites..."
+ : "Adding to public favorites...",
+ kind: SnackbarKind.INFO
+ }));
+
+ const promise: any = isPublicFavorite
+ ? services.favoriteService.delete({ userUuid: uuid, resourceUuid: resource.uuid })
+ : services.favoriteService.create({ userUuid: uuid, resource });
+
+ return promise
+ .then(() => {
+ dispatch(publicFavoritesActions.UPDATE_PUBLIC_FAVORITES({ [resource.uuid]: !isPublicFavorite }));
+ dispatch(snackbarActions.CLOSE_SNACKBAR());
+ dispatch(snackbarActions.OPEN_SNACKBAR({
+ message: isPublicFavorite
+ ? "Removed from public favorites"
+ : "Added to public favorites",
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS
+ }));
+ dispatch(progressIndicatorActions.STOP_WORKING("togglePublicFavorite"));
+ })
+ .catch((e: any) => {
+ dispatch(progressIndicatorActions.STOP_WORKING("togglePublicFavorite"));
+ throw e;
+ });
+ };
+
+export const updatePublicFavorites = (resourceUuids: string[]) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ const uuidPrefix = getState().config.uuidPrefix;
+ const uuid = `${uuidPrefix}-j7d0g-fffffffffffffff`;
+ dispatch(publicFavoritesActions.CHECK_PRESENCE_IN_PUBLIC_FAVORITES(resourceUuids));
+ services.favoriteService
+ .checkPresenceInFavorites(uuid, resourceUuids)
+ .then((results: any) => {
+ dispatch(publicFavoritesActions.UPDATE_PUBLIC_FAVORITES(results));
+ });
+ };
diff --git a/src/store/public-favorites/public-favorites-reducer.ts b/src/store/public-favorites/public-favorites-reducer.ts
new file mode 100644
index 00000000..cbc7ade6
--- /dev/null
+++ b/src/store/public-favorites/public-favorites-reducer.ts
@@ -0,0 +1,15 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { PublicFavoritesAction, publicFavoritesActions } from "./public-favorites-actions";
+
+export type PublicFavoritesState = Record<string, boolean>;
+
+export const publicFavoritesReducer = (state: PublicFavoritesState = {}, action: PublicFavoritesAction) =>
+ publicFavoritesActions.match(action, {
+ UPDATE_PUBLIC_FAVORITES: publicFavorites => ({ ...state, ...publicFavorites }),
+ default: () => state
+ });
+
+export const checkPublicFavorite = (uuid: string, state: PublicFavoritesState) => state[uuid] === true;
\ No newline at end of file
diff --git a/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts b/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts
index 551e2796..a09a3085 100644
--- a/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts
+++ b/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts
@@ -19,6 +19,7 @@ import { OrderBuilder, OrderDirection } from '~/services/api/order-builder';
import { ProjectResource } from '~/models/project';
import { ProjectPanelColumnNames } from '~/views/project-panel/project-panel';
import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
+import { updatePublicFavorites } from '~/store/public-favorites/public-favorites-actions';
export class SharedWithMeMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@ -35,6 +36,7 @@ export class SharedWithMeMiddlewareService extends DataExplorerMiddlewareService
excludeHomeProject: true,
});
api.dispatch<any>(updateFavorites(response.items.map(item => item.uuid)));
+ api.dispatch<any>(updatePublicFavorites(response.items.map(item => item.uuid)));
api.dispatch(updateResources(response.items));
await api.dispatch<any>(loadMissingProcessesInformation(response.items));
api.dispatch(setItems(response));
diff --git a/src/store/store.ts b/src/store/store.ts
index bdebebab..9d7dcdd4 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -61,6 +61,7 @@ import { API_CLIENT_AUTHORIZATION_PANEL_ID } from '~/store/api-client-authorizat
import { ApiClientAuthorizationMiddlewareService } from '~/store/api-client-authorizations/api-client-authorizations-middleware-service';
import { PublicFavoritesMiddlewareService } from '~/store/public-favorites-panel/public-favorites-middleware-service';
import { PUBLIC_FAVORITE_PANEL_ID } from '~/store/public-favorites-panel/public-favorites-action';
+import { publicFavoritesReducer } from '~/store/public-favorites/public-favorites-reducer';
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
@@ -145,6 +146,7 @@ const createRootReducer = (services: ServiceRepository) => combineReducers({
detailsPanel: detailsPanelReducer,
dialog: dialogReducer,
favorites: favoritesReducer,
+ publicFavorites: publicFavoritesReducer,
form: formReducer,
processLogsPanel: processLogsPanelReducer,
properties: propertiesReducer,
diff --git a/src/store/trash-panel/trash-panel-middleware-service.ts b/src/store/trash-panel/trash-panel-middleware-service.ts
index b3f0805f..f5173fc9 100644
--- a/src/store/trash-panel/trash-panel-middleware-service.ts
+++ b/src/store/trash-panel/trash-panel-middleware-service.ts
@@ -18,6 +18,7 @@ import { GroupContentsResourcePrefix } from "~/services/groups-service/groups-se
import { ProjectResource } from "~/models/project";
import { ProjectPanelColumnNames } from "~/views/project-panel/project-panel";
import { updateFavorites } from "~/store/favorites/favorites-actions";
+import { updatePublicFavorites } from '~/store/public-favorites/public-favorites-actions';
import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions";
import { updateResources } from "~/store/resources/resources-actions";
import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions";
@@ -83,6 +84,7 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
items
}));
api.dispatch<any>(updateFavorites(items));
+ api.dispatch<any>(updatePublicFavorites(items));
api.dispatch(updateResources(listResults.items));
} catch (e) {
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
diff --git a/src/views-components/context-menu/action-sets/collection-admin-action-set.ts b/src/views-components/context-menu/action-sets/collection-admin-action-set.ts
index 6ba86381..db849136 100644
--- a/src/views-components/context-menu/action-sets/collection-admin-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-admin-action-set.ts
@@ -16,6 +16,8 @@ import { openSharingDialog } from '~/store/sharing-dialog/sharing-dialog-actions
import { openAdvancedTabDialog } from "~/store/advanced-tab/advanced-tab";
import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action';
import { TogglePublicFavoriteAction } from "~/views-components/context-menu/actions/public-favorite-action";
+import { publicFavoritePanelActions } from "~/store/public-favorites-panel/public-favorites-action";
+import { togglePublicFavorite } from "~/store/public-favorites/public-favorites-actions";
export const collectionAdminActionSet: ContextMenuActionSet = [[
{
@@ -43,8 +45,8 @@ export const collectionAdminActionSet: ContextMenuActionSet = [[
{
component: TogglePublicFavoriteAction,
execute: (dispatch, resource) => {
- dispatch<any>(toggleFavorite(resource)).then(() => {
- dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
+ dispatch<any>(togglePublicFavorite(resource)).then(() => {
+ dispatch<any>(publicFavoritePanelActions.REQUEST_ITEMS());
});
}
},
diff --git a/src/views-components/context-menu/actions/public-favorite-action.tsx b/src/views-components/context-menu/actions/public-favorite-action.tsx
index 647b33b5..d9c4f9fb 100644
--- a/src/views-components/context-menu/actions/public-favorite-action.tsx
+++ b/src/views-components/context-menu/actions/public-favorite-action.tsx
@@ -9,21 +9,21 @@ import { connect } from "react-redux";
import { RootState } from "~/store/store";
const mapStateToProps = (state: RootState, props: { onClick: () => {} }) => ({
- isFavorite: state.contextMenu.resource !== undefined && state.favorites[state.contextMenu.resource.uuid] === true,
+ isPublicFavorite: state.contextMenu.resource !== undefined && state.publicFavorites[state.contextMenu.resource.uuid] === true,
onClick: props.onClick
});
-export const TogglePublicFavoriteAction = connect(mapStateToProps)((props: { isFavorite: boolean, onClick: () => void }) =>
+export const TogglePublicFavoriteAction = connect(mapStateToProps)((props: { isPublicFavorite: boolean, onClick: () => void }) =>
<ListItem
button
onClick={props.onClick}>
<ListItemIcon>
- {props.isFavorite
+ {props.isPublicFavorite
? <RemoveFavoriteIcon />
: <AddFavoriteIcon />}
</ListItemIcon>
<ListItemText style={{ textDecoration: 'none' }}>
- {props.isFavorite
+ {props.isPublicFavorite
? <>Remove from public favorites</>
: <>Add to public favorites</>}
</ListItemText>
commit 80fdf9603c057f1e41915e7c8890c942d240b36e
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Wed Mar 27 14:37:35 2019 +0100
data-explorer-routing-and-admins-context-menu-for-resources
Feature #14941
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/index.tsx b/src/index.tsx
index cfaff70a..9f9b27ca 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -61,6 +61,9 @@ import { groupActionSet } from '~/views-components/context-menu/action-sets/grou
import { groupMemberActionSet } from '~/views-components/context-menu/action-sets/group-member-action-set';
import { linkActionSet } from '~/views-components/context-menu/action-sets/link-action-set';
import { loadFileViewersConfig } from '~/store/file-viewers/file-viewers-actions';
+import { collectionAdminActionSet } from '~/views-components/context-menu/action-sets/collection-admin-action-set';
+import { processResourceAdminActionSet } from '~/views-components/context-menu/action-sets/process-resource-admin-action-set';
+import { projectAdminActionSet } from '~/views-components/context-menu/action-sets/project-admin-action-set';
console.log(`Starting arvados [${getBuildInfo()}]`);
@@ -87,6 +90,9 @@ addMenuActionSet(ContextMenuKind.NODE, computeNodeActionSet);
addMenuActionSet(ContextMenuKind.API_CLIENT_AUTHORIZATION, apiClientAuthorizationActionSet);
addMenuActionSet(ContextMenuKind.GROUPS, groupActionSet);
addMenuActionSet(ContextMenuKind.GROUP_MEMBER, groupMemberActionSet);
+addMenuActionSet(ContextMenuKind.COLLECTION_ADMIN, collectionAdminActionSet);
+addMenuActionSet(ContextMenuKind.PROCESS_ADMIN, processResourceAdminActionSet);
+addMenuActionSet(ContextMenuKind.PROJECT_ADMIN, projectAdminActionSet);
fetchConfig()
.then(({ config, apiHost }) => {
diff --git a/src/routes/route-change-handlers.ts b/src/routes/route-change-handlers.ts
index 141ae20b..2811f95a 100644
--- a/src/routes/route-change-handlers.ts
+++ b/src/routes/route-change-handlers.ts
@@ -23,6 +23,7 @@ const handleLocationChange = (store: RootStore) => ({ pathname }: Location) => {
const projectMatch = Routes.matchProjectRoute(pathname);
const collectionMatch = Routes.matchCollectionRoute(pathname);
const favoriteMatch = Routes.matchFavoritesRoute(pathname);
+ const publicFavoritesMatch = Routes.matchPublicFavorites(pathname);
const trashMatch = Routes.matchTrashRoute(pathname);
const processMatch = Routes.matchProcessRoute(pathname);
const processLogMatch = Routes.matchProcessLogRoute(pathname);
@@ -55,6 +56,8 @@ const handleLocationChange = (store: RootStore) => ({ pathname }: Location) => {
store.dispatch(WorkbenchActions.loadCollection(collectionMatch.params.id));
} else if (favoriteMatch) {
store.dispatch(WorkbenchActions.loadFavorites());
+ } else if (publicFavoritesMatch) {
+ store.dispatch(WorkbenchActions.loadPublicFavorites());
} else if (trashMatch) {
store.dispatch(WorkbenchActions.loadTrash());
} else if (processMatch) {
diff --git a/src/routes/routes.ts b/src/routes/routes.ts
index b1da9496..3fd6670d 100644
--- a/src/routes/routes.ts
+++ b/src/routes/routes.ts
@@ -33,7 +33,8 @@ export const Routes = {
API_CLIENT_AUTHORIZATIONS: `/api_client_authorizations`,
GROUPS: '/groups',
GROUP_DETAILS: `/group/:id(${RESOURCE_UUID_PATTERN})`,
- LINKS: '/links'
+ LINKS: '/links',
+ PUBLIC_FAVORITES: '/public-favorites'
};
export const getResourceUrl = (uuid: string) => {
@@ -131,6 +132,9 @@ export const matchGroupsRoute = (route: string) =>
export const matchGroupDetailsRoute = (route: string) =>
matchPath<ResourceRouteParams>(route, { path: Routes.GROUP_DETAILS });
-
+
export const matchLinksRoute = (route: string) =>
matchPath(route, { path: Routes.LINKS });
+
+export const matchPublicFavorites = (route: string) =>
+ matchPath(route, { path: Routes.PUBLIC_FAVORITES });
diff --git a/src/store/context-menu/context-menu-actions.ts b/src/store/context-menu/context-menu-actions.ts
index 269495e5..121ea50b 100644
--- a/src/store/context-menu/context-menu-actions.ts
+++ b/src/store/context-menu/context-menu-actions.ts
@@ -194,15 +194,15 @@ export const openProcessContextMenu = (event: React.MouseEvent<HTMLElement>, pro
}
};
-export const resourceKindToContextMenuKind = (uuid: string) => {
+export const resourceKindToContextMenuKind = (uuid: string, isAdmin?: boolean) => {
const kind = extractUuidKind(uuid);
switch (kind) {
case ResourceKind.PROJECT:
- return ContextMenuKind.PROJECT;
+ return !isAdmin ? ContextMenuKind.PROJECT : ContextMenuKind.PROJECT_ADMIN;
case ResourceKind.COLLECTION:
- return ContextMenuKind.COLLECTION_RESOURCE;
+ return !isAdmin ? ContextMenuKind.COLLECTION_RESOURCE : ContextMenuKind.COLLECTION_ADMIN;
case ResourceKind.PROCESS:
- return ContextMenuKind.PROCESS_RESOURCE;
+ return !isAdmin ? ContextMenuKind.PROCESS_RESOURCE : ContextMenuKind.PROCESS_ADMIN;
case ResourceKind.USER:
return ContextMenuKind.ROOT_PROJECT;
case ResourceKind.LINK:
diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts
index f610eb5e..af7a0c03 100644
--- a/src/store/navigation/navigation-action.ts
+++ b/src/store/navigation/navigation-action.ts
@@ -27,6 +27,8 @@ export const navigateTo = (uuid: string) =>
}
if (uuid === SidePanelTreeCategory.FAVORITES) {
dispatch<any>(navigateToFavorites);
+ } else if (uuid === SidePanelTreeCategory.PUBLIC_FAVORITES) {
+ dispatch(navigateToPublicFavorites);
} else if (uuid === SidePanelTreeCategory.SHARED_WITH_ME) {
dispatch(navigateToSharedWithMe);
} else if (uuid === SidePanelTreeCategory.WORKFLOWS) {
@@ -44,6 +46,8 @@ export const navigateToFavorites = push(Routes.FAVORITES);
export const navigateToTrash = push(Routes.TRASH);
+export const navigateToPublicFavorites = push(Routes.PUBLIC_FAVORITES);
+
export const navigateToWorkflows = push(Routes.WORKFLOWS);
export const navigateToProject = compose(push, getProjectUrl);
diff --git a/src/store/public-favorites-panel/public-favorites-action.ts b/src/store/public-favorites-panel/public-favorites-action.ts
new file mode 100644
index 00000000..ae9f8e8f
--- /dev/null
+++ b/src/store/public-favorites-panel/public-favorites-action.ts
@@ -0,0 +1,10 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { bindDataExplorerActions } from "~/store/data-explorer/data-explorer-action";
+
+export const PUBLIC_FAVORITE_PANEL_ID = "publicFavoritePanel";
+export const publicFavoritePanelActions = bindDataExplorerActions(PUBLIC_FAVORITE_PANEL_ID);
+
+export const loadPublicFavoritePanel = () => publicFavoritePanelActions.REQUEST_ITEMS();
\ No newline at end of file
diff --git a/src/store/public-favorites-panel/public-favorites-middleware-service.ts b/src/store/public-favorites-panel/public-favorites-middleware-service.ts
new file mode 100644
index 00000000..4e68ddc6
--- /dev/null
+++ b/src/store/public-favorites-panel/public-favorites-middleware-service.ts
@@ -0,0 +1,103 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { ServiceRepository } from '~/services/services';
+import { MiddlewareAPI, Dispatch } from 'redux';
+import { DataExplorerMiddlewareService, getDataExplorerColumnFilters } from '~/store/data-explorer/data-explorer-middleware-service';
+import { RootState } from '~/store/store';
+import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
+import { getDataExplorer } from '~/store/data-explorer/data-explorer-reducer';
+import { resourcesActions } from '~/store/resources/resources-actions';
+import { FilterBuilder } from '~/services/api/filter-builder';
+import { SortDirection } from '~/components/data-table/data-column';
+import { OrderDirection, OrderBuilder } from '~/services/api/order-builder';
+import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
+import { FavoritePanelColumnNames } from '~/views/favorite-panel/favorite-panel';
+import { publicFavoritePanelActions } from '~/store/public-favorites-panel/public-favorites-action';
+import { DataColumns } from '~/components/data-table/data-table';
+import { serializeSimpleObjectTypeFilters } from '../resource-type-filters/resource-type-filters';
+import { LinkResource } from '~/models/link';
+import { GroupContentsResource, GroupContentsResourcePrefix } from '~/services/groups-service/groups-service';
+import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
+import { loadMissingProcessesInformation } from '~/store/project-panel/project-panel-middleware-service';
+import { updateFavorites } from '~/store/favorites/favorites-actions';
+
+export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareService {
+ constructor(private services: ServiceRepository, id: string) {
+ super(id);
+ }
+
+ async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
+ const dataExplorer = getDataExplorer(api.getState().dataExplorer, this.getId());
+ if (!dataExplorer) {
+ api.dispatch(favoritesPanelDataExplorerIsNotSet());
+ } else {
+ const columns = dataExplorer.columns as DataColumns<string>;
+ const sortColumn = getSortColumn(dataExplorer);
+ const typeFilters = serializeSimpleObjectTypeFilters(getDataExplorerColumnFilters(columns, FavoritePanelColumnNames.TYPE));
+
+
+ const linkOrder = new OrderBuilder<LinkResource>();
+ const contentOrder = new OrderBuilder<GroupContentsResource>();
+
+ if (sortColumn && sortColumn.name === FavoritePanelColumnNames.NAME) {
+ const direction = sortColumn.sortDirection === SortDirection.ASC
+ ? OrderDirection.ASC
+ : OrderDirection.DESC;
+
+ linkOrder.addOrder(direction, "name");
+ contentOrder
+ .addOrder(direction, "name", GroupContentsResourcePrefix.COLLECTION)
+ .addOrder(direction, "name", GroupContentsResourcePrefix.PROCESS)
+ .addOrder(direction, "name", GroupContentsResourcePrefix.PROJECT);
+ }
+ try {
+ api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
+ const response = await this.services.favoriteService
+ .list(this.services.authService.getUuid()!, {
+ limit: dataExplorer.rowsPerPage,
+ offset: dataExplorer.page * dataExplorer.rowsPerPage,
+ linkOrder: linkOrder.getOrder(),
+ contentOrder: contentOrder.getOrder(),
+ filters: new FilterBuilder()
+ .addILike("name", dataExplorer.searchValue)
+ .addIsA("headUuid", typeFilters)
+ .getFilters(),
+
+ });
+ api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
+ api.dispatch(resourcesActions.SET_RESOURCES(response.items));
+ await api.dispatch<any>(loadMissingProcessesInformation(response.items));
+ api.dispatch(publicFavoritePanelActions.SET_ITEMS({
+ items: response.items.map(resource => resource.uuid),
+ itemsAvailable: response.itemsAvailable,
+ page: Math.floor(response.offset / response.limit),
+ rowsPerPage: response.limit
+ }));
+ api.dispatch<any>(updateFavorites(response.items.map(item => item.uuid)));
+ } catch (e) {
+ api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
+ api.dispatch(publicFavoritePanelActions.SET_ITEMS({
+ items: [],
+ itemsAvailable: 0,
+ page: 0,
+ rowsPerPage: dataExplorer.rowsPerPage
+ }));
+ api.dispatch(couldNotFetchPublicFavorites());
+ }
+ }
+ }
+}
+
+const favoritesPanelDataExplorerIsNotSet = () =>
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Favorites panel is not ready.',
+ kind: SnackbarKind.ERROR
+ });
+
+const couldNotFetchPublicFavorites = () =>
+ snackbarActions.OPEN_SNACKBAR({
+ message: 'Could not fetch public favorites contents.',
+ kind: SnackbarKind.ERROR
+ });
\ No newline at end of file
diff --git a/src/store/side-panel-tree/side-panel-tree-actions.ts b/src/store/side-panel-tree/side-panel-tree-actions.ts
index 6032666f..6ad71391 100644
--- a/src/store/side-panel-tree/side-panel-tree-actions.ts
+++ b/src/store/side-panel-tree/side-panel-tree-actions.ts
@@ -19,6 +19,7 @@ import { GroupClass } from '~/models/group';
export enum SidePanelTreeCategory {
PROJECTS = 'Projects',
SHARED_WITH_ME = 'Shared with me',
+ PUBLIC_FAVORITES = 'Public Favorites',
WORKFLOWS = 'Workflows',
FAVORITES = 'Favorites',
TRASH = 'Trash'
@@ -42,6 +43,7 @@ export const getSidePanelTreeBranch = (uuid: string) => (treePicker: TreePicker)
};
const SIDE_PANEL_CATEGORIES = [
+ SidePanelTreeCategory.PUBLIC_FAVORITES,
SidePanelTreeCategory.WORKFLOWS,
SidePanelTreeCategory.FAVORITES,
SidePanelTreeCategory.TRASH,
diff --git a/src/store/side-panel/side-panel-action.ts b/src/store/side-panel/side-panel-action.ts
index 6d3e4746..f5ec5efc 100644
--- a/src/store/side-panel/side-panel-action.ts
+++ b/src/store/side-panel/side-panel-action.ts
@@ -4,7 +4,7 @@
import { Dispatch } from 'redux';
import { isSidePanelTreeCategory, SidePanelTreeCategory } from '~/store/side-panel-tree/side-panel-tree-actions';
-import { navigateToFavorites, navigateTo, navigateToTrash, navigateToSharedWithMe, navigateToWorkflows } from '../navigation/navigation-action';
+import { navigateToFavorites, navigateTo, navigateToTrash, navigateToSharedWithMe, navigateToWorkflows, navigateToPublicFavorites } from '~/store/navigation/navigation-action';
import {snackbarActions, SnackbarKind} from '~/store/snackbar/snackbar-actions';
export const navigateFromSidePanel = (id: string) =>
@@ -20,6 +20,8 @@ const getSidePanelTreeCategoryAction = (id: string) => {
switch (id) {
case SidePanelTreeCategory.FAVORITES:
return navigateToFavorites;
+ case SidePanelTreeCategory.PUBLIC_FAVORITES:
+ return navigateToPublicFavorites;
case SidePanelTreeCategory.TRASH:
return navigateToTrash;
case SidePanelTreeCategory.SHARED_WITH_ME:
diff --git a/src/store/store.ts b/src/store/store.ts
index 04813b1c..bdebebab 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -59,6 +59,8 @@ import { COMPUTE_NODE_PANEL_ID } from '~/store/compute-nodes/compute-nodes-actio
import { ComputeNodeMiddlewareService } from '~/store/compute-nodes/compute-nodes-middleware-service';
import { API_CLIENT_AUTHORIZATION_PANEL_ID } from '~/store/api-client-authorizations/api-client-authorizations-actions';
import { ApiClientAuthorizationMiddlewareService } from '~/store/api-client-authorizations/api-client-authorizations-middleware-service';
+import { PublicFavoritesMiddlewareService } from '~/store/public-favorites-panel/public-favorites-middleware-service';
+import { PUBLIC_FAVORITE_PANEL_ID } from '~/store/public-favorites-panel/public-favorites-action';
const composeEnhancers =
(process.env.NODE_ENV === 'development' &&
@@ -109,6 +111,9 @@ export function configureStore(history: History, services: ServiceRepository): R
const apiClientAuthorizationMiddlewareService = dataExplorerMiddleware(
new ApiClientAuthorizationMiddlewareService(services, API_CLIENT_AUTHORIZATION_PANEL_ID)
);
+ const publicFavoritesMiddleware = dataExplorerMiddleware(
+ new PublicFavoritesMiddlewareService(services, PUBLIC_FAVORITE_PANEL_ID)
+ );
const middlewares: Middleware[] = [
routerMiddleware(history),
thunkMiddleware.withExtraArgument(services),
@@ -123,7 +128,8 @@ export function configureStore(history: History, services: ServiceRepository): R
groupDetailsPanelMiddleware,
linkPanelMiddleware,
computeNodeMiddleware,
- apiClientAuthorizationMiddlewareService
+ apiClientAuthorizationMiddlewareService,
+ publicFavoritesMiddleware
];
const enhancer = composeEnhancers(applyMiddleware(...middlewares));
return createStore(rootReducer, enhancer);
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index ddfe296c..e2276cef 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -92,6 +92,7 @@ import { groupsPanelColumns } from '~/views/groups-panel/groups-panel';
import * as groupDetailsPanelActions from '~/store/group-details-panel/group-details-panel-actions';
import { groupDetailsPanelColumns } from '~/views/group-details-panel/group-details-panel';
import { DataTableFetchMode } from "~/components/data-table/data-table";
+import { loadPublicFavoritePanel, publicFavoritePanelActions } from '~/store/public-favorites-panel/public-favorites-action';
export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';
@@ -119,6 +120,7 @@ export const loadWorkbench = () =>
if (user) {
dispatch(projectPanelActions.SET_COLUMNS({ columns: projectPanelColumns }));
dispatch(favoritePanelActions.SET_COLUMNS({ columns: favoritePanelColumns }));
+ dispatch(publicFavoritePanelActions.SET_COLUMNS({ columns: favoritePanelColumns }));
dispatch(trashPanelActions.SET_COLUMNS({ columns: trashPanelColumns }));
dispatch(sharedWithMePanelActions.SET_COLUMNS({ columns: projectPanelColumns }));
dispatch(workflowPanelActions.SET_COLUMNS({ columns: workflowPanelColumns }));
@@ -437,6 +439,14 @@ export const loadWorkflow = handleFirstTimeLoad(async (dispatch: Dispatch<any>)
dispatch(setSidePanelBreadcrumbs(SidePanelTreeCategory.WORKFLOWS));
});
+export const loadPublicFavorites = () =>
+ handleFirstTimeLoad(
+ (dispatch: Dispatch) => {
+ dispatch<any>(activateSidePanelTreeItem(SidePanelTreeCategory.PUBLIC_FAVORITES));
+ dispatch<any>(loadPublicFavoritePanel());
+ dispatch<any>(setSidePanelBreadcrumbs(SidePanelTreeCategory.PUBLIC_FAVORITES));
+ });
+
export const loadSearchResults = handleFirstTimeLoad(
async (dispatch: Dispatch<any>) => {
await dispatch(loadSearchResultsPanel());
diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-action-set.ts
index d6095d10..fe77b749 100644
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@ -12,7 +12,6 @@ import { openMoveCollectionDialog } from '~/store/collections/collection-move-ac
import { openCollectionCopyDialog } from "~/store/collections/collection-copy-actions";
import { ToggleTrashAction } from "~/views-components/context-menu/actions/trash-action";
import { toggleCollectionTrashed } from "~/store/trash/trash-actions";
-import { detailsPanelActions } from '~/store/details-panel/details-panel-action';
import { openSharingDialog } from '~/store/sharing-dialog/sharing-dialog-actions';
import { openAdvancedTabDialog } from "~/store/advanced-tab/advanced-tab";
import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action';
diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-admin-action-set.ts
similarity index 85%
copy from src/views-components/context-menu/action-sets/collection-action-set.ts
copy to src/views-components/context-menu/action-sets/collection-admin-action-set.ts
index d6095d10..6ba86381 100644
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-admin-action-set.ts
@@ -5,19 +5,19 @@
import { ContextMenuActionSet } from "../context-menu-action-set";
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "~/store/favorites/favorites-actions";
-import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RemoveIcon } from "~/components/icon/icon";
+import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, AdvancedIcon } from "~/components/icon/icon";
import { openCollectionUpdateDialog } from "~/store/collections/collection-update-actions";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
import { openMoveCollectionDialog } from '~/store/collections/collection-move-actions';
import { openCollectionCopyDialog } from "~/store/collections/collection-copy-actions";
import { ToggleTrashAction } from "~/views-components/context-menu/actions/trash-action";
import { toggleCollectionTrashed } from "~/store/trash/trash-actions";
-import { detailsPanelActions } from '~/store/details-panel/details-panel-action';
import { openSharingDialog } from '~/store/sharing-dialog/sharing-dialog-actions';
import { openAdvancedTabDialog } from "~/store/advanced-tab/advanced-tab";
import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action';
+import { TogglePublicFavoriteAction } from "~/views-components/context-menu/actions/public-favorite-action";
-export const collectionActionSet: ContextMenuActionSet = [[
+export const collectionAdminActionSet: ContextMenuActionSet = [[
{
icon: RenameIcon,
name: "Edit collection",
@@ -41,6 +41,14 @@ export const collectionActionSet: ContextMenuActionSet = [[
}
},
{
+ component: TogglePublicFavoriteAction,
+ execute: (dispatch, resource) => {
+ dispatch<any>(toggleFavorite(resource)).then(() => {
+ dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
+ });
+ }
+ },
+ {
icon: MoveToIcon,
name: "Move to",
execute: (dispatch, resource) => dispatch<any>(openMoveCollectionDialog(resource))
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/process-resource-admin-action-set.ts
similarity index 52%
copy from src/views-components/context-menu/action-sets/project-action-set.ts
copy to src/views-components/context-menu/action-sets/process-resource-admin-action-set.ts
index 660d7ea0..e0cb796b 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-resource-admin-action-set.ts
@@ -3,33 +3,24 @@
// SPDX-License-Identifier: AGPL-3.0
import { ContextMenuActionSet } from "../context-menu-action-set";
-import { NewProjectIcon, RenameIcon, CopyIcon, MoveToIcon, DetailsIcon, AdvancedIcon } from '~/components/icon/icon';
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "~/store/favorites/favorites-actions";
+import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, RemoveIcon } from "~/components/icon/icon";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
-import { openMoveProjectDialog } from '~/store/projects/project-move-actions';
-import { openProjectCreateDialog } from '~/store/projects/project-create-actions';
-import { openProjectUpdateDialog } from '~/store/projects/project-update-actions';
-import { ToggleTrashAction } from "~/views-components/context-menu/actions/trash-action";
-import { toggleProjectTrashed } from "~/store/trash/trash-actions";
-import { ShareIcon } from '~/components/icon/icon';
+import { openMoveProcessDialog } from '~/store/processes/process-move-actions';
+import { openProcessUpdateDialog } from "~/store/processes/process-update-actions";
+import { openCopyProcessDialog } from '~/store/processes/process-copy-actions';
import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions";
-import { openAdvancedTabDialog } from "~/store/advanced-tab/advanced-tab";
+import { openRemoveProcessDialog } from "~/store/processes/processes-actions";
import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action';
+import { TogglePublicFavoriteAction } from "~/views-components/context-menu/actions/public-favorite-action";
-export const projectActionSet: ContextMenuActionSet = [[
- {
- icon: NewProjectIcon,
- name: "New project",
- execute: (dispatch, resource) => {
- dispatch<any>(openProjectCreateDialog(resource.uuid));
- }
- },
+export const processResourceAdminActionSet: ContextMenuActionSet = [[
{
icon: RenameIcon,
- name: "Edit project",
+ name: "Edit process",
execute: (dispatch, resource) => {
- dispatch<any>(openProjectUpdateDialog(resource));
+ dispatch<any>(openProcessUpdateDialog(resource));
}
},
{
@@ -48,19 +39,27 @@ export const projectActionSet: ContextMenuActionSet = [[
}
},
{
+ component: TogglePublicFavoriteAction,
+ execute: (dispatch, resource) => {
+ dispatch<any>(toggleFavorite(resource)).then(() => {
+ dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
+ });
+ }
+ },
+ {
icon: MoveToIcon,
name: "Move to",
execute: (dispatch, resource) => {
- dispatch<any>(openMoveProjectDialog(resource));
+ dispatch<any>(openMoveProcessDialog(resource));
+ }
+ },
+ {
+ icon: CopyIcon,
+ name: "Copy to project",
+ execute: (dispatch, resource) => {
+ dispatch<any>(openCopyProcessDialog(resource));
}
},
- // {
- // icon: CopyIcon,
- // name: "Copy to project",
- // execute: (dispatch, resource) => {
- // // add code
- // }
- // },
{
icon: DetailsIcon,
name: "View details",
@@ -69,16 +68,10 @@ export const projectActionSet: ContextMenuActionSet = [[
}
},
{
- icon: AdvancedIcon,
- name: "Advanced",
+ name: "Remove",
+ icon: RemoveIcon,
execute: (dispatch, resource) => {
- dispatch<any>(openAdvancedTabDialog(resource.uuid));
+ dispatch<any>(openRemoveProcessDialog(resource.uuid));
}
- },
- {
- component: ToggleTrashAction,
- execute: (dispatch, resource) => {
- dispatch<any>(toggleProjectTrashed(resource.uuid, resource.ownerUuid, resource.isTrashed!!));
- }
- },
+ }
]];
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index 660d7ea0..32616fce 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import { ContextMenuActionSet } from "../context-menu-action-set";
-import { NewProjectIcon, RenameIcon, CopyIcon, MoveToIcon, DetailsIcon, AdvancedIcon } from '~/components/icon/icon';
+import { NewProjectIcon, RenameIcon, MoveToIcon, DetailsIcon, AdvancedIcon } from '~/components/icon/icon';
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "~/store/favorites/favorites-actions";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-admin-action-set.ts
similarity index 83%
copy from src/views-components/context-menu/action-sets/project-action-set.ts
copy to src/views-components/context-menu/action-sets/project-admin-action-set.ts
index 660d7ea0..1076696a 100644
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-admin-action-set.ts
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import { ContextMenuActionSet } from "../context-menu-action-set";
-import { NewProjectIcon, RenameIcon, CopyIcon, MoveToIcon, DetailsIcon, AdvancedIcon } from '~/components/icon/icon';
+import { NewProjectIcon, RenameIcon, MoveToIcon, DetailsIcon, AdvancedIcon } from '~/components/icon/icon';
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "~/store/favorites/favorites-actions";
import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
@@ -16,8 +16,9 @@ import { ShareIcon } from '~/components/icon/icon';
import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions";
import { openAdvancedTabDialog } from "~/store/advanced-tab/advanced-tab";
import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action';
+import { TogglePublicFavoriteAction } from "~/views-components/context-menu/actions/public-favorite-action";
-export const projectActionSet: ContextMenuActionSet = [[
+export const projectAdminActionSet: ContextMenuActionSet = [[
{
icon: NewProjectIcon,
name: "New project",
@@ -48,6 +49,14 @@ export const projectActionSet: ContextMenuActionSet = [[
}
},
{
+ component: TogglePublicFavoriteAction,
+ execute: (dispatch, resource) => {
+ dispatch<any>(toggleFavorite(resource)).then(() => {
+ dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
+ });
+ }
+ },
+ {
icon: MoveToIcon,
name: "Move to",
execute: (dispatch, resource) => {
diff --git a/src/views-components/context-menu/actions/public-favorite-action.tsx b/src/views-components/context-menu/actions/public-favorite-action.tsx
new file mode 100644
index 00000000..647b33b5
--- /dev/null
+++ b/src/views-components/context-menu/actions/public-favorite-action.tsx
@@ -0,0 +1,30 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as React from "react";
+import { ListItemIcon, ListItemText, ListItem } from "@material-ui/core";
+import { AddFavoriteIcon, RemoveFavoriteIcon } from "~/components/icon/icon";
+import { connect } from "react-redux";
+import { RootState } from "~/store/store";
+
+const mapStateToProps = (state: RootState, props: { onClick: () => {} }) => ({
+ isFavorite: state.contextMenu.resource !== undefined && state.favorites[state.contextMenu.resource.uuid] === true,
+ onClick: props.onClick
+});
+
+export const TogglePublicFavoriteAction = connect(mapStateToProps)((props: { isFavorite: boolean, onClick: () => void }) =>
+ <ListItem
+ button
+ onClick={props.onClick}>
+ <ListItemIcon>
+ {props.isFavorite
+ ? <RemoveFavoriteIcon />
+ : <AddFavoriteIcon />}
+ </ListItemIcon>
+ <ListItemText style={{ textDecoration: 'none' }}>
+ {props.isFavorite
+ ? <>Remove from public favorites</>
+ : <>Add to public favorites</>}
+ </ListItemText>
+ </ListItem >);
diff --git a/src/views-components/context-menu/context-menu.tsx b/src/views-components/context-menu/context-menu.tsx
index f6910290..65e98cc5 100644
--- a/src/views-components/context-menu/context-menu.tsx
+++ b/src/views-components/context-menu/context-menu.tsx
@@ -65,6 +65,7 @@ export enum ContextMenuKind {
API_CLIENT_AUTHORIZATION = "ApiClientAuthorization",
ROOT_PROJECT = "RootProject",
PROJECT = "Project",
+ PROJECT_ADMIN = "ProjectAdmin",
RESOURCE = "Resource",
FAVORITE = "Favorite",
TRASH = "Trash",
@@ -72,9 +73,11 @@ export enum ContextMenuKind {
COLLECTION_FILES_ITEM = "CollectionFilesItem",
COLLECTION_FILES_NOT_SELECTED = "CollectionFilesNotSelected",
COLLECTION = 'Collection',
+ COLLECTION_ADMIN = 'CollectionAdmin',
COLLECTION_RESOURCE = 'CollectionResource',
TRASHED_COLLECTION = 'TrashedCollection',
PROCESS = "Process",
+ PROCESS_ADMIN = 'ProcessAdmin',
PROCESS_RESOURCE = 'ProcessResource',
PROCESS_LOGS = "ProcessLogs",
REPOSITORY = "Repository",
diff --git a/src/views-components/data-explorer/data-explorer.tsx b/src/views-components/data-explorer/data-explorer.tsx
index ed4bffd6..371569d1 100644
--- a/src/views-components/data-explorer/data-explorer.tsx
+++ b/src/views-components/data-explorer/data-explorer.tsx
@@ -15,7 +15,7 @@ import { DataTableFilters } from '~/components/data-table-filters/data-table-fil
interface Props {
id: string;
onRowClick: (item: any) => void;
- onContextMenu?: (event: React.MouseEvent<HTMLElement>, item: any) => void;
+ onContextMenu?: (event: React.MouseEvent<HTMLElement>, item: any, isAdmin?: boolean) => void;
onRowDoubleClick: (item: any) => void;
extractKey?: (item: any) => React.Key;
}
diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx
index 825bab30..2483c516 100644
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@ -113,6 +113,7 @@ const DEFAUL_VIEW_MESSAGES = [
interface ProjectPanelDataProps {
currentItemId: string;
resources: ResourcesState;
+ isAdmin: boolean;
}
type ProjectPanelProps = ProjectPanelDataProps & DispatchProp
@@ -121,7 +122,8 @@ type ProjectPanelProps = ProjectPanelDataProps & DispatchProp
export const ProjectPanel = withStyles(styles)(
connect((state: RootState) => ({
currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties),
- resources: state.resources
+ resources: state.resources,
+ isAdmin: state.auth.user!.isAdmin
}))(
class extends React.Component<ProjectPanelProps> {
render() {
@@ -146,7 +148,7 @@ export const ProjectPanel = withStyles(styles)(
}
handleContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) => {
- const menuKind = resourceKindToContextMenuKind(resourceUuid);
+ const menuKind = resourceKindToContextMenuKind(resourceUuid, this.props.isAdmin);
const resource = getResource<ProjectResource>(resourceUuid)(this.props.resources);
if (menuKind && resource) {
this.props.dispatch<any>(openContextMenu(event, {
diff --git a/src/views/public-favorites-panel/public-favorites-panel.tsx b/src/views/public-favorites-panel/public-favorites-panel.tsx
new file mode 100644
index 00000000..f559a616
--- /dev/null
+++ b/src/views/public-favorites-panel/public-favorites-panel.tsx
@@ -0,0 +1,167 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as React from 'react';
+import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
+import { DataExplorer } from "~/views-components/data-explorer/data-explorer";
+import { connect, DispatchProp } from 'react-redux';
+import { DataColumns } from '~/components/data-table/data-table';
+import { RouteComponentProps } from 'react-router';
+import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters';
+import { SortDirection } from '~/components/data-table/data-column';
+import { ResourceKind } from '~/models/resource';
+import { ArvadosTheme } from '~/common/custom-theme';
+import {
+ ProcessStatus,
+ ResourceFileSize,
+ ResourceLastModifiedDate,
+ ResourceName,
+ ResourceOwner,
+ ResourceType
+} from '~/views-components/data-explorer/renderers';
+import { FavoriteIcon } from '~/components/icon/icon';
+import { Dispatch } from 'redux';
+import { openContextMenu, resourceKindToContextMenuKind } 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 { PUBLIC_FAVORITE_PANEL_ID } from '~/store/public-favorites-panel/public-favorites-action';
+
+type CssRules = "toolbar" | "button";
+
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+ toolbar: {
+ paddingBottom: theme.spacing.unit * 3,
+ textAlign: "right"
+ },
+ button: {
+ marginLeft: theme.spacing.unit
+ },
+});
+
+export enum FavoritePanelColumnNames {
+ NAME = "Name",
+ STATUS = "Status",
+ TYPE = "Type",
+ OWNER = "Owner",
+ FILE_SIZE = "File size",
+ LAST_MODIFIED = "Last modified"
+}
+
+export interface FavoritePanelFilter extends DataTableFilterItem {
+ type: ResourceKind | ContainerRequestState;
+}
+
+export const favoritePanelColumns: DataColumns<string> = [
+ {
+ name: FavoritePanelColumnNames.NAME,
+ selected: true,
+ configurable: true,
+ sortDirection: SortDirection.NONE,
+ filters: createTree(),
+ render: uuid => <ResourceName uuid={uuid} />
+ },
+ {
+ name: "Status",
+ selected: true,
+ configurable: true,
+ filters: createTree(),
+ render: uuid => <ProcessStatus uuid={uuid} />
+ },
+ {
+ name: FavoritePanelColumnNames.TYPE,
+ selected: true,
+ configurable: true,
+ filters: getSimpleObjectTypeFilters(),
+ render: uuid => <ResourceType uuid={uuid} />
+ },
+ {
+ name: FavoritePanelColumnNames.OWNER,
+ selected: true,
+ configurable: true,
+ filters: createTree(),
+ render: uuid => <ResourceOwner uuid={uuid} />
+ },
+ {
+ name: FavoritePanelColumnNames.FILE_SIZE,
+ selected: true,
+ configurable: true,
+ filters: createTree(),
+ render: uuid => <ResourceFileSize uuid={uuid} />
+ },
+ {
+ name: FavoritePanelColumnNames.LAST_MODIFIED,
+ selected: true,
+ configurable: true,
+ sortDirection: SortDirection.DESC,
+ filters: createTree(),
+ render: uuid => <ResourceLastModifiedDate uuid={uuid} />
+ }
+];
+
+interface FavoritePanelDataProps {
+ favorites: FavoritesState;
+}
+
+interface FavoritePanelActionProps {
+ onItemClick: (item: string) => void;
+ onContextMenu: (event: React.MouseEvent<HTMLElement>, item: string) => void;
+ onDialogOpen: (ownerUuid: string) => void;
+ onItemDoubleClick: (item: string) => void;
+}
+const mapStateToProps = ({ favorites }: RootState): FavoritePanelDataProps => ({
+ favorites
+});
+
+const mapDispatchToProps = (dispatch: Dispatch): FavoritePanelActionProps => ({
+ onContextMenu: (event, resourceUuid) => {
+ const kind = resourceKindToContextMenuKind(resourceUuid);
+ if (kind) {
+ dispatch<any>(openContextMenu(event, {
+ name: '',
+ uuid: resourceUuid,
+ ownerUuid: '',
+ kind: ResourceKind.NONE,
+ menuKind: kind
+ }));
+ }
+ dispatch<any>(loadDetailsPanel(resourceUuid));
+ },
+ onDialogOpen: (ownerUuid: string) => { return; },
+ onItemClick: (resourceUuid: string) => {
+ dispatch<any>(loadDetailsPanel(resourceUuid));
+ },
+ onItemDoubleClick: uuid => {
+ dispatch<any>(navigateTo(uuid));
+ }
+});
+
+type FavoritePanelProps = FavoritePanelDataProps & FavoritePanelActionProps & DispatchProp
+ & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
+
+export const PublicFavoritePanel = withStyles(styles)(
+ connect(mapStateToProps, mapDispatchToProps)(
+ class extends React.Component<FavoritePanelProps> {
+ render() {
+ return <DataExplorer
+ id={PUBLIC_FAVORITE_PANEL_ID}
+ onRowClick={this.props.onItemClick}
+ onRowDoubleClick={this.props.onItemDoubleClick}
+ onContextMenu={this.props.onContextMenu}
+ contextMenuColumn={true}
+ dataTableDefaultView={
+ <DataTableDefaultView
+ icon={FavoriteIcon}
+ messages={['Public favorites list is empty.']}
+ />
+ } />;
+ }
+ }
+ )
+);
diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index a009d614..a31c7d25 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -91,6 +91,7 @@ import { RemoveGroupMemberDialog } from '~/views-components/groups-dialog/member
import { GroupMemberAttributesDialog } from '~/views-components/groups-dialog/member-attributes-dialog';
import { AddGroupMembersDialog } from '~/views-components/dialog-forms/add-group-member-dialog';
import { PartialCopyToCollectionDialog } from '~/views-components/dialog-forms/partial-copy-to-collection-dialog';
+import { PublicFavoritePanel } from '~/views/public-favorites-panel/public-favorites-panel';
type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';
@@ -138,9 +139,9 @@ export const WorkbenchPanel =
<Grid container item xs className={classes.root}>
<Grid container item xs className={classes.container}>
<SplitterLayout customClassName={classes.splitter} percentage={true}
- primaryIndex={0} primaryMinSize={10}
- secondaryInitialSize={getSplitterInitialSize()} secondaryMinSize={40}
- onSecondaryPaneSizeChange={saveSplitterSize}>
+ primaryIndex={0} primaryMinSize={10}
+ secondaryInitialSize={getSplitterInitialSize()} secondaryMinSize={40}
+ onSecondaryPaneSizeChange={saveSplitterSize}>
<Grid container item xs component='aside' direction='column' className={classes.asidePanel}>
<SidePanel />
</Grid>
@@ -174,6 +175,7 @@ export const WorkbenchPanel =
<Route path={Routes.GROUPS} component={GroupsPanel} />
<Route path={Routes.GROUP_DETAILS} component={GroupDetailsPanel} />
<Route path={Routes.LINKS} component={LinkPanel} />
+ <Route path={Routes.PUBLIC_FAVORITES} component={PublicFavoritePanel} />
</Switch>
</Grid>
</Grid>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list