[ARVADOS-WORKBENCH2] created: 1.2.0-812-g2fe0b95
Git user
git at public.curoverse.com
Tue Nov 6 08:48:32 EST 2018
at 2fe0b9581f05dc2f74ad1d2fea169e40df29eb9e (commit)
commit 2fe0b9581f05dc2f74ad1d2fea169e40df29eb9e
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Tue Nov 6 14:48:16 2018 +0100
fix height for columns - change style for buttons, sort options for items in menu
Feature #14315_fix_columns_height_and_sort_more_options_for_items
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
diff --git a/src/components/data-explorer/data-explorer.tsx b/src/components/data-explorer/data-explorer.tsx
index e808351..fcb10af 100644
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@ -12,7 +12,7 @@ import { DataTableFilterItem } from '../data-table-filters/data-table-filters';
import { SearchInput } from '../search-input/search-input';
import { ArvadosTheme } from "~/common/custom-theme";
-type CssRules = 'searchBox' | "toolbar" | "footer" | "root";
+type CssRules = 'searchBox' | "toolbar" | "footer" | "root" | 'moreOptionsButton';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
searchBox: {
@@ -26,6 +26,9 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
},
root: {
height: '100%'
+ },
+ moreOptionsButton: {
+ padding: 0
}
});
@@ -121,9 +124,9 @@ export const DataExplorer = withStyles(styles)(
}
renderContextMenuTrigger = (item: T) =>
- <Grid container justify="flex-end">
+ <Grid container justify="center">
<Tooltip title="More options">
- <IconButton onClick={event => this.props.onContextMenu(event, item)}>
+ <IconButton className={this.props.classes.moreOptionsButton} onClick={event => this.props.onContextMenu(event, item)}>
<MoreVertIcon />
</IconButton>
</Tooltip>
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 07e1502..a33f78d 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
@@ -32,11 +32,6 @@ export const collectionActionSet: ContextMenuActionSet = [[
}
},
{
- icon: MoveToIcon,
- name: "Move to",
- execute: (dispatch, resource) => dispatch<any>(openMoveCollectionDialog(resource))
- },
- {
component: ToggleFavoriteAction,
execute: (dispatch, resource) => {
dispatch<any>(toggleFavorite(resource)).then(() => {
@@ -51,6 +46,11 @@ export const collectionActionSet: ContextMenuActionSet = [[
}
},
{
+ icon: MoveToIcon,
+ name: "Move to",
+ execute: (dispatch, resource) => dispatch<any>(openMoveCollectionDialog(resource))
+ },
+ {
icon: CopyIcon,
name: "Copy to project",
execute: (dispatch, resource) => {
@@ -65,25 +65,25 @@ export const collectionActionSet: ContextMenuActionSet = [[
dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
}
},
- {
- icon: ProvenanceGraphIcon,
- name: "Provenance graph",
- execute: (dispatch, resource) => {
- // add code
- }
- },
+ // {
+ // icon: ProvenanceGraphIcon,
+ // name: "Provenance graph",
+ // execute: (dispatch, resource) => {
+ // // add code
+ // }
+ // },
{
icon: AdvancedIcon,
name: "Advanced",
execute: (dispatch, resource) => {
dispatch<any>(openAdvancedTabDialog(resource.uuid));
}
- },
- {
- icon: RemoveIcon,
- name: "Remove",
- execute: (dispatch, resource) => {
- // add code
- }
}
+ // {
+ // icon: RemoveIcon,
+ // name: "Remove",
+ // execute: (dispatch, resource) => {
+ // // add code
+ // }
+ // }
]];
diff --git a/src/views-components/context-menu/action-sets/collection-resource-action-set.ts b/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
index 30ef4e7..1e2ac04 100644
--- a/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
@@ -31,13 +31,6 @@ export const collectionResourceActionSet: ContextMenuActionSet = [[
}
},
{
- icon: MoveToIcon,
- name: "Move to",
- execute: (dispatch, resource) => {
- dispatch<any>(openMoveCollectionDialog(resource));
- }
- },
- {
component: ToggleFavoriteAction,
execute: (dispatch, resource) => {
dispatch<any>(toggleFavorite(resource)).then(() => {
@@ -52,6 +45,13 @@ export const collectionResourceActionSet: ContextMenuActionSet = [[
}
},
{
+ icon: MoveToIcon,
+ name: "Move to",
+ execute: (dispatch, resource) => {
+ dispatch<any>(openMoveCollectionDialog(resource));
+ }
+ },
+ {
icon: CopyIcon,
name: "Copy to project",
execute: (dispatch, resource) => {
@@ -64,12 +64,12 @@ export const collectionResourceActionSet: ContextMenuActionSet = [[
execute: dispatch => {
dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
}
- },
- {
- icon: RemoveIcon,
- name: "Remove",
- execute: (dispatch, resource) => {
- // add code
- }
}
+ // {
+ // icon: RemoveIcon,
+ // name: "Remove",
+ // execute: (dispatch, resource) => {
+ // // add code
+ // }
+ // }
]];
diff --git a/src/views-components/context-menu/action-sets/process-action-set.ts b/src/views-components/context-menu/action-sets/process-action-set.ts
index 4ad6859..f1b21bf 100644
--- a/src/views-components/context-menu/action-sets/process-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-action-set.ts
@@ -35,13 +35,6 @@ export const processActionSet: ContextMenuActionSet = [[
}
},
{
- icon: MoveToIcon,
- name: "Move to",
- execute: (dispatch, resource) => {
- dispatch<any>(openMoveProcessDialog(resource));
- }
- },
- {
component: ToggleFavoriteAction,
execute: (dispatch, resource) => {
dispatch<any>(toggleFavorite(resource)).then(() => {
@@ -50,6 +43,13 @@ export const processActionSet: ContextMenuActionSet = [[
}
},
{
+ icon: MoveToIcon,
+ name: "Move to",
+ execute: (dispatch, resource) => {
+ dispatch<any>(openMoveProcessDialog(resource));
+ }
+ },
+ {
icon: CopyIcon,
name: "Copy to project",
execute: (dispatch, resource) => {
@@ -85,13 +85,6 @@ export const processActionSet: ContextMenuActionSet = [[
}
},
{
- icon: DetailsIcon,
- name: "View details",
- execute: dispatch => {
- dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
- }
- },
- {
icon: LogIcon,
name: "Log",
execute: (dispatch, resource) => {
@@ -99,24 +92,31 @@ export const processActionSet: ContextMenuActionSet = [[
}
},
{
- icon: ProvenanceGraphIcon,
- name: "Provenance graph",
- execute: (dispatch, resource) => {
- // add code
+ icon: DetailsIcon,
+ name: "View details",
+ execute: dispatch => {
+ dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
}
},
+ // {
+ // icon: ProvenanceGraphIcon,
+ // name: "Provenance graph",
+ // execute: (dispatch, resource) => {
+ // // add code
+ // }
+ // },
{
icon: AdvancedIcon,
name: "Advanced",
execute: (dispatch, resource) => {
dispatch<any>(openAdvancedTabDialog(resource.uuid));
}
- },
- {
- icon: RemoveIcon,
- name: "Remove",
- execute: (dispatch, resource) => {
- // add code
- }
}
+ // {
+ // icon: RemoveIcon,
+ // name: "Remove",
+ // execute: (dispatch, resource) => {
+ // // add code
+ // }
+ // }
]];
diff --git a/src/views-components/context-menu/action-sets/process-resource-action-set.ts b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
index cf8aba5..4a0a83b 100644
--- a/src/views-components/context-menu/action-sets/process-resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
@@ -29,13 +29,6 @@ export const processResourceActionSet: ContextMenuActionSet = [[
}
},
{
- icon: MoveToIcon,
- name: "Move to",
- execute: (dispatch, resource) => {
- dispatch<any>(openMoveProcessDialog(resource));
- }
- },
- {
component: ToggleFavoriteAction,
execute: (dispatch, resource) => {
dispatch<any>(toggleFavorite(resource)).then(() => {
@@ -44,6 +37,13 @@ export const processResourceActionSet: ContextMenuActionSet = [[
}
},
{
+ icon: MoveToIcon,
+ name: "Move to",
+ execute: (dispatch, resource) => {
+ dispatch<any>(openMoveProcessDialog(resource));
+ }
+ },
+ {
icon: CopyIcon,
name: "Copy to project",
execute: (dispatch, resource) => {
@@ -56,12 +56,12 @@ export const processResourceActionSet: ContextMenuActionSet = [[
execute: dispatch => {
dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
}
- },
- {
- icon: RemoveIcon,
- name: "Remove",
- execute: (dispatch, resource) => {
- // add code
- }
}
+ // {
+ // icon: RemoveIcon,
+ // name: "Remove",
+ // execute: (dispatch, resource) => {
+ // // add code
+ // }
+ // }
]];
diff --git a/src/views/trash-panel/trash-panel.tsx b/src/views/trash-panel/trash-panel.tsx
index 4d5df5c..a0cf3e4 100644
--- a/src/views/trash-panel/trash-panel.tsx
+++ b/src/views/trash-panel/trash-panel.tsx
@@ -64,7 +64,7 @@ export const ResourceRestore =
return { resource, dispatch: props.dispatch };
})((props: { resource?: TrashableResource, dispatch?: Dispatch<any> }) =>
<Tooltip title="Restore">
- <IconButton onClick={() => {
+ <IconButton style={{ padding: '0' }} onClick={() => {
if (props.resource && props.dispatch) {
props.dispatch(toggleTrashed(
props.resource.kind,
@@ -72,8 +72,8 @@ export const ResourceRestore =
props.resource.ownerUuid,
props.resource.isTrashed
));
- }
- }}>
+ }}}
+ >
<RestoreFromTrashIcon />
</IconButton>
</Tooltip>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list