[ARVADOS-WORKBENCH2] created: 1.3.1-441-g798af50d
Git user
git at public.curoverse.com
Wed Apr 24 10:42:47 UTC 2019
at 798af50d33bc0f1e81e1743fc9832c6aa658be8e (commit)
commit 798af50d33bc0f1e81e1743fc9832c6aa658be8e
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Wed Apr 24 12:41:56 2019 +0200
render-items-from-links-inside-public-favorites-panel
Feature #15120
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/favorite-panel/favorite-panel-middleware-service.ts b/src/store/favorite-panel/favorite-panel-middleware-service.ts
index e518482b..868d7b05 100644
--- a/src/store/favorite-panel/favorite-panel-middleware-service.ts
+++ b/src/store/favorite-panel/favorite-panel-middleware-service.ts
@@ -56,14 +56,14 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic
}
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
- const resp1 = await this.services.linkService.list({
+ const responseLinks = await this.services.linkService.list({
filters: new FilterBuilder()
.addEqual("linkClass", 'star')
.addEqual('tailUuid', this.services.authService.getUuid()!)
.addEqual('tailKind', ResourceKind.USER)
.getFilters()
}).then(results => results);
- const uuids = resp1.items.map(it => it.headUuid);
+ const uuids = responseLinks.items.map(it => it.headUuid);
const groupItems: any = await this.services.groupsService.list({
filters: new FilterBuilder()
.addIn("uuid", uuids)
@@ -94,7 +94,7 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic
response.itemsAvailable++;
response.items.push(it);
});
-
+
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
api.dispatch(resourcesActions.SET_RESOURCES(response.items));
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 c69f32b1..be7f5285 100644
--- a/src/store/public-favorites-panel/public-favorites-middleware-service.ts
+++ b/src/store/public-favorites-panel/public-favorites-middleware-service.ts
@@ -55,7 +55,7 @@ export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareServ
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
const uuidPrefix = api.getState().config.uuidPrefix;
const uuid = `${uuidPrefix}-j7d0g-fffffffffffffff`;
- const response = await this.services.linkService.list({
+ const responseLinks = await this.services.linkService.list({
limit: dataExplorer.rowsPerPage,
offset: dataExplorer.page * dataExplorer.rowsPerPage,
filters: new FilterBuilder()
@@ -65,15 +65,46 @@ export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareServ
.addIsA("headUuid", typeFilters)
.getFilters()
});
+ const uuids = responseLinks.items.map(it => it.headUuid);
+ const groupItems: any = await this.services.groupsService.list({
+ filters: new FilterBuilder()
+ .addIn("uuid", uuids)
+ .addILike("name", dataExplorer.searchValue)
+ .addIsA("uuid", typeFilters)
+ .getFilters()
+ });
+ const collectionItems: any = await this.services.collectionService.list({
+ filters: new FilterBuilder()
+ .addIn("uuid", uuids)
+ .addILike("name", dataExplorer.searchValue)
+ .addIsA("uuid", typeFilters)
+ .getFilters()
+ });
+ const processItems: any = await this.services.containerRequestService.list({
+ filters: new FilterBuilder()
+ .addIn("uuid", uuids)
+ .addILike("name", dataExplorer.searchValue)
+ .addIsA("uuid", typeFilters)
+ .getFilters()
+ });
+ const response = groupItems;
+ collectionItems.items.map((it: any) => {
+ response.itemsAvailable++;
+ response.items.push(it);
+ });
+ processItems.items.map((it: any) => {
+ response.itemsAvailable++;
+ response.items.push(it);
+ });
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
api.dispatch(resourcesActions.SET_RESOURCES(response.items));
api.dispatch(publicFavoritePanelActions.SET_ITEMS({
- items: response.items.map(resource => resource.uuid),
+ items: response.items.map((resource: any) => resource.uuid),
itemsAvailable: response.itemsAvailable,
page: Math.floor(response.offset / response.limit),
rowsPerPage: response.limit
}));
- api.dispatch<any>(updatePublicFavorites(response.items.map(item => item.headUuid)));
+ api.dispatch<any>(updatePublicFavorites(response.items.map((item: any) => 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
index b5aa9fce..50b9070b 100644
--- a/src/store/public-favorites/public-favorites-actions.ts
+++ b/src/store/public-favorites/public-favorites-actions.ts
@@ -9,8 +9,6 @@ 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";
-import { getResource } from '~/store/resources/resources';
-import { LinkResource } from "~/models/link";
export const publicFavoritesActions = unionize({
TOGGLE_PUBLIC_FAVORITE: ofType<{ resourceUuid: string }>(),
@@ -69,12 +67,6 @@ export const updatePublicFavorites = (resourceUuids: string[]) =>
});
};
-export const getHeadUuid = (uuid: string) =>
- (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
- const resource = getResource<LinkResource>(uuid)(getState().resources);
- return resource!.headUuid;
- };
-
export const getIsAdmin = () =>
(dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const resource = getState().auth.user!.isAdmin;
diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 87e17c4f..5dc1e02a 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Grid, Typography, withStyles, Tooltip, IconButton, Checkbox, Button } from '@material-ui/core';
+import { Grid, Typography, withStyles, Tooltip, IconButton, Checkbox } from '@material-ui/core';
import { FavoriteStar, PublicFavoriteStar } from '../favorite-star/favorite-star';
import { ResourceKind, TrashableResource } from '~/models/resource';
import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon, WorkflowIcon, ShareIcon } from '~/components/icon/icon';
@@ -327,36 +327,6 @@ export const ResourceLinkUuid = connect(
return resource || { uuid: '' };
})(renderUuid);
-const renderLinkNameAndIcon = (item: { name: string; headUuid: string, headKind: string }) =>
- <Grid container alignItems="center" wrap="nowrap" spacing={16}>
- <Grid item>
- {renderIcon(item.headKind)}
- </Grid>
- <Grid item>
- <Typography color="primary" style={{ width: 'auto' }}>
- {item.name}
- </Typography>
- </Grid>
- <Grid item>
- <Typography variant="caption">
- <FavoriteStar resourceUuid={item.headUuid} />
- <PublicFavoriteStar resourceUuid={item.headUuid} />
- </Typography>
- </Grid>
- </Grid>;
-
-export const ResourceLinkNameAndIcon = connect(
- (state: RootState, props: { uuid: string }) => {
- const resource = getResource<LinkResource>(props.uuid)(state.resources);
- return resource || { name: '', headUuid: '', headKind: '' };
- })(renderLinkNameAndIcon);
-
-export const ResourceLinkType = connect(
- (state: RootState, props: { uuid: string }) => {
- const resource = getResource<LinkResource>(props.uuid)(state.resources);
- return { type: resource ? resource.headKind : '' };
- })((props: { type: string }) => renderType(props.type));
-
// Process Resources
const resourceRunProcess = (dispatch: Dispatch, uuid: string) => {
return (
diff --git a/src/views/public-favorites-panel/public-favorites-panel.tsx b/src/views/public-favorites-panel/public-favorites-panel.tsx
index 4a01c6f4..ab423a6e 100644
--- a/src/views/public-favorites-panel/public-favorites-panel.tsx
+++ b/src/views/public-favorites-panel/public-favorites-panel.tsx
@@ -16,8 +16,8 @@ import {
ProcessStatus,
ResourceFileSize,
ResourceLastModifiedDate,
- ResourceLinkNameAndIcon,
- ResourceLinkType
+ ResourceType,
+ ResourceName
} from '~/views-components/data-explorer/renderers';
import { PublicFavoriteIcon } from '~/components/icon/icon';
import { Dispatch } from 'redux';
@@ -31,7 +31,7 @@ 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 { getHeadUuid, getIsAdmin } from '~/store/public-favorites/public-favorites-actions';
+import { getIsAdmin } from '~/store/public-favorites/public-favorites-actions';
type CssRules = "toolbar" | "button";
@@ -45,7 +45,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
},
});
-export enum FavoritePanelColumnNames {
+export enum PublicFavoritePanelColumnNames {
NAME = "Name",
STATUS = "Status",
TYPE = "Type",
@@ -60,12 +60,12 @@ export interface FavoritePanelFilter extends DataTableFilterItem {
export const publicFavoritePanelColumns: DataColumns<string> = [
{
- name: FavoritePanelColumnNames.NAME,
+ name: PublicFavoritePanelColumnNames.NAME,
selected: true,
configurable: true,
sortDirection: SortDirection.NONE,
filters: createTree(),
- render: uuid => <ResourceLinkNameAndIcon uuid={uuid} />
+ render: uuid => <ResourceName uuid={uuid} />
},
{
name: "Status",
@@ -75,21 +75,21 @@ export const publicFavoritePanelColumns: DataColumns<string> = [
render: uuid => <ProcessStatus uuid={uuid} />
},
{
- name: FavoritePanelColumnNames.TYPE,
+ name: PublicFavoritePanelColumnNames.TYPE,
selected: true,
configurable: true,
filters: getSimpleObjectTypeFilters(),
- render: uuid => <ResourceLinkType uuid={uuid} />
+ render: uuid => <ResourceType uuid={uuid} />
},
{
- name: FavoritePanelColumnNames.FILE_SIZE,
+ name: PublicFavoritePanelColumnNames.FILE_SIZE,
selected: true,
configurable: true,
filters: createTree(),
render: uuid => <ResourceFileSize uuid={uuid} />
},
{
- name: FavoritePanelColumnNames.LAST_MODIFIED,
+ name: PublicFavoritePanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
sortDirection: SortDirection.DESC,
@@ -115,24 +115,24 @@ const mapStateToProps = ({ publicFavorites }: RootState): PublicFavoritePanelDat
const mapDispatchToProps = (dispatch: Dispatch): PublicFavoritePanelActionProps => ({
onContextMenu: (event, resourceUuid) => {
const isAdmin = dispatch<any>(getIsAdmin());
- const kind = resourceKindToContextMenuKind(dispatch<any>(getHeadUuid(resourceUuid)), isAdmin);
+ const kind = resourceKindToContextMenuKind(resourceUuid, isAdmin);
if (kind) {
dispatch<any>(openContextMenu(event, {
name: '',
- uuid: dispatch<any>(getHeadUuid(resourceUuid)),
+ uuid: resourceUuid,
ownerUuid: '',
kind: ResourceKind.NONE,
menuKind: kind
}));
}
- dispatch<any>(loadDetailsPanel(dispatch<any>(getHeadUuid(resourceUuid))));
+ dispatch<any>(loadDetailsPanel(resourceUuid));
},
onDialogOpen: (ownerUuid: string) => { return; },
onItemClick: (uuid: string) => {
- dispatch<any>(loadDetailsPanel(dispatch<any>(getHeadUuid(uuid))));
+ dispatch<any>(loadDetailsPanel(uuid));
},
onItemDoubleClick: uuid => {
- dispatch<any>(navigateTo(dispatch<any>(getHeadUuid(uuid))));
+ dispatch<any>(navigateTo(uuid));
}
});
commit f71fdeed4749859fefd7590bd77b05a53366bf12
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Wed Apr 24 11:27:26 2019 +0200
add-posibitility-to-add-to-public-favs-from-favorites-panel
Feature #15120
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/views/favorite-panel/favorite-panel.tsx b/src/views/favorite-panel/favorite-panel.tsx
index 5c19c30b..8498b787 100644
--- a/src/views/favorite-panel/favorite-panel.tsx
+++ b/src/views/favorite-panel/favorite-panel.tsx
@@ -107,53 +107,54 @@ export const favoritePanelColumns: DataColumns<string> = [
interface FavoritePanelDataProps {
favorites: FavoritesState;
+ isAdmin: boolean;
}
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));
- }
+const mapStateToProps = (state : RootState): FavoritePanelDataProps => ({
+ favorites: state.favorites,
+ isAdmin: state.auth.user!.isAdmin
});
type FavoritePanelProps = FavoritePanelDataProps & FavoritePanelActionProps & DispatchProp
& WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
export const FavoritePanel = withStyles(styles)(
- connect(mapStateToProps, mapDispatchToProps)(
+ connect(mapStateToProps)(
class extends React.Component<FavoritePanelProps> {
+
+ handleContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) => {
+ const menuKind = resourceKindToContextMenuKind(resourceUuid, this.props.isAdmin);
+ if (menuKind) {
+ this.props.dispatch<any>(openContextMenu(event, {
+ name: '',
+ uuid: resourceUuid,
+ ownerUuid: '',
+ kind: ResourceKind.NONE,
+ menuKind
+ }));
+ }
+ this.props.dispatch<any>(loadDetailsPanel(resourceUuid));
+ }
+
+ handleRowDoubleClick = (uuid: string) => {
+ this.props.dispatch<any>(navigateTo(uuid));
+ }
+
+ handleRowClick = (uuid: string) => {
+ this.props.dispatch(loadDetailsPanel(uuid));
+ }
+
render() {
return <DataExplorer
id={FAVORITE_PANEL_ID}
- onRowClick={this.props.onItemClick}
- onRowDoubleClick={this.props.onItemDoubleClick}
- onContextMenu={this.props.onContextMenu}
+ onRowClick={this.handleRowClick}
+ onRowDoubleClick={this.handleRowDoubleClick}
+ onContextMenu={this.handleContextMenu}
contextMenuColumn={true}
dataTableDefaultView={
<DataTableDefaultView
commit c8198e82d197977052156b0f502396ec116a76c7
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Wed Apr 24 11:04:59 2019 +0200
adding-to-public-favorites-from-shared-with me
Feature #15120
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 9f9b27ca..9c7b39aa 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -14,7 +14,6 @@ import { configureStore, RootStore } from '~/store/store';
import { ConnectedRouter } from "react-router-redux";
import { ApiToken } from "~/views-components/api-token/api-token";
import { initAuth } from "~/store/auth/auth-action";
-import { configActions } from "~/store/config/config-action";
import { createServices } from "~/services/services";
import { MuiThemeProvider } from '@material-ui/core/styles';
import { CustomTheme } from '~/common/custom-theme';
@@ -40,7 +39,6 @@ import { addRouteChangeHandlers } from './routes/route-change-handlers';
import { setCurrentTokenDialogApiHost } from '~/store/current-token-dialog/current-token-dialog-actions';
import { processResourceActionSet } from '~/views-components/context-menu/action-sets/process-resource-action-set';
import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
-import { setUuidPrefix } from '~/store/workflow-panel/workflow-panel-actions';
import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set';
import { ContainerRequestState } from '~/models/container-request';
import { MountKind } from '~/models/mount-types';
diff --git a/src/views/shared-with-me-panel/shared-with-me-panel.tsx b/src/views/shared-with-me-panel/shared-with-me-panel.tsx
index 582aa9c7..7fd00ba1 100644
--- a/src/views/shared-with-me-panel/shared-with-me-panel.tsx
+++ b/src/views/shared-with-me-panel/shared-with-me-panel.tsx
@@ -31,13 +31,15 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
interface SharedWithMePanelDataProps {
resources: ResourcesState;
+ isAdmin: boolean;
}
type SharedWithMePanelProps = SharedWithMePanelDataProps & DispatchProp & WithStyles<CssRules>;
export const SharedWithMePanel = withStyles(styles)(
connect((state: RootState) => ({
- resources: state.resources
+ resources: state.resources,
+ isAdmin: state.auth.user!.isAdmin
}))(
class extends React.Component<SharedWithMePanelProps> {
render() {
@@ -51,7 +53,7 @@ export const SharedWithMePanel = withStyles(styles)(
}
handleContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) => {
- const menuKind = resourceKindToContextMenuKind(resourceUuid);
+ const menuKind = resourceKindToContextMenuKind(resourceUuid, this.props.isAdmin);
const resource = getResource<GroupResource>(resourceUuid)(this.props.resources);
if (menuKind && resource) {
this.props.dispatch<any>(openContextMenu(event, {
commit 69a0ab3baf5ae7d1f5abc429831f0261ac8ecc05
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Wed Apr 24 10:40:18 2019 +0200
rendering-public-fav-icon
Feature #15120
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 04dbfa7c..87e17c4f 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -4,7 +4,7 @@
import * as React from 'react';
import { Grid, Typography, withStyles, Tooltip, IconButton, Checkbox, Button } from '@material-ui/core';
-import { FavoriteStar } from '../favorite-star/favorite-star';
+import { FavoriteStar, PublicFavoriteStar } from '../favorite-star/favorite-star';
import { ResourceKind, TrashableResource } from '~/models/resource';
import { ProjectIcon, CollectionIcon, ProcessIcon, DefaultIcon, WorkflowIcon, ShareIcon } from '~/components/icon/icon';
import { formatDate, formatFileSize } from '~/common/formatters';
@@ -40,6 +40,7 @@ const renderName = (item: { name: string; uuid: string, kind: string }) =>
<Grid item>
<Typography variant="caption">
<FavoriteStar resourceUuid={item.uuid} />
+ <PublicFavoriteStar resourceUuid={item.uuid} />
</Typography>
</Grid>
</Grid>;
@@ -339,6 +340,7 @@ const renderLinkNameAndIcon = (item: { name: string; headUuid: string, headKind:
<Grid item>
<Typography variant="caption">
<FavoriteStar resourceUuid={item.headUuid} />
+ <PublicFavoriteStar resourceUuid={item.headUuid} />
</Typography>
</Grid>
</Grid>;
diff --git a/src/views-components/favorite-star/favorite-star.tsx b/src/views-components/favorite-star/favorite-star.tsx
index cf744886..6812535d 100644
--- a/src/views-components/favorite-star/favorite-star.tsx
+++ b/src/views-components/favorite-star/favorite-star.tsx
@@ -23,11 +23,18 @@ const mapStateToProps = (state: RootState, props: { resourceUuid: string; classN
});
export const FavoriteStar = connect(mapStateToProps)(
- withStyles(styles)((props: { isFavoriteVisible: boolean; isPublicFavoriteVisible: boolean; className?: string; } & WithStyles<CssRules>) => {
+ withStyles(styles)((props: { isFavoriteVisible: boolean; className?: string; } & WithStyles<CssRules>) => {
+ if (props.isFavoriteVisible) {
+ return <FavoriteIcon className={props.className || props.classes.icon} />;
+ } else {
+ return null;
+ }
+ }));
+
+export const PublicFavoriteStar = connect(mapStateToProps)(
+ withStyles(styles)((props: { isPublicFavoriteVisible: boolean; className?: string; } & WithStyles<CssRules>) => {
if (props.isPublicFavoriteVisible) {
return <PublicFavoriteIcon className={props.className || props.classes.icon} />;
- } else if (props.isFavoriteVisible) {
- return <FavoriteIcon className={props.className || props.classes.icon} />;
} else {
return null;
}
commit 5a84b3bf9b7bf9a1d07e9595b2453c4133ffd23d
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Wed Apr 24 10:26:57 2019 +0200
correct-order-for-public-favorites-inside-tree-project
Feature #15120
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
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 c7bbf8dd..c69f32b1 100644
--- a/src/store/public-favorites-panel/public-favorites-middleware-service.ts
+++ b/src/store/public-favorites-panel/public-favorites-middleware-service.ts
@@ -20,7 +20,6 @@ import { serializeSimpleObjectTypeFilters } from '../resource-type-filters/resou
import { LinkResource, LinkClass } 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 { updatePublicFavorites } from '~/store/public-favorites/public-favorites-actions';
export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareService {
diff --git a/src/views-components/projects-tree-picker/projects-tree-picker.tsx b/src/views-components/projects-tree-picker/projects-tree-picker.tsx
index 653ae604..f4969f5c 100644
--- a/src/views-components/projects-tree-picker/projects-tree-picker.tsx
+++ b/src/views-components/projects-tree-picker/projects-tree-picker.tsx
@@ -32,8 +32,8 @@ export const ProjectsTreePicker = ({ pickerId, ...props }: ProjectsTreePickerPro
return <div>
<HomeTreePicker pickerId={home} {...p} />
<SharedTreePicker pickerId={shared} {...p} />
- <FavoritesTreePicker pickerId={favorites} {...p} />
<PublicFavoritesTreePicker pickerId={publicFavorites} {...p} />
+ <FavoritesTreePicker pickerId={favorites} {...p} />
</div>;
};
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list