From 536568cffa1013e70c6752ac398a005b7396b74d Mon Sep 17 00:00:00 2001 From: Pawel Kowalczyk Date: Mon, 8 Apr 2019 10:09:00 +0200 Subject: [PATCH] temp-icons Feature #14941 Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk --- src/components/icon/icon.tsx | 2 ++ .../context-menu/actions/public-favorite-action.tsx | 6 +++--- src/views-components/favorite-star/favorite-star.tsx | 4 ++-- .../project-tree-picker/project-tree-picker.tsx | 4 ++-- .../projects-tree-picker/public-favorites-tree-picker.tsx | 4 ++-- src/views-components/side-panel-tree/side-panel-tree.tsx | 4 +++- src/views/public-favorites-panel/public-favorites-panel.tsx | 4 ++-- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/components/icon/icon.tsx b/src/components/icon/icon.tsx index 2bd16970..44a2b233 100644 --- a/src/components/icon/icon.tsx +++ b/src/components/icon/icon.tsx @@ -43,6 +43,7 @@ import People from '@material-ui/icons/People'; import Person from '@material-ui/icons/Person'; import PersonAdd from '@material-ui/icons/PersonAdd'; import PlayArrow from '@material-ui/icons/PlayArrow'; +import Public from '@material-ui/icons/Public'; import RateReview from '@material-ui/icons/RateReview'; import RestoreFromTrash from '@material-ui/icons/History'; import Search from '@material-ui/icons/Search'; @@ -95,6 +96,7 @@ export const ProjectsIcon: IconType = (props) => ; export const ProvenanceGraphIcon: IconType = (props) => ; export const RemoveIcon: IconType = (props) => ; export const RemoveFavoriteIcon: IconType = (props) => ; +export const PublicFavoriteIcon: IconType = (props) => ; export const RenameIcon: IconType = (props) => ; export const RestoreFromTrashIcon: IconType = (props) => ; export const ReRunProcessIcon: IconType = (props) => ; 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 d9c4f9fb..d25528cc 100644 --- a/src/views-components/context-menu/actions/public-favorite-action.tsx +++ b/src/views-components/context-menu/actions/public-favorite-action.tsx @@ -4,7 +4,7 @@ import * as React from "react"; import { ListItemIcon, ListItemText, ListItem } from "@material-ui/core"; -import { AddFavoriteIcon, RemoveFavoriteIcon } from "~/components/icon/icon"; +import { PublicFavoriteIcon } from "~/components/icon/icon"; import { connect } from "react-redux"; import { RootState } from "~/store/store"; @@ -19,8 +19,8 @@ export const TogglePublicFavoriteAction = connect(mapStateToProps)((props: { isP onClick={props.onClick}> {props.isPublicFavorite - ? - : } + ? + : } {props.isPublicFavorite diff --git a/src/views-components/favorite-star/favorite-star.tsx b/src/views-components/favorite-star/favorite-star.tsx index 586b442d..cf744886 100644 --- a/src/views-components/favorite-star/favorite-star.tsx +++ b/src/views-components/favorite-star/favorite-star.tsx @@ -3,7 +3,7 @@ // SPDX-License-Identifier: AGPL-3.0 import * as React from "react"; -import { FavoriteIcon } from "~/components/icon/icon"; +import { FavoriteIcon, PublicFavoriteIcon } from "~/components/icon/icon"; import { connect } from "react-redux"; import { RootState } from "~/store/store"; import { withStyles, StyleRulesCallback, WithStyles } from "@material-ui/core"; @@ -25,7 +25,7 @@ const mapStateToProps = (state: RootState, props: { resourceUuid: string; classN export const FavoriteStar = connect(mapStateToProps)( withStyles(styles)((props: { isFavoriteVisible: boolean; isPublicFavoriteVisible: boolean; className?: string; } & WithStyles) => { if (props.isPublicFavoriteVisible) { - return ; + return ; } else if (props.isFavoriteVisible) { return ; } else { diff --git a/src/views-components/project-tree-picker/project-tree-picker.tsx b/src/views-components/project-tree-picker/project-tree-picker.tsx index 38622651..215c31b7 100644 --- a/src/views-components/project-tree-picker/project-tree-picker.tsx +++ b/src/views-components/project-tree-picker/project-tree-picker.tsx @@ -11,7 +11,7 @@ import { TreeItem, TreeItemStatus } from "~/components/tree/tree"; import { ProjectResource } from "~/models/project"; import { treePickerActions, loadProjectTreePickerProjects, loadFavoriteTreePickerProjects, loadPublicFavoriteTreePickerProjects } from "~/store/tree-picker/tree-picker-actions"; import { ListItemTextIcon } from "~/components/list-item-text-icon/list-item-text-icon"; -import { ProjectIcon, FavoriteIcon, ProjectsIcon, ShareMeIcon } from "~/components/icon/icon"; +import { ProjectIcon, FavoriteIcon, ProjectsIcon, ShareMeIcon, PublicFavoriteIcon } from '~/components/icon/icon'; import { RootState } from "~/store/store"; import { ServiceRepository } from "~/services/services"; import { WrappedFieldProps } from 'redux-form'; @@ -81,7 +81,7 @@ const getProjectPickerIcon = (item: TreeItem) => { case TreePickerId.SHARED_WITH_ME: return ShareMeIcon; case TreePickerId.PUBLIC_FAVORITES: - return ShareMeIcon; + return PublicFavoriteIcon; default: return ProjectIcon; } diff --git a/src/views-components/projects-tree-picker/public-favorites-tree-picker.tsx b/src/views-components/projects-tree-picker/public-favorites-tree-picker.tsx index 2d1f9756..0f88e2ea 100644 --- a/src/views-components/projects-tree-picker/public-favorites-tree-picker.tsx +++ b/src/views-components/projects-tree-picker/public-favorites-tree-picker.tsx @@ -5,11 +5,11 @@ import { connect } from 'react-redux'; import { ProjectsTreePicker, ProjectsTreePickerProps } from '~/views-components/projects-tree-picker/generic-projects-tree-picker'; import { Dispatch } from 'redux'; -import { FavoriteIcon } from '~/components/icon/icon'; +import { PublicFavoriteIcon } from '~/components/icon/icon'; import { loadPublicFavoritesProject } from '~/store/tree-picker/tree-picker-actions'; export const PublicFavoritesTreePicker = connect(() => ({ - rootItemIcon: FavoriteIcon, + rootItemIcon: PublicFavoriteIcon, }), (dispatch: Dispatch): Pick => ({ loadRootItem: (_, pickerId, includeCollections, includeFiles) => { dispatch(loadPublicFavoritesProject({ pickerId, includeCollections, includeFiles })); diff --git a/src/views-components/side-panel-tree/side-panel-tree.tsx b/src/views-components/side-panel-tree/side-panel-tree.tsx index dd5005c3..c407bc1f 100644 --- a/src/views-components/side-panel-tree/side-panel-tree.tsx +++ b/src/views-components/side-panel-tree/side-panel-tree.tsx @@ -9,7 +9,7 @@ import { TreePicker, TreePickerProps } from "../tree-picker/tree-picker"; import { TreeItem } from "~/components/tree/tree"; import { ProjectResource } from "~/models/project"; import { ListItemTextIcon } from "~/components/list-item-text-icon/list-item-text-icon"; -import { ProjectIcon, FavoriteIcon, ProjectsIcon, ShareMeIcon, TrashIcon } from '~/components/icon/icon'; +import { ProjectIcon, FavoriteIcon, ProjectsIcon, ShareMeIcon, TrashIcon, PublicFavoriteIcon } from '~/components/icon/icon'; import { WorkflowIcon } from '~/components/icon/icon'; import { activateSidePanelTreeItem, toggleSidePanelTreeItemCollapse, SIDE_PANEL_TREE, SidePanelTreeCategory } from '~/store/side-panel-tree/side-panel-tree-actions'; import { openSidePanelContextMenu } from '~/store/context-menu/context-menu-actions'; @@ -65,6 +65,8 @@ const getSidePanelIcon = (category: string) => { return TrashIcon; case SidePanelTreeCategory.WORKFLOWS: return WorkflowIcon; + case SidePanelTreeCategory.PUBLIC_FAVORITES: + return PublicFavoriteIcon; default: return ProjectIcon; } diff --git a/src/views/public-favorites-panel/public-favorites-panel.tsx b/src/views/public-favorites-panel/public-favorites-panel.tsx index 7af4edc7..4a01c6f4 100644 --- a/src/views/public-favorites-panel/public-favorites-panel.tsx +++ b/src/views/public-favorites-panel/public-favorites-panel.tsx @@ -19,7 +19,7 @@ import { ResourceLinkNameAndIcon, ResourceLinkType } from '~/views-components/data-explorer/renderers'; -import { FavoriteIcon } from '~/components/icon/icon'; +import { PublicFavoriteIcon } 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'; @@ -151,7 +151,7 @@ export const PublicFavoritePanel = withStyles(styles)( contextMenuColumn={true} dataTableDefaultView={ } />; } -- 2.39.5