[ARVADOS-WORKBENCH2] updated: 1.2.0-832-g35c2b0a
Git user
git at public.curoverse.com
Fri Nov 9 04:07:09 EST 2018
Summary of changes:
package.json | 2 +-
.../collection-panel-files.tsx | 2 +-
src/components/data-explorer/data-explorer.tsx | 11 +-
src/components/file-tree/file-tree-item.tsx | 2 +-
src/components/icon/icon.tsx | 2 +-
.../list-item-text-icon/list-item-text-icon.tsx | 8 +-
src/components/tree/tree.tsx | 2 +-
src/store/advanced-tab/advanced-tab.ts | 9 +-
src/store/project-panel/project-panel-action.ts | 4 +
.../project-panel-middleware-service.ts | 8 +-
.../side-panel-tree/side-panel-tree-actions.ts | 88 +-
src/store/workbench/workbench-actions.ts | 9 +-
.../advanced-tab-dialog/advanced-tab-dialog.tsx | 5 +-
.../advanced-tab-dialog/metadataTab.tsx | 4 +-
.../action-sets/collection-action-set.ts | 38 +-
.../action-sets/collection-resource-action-set.ts | 30 +-
.../context-menu/action-sets/process-action-set.ts | 50 +-
.../action-sets/process-resource-action-set.ts | 28 +-
.../side-panel-tree/side-panel-tree.tsx | 4 +-
src/views/collection-panel/collection-panel.tsx | 2 +-
.../process-log-panel/process-log-main-card.tsx | 2 +-
.../process-panel/process-information-card.tsx | 2 +-
.../process-panel/process-subprocesses-card.tsx | 2 +-
src/views/trash-panel/trash-panel.tsx | 6 +-
yarn.lock | 1954 +++++++++++++++++---
25 files changed, 1845 insertions(+), 429 deletions(-)
via 35c2b0aa20a24768ae34c7a3788b1e5b43cdfdac (commit)
via 2275f9352df4a782d3e73a450a7ff12a99ae711e (commit)
via 406684760f9c2e71cca1835c15b96474932d25fd (commit)
via 6a9ed65ed717080ce933718436038b5c4dec2a74 (commit)
via 4b8cc1acf54add3e4337b27a7e957a84dc9c07b4 (commit)
via 247b312a502ac3fdcc915a2e6e858a0eea8c0c5b (commit)
via 3e1a77c445b8f9e029fa52a53d8916e6ce33c14b (commit)
via 3f359e860ebe44e984db502afa6842623def8eaa (commit)
via 994434ce0881e5e4f309982790352e9af66cdb05 (commit)
via 0efebb152c5b21d3d1d58a2a27058c1e661342b9 (commit)
via 236827e065018991740c7b565be00ca4637130c4 (commit)
via 21237e49270dda6c87200630b03e1047a96d5d86 (commit)
via fa13298b95d060e0e37493810e460a6f24e63e21 (commit)
via 2fe0b9581f05dc2f74ad1d2fea169e40df29eb9e (commit)
via f6cb749fd3c67e2cbb74198e4d037e3c52e1267a (commit)
via 30e3140a2a78465e14017219fbf9baece57554bb (commit)
via 6577969579f623c9788113083342a5268ee7c8c8 (commit)
via c7716d1c74a7626f38f8308d1b18c5901244b044 (commit)
from ba27bdf218da8894df4ffa6174c67c1fb3e70c81 (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 35c2b0aa20a24768ae34c7a3788b1e5b43cdfdac
Merge: 2275f93 4066847
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Fri Nov 9 10:06:55 2018 +0100
Merge branch 'master' into 14431-metadata
refs #14431
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
commit 2275f9352df4a782d3e73a450a7ff12a99ae711e
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Fri Nov 9 10:06:47 2018 +0100
cr-changes
Feature #14431
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/advanced-tab/advanced-tab.ts b/src/store/advanced-tab/advanced-tab.ts
index c986a24..ba0cf77 100644
--- a/src/store/advanced-tab/advanced-tab.ts
+++ b/src/store/advanced-tab/advanced-tab.ts
@@ -51,11 +51,7 @@ export const openAdvancedTabDialog = (uuid: string) =>
const { resources } = getState();
const kind = extractUuidKind(uuid);
const data = getResource<any>(uuid)(resources);
- const user = await services.userService.list({
- filters: new FilterBuilder()
- .addEqual('uuid', data.ownerUuid)
- .getFilters()
- });
+ const user = await services.userService.get(data.ownerUuid);
const metadata = await services.linkService.list({
filters: new FilterBuilder()
.addEqual('headUuid', uuid)
@@ -80,7 +76,8 @@ export const openAdvancedTabDialog = (uuid: string) =>
const advancedTabData = (uuid: string, metadata: any, user: any, apiResponseKind: any, data: any, resourceKind: CollectionData | ProcessData | ProjectData, resourcePrefix: GroupContentsResourcePrefix, resourceKindProperty: CollectionData | ProcessData | ProjectData, property: any) => {
return {
uuid,
- metadata: { ...metadata, user },
+ user,
+ metadata,
apiResponse: apiResponseKind(data),
pythonHeader: pythonHeader(resourceKind),
pythonExample: pythonExample(uuid, resourcePrefix),
diff --git a/src/views-components/advanced-tab-dialog/advanced-tab-dialog.tsx b/src/views-components/advanced-tab-dialog/advanced-tab-dialog.tsx
index f715899..9a31a69 100644
--- a/src/views-components/advanced-tab-dialog/advanced-tab-dialog.tsx
+++ b/src/views-components/advanced-tab-dialog/advanced-tab-dialog.tsx
@@ -60,7 +60,8 @@ export const AdvancedTabDialog = compose(
cliUpdateExample,
curlHeader,
curlExample,
- uuid
+ uuid,
+ user
} = this.props.data;
return <Dialog
open={open}
@@ -77,7 +78,7 @@ export const AdvancedTabDialog = compose(
</Tabs>
<DialogContent className={classes.content}>
{value === 0 && <div>{dialogContentExample(apiResponse, classes)}</div>}
- {value === 1 && <div>{metadata.items.length > 0 ? <MetadataTab items={metadata.items} uuid={uuid} user={metadata.user.items}/>: dialogContentHeader('(No metadata links found)')}</div>}
+ {value === 1 && <div>{metadata.items.length > 0 ? <MetadataTab items={metadata.items} uuid={uuid} user={user} /> : dialogContentHeader('(No metadata links found)')}</div>}
{value === 2 && dialogContent(pythonHeader, pythonExample, classes)}
{value === 3 && <div>
{dialogContent(cliGetHeader, cliGetExample, classes)}
diff --git a/src/views-components/advanced-tab-dialog/metadataTab.tsx b/src/views-components/advanced-tab-dialog/metadataTab.tsx
index 24c065a..6250a7a 100644
--- a/src/views-components/advanced-tab-dialog/metadataTab.tsx
+++ b/src/views-components/advanced-tab-dialog/metadataTab.tsx
@@ -25,7 +25,7 @@ interface MetadataTable {
interface MetadataProps {
items: MetadataTable[];
- user: UserResource[];
+ user: UserResource;
uuid: string;
}
@@ -47,7 +47,7 @@ export const MetadataTab = withStyles(styles)((props: MetadataProps & WithStyles
<TableCell className={props.classes.cell}>{it.uuid}</TableCell>
<TableCell className={props.classes.cell}>{it.linkClass}</TableCell>
<TableCell className={props.classes.cell}>{it.name}</TableCell>
- <TableCell className={props.classes.cell}>{props.user.length > 0 ? `User: ${props.user[0].firstName} ${props.user[0].lastName}` : it.tailUuid}</TableCell>
+ <TableCell className={props.classes.cell}>{props.user ? `User: ${props.user.firstName} ${props.user.lastName}` : it.tailUuid}</TableCell>
<TableCell className={props.classes.cell}>{it.headUuid === props.uuid ? 'this' : it.headUuid}</TableCell>
<TableCell className={props.classes.cell}>{JSON.stringify(it.properties)}</TableCell>
</TableRow>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list