projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove-process-permanently
[arvados-workbench2.git]
/
src
/
views
/
favorite-panel
/
favorite-panel.tsx
diff --git
a/src/views/favorite-panel/favorite-panel.tsx
b/src/views/favorite-panel/favorite-panel.tsx
index 803d8002a365105c2691648e2a5f000cbd3be254..33c901cb784e19e51b03051cfaa640d1facd571b 100644
(file)
--- a/
src/views/favorite-panel/favorite-panel.tsx
+++ b/
src/views/favorite-panel/favorite-panel.tsx
@@
-28,6
+28,9
@@
import { openContextMenu, resourceKindToContextMenuKind } from '~/store/context-
import { loadDetailsPanel } from '~/store/details-panel/details-panel-action';
import { navigateTo } from '~/store/navigation/navigation-action';
import { ContainerRequestState } from "~/models/container-request";
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';
type CssRules = "toolbar" | "button";
type CssRules = "toolbar" | "button";
@@
-61,16
+64,14
@@
export const favoritePanelColumns: DataColumns<string, FavoritePanelFilter> = [
configurable: true,
sortDirection: SortDirection.ASC,
filters: [],
configurable: true,
sortDirection: SortDirection.ASC,
filters: [],
- render: uuid => <ResourceName uuid={uuid} />,
- width: "450px"
+ render: uuid => <ResourceName uuid={uuid} />
},
{
name: "Status",
selected: true,
configurable: true,
filters: [],
},
{
name: "Status",
selected: true,
configurable: true,
filters: [],
- render: uuid => <ProcessStatus uuid={uuid} />,
- width: "75px"
+ render: uuid => <ProcessStatus uuid={uuid} />
},
{
name: FavoritePanelColumnNames.TYPE,
},
{
name: FavoritePanelColumnNames.TYPE,
@@
-93,24
+94,21
@@
export const favoritePanelColumns: DataColumns<string, FavoritePanelFilter> = [
type: ResourceKind.PROJECT
}
],
type: ResourceKind.PROJECT
}
],
- render: uuid => <ResourceType uuid={uuid} />,
- width: "125px"
+ render: uuid => <ResourceType uuid={uuid} />
},
{
name: FavoritePanelColumnNames.OWNER,
selected: true,
configurable: true,
filters: [],
},
{
name: FavoritePanelColumnNames.OWNER,
selected: true,
configurable: true,
filters: [],
- render: uuid => <ResourceOwner uuid={uuid} />,
- width: "200px"
+ render: uuid => <ResourceOwner uuid={uuid} />
},
{
name: FavoritePanelColumnNames.FILE_SIZE,
selected: true,
configurable: true,
filters: [],
},
{
name: FavoritePanelColumnNames.FILE_SIZE,
selected: true,
configurable: true,
filters: [],
- render: uuid => <ResourceFileSize uuid={uuid} />,
- width: "50px"
+ render: uuid => <ResourceFileSize uuid={uuid} />
},
{
name: FavoritePanelColumnNames.LAST_MODIFIED,
},
{
name: FavoritePanelColumnNames.LAST_MODIFIED,
@@
-118,13
+116,12
@@
export const favoritePanelColumns: DataColumns<string, FavoritePanelFilter> = [
configurable: true,
sortDirection: SortDirection.NONE,
filters: [],
configurable: true,
sortDirection: SortDirection.NONE,
filters: [],
- render: uuid => <ResourceLastModifiedDate uuid={uuid} />,
- width: "150px"
+ render: uuid => <ResourceLastModifiedDate uuid={uuid} />
}
];
interface FavoritePanelDataProps {
}
];
interface FavoritePanelDataProps {
-
currentItemId: string
;
+
favorites: FavoritesState
;
}
interface FavoritePanelActionProps {
}
interface FavoritePanelActionProps {
@@
-133,6
+130,9
@@
interface FavoritePanelActionProps {
onDialogOpen: (ownerUuid: string) => void;
onItemDoubleClick: (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 mapDispatchToProps = (dispatch: Dispatch): FavoritePanelActionProps => ({
onContextMenu: (event, resourceUuid) => {
@@
-146,6
+146,7
@@
const mapDispatchToProps = (dispatch: Dispatch): FavoritePanelActionProps => ({
menuKind: kind
}));
}
menuKind: kind
}));
}
+ dispatch<any>(loadDetailsPanel(resourceUuid));
},
onDialogOpen: (ownerUuid: string) => { return; },
onItemClick: (resourceUuid: string) => {
},
onDialogOpen: (ownerUuid: string) => { return; },
onItemClick: (resourceUuid: string) => {
@@
-160,7
+161,7
@@
type FavoritePanelProps = FavoritePanelDataProps & FavoritePanelActionProps & Di
& WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
export const FavoritePanel = withStyles(styles)(
& WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
export const FavoritePanel = withStyles(styles)(
- connect(
undefined
, mapDispatchToProps)(
+ connect(
mapStateToProps
, mapDispatchToProps)(
class extends React.Component<FavoritePanelProps> {
render() {
return <DataExplorer
class extends React.Component<FavoritePanelProps> {
render() {
return <DataExplorer
@@
-168,9
+169,13
@@
export const FavoritePanel = withStyles(styles)(
onRowClick={this.props.onItemClick}
onRowDoubleClick={this.props.onItemDoubleClick}
onContextMenu={this.props.onContextMenu}
onRowClick={this.props.onItemClick}
onRowDoubleClick={this.props.onItemDoubleClick}
onContextMenu={this.props.onContextMenu}
- defaultIcon={FavoriteIcon}
- defaultMessages={['Your favorites list is empty.']}
- contextMenuColumn={true}/>;
+ contextMenuColumn={true}
+ dataTableDefaultView={
+ <DataTableDefaultView
+ icon={FavoriteIcon}
+ messages={['Your favorites list is empty.']}
+ />
+ } />;
}
}
)
}
}
)