[ARVADOS-WORKBENCH2] updated: 1.3.0-278-g9b29a65b
Git user
git at public.curoverse.com
Fri Dec 28 04:16:20 EST 2018
Summary of changes:
src/components/data-explorer/data-explorer.tsx | 5 +-
src/models/api-client-authorization.ts | 4 +-
src/models/group.ts | 2 +-
src/services/api/order-builder.test.ts | 4 +-
src/store/advanced-tab/advanced-tab.ts | 3 +-
.../api-client-authorizations-actions.ts | 20 +--
...pi-client-authorizations-middleware-service.ts} | 20 +--
.../api-client-authorizations-reducer.ts | 22 ---
src/store/auth/auth-action-session.ts | 4 +-
src/store/context-menu/context-menu-actions.ts | 6 +-
src/store/projects/project-create-actions.ts | 24 ++-
src/store/resources/resources-actions.ts | 2 +-
src/store/store.ts | 11 +-
src/store/users/users-actions.ts | 33 +++-
src/store/workbench/workbench-actions.ts | 5 +-
.../context-menu/action-sets/user-action-set.ts | 7 +-
src/views-components/data-explorer/renderers.tsx | 45 +++--
.../dialog-create/dialog-project-create.tsx | 8 +-
.../dialog-create/dialog-user-create.tsx | 3 +-
.../dialog-forms/setup-shell-account-dialog.tsx | 95 ++++++++++
.../form-fields/user-form-fields.tsx | 7 -
.../create-project-properties-form.tsx | 54 ++++++
.../create-project-properties-list.tsx | 54 ++++++
.../resource-properties-form.tsx | 2 +-
.../search-bar/search-bar-view.tsx | 150 ++++++----------
src/views-components/user-dialog/manage-dialog.tsx | 77 ++++++++
.../api-client-authorization-panel-root.tsx | 197 ++++++++++++++-------
.../api-client-authorization-panel.tsx | 7 +-
.../compute-node-panel/compute-node-panel-root.tsx | 4 +-
.../my-account-panel/my-account-panel-root.tsx | 2 +-
src/views/user-panel/user-panel.tsx | 13 +-
src/views/workbench/workbench.tsx | 4 +
32 files changed, 631 insertions(+), 263 deletions(-)
copy src/store/{compute-nodes/compute-nodes-middleware-service.ts => api-client-authorizations/api-client-authorizations-middleware-service.ts} (71%)
delete mode 100644 src/store/api-client-authorizations/api-client-authorizations-reducer.ts
create mode 100644 src/views-components/dialog-forms/setup-shell-account-dialog.tsx
create mode 100644 src/views-components/project-properties/create-project-properties-form.tsx
create mode 100644 src/views-components/project-properties/create-project-properties-list.tsx
create mode 100644 src/views-components/user-dialog/manage-dialog.tsx
via 9b29a65b9f9f02b338445c12b5d08b292f797c1c (commit)
via fb37efe50c142aaaa91fbb10c674347b85afaab1 (commit)
via db2c87fbe29eed8c4bfca47a97c97cee77959d58 (commit)
via 80925b518233f7ef75615917a1e3503b2e9a7874 (commit)
via 7a3531ac6ea4794e44d5218b37792eb286416d75 (commit)
via 91feb6c2087d1584bd4b1c07044497295f3ff6c9 (commit)
via 154991e8c07361906eab8a1fdefa00858bbc6818 (commit)
via 20657bc90bdb96c85eb5b50e80d09ae4978e7c7f (commit)
via 5eb7330194c44b696fd0a96e68eee9f153faa607 (commit)
via a2a677d93e31f731827311769cec9f141c5dd3b6 (commit)
via 78224728bc808a560718e934ef124afa77b81834 (commit)
via 283e54cc304d07d92b5e1c6810e002610118fd09 (commit)
via 10ed13601df5259b7723aaa2b613d43196039a50 (commit)
via 8753f89e9f786a12cf72374ffb1c9146b598d285 (commit)
via 1534cfafa7025c358548d9910b603b94b5984912 (commit)
via 24574669fd453c6846bc9f64ce9ae407db79568b (commit)
via f47b00424bc2f946315ce7691cf949cef1b35408 (commit)
via 46751b9305a7e991d484494facd1f40790254d40 (commit)
via 5017989693137cabe7f00a00c51db35625f9b55f (commit)
via dbbaaf10b4f87f30a3d15480b9d27dc909d5c4e1 (commit)
via 9e5ba9af996126cdf1186df49ff4c177af62e41d (commit)
via 51cd088a325c728b9322a151a579236ce73ef006 (commit)
via e1605f7c93aeb41ae31e0dd88a9afd8709136b62 (commit)
via 53174403f4eac7d7f67540ce4491b85d72c64d71 (commit)
via 9a37cc202448e431064b247d36ac0229a6bfa9b2 (commit)
via c9f7a67011582d0beb478b1d0407145a5b9e8143 (commit)
via 7afc443a21879751d8afd8ec36a3ae993d98b85a (commit)
via 467d932e354ea551cbff134ac50723bd56cea68d (commit)
via 3408a97206bfac10d8ecc6e30cf0b28d66697b9b (commit)
via bcd42fb41e7fabd3bc0b432e039eade4d05f4f76 (commit)
via c4106363643160b30bb924b72f5b6ad95e4ba2ae (commit)
via ef2ec6d9c6674e14b9297981ed03188dc7b952b8 (commit)
via fe5d65e4e704358fab18d91dae5a97ff7659f5df (commit)
via 6faff5910b3e7bdaf47ab5ede7cf8094a1b4adb9 (commit)
via 229eaf53b39af3a7e9408ed5f7e49d74b318445a (commit)
via b1a6da4a288560a87e0e38ad2fd73fb227e3fc66 (commit)
via ba827c8901ad45c3a8af49bf11af20c90bd46376 (commit)
from 45c43fb22953b3f54d8e370017b7216c93e1cb83 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 9b29a65b9f9f02b338445c12b5d08b292f797c1c
Merge: 45c43fb2 fb37efe5
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date: Fri Dec 28 10:16:13 2018 +0100
Merge branch 'origin/master' into 14348-cluster-search
# Conflicts:
# src/views/compute-node-panel/compute-node-panel-root.tsx
Feature #14348
Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos at contractors.roche.com>
diff --cc src/components/data-explorer/data-explorer.tsx
index db925236,b2377888..d2b161ed
--- a/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@@ -83,10 -81,10 +83,10 @@@ export const DataExplorer = withStyles(
rowsPerPage, rowsPerPageOptions, onColumnToggle, searchValue, onSearch,
items, itemsAvailable, onRowClick, onRowDoubleClick, classes,
dataTableDefaultView, hideColumnSelector, actions, paperProps, hideSearchInput,
- paperKey
+ paperKey, fetchMode
} = this.props;
return <Paper className={classes.root} {...paperProps} key={paperKey}>
- <Toolbar className={classes.toolbar}>
+ {(!hideColumnSelector || !hideSearchInput) && <Toolbar className={classes.toolbar}>
<Grid container justify="space-between" wrap="nowrap" alignItems="center">
{!hideSearchInput && <div className={classes.searchBox}>
<SearchInput
diff --cc src/views-components/data-explorer/renderers.tsx
index f90dac6b,0637676c..d52dcab1
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@@ -203,43 -224,19 +224,41 @@@ const renderNodeInfo = (data: string) =
return <Typography>{JSON.stringify(data, null, 4)}</Typography>;
};
+const clusterColors = [
+ ['#f44336', '#fff'],
+ ['#2196f3', '#fff'],
+ ['#009688', '#fff'],
+ ['#cddc39', '#fff'],
+ ['#ff9800', '#fff']
+];
+
+export const ResourceCluster = (props: { uuid: string }) => {
+ const p = props.uuid.indexOf('-');
+ const clusterId = p >= 5 ? props.uuid.substr(0, p) : '';
+ const ci = p >= 5 ? (props.uuid.charCodeAt(0) + props.uuid.charCodeAt(1)) % clusterColors.length : 0;
+ return <Typography>
+ <div style={{
+ backgroundColor: clusterColors[ci][0],
+ color: clusterColors[ci][1],
+ padding: "2px 7px",
+ borderRadius: 3
+ }}>{clusterId}</div>
+ </Typography>;
+};
+
export const ComputeNodeInfo = withResourceData('info', renderNodeInfo);
- export const ComputeNodeUuid = withResourceData('uuid', renderNodeData);
-
- export const ComputeNodeDomain = withResourceData('domain', renderNodeData);
+ export const ComputeNodeDomain = withResourceData('domain', renderCommonData);
- export const ComputeNodeFirstPingAt = withResourceData('firstPingAt', renderNodeDate);
+ export const ComputeNodeFirstPingAt = withResourceData('firstPingAt', renderCommonDate);
- export const ComputeNodeHostname = withResourceData('hostname', renderNodeData);
+ export const ComputeNodeHostname = withResourceData('hostname', renderCommonData);
- export const ComputeNodeIpAddress = withResourceData('ipAddress', renderNodeData);
+ export const ComputeNodeIpAddress = withResourceData('ipAddress', renderCommonData);
- export const ComputeNodeJobUuid = withResourceData('jobUuid', renderNodeData);
+ export const ComputeNodeJobUuid = withResourceData('jobUuid', renderCommonData);
- export const ComputeNodeLastPingAt = withResourceData('lastPingAt', renderNodeDate);
+ export const ComputeNodeLastPingAt = withResourceData('lastPingAt', renderCommonDate);
// Links Resources
const renderLinkName = (item: { name: string }) =>
diff --cc src/views/compute-node-panel/compute-node-panel-root.tsx
index 88a0e551,e49fc79d..530b7537
--- a/src/views/compute-node-panel/compute-node-panel-root.tsx
+++ b/src/views/compute-node-panel/compute-node-panel-root.tsx
@@@ -7,11 -7,11 +7,11 @@@ import { ShareMeIcon } from '~/componen
import { DataExplorer } from '~/views-components/data-explorer/data-explorer';
import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view';
import { COMPUTE_NODE_PANEL_ID } from '~/store/compute-nodes/compute-nodes-actions';
-import { DataColumns } from '~/components/data-table/data-table';
+import { DataColumns, DataTableFetchMode } from '~/components/data-table/data-table';
import { SortDirection } from '~/components/data-table/data-column';
import { createTree } from '~/models/tree';
-import {
- CommonUuid, ComputeNodeInfo, ComputeNodeDomain, ComputeNodeHostname, ComputeNodeJobUuid,
+import {
- ComputeNodeUuid, ComputeNodeInfo, ComputeNodeDomain, ComputeNodeHostname, ComputeNodeJobUuid,
++ ComputeUuid, ComputeNodeInfo, ComputeNodeDomain, ComputeNodeHostname, ComputeNodeJobUuid,
ComputeNodeFirstPingAt, ComputeNodeLastPingAt, ComputeNodeIpAddress
} from '~/views-components/data-explorer/renderers';
import { ResourcesState } from '~/store/resources/resources';
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list