From 1034f4bc3706da87143f377fa9427d5bbb58f28d Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Thu, 12 Jul 2018 08:34:59 -0700 Subject: [PATCH 1/4] Fix context menu not showing on tables --- app/components/task/browse/display/task-list-display.html | 1 + src/@batch-flask/ui/abstract-list/abstract-list-base.ts | 2 +- .../ui/table/table-row-render/table-row.component.ts | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/components/task/browse/display/task-list-display.html b/app/components/task/browse/display/task-list-display.html index 9a59ce4a3e..94ca9865c9 100644 --- a/app/components/task/browse/display/task-list-display.html +++ b/app/components/task/browse/display/task-list-display.html @@ -23,6 +23,7 @@ diff --git a/src/@batch-flask/ui/abstract-list/abstract-list-base.ts b/src/@batch-flask/ui/abstract-list/abstract-list-base.ts index 22ce4cb786..982a6bfd6f 100644 --- a/src/@batch-flask/ui/abstract-list/abstract-list-base.ts +++ b/src/@batch-flask/ui/abstract-list/abstract-list-base.ts @@ -313,8 +313,8 @@ export class AbstractListBase extends SelectableList implements OnDestroy { public openContextMenu(target?: any) { if (!this.commands) { return; } - let selection = this.selection; + console.log("Tag", target, this.selection); // If we right clicked on an non selected item it will just make this the context menu selection if (target && !selection.has(target.id)) { diff --git a/src/@batch-flask/ui/table/table-row-render/table-row.component.ts b/src/@batch-flask/ui/table/table-row-render/table-row.component.ts index 18fa90bd6f..5dbb1ab015 100644 --- a/src/@batch-flask/ui/table/table-row-render/table-row.component.ts +++ b/src/@batch-flask/ui/table/table-row-render/table-row.component.ts @@ -59,6 +59,9 @@ export class TableRowRenderComponent implements OnInit, OnDestroy { this.table.openContextMenu(this); } + public get id() { + return this.item.id; + } public trackColumn(index: number, column: TableColumnRef) { return column.name; } From ea7be67aa77629b58452ab759e74804f8e93fea4 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Thu, 12 Jul 2018 08:36:56 -0700 Subject: [PATCH 2/4] Remove console.log --- src/@batch-flask/ui/abstract-list/abstract-list-base.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/@batch-flask/ui/abstract-list/abstract-list-base.ts b/src/@batch-flask/ui/abstract-list/abstract-list-base.ts index 982a6bfd6f..b83a2d26d0 100644 --- a/src/@batch-flask/ui/abstract-list/abstract-list-base.ts +++ b/src/@batch-flask/ui/abstract-list/abstract-list-base.ts @@ -314,7 +314,6 @@ export class AbstractListBase extends SelectableList implements OnDestroy { public openContextMenu(target?: any) { if (!this.commands) { return; } let selection = this.selection; - console.log("Tag", target, this.selection); // If we right clicked on an non selected item it will just make this the context menu selection if (target && !selection.has(target.id)) { From 59943465dfaa6c9697fa5d44163fbfbd8db05fdd Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Thu, 12 Jul 2018 08:38:24 -0700 Subject: [PATCH 3/4] Tweaks --- src/@batch-flask/ui/abstract-list/abstract-list-base.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/@batch-flask/ui/abstract-list/abstract-list-base.ts b/src/@batch-flask/ui/abstract-list/abstract-list-base.ts index b83a2d26d0..22ce4cb786 100644 --- a/src/@batch-flask/ui/abstract-list/abstract-list-base.ts +++ b/src/@batch-flask/ui/abstract-list/abstract-list-base.ts @@ -313,6 +313,7 @@ export class AbstractListBase extends SelectableList implements OnDestroy { public openContextMenu(target?: any) { if (!this.commands) { return; } + let selection = this.selection; // If we right clicked on an non selected item it will just make this the context menu selection From 633ce54d20a08263abc42a2547e790e14fbb4989 Mon Sep 17 00:00:00 2001 From: Timothee Guerin Date: Thu, 12 Jul 2018 08:38:35 -0700 Subject: [PATCH 4/4] Tweaks --- .../ui/table/table-row-render/table-row.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/@batch-flask/ui/table/table-row-render/table-row.component.ts b/src/@batch-flask/ui/table/table-row-render/table-row.component.ts index 5dbb1ab015..cefa4bfc48 100644 --- a/src/@batch-flask/ui/table/table-row-render/table-row.component.ts +++ b/src/@batch-flask/ui/table/table-row-render/table-row.component.ts @@ -62,6 +62,7 @@ export class TableRowRenderComponent implements OnInit, OnDestroy { public get id() { return this.item.id; } + public trackColumn(index: number, column: TableColumnRef) { return column.name; }