From b0223c40db64992a0ddddc3a4b55b594d2b09354 Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Fri, 6 May 2022 15:46:14 +0200 Subject: [PATCH 01/46] adding custom data to basic bar charts --- dist/lineup/Ranking.d.ts | 1 + dist/lineup/Ranking.d.ts.map | 2 +- dist/lineup/RankingViewComponent.d.ts | 1 + dist/lineup/RankingViewComponent.d.ts.map | 2 +- dist/views/visyn/demo/VisynDemoView.d.ts | 1 + dist/views/visyn/demo/VisynDemoView.d.ts.map | 2 +- dist/vis/Vis.d.ts | 1 + dist/vis/Vis.d.ts.map | 2 +- dist/vis/VisSidebar.d.ts | 1 + dist/vis/VisSidebar.d.ts.map | 2 +- dist/vis/bar/BarVis.d.ts.map | 2 +- dist/vis/bar/BarVis.js | 7 ++++++- dist/vis/bar/BarVis.js.map | 2 +- dist/vis/bar/utils.d.ts.map | 2 +- dist/vis/bar/utils.js | 9 ++++++++- dist/vis/bar/utils.js.map | 2 +- dist/vis/sidebar/CloseButton.d.ts | 1 + dist/vis/sidebar/CloseButton.d.ts.map | 2 +- dist/vis/sidebar/utils.d.ts | 1 - dist/vis/sidebar/utils.d.ts.map | 2 +- src/vis/bar/BarVis.tsx | 6 ++++++ src/vis/bar/utils.ts | 13 ++++++++++++- 22 files changed, 49 insertions(+), 15 deletions(-) diff --git a/dist/lineup/Ranking.d.ts b/dist/lineup/Ranking.d.ts index 8905d9138..a2510c020 100644 --- a/dist/lineup/Ranking.d.ts +++ b/dist/lineup/Ranking.d.ts @@ -1,3 +1,4 @@ +/// import { LocalDataProvider, IColumnDesc } from 'lineupjs'; import { ILazyLoadedColumn } from './internal/column'; import { EViewMode, IAdditionalColumnDesc, IScoreRow, ISelection } from '../base/interfaces'; diff --git a/dist/lineup/Ranking.d.ts.map b/dist/lineup/Ranking.d.ts.map index 6f06358d8..eda38256f 100644 --- a/dist/lineup/Ranking.d.ts.map +++ b/dist/lineup/Ranking.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Ranking.d.ts","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,iBAAiB,EAajB,WAAW,EAGZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,iBAAiB,EAAc,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAoB,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAElC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC;IAElE,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAE/C,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AA+DD,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,OAAO,CAAC,EACtB,IAAS,EACT,aAAyC,EACzC,UAAe,EACf,OAAO,EAAE,IAAS,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa;AACb;;GAEG;AACH,gBAAgB,GACjB,EAAE,aAAa,eAuYf"} \ No newline at end of file +{"version":3,"file":"Ranking.d.ts","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":";AAGA,OAAO,EAEL,iBAAiB,EAajB,WAAW,EAGZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,iBAAiB,EAAc,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAoB,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAElC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC;IAElE,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAE/C,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AA+DD,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,OAAO,CAAC,EACtB,IAAS,EACT,aAAyC,EACzC,UAAe,EACf,OAAO,EAAE,IAAS,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa;AACb;;GAEG;AACH,gBAAgB,GACjB,EAAE,aAAa,eAuYf"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.d.ts b/dist/lineup/RankingViewComponent.d.ts index 83e84acd4..56b84fd55 100644 --- a/dist/lineup/RankingViewComponent.d.ts +++ b/dist/lineup/RankingViewComponent.d.ts @@ -1,3 +1,4 @@ +/// import { IRankingProps } from './Ranking'; import { ISelection } from '../base/interfaces'; import { ISelectionAdapter } from './selection/ISelectionAdapter'; diff --git a/dist/lineup/RankingViewComponent.d.ts.map b/dist/lineup/RankingViewComponent.d.ts.map index 2124c80c9..ccebdc50d 100644 --- a/dist/lineup/RankingViewComponent.d.ts.map +++ b/dist/lineup/RankingViewComponent.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAqH5B"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAqH5B"} \ No newline at end of file diff --git a/dist/views/visyn/demo/VisynDemoView.d.ts b/dist/views/visyn/demo/VisynDemoView.d.ts index 4df3855fd..6e4ff5068 100644 --- a/dist/views/visyn/demo/VisynDemoView.d.ts +++ b/dist/views/visyn/demo/VisynDemoView.d.ts @@ -1,3 +1,4 @@ +/// import { DemoVisynViewPluginType } from './interfaces'; export declare function VisynDemoView({ desc, parameters, onParametersChanged }: DemoVisynViewPluginType['props']): JSX.Element; export declare function VisynDemoViewSidebar({ parameters, onParametersChanged }: DemoVisynViewPluginType['props']): JSX.Element; diff --git a/dist/views/visyn/demo/VisynDemoView.d.ts.map b/dist/views/visyn/demo/VisynDemoView.d.ts.map index 54d6675d1..d3da0fa6e 100644 --- a/dist/views/visyn/demo/VisynDemoView.d.ts.map +++ b/dist/views/visyn/demo/VisynDemoView.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"VisynDemoView.d.ts","sourceRoot":"","sources":["../../../../src/views/visyn/demo/VisynDemoView.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAkEvD,wBAAgB,aAAa,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eA0BxG;AAED,wBAAgB,oBAAoB,CAAC,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiBzG;AAED,wBAAgB,mBAAmB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiCnH;AAED,wBAAgB,mBAAmB,IAAI,uBAAuB,CAAC,YAAY,CAAC,CAY3E"} \ No newline at end of file +{"version":3,"file":"VisynDemoView.d.ts","sourceRoot":"","sources":["../../../../src/views/visyn/demo/VisynDemoView.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAkEvD,wBAAgB,aAAa,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eA0BxG;AAED,wBAAgB,oBAAoB,CAAC,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiBzG;AAED,wBAAgB,mBAAmB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiCnH;AAED,wBAAgB,mBAAmB,IAAI,uBAAuB,CAAC,YAAY,CAAC,CAY3E"} \ No newline at end of file diff --git a/dist/vis/Vis.d.ts b/dist/vis/Vis.d.ts index f1af3142b..e2070d05c 100644 --- a/dist/vis/Vis.d.ts +++ b/dist/vis/Vis.d.ts @@ -1,3 +1,4 @@ +/// import { IVisConfig, VisColumn, EFilterOptions } from './interfaces'; export declare function Vis({ columns, selected, colors, shapes, selectionCallback, filterCallback, setExternalConfig, closeCallback, showCloseButton, externalConfig, hideSidebar, }: { /** diff --git a/dist/vis/Vis.d.ts.map b/dist/vis/Vis.d.ts.map index 6744df886..97352aa61 100644 --- a/dist/vis/Vis.d.ts.map +++ b/dist/vis/Vis.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Vis.d.ts","sourceRoot":"","sources":["../../src/vis/Vis.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,UAAU,EAEV,SAAS,EACT,cAAc,EAQf,MAAM,cAAc,CAAC;AAwBtB,wBAAgB,GAAG,CAAC,EAClB,OAAO,EACP,QAAa,EACb,MAAuB,EACvB,MAAuB,EACvB,iBAA8B,EAC9B,cAA2B,EAC3B,iBAA8B,EAC9B,aAA0B,EAC1B,eAAuB,EACvB,cAAqB,EACrB,WAAmB,GACpB,EAAE;IACD;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC1C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7C,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,eA4LA"} \ No newline at end of file +{"version":3,"file":"Vis.d.ts","sourceRoot":"","sources":["../../src/vis/Vis.tsx"],"names":[],"mappings":";AAGA,OAAO,EAEL,UAAU,EAEV,SAAS,EACT,cAAc,EAQf,MAAM,cAAc,CAAC;AAwBtB,wBAAgB,GAAG,CAAC,EAClB,OAAO,EACP,QAAa,EACb,MAAuB,EACvB,MAAuB,EACvB,iBAA8B,EAC9B,cAA2B,EAC3B,iBAA8B,EAC9B,aAA0B,EAC1B,eAAuB,EACvB,cAAqB,EACrB,WAAmB,GACpB,EAAE;IACD;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC1C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7C,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,eA4LA"} \ No newline at end of file diff --git a/dist/vis/VisSidebar.d.ts b/dist/vis/VisSidebar.d.ts index a354f7263..a0d76cd45 100644 --- a/dist/vis/VisSidebar.d.ts +++ b/dist/vis/VisSidebar.d.ts @@ -1,3 +1,4 @@ +/// import { IVisConfig, VisColumn, ICommonVisSideBarProps } from './interfaces'; export declare type VisSidebarProps = { /** diff --git a/dist/vis/VisSidebar.d.ts.map b/dist/vis/VisSidebar.d.ts.map index 1910646d5..63c5bf3fa 100644 --- a/dist/vis/VisSidebar.d.ts.map +++ b/dist/vis/VisSidebar.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"VisSidebar.d.ts","sourceRoot":"","sources":["../../src/vis/VisSidebar.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAU7E,oBAAY,eAAe,GAAG;IAC5B;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,cAAc,EAAE,UAAU,CAAC;IAC3B,iBAAiB,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;CAC5C,GAAG,sBAAsB,CAAC;AAE3B,wBAAgB,UAAU,CAAC,EAAE,OAAO,EAAE,cAA2B,EAAE,cAAqB,EAAE,iBAAwB,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,eAAe,eAmDtJ"} \ No newline at end of file +{"version":3,"file":"VisSidebar.d.ts","sourceRoot":"","sources":["../../src/vis/VisSidebar.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAU7E,oBAAY,eAAe,GAAG;IAC5B;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,cAAc,EAAE,UAAU,CAAC;IAC3B,iBAAiB,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;CAC5C,GAAG,sBAAsB,CAAC;AAE3B,wBAAgB,UAAU,CAAC,EAAE,OAAO,EAAE,cAA2B,EAAE,cAAqB,EAAE,iBAAwB,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,eAAe,eAmDtJ"} \ No newline at end of file diff --git a/dist/vis/bar/BarVis.d.ts.map b/dist/vis/bar/BarVis.d.ts.map index e7ab362d7..f7366d923 100644 --- a/dist/vis/bar/BarVis.d.ts.map +++ b/dist/vis/bar/BarVis.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"BarVis.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAoB,MAAM,eAAe,CAAC;AAU5F,UAAU,WAAW;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,KAAK,CAAC,EAAE;YACN,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,YAAY,CAAC,EAAE;YACb,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;KACH,CAAC;IACF,UAAU,CAAC,EAAE;QACX,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC3B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC7B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AASD,wBAAgB,MAAM,CAAC,EACrB,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EACP,SAAS,EACT,MAAM,EACN,WAAmB,EACnB,eAAuB,EACvB,mBAAgC,GACjC,EAAE,WAAW,eAkGb"} \ No newline at end of file +{"version":3,"file":"BarVis.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAoB,MAAM,eAAe,CAAC;AAU5F,UAAU,WAAW;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,KAAK,CAAC,EAAE;YACN,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,YAAY,CAAC,EAAE;YACb,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;KACH,CAAC;IACF,UAAU,CAAC,EAAE;QACX,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC3B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC7B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AASD,wBAAgB,MAAM,CAAC,EACrB,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EACP,SAAS,EACT,MAAM,EACN,WAAmB,EACnB,eAAuB,EACvB,mBAAgC,GACjC,EAAE,WAAW,eAwGb"} \ No newline at end of file diff --git a/dist/vis/bar/BarVis.js b/dist/vis/bar/BarVis.js index 0586a7d82..0d20716e6 100644 --- a/dist/vis/bar/BarVis.js +++ b/dist/vis/bar/BarVis.js @@ -67,7 +67,12 @@ export function BarVis({ config, optionsConfig, extensions, columns, setConfig, return (React.createElement("div", { ref: plotlyDivRef, className: "d-flex flex-row w-100 h-100", style: { minHeight: '0px' } }, React.createElement("div", { className: `position-relative d-flex justify-content-center align-items-center flex-grow-1 ${traceStatus === 'pending' ? 'tdp-busy-partial-overlay' : ''}` }, mergedExtensions.prePlot, - traceStatus === 'success' && (traces === null || traces === void 0 ? void 0 : traces.plots.length) > 0 ? (React.createElement(PlotlyComponent, { divId: `plotlyDiv${id}`, data: [...traces.plots.map((p) => p.data), ...traces.legendPlots.map((p) => p.data)], layout: layout, config: { responsive: true, displayModeBar: false }, useResizeHandler: true, style: { width: '100%', height: '100%' }, + traceStatus === 'success' && (traces === null || traces === void 0 ? void 0 : traces.plots.length) > 0 ? (React.createElement(PlotlyComponent, { divId: `plotlyDiv${id}`, data: [...traces.plots.map((p) => p.data), ...traces.legendPlots.map((p) => p.data)], layout: layout, config: { responsive: true, displayModeBar: false }, useResizeHandler: true, style: { width: '100%', height: '100%' }, onClick: (e) => { + const clickedCategory = e.points[0].id; + console.log(e); + console.log(config.group); + console.log(clickedCategory); + }, // plotly redraws everything on updates, so you need to reappend title and onUpdate: () => { for (const p of traces.plots) { diff --git a/dist/vis/bar/BarVis.js.map b/dist/vis/bar/BarVis.js.map index 54a27afb4..15f585487 100644 --- a/dist/vis/bar/BarVis.js.map +++ b/dist/vis/bar/BarVis.js.map @@ -1 +1 @@ -{"version":3,"file":"BarVis.js","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"BarVis.js","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/vis/bar/utils.d.ts.map b/dist/vis/bar/utils.d.ts.map index 5cded1fb1..184920ce2 100644 --- a/dist/vis/bar/utils.d.ts.map +++ b/dist/vis/bar/utils.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EAKV,UAAU,EACV,MAAM,EACN,SAAS,EAET,UAAU,EAOX,MAAM,eAAe,CAAC;AAIvB,wBAAgB,KAAK,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,IAAI,UAAU,CAEpD;AAiBD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,CAe1F;AA2UD,wBAAsB,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA4CnH"} \ No newline at end of file +{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,UAAU,EAKV,UAAU,EACV,MAAM,EACN,SAAS,EAET,UAAU,EAOX,MAAM,eAAe,CAAC;AAIvB,wBAAgB,KAAK,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,IAAI,UAAU,CAEpD;AAiBD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,CAe1F;AAqVD,wBAAsB,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA4CnH"} \ No newline at end of file diff --git a/dist/vis/bar/utils.js b/dist/vis/bar/utils.js index def299b22..6e3788dd1 100644 --- a/dist/vis/bar/utils.js +++ b/dist/vis/bar/utils.js @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/naming-convention */ import { merge, sum, mean, min, max } from 'lodash'; import { median } from 'd3'; import { I18nextManager } from '../../i18n'; @@ -104,6 +105,7 @@ async function setPlotsWithGroupsAndMultiples(columns, catCol, aggregateType, ag x: vertFlag ? uniqueColVals : aggregateVals, y: !vertFlag ? uniqueColVals : aggregateVals, text: uniqueColVals, + ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueMultiples}, ${uniqueGroup}`), textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', orientation: vertFlag ? 'v' : 'h', @@ -154,6 +156,7 @@ async function setPlotsWithGroups(columns, catCol, aggregateType, aggregateColum x: vertFlag ? uniqueColVals : finalAggregateValues, y: !vertFlag ? uniqueColVals : finalAggregateValues, text: uniqueColVals, + ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueVal}`), textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', orientation: vertFlag ? 'v' : 'h', @@ -198,6 +201,7 @@ async function setPlotsWithMultiples(columns, catCol, aggregateType, aggregateCo data: { x: vertFlag ? uniqueColVals : finalAggregateValues, y: !vertFlag ? uniqueColVals : finalAggregateValues, + ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueVal}`), text: uniqueColVals, textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', @@ -217,7 +221,7 @@ async function setPlotsWithMultiples(columns, catCol, aggregateType, aggregateCo }); plotCounterEdit += 1; }); - return plotCounterEdit; + return plotCounter; } async function setPlotsBasic(columns, aggregateType, aggregateColumn, catCol, config, plots, scales, plotCounter) { let plotCounterEdit = plotCounter; @@ -226,6 +230,8 @@ async function setPlotsBasic(columns, aggregateType, aggregateColumn, catCol, co const vertFlag = config.direction === EBarDirection.VERTICAL; const aggValues = getAggregateValues(aggregateType, catColValues.resolvedValues, aggColValues === null || aggColValues === void 0 ? void 0 : aggColValues.resolvedValues); const valArr = [...new Set(catColValues.resolvedValues.map((v) => v.val))]; + const valIdArr = valArr.map((val) => []); + catColValues.resolvedValues.forEach((row) => valIdArr[valArr.indexOf(row.val)].push(row.id)); const plotAggregateAxisName = createAxisLabel(aggregateType, aggregateColumn); plots.push({ data: { @@ -235,6 +241,7 @@ async function setPlotsBasic(columns, aggregateType, aggregateColumn, catCol, co textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', ids: valArr, + customdata: valIdArr, orientation: vertFlag ? 'v' : 'h', xaxis: plotCounter === 1 ? 'x' : `x${plotCounter}`, yaxis: plotCounter === 1 ? 'y' : `y${plotCounter}`, diff --git a/dist/vis/bar/utils.js.map b/dist/vis/bar/utils.js.map index 0ae3f2d41..b7c169b44 100644 --- a/dist/vis/bar/utils.js.map +++ b/dist/vis/bar/utils.js.map @@ -1 +1 @@ -{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/vis/bar/utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/vis/bar/utils.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAIL,YAAY,EACZ,mBAAmB,EAMnB,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,eAAe,GAGhB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC,MAAM,UAAU,KAAK,CAAC,CAAa;IACjC,OAAO,CAAC,CAAC,IAAI,KAAK,mBAAmB,CAAC,GAAG,CAAC;AAC5C,CAAC;AAED,MAAM,aAAa,GAAe;IAChC,IAAI,EAAE,mBAAmB,CAAC,GAAG;IAC7B,kBAAkB,EAAE,EAAE;IACtB,iBAAiB,EAAE,IAAI;IACvB,KAAK,EAAE,IAAI;IACX,SAAS,EAAE,gBAAgB,CAAC,KAAK;IACjC,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,eAAe,CAAC,QAAQ;IACjC,SAAS,EAAE,aAAa,CAAC,UAAU;IACnC,eAAe,EAAE,IAAI;IACrB,aAAa,EAAE,eAAe,CAAC,KAAK;CACrC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,MAAM,UAAU,qBAAqB,CAAC,OAAoB,EAAE,MAAkB;IAC5E,MAAM,MAAM,GAAG,KAAK,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IAEhD,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,WAAW,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,SAAS,CAAC,CAAC;IAEzE,IAAI,CAAC,MAAM,CAAC,iBAAiB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACnD,MAAM,CAAC,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;KAC7D;IAED,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACjD,MAAM,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;KAC3D;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,aAA8B,EAAE,eAA0B;IACjF,OAAO,aAAa,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AACtH,CAAC;AAED;;;;;;;;;;GAUG;AACH,SAAS,kBAAkB,CACzB,aAA8B,EAC9B,YAAmC,EACnC,YAAiC,EACjC,mBAA8B,EAC9B,OAAiB;IAEjB,MAAM,kBAAkB,GAAG,mBAAmB,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAE/F,MAAM,cAAc,GAAG,EAAE,CAAC;IAE1B,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC3B,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,SAAS,SAAS,CAAC,OAAO;QACxB,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,CACtC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAE,YAAoC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CACrJ,CAAC;QAEF,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9C,CAAC;IAED,QAAQ,aAAa,EAAE;QACrB,KAAK,eAAe,CAAC,GAAG;YACtB,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC;QAEzB,KAAK,eAAe,CAAC,GAAG;YACtB,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;QAExB,KAAK,eAAe,CAAC,GAAG;YACtB,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC;QAExB,KAAK,eAAe,CAAC,GAAG;YACtB,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;QAE3B,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC;YAC1B,MAAM,WAAW,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAE,YAAsC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC;YACnI,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;SACjD;QAED;YACE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC/C;AACH,CAAC;AAED,KAAK,UAAU,8BAA8B,CAC3C,OAAoB,EACpB,MAA4B,EAC5B,aAA8B,EAC9B,eAAmC,EACnC,MAAkB,EAClB,KAAmB,EACnB,MAAc,EACd,WAAmB;IAEnB,IAAI,eAAe,GAAG,WAAW,CAAC;IAClC,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,eAAe,CAAC,CAAC;IAEhE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,KAAK,aAAa,CAAC,QAAQ,CAAC;IAC7D,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,KAAK,eAAe,CAAC,UAAU,CAAC;IACrE,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACjF,MAAM,mBAAmB,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAEzF,MAAM,eAAe,GAAa,CAAC,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAa,CAAC;IAC7G,MAAM,mBAAmB,GAAa,CAAC,GAAG,IAAI,GAAG,CAAC,mBAAmB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAa,CAAC;IAErH,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAa,CAAC,CAAC,CAAa,CAAC;IAExG,mBAAmB,CAAC,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;QAC9C,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAChC,mBAAmB,CAAC,cAAwC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACxH,CAAC;QAEF,eAAe,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACtC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAE,eAAe,CAAC,cAAwC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAEjJ,MAAM,aAAa,GAAG,aAAa;iBAChC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,MAAM,OAAO,GAAI,YAAY,CAAC,cAAwC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;gBAClG,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAErD,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAErG,MAAM,eAAe,GAAG,kBAAkB,CAAC,aAAa,EAAE,UAAU,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAqC,CAAC,CAAC;gBAE3H,MAAM,wBAAwB,GAAG,kBAAkB,CACjD,aAAa,EACb,mBAAmB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAA0B,EACnG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAqC,EACnD,mBAAmB,CACpB,CAAC;gBACF,OAAO,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,GAAI,wBAAmC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC;YAC9I,CAAC,CAAC;iBACD,IAAI,EAAE,CAAC;YAEV,MAAM,qBAAqB,GAAG,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YAE9E,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE;oBACJ,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa;oBAC3C,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa;oBAC5C,IAAI,EAAE,aAAa;oBACnB,GAAG,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,KAAK,eAAe,KAAK,WAAW,EAAE,CAAC;oBAEnF,YAAY,EAAE,MAAM;oBACpB,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;oBACzC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;oBACjC,KAAK,EAAE,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,eAAe,EAAE;oBAC1D,KAAK,EAAE,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,eAAe,EAAE;oBAC1D,UAAU,EAAE,eAAe,KAAK,CAAC;oBACjC,IAAI,EAAE,KAAK;oBACX,IAAI,EAAE,WAAW;oBACjB,MAAM,EAAE;wBACN,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;qBACjC;iBACF;gBACD,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,qBAAqB;gBACvG,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI;gBACzG,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;gBACvC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC3F,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;gBACxC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;aAC7F,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,eAAe,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,OAAoB,EACpB,MAA4B,EAC5B,aAA8B,EAC9B,eAAmC,EACnC,MAAkB,EAClB,KAAmB,EACnB,MAAc,EACd,WAAmB;IAEnB,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,eAAe,CAAC,CAAC;IAEhE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,KAAK,aAAa,CAAC,QAAQ,CAAC;IAC7D,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,KAAK,eAAe,CAAC,UAAU,CAAC;IACrE,MAAM,WAAW,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAE7E,MAAM,eAAe,GAAa,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAa,CAAC;IACzG,MAAM,aAAa,GAAa,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAa,CAAC;IAExG,eAAe,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QACpC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAE,WAAW,CAAC,cAAwC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3I,MAAM,oBAAoB,GAAG,aAAa;aACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,MAAM,OAAO,GAAI,YAAY,CAAC,cAAwC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YAClG,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAErD,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;YAE9E,MAAM,eAAe,GAAG,kBAAkB,CAAC,aAAa,EAAE,UAAU,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAqC,CAAC,CAAC;YAC3H,MAAM,wBAAwB,GAAG,kBAAkB,CACjD,aAAa,EACb,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAA0B,EAC3F,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAqC,EACnD,eAAe,EACf,IAAI,CACL,CAAC;YAEF,OAAO,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,GAAI,wBAAmC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC;QAC9I,CAAC,CAAC;aACD,IAAI,EAAE,CAAC;QAEV,MAAM,qBAAqB,GAAG,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;QAE9E,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE;gBACJ,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,oBAAoB;gBAClD,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,oBAAoB;gBACnD,IAAI,EAAE,aAAa;gBACnB,GAAG,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,KAAK,SAAS,EAAE,CAAC;gBAE7D,YAAY,EAAE,MAAM;gBACpB,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;gBACzC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;gBACjC,KAAK,EAAE,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE;gBAClD,KAAK,EAAE,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE;gBAClD,UAAU,EAAE,WAAW,KAAK,CAAC;gBAC7B,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE;oBACN,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC;iBAC/B;aACF;YACD,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,qBAAqB;YACvG,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI;YACzG,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;YACvC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;YAC3F,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;YACxC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;SAC7F,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,OAAoB,EACpB,MAA4B,EAC5B,aAA8B,EAC9B,eAAmC,EACnC,MAAkB,EAClB,KAAmB,EACnB,WAAmB;IAEnB,IAAI,eAAe,GAAG,WAAW,CAAC;IAClC,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,eAAe,CAAC,CAAC;IAChE,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAErF,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,KAAK,aAAa,CAAC,QAAQ,CAAC;IAE7D,MAAM,mBAAmB,GAAa,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,eAAe,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAa,CAAC;IACzH,MAAM,aAAa,GAAa,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAa,CAAC;IAExG,mBAAmB,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QACxC,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAE,eAAe,CAAC,cAAwC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEnJ,MAAM,oBAAoB,GAAG,aAAa;aACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,MAAM,OAAO,GAAI,YAAY,CAAC,cAAwC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;YAClG,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAExE,OAAO,UAAU,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,aAAa,EAAE,UAAU,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAqC,CAAC,CAAC;QAC5I,CAAC,CAAC;aACD,IAAI,EAAE,CAAC;QACV,MAAM,qBAAqB,GAAG,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;QAE9E,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE;gBACJ,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,oBAAoB;gBAClD,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,oBAAoB;gBACnD,GAAG,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC7D,IAAI,EAAE,aAAa;gBACnB,YAAY,EAAE,MAAM;gBACpB,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;gBACzC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;gBACjC,KAAK,EAAE,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,eAAe,EAAE;gBAC1D,KAAK,EAAE,eAAe,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,eAAe,EAAE;gBAC1D,UAAU,EAAE,KAAK;gBACjB,IAAI,EAAE,KAAK;gBACX,IAAI,EAAE,SAAS;aAChB;YACD,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB;YACjE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI;YACjE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;YACvC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;YAC3F,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;YACxC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;SAC7F,CAAC,CAAC;QACH,eAAe,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,OAAoB,EACpB,aAA8B,EAC9B,eAA0C,EAC1C,MAA4B,EAC5B,MAAkB,EAClB,KAAmB,EACnB,MAAc,EACd,WAAmB;IAEnB,IAAI,eAAe,GAAG,WAAW,CAAC;IAClC,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,MAAM,mBAAmB,CAAC,eAAe,CAAC,CAAC;IAEhE,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,KAAK,aAAa,CAAC,QAAQ,CAAC;IAE7D,MAAM,SAAS,GAAU,kBAAkB,CACzC,aAAa,EACb,YAAY,CAAC,cAAuC,EACpD,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,cAAqC,CAC3C,CAAC;IAEX,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAa,CAAC,CAAC,CAAC,CAAC;IACrF,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;IAEzC,YAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAa,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAEvG,MAAM,qBAAqB,GAAG,eAAe,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;IAE9E,KAAK,CAAC,IAAI,CAAC;QACT,IAAI,EAAE;YACJ,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;YAChC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;YACjC,IAAI,EAAE,MAAM;YACZ,YAAY,EAAE,MAAM;YACpB,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ;YACzC,GAAG,EAAE,MAAM;YACX,UAAU,EAAE,QAAQ;YACpB,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;YACjC,KAAK,EAAE,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE;YAClD,KAAK,EAAE,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE;YAClD,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,YAAY,CAAC,IAAI,CAAC,IAAI;YAC5B,UAAU,EAAE,KAAK;SAClB;QACD,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB;QACjE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI;QACjE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;QAChC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;QACpF,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;QACjC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;KACtF,CAAC,CAAC;IACH,eAAe,IAAI,CAAC,CAAC;IAErB,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAoB,EAAE,MAAkB,EAAE,MAAc;IAC5F,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;QAC7B,OAAO;YACL,KAAK,EAAE,EAAE;YACT,WAAW,EAAE,EAAE;YACf,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,CAAC;YACP,YAAY,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC;YAC1E,kBAAkB,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,0BAA0B,CAAC;SACpF,CAAC;KACH;IAED,MAAM,KAAK,GAAiB,EAAE,CAAC;IAE/B,MAAM,MAAM,GAAyB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAyB,CAAC;IAC5H,MAAM,eAAe,GAAuB,MAAM,CAAC,eAAe;QAChE,CAAC,CAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,eAAe,CAAC,EAAE,CAAwB;QACtF,CAAC,CAAC,IAAI,CAAC;IAET,IAAI,MAAM,EAAE;QACV,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,SAAS,EAAE;YACpC,WAAW,GAAG,MAAM,8BAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;SAChJ;aAAM,IAAI,MAAM,CAAC,KAAK,EAAE;YACvB,WAAW,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;SACpI;aAAM,IAAI,MAAM,CAAC,SAAS,EAAE;YAC3B,WAAW,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;SAC/H;aAAM;YACL,WAAW,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;SAC/H;KACF;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC;IACnD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAEjD,OAAO;QACL,KAAK;QACL,WAAW,EAAE,EAAE;QACf,IAAI;QACJ,IAAI;QACJ,YAAY,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC;QAC1E,kBAAkB,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,0BAA0B,CAAC;KACpF,CAAC;AACJ,CAAC"} \ No newline at end of file diff --git a/dist/vis/sidebar/CloseButton.d.ts b/dist/vis/sidebar/CloseButton.d.ts index e4bc3a1dc..fb72491b9 100644 --- a/dist/vis/sidebar/CloseButton.d.ts +++ b/dist/vis/sidebar/CloseButton.d.ts @@ -1,3 +1,4 @@ +/// export declare function CloseButton({ closeCallback }: { closeCallback: () => void; }): JSX.Element; diff --git a/dist/vis/sidebar/CloseButton.d.ts.map b/dist/vis/sidebar/CloseButton.d.ts.map index f0586c3ce..71389d733 100644 --- a/dist/vis/sidebar/CloseButton.d.ts.map +++ b/dist/vis/sidebar/CloseButton.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"CloseButton.d.ts","sourceRoot":"","sources":["../../../src/vis/sidebar/CloseButton.tsx"],"names":[],"mappings":"AAEA,wBAAgB,WAAW,CAAC,EAAE,aAAa,EAAE,EAAE;IAAE,aAAa,EAAE,MAAM,IAAI,CAAA;CAAE,eAM3E"} \ No newline at end of file +{"version":3,"file":"CloseButton.d.ts","sourceRoot":"","sources":["../../../src/vis/sidebar/CloseButton.tsx"],"names":[],"mappings":";AAEA,wBAAgB,WAAW,CAAC,EAAE,aAAa,EAAE,EAAE;IAAE,aAAa,EAAE,MAAM,IAAI,CAAA;CAAE,eAM3E"} \ No newline at end of file diff --git a/dist/vis/sidebar/utils.d.ts b/dist/vis/sidebar/utils.d.ts index fca09f382..1164bc62d 100644 --- a/dist/vis/sidebar/utils.d.ts +++ b/dist/vis/sidebar/utils.d.ts @@ -1,4 +1,3 @@ -/// import { ColumnInfo, VisNumericalColumn, VisCategoricalColumn, VisColumn } from '../interfaces'; export declare const formatOptionLabel: (option: any, ctx: any) => JSX.Element; export declare function getCol(columns: VisColumn[], info: ColumnInfo | null): VisNumericalColumn | VisCategoricalColumn | null; diff --git a/dist/vis/sidebar/utils.d.ts.map b/dist/vis/sidebar/utils.d.ts.map index 586c66cac..09d2ff076 100644 --- a/dist/vis/sidebar/utils.d.ts.map +++ b/dist/vis/sidebar/utils.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/vis/sidebar/utils.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAEhG,eAAO,MAAM,iBAAiB,wCAO7B,CAAC;AAEF,wBAAgB,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,GAAG,kBAAkB,GAAG,oBAAoB,GAAG,IAAI,CAKtH"} \ No newline at end of file +{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/vis/sidebar/utils.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAEhG,eAAO,MAAM,iBAAiB,wCAO7B,CAAC;AAEF,wBAAgB,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,GAAG,kBAAkB,GAAG,oBAAoB,GAAG,IAAI,CAKtH"} \ No newline at end of file diff --git a/src/vis/bar/BarVis.tsx b/src/vis/bar/BarVis.tsx index b1b29b332..ff6edeab5 100644 --- a/src/vis/bar/BarVis.tsx +++ b/src/vis/bar/BarVis.tsx @@ -144,6 +144,12 @@ export function BarVis({ config={{ responsive: true, displayModeBar: false }} useResizeHandler style={{ width: '100%', height: '100%' }} + onClick={(e: any) => { + const clickedCategory = e.points[0].id; + console.log(e); + console.log(config.group) + console.log(clickedCategory); + }} // plotly redraws everything on updates, so you need to reappend title and onUpdate={() => { for (const p of traces.plots) { diff --git a/src/vis/bar/utils.ts b/src/vis/bar/utils.ts index 2d899d344..82b17f140 100644 --- a/src/vis/bar/utils.ts +++ b/src/vis/bar/utils.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/naming-convention */ import { merge, sum, mean, min, max } from 'lodash'; import { median } from 'd3'; import { I18nextManager } from '../../i18n'; @@ -177,6 +178,8 @@ async function setPlotsWithGroupsAndMultiples( x: vertFlag ? uniqueColVals : aggregateVals, y: !vertFlag ? uniqueColVals : aggregateVals, text: uniqueColVals, + ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueMultiples}, ${uniqueGroup}`), + textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', orientation: vertFlag ? 'v' : 'h', @@ -252,6 +255,8 @@ async function setPlotsWithGroups( x: vertFlag ? uniqueColVals : finalAggregateValues, y: !vertFlag ? uniqueColVals : finalAggregateValues, text: uniqueColVals, + ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueVal}`), + textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', orientation: vertFlag ? 'v' : 'h', @@ -312,6 +317,7 @@ async function setPlotsWithMultiples( data: { x: vertFlag ? uniqueColVals : finalAggregateValues, y: !vertFlag ? uniqueColVals : finalAggregateValues, + ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueVal}`), text: uniqueColVals, textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', @@ -332,7 +338,7 @@ async function setPlotsWithMultiples( plotCounterEdit += 1; }); - return plotCounterEdit; + return plotCounter; } async function setPlotsBasic( @@ -358,6 +364,10 @@ async function setPlotsBasic( ) as any[]; const valArr = [...new Set(catColValues.resolvedValues.map((v) => v.val as string))]; + const valIdArr = valArr.map((val) => []); + + catColValues.resolvedValues.forEach((row) => valIdArr[valArr.indexOf(row.val as string)].push(row.id)); + const plotAggregateAxisName = createAxisLabel(aggregateType, aggregateColumn); plots.push({ @@ -368,6 +378,7 @@ async function setPlotsBasic( textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', ids: valArr, + customdata: valIdArr, orientation: vertFlag ? 'v' : 'h', xaxis: plotCounter === 1 ? 'x' : `x${plotCounter}`, yaxis: plotCounter === 1 ? 'y' : `y${plotCounter}`, From 25afce998e1f91f3587a8ebadf5640faf7038799 Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Wed, 11 May 2022 18:17:03 +0200 Subject: [PATCH 02/46] fixing context selection bug --- dist/lineup/Ranking.d.ts.map | 2 +- dist/lineup/Ranking.js | 22 ++++++++++++-- dist/lineup/Ranking.js.map | 2 +- dist/lineup/RankingViewComponent.d.ts.map | 2 +- dist/lineup/RankingViewComponent.js | 29 +++++++++++------- dist/lineup/RankingViewComponent.js.map | 2 +- src/lineup/Ranking.tsx | 37 ++++++++++++++++++----- src/lineup/RankingViewComponent.tsx | 37 ++++++++++++++++------- 8 files changed, 96 insertions(+), 37 deletions(-) diff --git a/dist/lineup/Ranking.d.ts.map b/dist/lineup/Ranking.d.ts.map index 6f06358d8..9cb0e695a 100644 --- a/dist/lineup/Ranking.d.ts.map +++ b/dist/lineup/Ranking.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Ranking.d.ts","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,iBAAiB,EAajB,WAAW,EAGZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,iBAAiB,EAAc,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAoB,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAElC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC;IAElE,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAE/C,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AA+DD,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,OAAO,CAAC,EACtB,IAAS,EACT,aAAyC,EACzC,UAAe,EACf,OAAO,EAAE,IAAS,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa;AACb;;GAEG;AACH,gBAAgB,GACjB,EAAE,aAAa,eAuYf"} \ No newline at end of file +{"version":3,"file":"Ranking.d.ts","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,iBAAiB,EAajB,WAAW,EAGZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,iBAAiB,EAAc,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAoB,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAElC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC;IAElE,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAE/C,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AA+DD,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,OAAO,CAAC,EACtB,IAAS,EACT,aAAyC,EACzC,UAAe,EACf,OAAO,EAAE,IAAS,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa;AACb;;GAEG;AACH,gBAAgB,GACjB,EAAE,aAAa,eA4Zf"} \ No newline at end of file diff --git a/dist/lineup/Ranking.js b/dist/lineup/Ranking.js index 5883eaba7..d7308558c 100644 --- a/dist/lineup/Ranking.js +++ b/dist/lineup/Ranking.js @@ -2,7 +2,7 @@ /* eslint-disable import/no-cycle */ /* eslint-disable @typescript-eslint/no-shadow */ import { LocalDataProvider, EngineRenderer, TaggleRenderer, createLocalDataProvider, defaultOptions, isGroup, spaceFillingRule, updateLodRules, } from 'lineupjs'; -import React from 'react'; +import React, { useCallback, useEffect, useMemo } from 'react'; import { merge } from 'lodash'; import { LazyColumn } from './internal/column'; import { LineUpColors } from './internal/LineUpColors'; @@ -91,6 +91,7 @@ export function Ranking({ data = [], itemSelection = { idtype: null, ids: [] }, * Maybe refactor this when using the native lineup implementation of scores */ onAddScoreColumn, }) { + var _a, _b; const [busy, setBusy] = React.useState(false); const [built, setBuilt] = React.useState(false); const options = merge({}, defaults, opts); @@ -109,13 +110,13 @@ onAddScoreColumn, }) { itemSelections.set(AView.DEFAULT_SELECTION_NAME, sel); // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - const addColumn = (colDesc, d, id = null, position) => { + const addColumn = useCallback((colDesc, d, id = null, position) => { // use `colorMapping` as default; otherwise use `color`, which is deprecated; else get a new color colDesc.colorMapping = colDesc.colorMapping ? colDesc.colorMapping : colDesc.color ? colDesc.color : colorsRef.current.getColumnColor(id); return LazyColumn.addLazyColumn(colDesc, d, providerRef.current, position, () => { taggleRef.current.update(); }); - }; + }, [colorsRef]); const addScoreColumn = (score) => { const args = typeof options.additionalComputeScoreParameter === 'function' ? options.additionalComputeScoreParameter() : options.additionalComputeScoreParameter; const colDesc = score.createDesc(args); @@ -340,6 +341,21 @@ onAddScoreColumn, }) { } // eslint-disable-next-line react-hooks/exhaustive-deps }, []); + const stringCols = (_b = (_a = providerRef.current) === null || _a === void 0 ? void 0 : _a.getLastRanking()) === null || _b === void 0 ? void 0 : _b.flatColumns.toString(); + const columns = useMemo(() => { + var _a; + const ranking = (_a = providerRef.current) === null || _a === void 0 ? void 0 : _a.getLastRanking(); + return ranking ? ranking.flatColumns : []; + }, [stringCols]); + useEffect(() => { + const context = { + columns, + freeColor: (id) => colorsRef.current.freeColumnColor(id), + add: (columns) => columns.forEach((col) => addColumn(col.desc, col.data, col.id, col.position)), + remove: (columns) => columns.forEach((c) => c.removeMe()), + }; + onContextChanged === null || onContextChanged === void 0 ? void 0 : onContextChanged(context); + }, [addColumn, columns, onContextChanged, colorsRef]); const build = React.useMemo(() => async () => { setBusy(true); columnDesc.forEach((c) => providerRef.current.pushDesc({ ...c })); diff --git a/dist/lineup/Ranking.js.map b/dist/lineup/Ranking.js.map index f26f04669..fefa0d23f 100644 --- a/dist/lineup/Ranking.js.map +++ b/dist/lineup/Ranking.js.map @@ -1 +1 @@ -{"version":3,"file":"Ranking.js","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Ranking.js","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.d.ts.map b/dist/lineup/RankingViewComponent.d.ts.map index 2124c80c9..ec3dfcb38 100644 --- a/dist/lineup/RankingViewComponent.d.ts.map +++ b/dist/lineup/RankingViewComponent.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAqH5B"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAsI5B"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.js b/dist/lineup/RankingViewComponent.js index d870a750d..366d14419 100644 --- a/dist/lineup/RankingViewComponent.js +++ b/dist/lineup/RankingViewComponent.js @@ -1,7 +1,5 @@ -/* eslint-disable react-hooks/exhaustive-deps */ /* eslint-disable import/no-cycle */ -/* eslint-disable @typescript-eslint/no-shadow */ -import React, { useCallback, useRef } from 'react'; +import React, { useCallback, useMemo } from 'react'; import { Ranking } from './Ranking'; import { ERenderAuthorizationStatus } from '../auth/interfaces'; import { TDPTokenManager, TokenManager } from '../auth/TokenManager'; @@ -14,9 +12,10 @@ export function RankingViewComponent({ data = [], selection: inputSelection, ite * Maybe refactor this when using the native lineup implementation of scores */ onAddScoreColumn, }) { - const isMounted = useRef(false); - const selections = new Map(); const [context, setContext] = React.useState(null); + const selections = useMemo(() => { + return new Map(); + }, []); const viewRef = React.useRef(null); const runAuthorizations = useCallback(async () => { await TDPTokenManager.runAuthorizations(authorization, { @@ -68,6 +67,13 @@ onAddScoreColumn, }) { }); }, [runAuthorizations]); const { status } = useAsync(init, []); + React.useEffect(() => { + if (context) { + setContext({ ...context, selection: inputSelection }); + } + }, [inputSelection]); + // TODO:: Pretty sure this only works by blind luck, because the parameter changed update gets canceled on + // selection change because theyre both running at the same time, but its a race case /** * onInputSelectionChanged */ @@ -85,20 +91,21 @@ onAddScoreColumn, }) { } } } - }, [status, inputSelection, context]); + }, [status, context, selectionAdapter, inputSelection, selections]); /** * onParametersChanged */ React.useEffect(() => { - // ignore first time parameter are passed since there is no change - if (status === 'success' && parameters && isMounted.current) { + if (status === 'success' && parameters) { if (selectionAdapter) { selectionAdapter.parameterChanged(null, () => context); } } - isMounted.current = true; - }, [status, parameters, context]); + }, [status, parameters, context, selectionAdapter]); + const onContextChangedCallback = useCallback((newContext) => { + setContext({ ...newContext, selection: inputSelection }); + }, [inputSelection]); return (React.createElement("div", { ref: viewRef, className: `tdp-view lineup lu-taggle lu ${status !== 'success' && 'tdp-busy'}` }, - React.createElement(Ranking, { data: data, columnDesc: columnDesc, itemSelection: itemSelection, options: options, onItemSelect: onItemSelect, onContextChanged: (context) => setContext({ ...context, selection: inputSelection }), onAddScoreColumn: onAddScoreColumn, onBuiltLineUp: onBuiltLineUp, onItemSelectionChanged: onItemSelectionChanged, onCustomizeRanking: onCustomizeRanking, onUpdateEntryPoint: onUpdateEntryPoint }))); + React.createElement(Ranking, { data: data, columnDesc: columnDesc, itemSelection: itemSelection, options: options, onItemSelect: onItemSelect, onContextChanged: onContextChangedCallback, onAddScoreColumn: onAddScoreColumn, onBuiltLineUp: onBuiltLineUp, onItemSelectionChanged: onItemSelectionChanged, onCustomizeRanking: onCustomizeRanking, onUpdateEntryPoint: onUpdateEntryPoint }))); } //# sourceMappingURL=RankingViewComponent.js.map \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.js.map b/dist/lineup/RankingViewComponent.js.map index c9c4b8d38..e82ae7363 100644 --- a/dist/lineup/RankingViewComponent.js.map +++ b/dist/lineup/RankingViewComponent.js.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/lineup/Ranking.tsx b/src/lineup/Ranking.tsx index b53afe5c9..9f6aa463e 100644 --- a/src/lineup/Ranking.tsx +++ b/src/lineup/Ranking.tsx @@ -20,7 +20,7 @@ import { Ranking as LineUpRanking, UIntTypedArray, } from 'lineupjs'; -import React from 'react'; +import React, { useCallback, useEffect, useMemo } from 'react'; import { merge } from 'lodash'; import { ILazyLoadedColumn, LazyColumn } from './internal/column'; import { LineUpColors } from './internal/LineUpColors'; @@ -182,13 +182,16 @@ export function Ranking({ // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - const addColumn = (colDesc: any, d: Promise[]>, id: string = null, position?: number) => { - // use `colorMapping` as default; otherwise use `color`, which is deprecated; else get a new color - colDesc.colorMapping = colDesc.colorMapping ? colDesc.colorMapping : colDesc.color ? colDesc.color : colorsRef.current.getColumnColor(id); - return LazyColumn.addLazyColumn(colDesc, d, providerRef.current, position, () => { - taggleRef.current.update(); - }); - }; + const addColumn = useCallback( + (colDesc: any, d: Promise[]>, id: string = null, position?: number) => { + // use `colorMapping` as default; otherwise use `color`, which is deprecated; else get a new color + colDesc.colorMapping = colDesc.colorMapping ? colDesc.colorMapping : colDesc.color ? colDesc.color : colorsRef.current.getColumnColor(id); + return LazyColumn.addLazyColumn(colDesc, d, providerRef.current, position, () => { + taggleRef.current.update(); + }); + }, + [colorsRef], + ); const addScoreColumn = (score: IScore) => { const args = @@ -380,6 +383,7 @@ export function Ranking({ return { ...r, ...{ data: await r.data } }; }), ); + onAddScoreColumn?.(loadedResults); }); @@ -448,6 +452,23 @@ export function Ranking({ // eslint-disable-next-line react-hooks/exhaustive-deps }, []); + const stringCols = providerRef.current?.getLastRanking()?.flatColumns.toString(); + + const columns = useMemo(() => { + const ranking = providerRef.current?.getLastRanking(); + return ranking ? ranking.flatColumns : []; + }, [stringCols]); + + useEffect(() => { + const context = { + columns, + freeColor: (id: string) => colorsRef.current.freeColumnColor(id), + add: (columns: ISelectionColumn[]) => columns.forEach((col) => addColumn(col.desc, col.data, col.id, col.position)), + remove: (columns: Column[]) => columns.forEach((c) => c.removeMe()), + }; + onContextChanged?.(context); + }, [addColumn, columns, onContextChanged, colorsRef]); + const build = React.useMemo( () => async () => { setBusy(true); diff --git a/src/lineup/RankingViewComponent.tsx b/src/lineup/RankingViewComponent.tsx index 20c6e2296..71da130bd 100644 --- a/src/lineup/RankingViewComponent.tsx +++ b/src/lineup/RankingViewComponent.tsx @@ -1,7 +1,5 @@ -/* eslint-disable react-hooks/exhaustive-deps */ /* eslint-disable import/no-cycle */ -/* eslint-disable @typescript-eslint/no-shadow */ -import React, { useCallback, useRef } from 'react'; +import React, { useCallback, useMemo, useRef } from 'react'; import { Ranking, IRankingProps } from './Ranking'; import { ISelection } from '../base/interfaces'; import { IContext, ISelectionAdapter } from './selection/ISelectionAdapter'; @@ -44,9 +42,12 @@ export function RankingViewComponent({ */ onAddScoreColumn, }: IRankingViewComponentProps) { - const isMounted = useRef(false); - const selections = new Map(); const [context, setContext] = React.useState(null); + + const selections = useMemo(() => { + return new Map(); + }, []); + const viewRef = React.useRef(null); const runAuthorizations = useCallback(async (): Promise => { @@ -111,6 +112,15 @@ export function RankingViewComponent({ }, [runAuthorizations]); const { status } = useAsync(init, []); + React.useEffect(() => { + if (context) { + setContext({ ...context, selection: inputSelection }); + } + }, [inputSelection]); + + // TODO:: Pretty sure this only works by blind luck, because the parameter changed update gets canceled on + // selection change because theyre both running at the same time, but its a race case + /** * onInputSelectionChanged */ @@ -128,20 +138,25 @@ export function RankingViewComponent({ } } } - }, [status, inputSelection, context]); + }, [status, context, selectionAdapter, inputSelection, selections]); /** * onParametersChanged */ React.useEffect(() => { - // ignore first time parameter are passed since there is no change - if (status === 'success' && parameters && isMounted.current) { + if (status === 'success' && parameters) { if (selectionAdapter) { selectionAdapter.parameterChanged(null, () => context); } } - isMounted.current = true; - }, [status, parameters, context]); + }, [status, parameters, context, selectionAdapter]); + + const onContextChangedCallback = useCallback( + (newContext: Omit) => { + setContext({ ...newContext, selection: inputSelection }); + }, + [inputSelection], + ); return (
@@ -151,7 +166,7 @@ export function RankingViewComponent({ itemSelection={itemSelection} options={options} onItemSelect={onItemSelect} - onContextChanged={(context: Omit) => setContext({ ...context, selection: inputSelection })} + onContextChanged={onContextChangedCallback} onAddScoreColumn={onAddScoreColumn} onBuiltLineUp={onBuiltLineUp} onItemSelectionChanged={onItemSelectionChanged} From cd312f4a27fc20c72499eddd420c7d28b739e2c2 Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Wed, 11 May 2022 18:17:41 +0200 Subject: [PATCH 03/46] more bug fixes --- dist/lineup/Ranking.d.ts.map | 2 +- dist/lineup/Ranking.js | 2 ++ dist/lineup/Ranking.js.map | 2 +- dist/lineup/RankingViewComponent.d.ts.map | 2 +- dist/lineup/RankingViewComponent.js | 19 ++++++++-------- dist/lineup/RankingViewComponent.js.map | 2 +- src/lineup/Ranking.tsx | 2 ++ src/lineup/RankingViewComponent.tsx | 27 +++++++++-------------- 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dist/lineup/Ranking.d.ts.map b/dist/lineup/Ranking.d.ts.map index 9cb0e695a..8794d63ee 100644 --- a/dist/lineup/Ranking.d.ts.map +++ b/dist/lineup/Ranking.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Ranking.d.ts","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,iBAAiB,EAajB,WAAW,EAGZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,iBAAiB,EAAc,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAoB,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAElC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC;IAElE,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAE/C,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AA+DD,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,OAAO,CAAC,EACtB,IAAS,EACT,aAAyC,EACzC,UAAe,EACf,OAAO,EAAE,IAAS,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa;AACb;;GAEG;AACH,gBAAgB,GACjB,EAAE,aAAa,eA4Zf"} \ No newline at end of file +{"version":3,"file":"Ranking.d.ts","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,iBAAiB,EAajB,WAAW,EAGZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,iBAAiB,EAAc,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAoB,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAElC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC;IAElE,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAE/C,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AA+DD,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,OAAO,CAAC,EACtB,IAAS,EACT,aAAyC,EACzC,UAAe,EACf,OAAO,EAAE,IAAS,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa;AACb;;GAEG;AACH,gBAAgB,GACjB,EAAE,aAAa,eA8Zf"} \ No newline at end of file diff --git a/dist/lineup/Ranking.js b/dist/lineup/Ranking.js index d7308558c..4710a3f83 100644 --- a/dist/lineup/Ranking.js +++ b/dist/lineup/Ranking.js @@ -346,6 +346,8 @@ onAddScoreColumn, }) { var _a; const ranking = (_a = providerRef.current) === null || _a === void 0 ? void 0 : _a.getLastRanking(); return ranking ? ranking.flatColumns : []; + // This dep is needed because the columns are not part of a normal variable, only part of a ref. Probably should think of a better way. + // eslint-disable-next-line react-hooks/exhaustive-deps }, [stringCols]); useEffect(() => { const context = { diff --git a/dist/lineup/Ranking.js.map b/dist/lineup/Ranking.js.map index fefa0d23f..b61d4900f 100644 --- a/dist/lineup/Ranking.js.map +++ b/dist/lineup/Ranking.js.map @@ -1 +1 @@ -{"version":3,"file":"Ranking.js","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Ranking.js","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.d.ts.map b/dist/lineup/RankingViewComponent.d.ts.map index ec3dfcb38..18aa91dc5 100644 --- a/dist/lineup/RankingViewComponent.d.ts.map +++ b/dist/lineup/RankingViewComponent.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAsI5B"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAiI5B"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.js b/dist/lineup/RankingViewComponent.js index 366d14419..9cbc3c1ec 100644 --- a/dist/lineup/RankingViewComponent.js +++ b/dist/lineup/RankingViewComponent.js @@ -67,11 +67,6 @@ onAddScoreColumn, }) { }); }, [runAuthorizations]); const { status } = useAsync(init, []); - React.useEffect(() => { - if (context) { - setContext({ ...context, selection: inputSelection }); - } - }, [inputSelection]); // TODO:: Pretty sure this only works by blind luck, because the parameter changed update gets canceled on // selection change because theyre both running at the same time, but its a race case /** @@ -87,7 +82,9 @@ onAddScoreColumn, }) { selections.set(name, inputSelection); if (name === AView.DEFAULT_SELECTION_NAME) { if (selectionAdapter) { - selectionAdapter.selectionChanged(null, () => context); + selectionAdapter.selectionChanged(null, () => { + return { ...context, selection: inputSelection }; + }); } } } @@ -98,13 +95,15 @@ onAddScoreColumn, }) { React.useEffect(() => { if (status === 'success' && parameters) { if (selectionAdapter) { - selectionAdapter.parameterChanged(null, () => context); + selectionAdapter.parameterChanged(null, () => { + return { ...context, selection: inputSelection }; + }); } } - }, [status, parameters, context, selectionAdapter]); + }, [status, parameters, context, selectionAdapter, inputSelection]); const onContextChangedCallback = useCallback((newContext) => { - setContext({ ...newContext, selection: inputSelection }); - }, [inputSelection]); + setContext(newContext); + }, []); return (React.createElement("div", { ref: viewRef, className: `tdp-view lineup lu-taggle lu ${status !== 'success' && 'tdp-busy'}` }, React.createElement(Ranking, { data: data, columnDesc: columnDesc, itemSelection: itemSelection, options: options, onItemSelect: onItemSelect, onContextChanged: onContextChangedCallback, onAddScoreColumn: onAddScoreColumn, onBuiltLineUp: onBuiltLineUp, onItemSelectionChanged: onItemSelectionChanged, onCustomizeRanking: onCustomizeRanking, onUpdateEntryPoint: onUpdateEntryPoint }))); } diff --git a/dist/lineup/RankingViewComponent.js.map b/dist/lineup/RankingViewComponent.js.map index e82ae7363..00d2c11c0 100644 --- a/dist/lineup/RankingViewComponent.js.map +++ b/dist/lineup/RankingViewComponent.js.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/lineup/Ranking.tsx b/src/lineup/Ranking.tsx index 9f6aa463e..d6e670b21 100644 --- a/src/lineup/Ranking.tsx +++ b/src/lineup/Ranking.tsx @@ -457,6 +457,8 @@ export function Ranking({ const columns = useMemo(() => { const ranking = providerRef.current?.getLastRanking(); return ranking ? ranking.flatColumns : []; + // This dep is needed because the columns are not part of a normal variable, only part of a ref. Probably should think of a better way. + // eslint-disable-next-line react-hooks/exhaustive-deps }, [stringCols]); useEffect(() => { diff --git a/src/lineup/RankingViewComponent.tsx b/src/lineup/RankingViewComponent.tsx index 71da130bd..f6dbbc176 100644 --- a/src/lineup/RankingViewComponent.tsx +++ b/src/lineup/RankingViewComponent.tsx @@ -42,7 +42,7 @@ export function RankingViewComponent({ */ onAddScoreColumn, }: IRankingViewComponentProps) { - const [context, setContext] = React.useState(null); + const [context, setContext] = React.useState>(null); const selections = useMemo(() => { return new Map(); @@ -112,12 +112,6 @@ export function RankingViewComponent({ }, [runAuthorizations]); const { status } = useAsync(init, []); - React.useEffect(() => { - if (context) { - setContext({ ...context, selection: inputSelection }); - } - }, [inputSelection]); - // TODO:: Pretty sure this only works by blind luck, because the parameter changed update gets canceled on // selection change because theyre both running at the same time, but its a race case @@ -134,7 +128,9 @@ export function RankingViewComponent({ selections.set(name, inputSelection); if (name === AView.DEFAULT_SELECTION_NAME) { if (selectionAdapter) { - selectionAdapter.selectionChanged(null, () => context); + selectionAdapter.selectionChanged(null, () => { + return { ...context, selection: inputSelection }; + }); } } } @@ -146,17 +142,16 @@ export function RankingViewComponent({ React.useEffect(() => { if (status === 'success' && parameters) { if (selectionAdapter) { - selectionAdapter.parameterChanged(null, () => context); + selectionAdapter.parameterChanged(null, () => { + return { ...context, selection: inputSelection }; + }); } } - }, [status, parameters, context, selectionAdapter]); + }, [status, parameters, context, selectionAdapter, inputSelection]); - const onContextChangedCallback = useCallback( - (newContext: Omit) => { - setContext({ ...newContext, selection: inputSelection }); - }, - [inputSelection], - ); + const onContextChangedCallback = useCallback((newContext: Omit) => { + setContext(newContext); + }, []); return (
From 09de131cffcf13ce9068442818bc692df3bfeb2b Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Fri, 13 May 2022 13:52:06 +0200 Subject: [PATCH 04/46] Refactor multi selection adapter - Add optional `diffSubtypes` to `IMultiSelectionAdapter` - Remove `ReprovisynMultiSelectionAdapter` - Add generics to `MultiSelectionAdapter` - Comment functions of `MultiSelectionAdapter` --- .../ReprovisynMultiSelectionAdapter.d.ts | 44 -------- .../ReprovisynMultiSelectionAdapter.d.ts.map | 1 - .../ReprovisynMultiSelectionAdapter.js | 57 ---------- .../ReprovisynMultiSelectionAdapter.js.map | 1 - src/lineup/selection/AdapterUtils.ts | 26 ++--- .../internal/ABaseSelectionAdapter.ts | 2 +- .../internal/MultiSelectionAdapter.ts | 93 ++++++++++------ .../ReprovisynMultiSelectionAdapter.ts | 103 ------------------ .../internal/SingleSelectionAdapter.ts | 4 +- 9 files changed, 75 insertions(+), 256 deletions(-) delete mode 100644 dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.d.ts delete mode 100644 dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.d.ts.map delete mode 100644 dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.js delete mode 100644 dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.js.map delete mode 100644 src/lineup/selection/internal/ReprovisynMultiSelectionAdapter.ts diff --git a/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.d.ts b/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.d.ts deleted file mode 100644 index 5edc555d5..000000000 --- a/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.d.ts +++ /dev/null @@ -1,44 +0,0 @@ -import { IContext } from '../ISelectionAdapter'; -import { IAdditionalColumnDesc, IScoreRow } from '../../../base/interfaces'; -import { ABaseSelectionAdapter } from './ABaseSelectionAdapter'; -export interface IReprovisynMultiSelectionAdapter { - /** - * returns the list of currently selected sub types - * @returns {string[]} - */ - getSelectedSubTypes(): { - entityId: string; - columnSelection: string; - }[]; - /** - * create the column descriptions for the given selection and sub types - * @param {string} id the id - * @param {string[]} subTypes the currently selected sub types - * @returns {Promise} the created descriptions - */ - createDescs(id: string, subTypes: { - entityId: string; - columnSelection: string; - }[]): Promise | IAdditionalColumnDesc[]; - /** - * load the data for the given selection and the selected descriptions - * @param {string} id the id - * @param {IAdditionalColumnDesc[]} descs list of scores to load - * @returns {Promise[][]>} data - */ - loadData(id: string, descs: IAdditionalColumnDesc[]): Promise[]>[]; -} -export declare class ReprovisynMultiSelectionAdapter extends ABaseSelectionAdapter { - private readonly adapter; - constructor(adapter: IReprovisynMultiSelectionAdapter); - protected parameterChangedImpl(context: IContext): Promise; - protected createColumnsFor(context: IContext, id: string): Promise<{ - desc: IAdditionalColumnDesc; - data: Promise[]>; - id: string; - position: number; - }[]>; - private removePartialDynamicColumns; - private computePositionToInsert; -} -//# sourceMappingURL=ReprovisynMultiSelectionAdapter.d.ts.map \ No newline at end of file diff --git a/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.d.ts.map deleted file mode 100644 index 2c9cf98ec..000000000 --- a/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"ReprovisynMultiSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ReprovisynMultiSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,gCAAgC;IAC/C;;;OAGG;IACH,mBAAmB,IAAI;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAEvE;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,qBAAqB,EAAE,CAAC;IAE/I;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;CACnF;AAED,qBAAa,+BAAgC,SAAQ,qBAAqB;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,gCAAgC;IAItE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ;IAMhD,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM;;;;;;IA4BxD,OAAO,CAAC,2BAA2B;IA2BnC,OAAO,CAAC,uBAAuB;CAOhC"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.js b/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.js deleted file mode 100644 index 586094ec9..000000000 --- a/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.js +++ /dev/null @@ -1,57 +0,0 @@ -import { difference } from 'lodash'; -import { ABaseSelectionAdapter } from './ABaseSelectionAdapter'; -export class ReprovisynMultiSelectionAdapter extends ABaseSelectionAdapter { - constructor(adapter) { - super(); - this.adapter = adapter; - } - parameterChangedImpl(context) { - const selectedIds = context.selection.ids; - this.removePartialDynamicColumns(context, selectedIds); - return this.addDynamicColumns(context, selectedIds); - } - createColumnsFor(context, id) { - return Promise.resolve(this.adapter.createDescs(id, this.adapter.getSelectedSubTypes())).then((descs) => { - if (descs.length <= 0) { - return []; - } - descs.forEach((d) => ABaseSelectionAdapter.patchDesc(d, id)); - const usedCols = context.columns.filter((col) => col.desc.selectedSubtype !== undefined); - const dynamicColumnIDs = usedCols.map((col) => `${col.desc.selectedId}_${col.desc.selectedSubtype}`); - // Save which columns have been added for a specific element in the selection - const selectedElements = descs.map((desc) => `${id}_${desc.selectedSubtype}`); - // Check which items are new and should therefore be added as columns - const addedParameters = difference(selectedElements, dynamicColumnIDs); - if (addedParameters.length <= 0) { - return []; - } - // Filter the descriptions to only leave the new columns and load them - const columnsToBeAdded = descs.filter((desc) => addedParameters.includes(`${id}_${desc.selectedSubtype}`)); - const data = this.adapter.loadData(id, columnsToBeAdded); - const position = this.computePositionToInsert(context, id); - return columnsToBeAdded.map((desc, i) => ({ desc, data: data[i], id, position })); - }); - } - removePartialDynamicColumns(context, ids) { - const { columns } = context; - const selectedSubTypes = this.adapter.getSelectedSubTypes(); - if (selectedSubTypes.length === 0) { - ids.forEach((id) => context.freeColor(id)); - } - const usedCols = columns.filter((col) => col.desc.selectedSubtype !== undefined); - // get available all current subtypes from lineup - const dynamicColumnSubtypes = usedCols.map((col) => col.desc.selectedSubtype); - // check which parameters have been removed - const removedParameters = difference(dynamicColumnSubtypes, selectedSubTypes.map((s) => s.columnSelection)); - context.remove([].concat(...removedParameters.map((param) => { - return usedCols.filter((d) => d.desc.selectedSubtype === param); - }))); - } - computePositionToInsert(context, id) { - const ids = context.columns.map((col) => col.desc.selectedId); - // find index to insert the column or append it at the end - const lastIndex = ids.lastIndexOf(id); - return lastIndex === -1 ? context.columns.length : lastIndex + 1; - } -} -//# sourceMappingURL=ReprovisynMultiSelectionAdapter.js.map \ No newline at end of file diff --git a/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.js.map b/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.js.map deleted file mode 100644 index 2c5ba56d1..000000000 --- a/dist/lineup/selection/internal/ReprovisynMultiSelectionAdapter.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"ReprovisynMultiSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ReprovisynMultiSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/lineup/selection/AdapterUtils.ts b/src/lineup/selection/AdapterUtils.ts index cd7de39be..86e0828b5 100644 --- a/src/lineup/selection/AdapterUtils.ts +++ b/src/lineup/selection/AdapterUtils.ts @@ -1,34 +1,30 @@ import { ISelectionAdapter } from './ISelectionAdapter'; import { SingleSelectionAdapter, ISingleSelectionAdapter } from './internal/SingleSelectionAdapter'; import { MultiSelectionAdapter, IMultiSelectionAdapter } from './internal/MultiSelectionAdapter'; -import { IReprovisynMultiSelectionAdapter, ReprovisynMultiSelectionAdapter } from './internal/ReprovisynMultiSelectionAdapter'; export class AdapterUtils { /** - * create a single selection adapter, i.e. that one selected item results in one additional column in LineUp - * @param {ISingleSelectionAdapter} adapter for loading and creating of those columns - * @returns {ISelectionAdapter} + * Create a single selection adapter, i.e. that one selected item results in one additional column in LineUp + * @param adapter Adapter for loading and creating of those columns + * @returns Returns the selection adapter */ static single(adapter: ISingleSelectionAdapter): ISelectionAdapter { return new SingleSelectionAdapter(adapter); } /** - * create a multi selection adapter, i.e that one selected item results in N additional columsn in LineUp - * @param {IMultiSelectionAdapter} adapter adapter for loading and creating of those columns - * @returns {ISelectionAdapter} + * Create a multi selection adapter, i.e that one selected item results in N additional columms in LineUp + * The generic `T` is typing the _selected subtypes_ which is by default a list of strings. + * @param adapter Adapter adapter for loading and creating of those columns + * @returns Returns the selection adapter */ - static multi(adapter: IMultiSelectionAdapter): ISelectionAdapter { - return new MultiSelectionAdapter(adapter); - } - - static reprovisynMulti(adapter: IReprovisynMultiSelectionAdapter): ISelectionAdapter { - return new ReprovisynMultiSelectionAdapter(adapter); + static multi(adapter: IMultiSelectionAdapter): ISelectionAdapter { + return new MultiSelectionAdapter(adapter); } /** - * no columns for selected items - * @returns {ISelectionAdapter} + * No columns for selected items + * @returns Returns a no-op selection adapter */ static none(): ISelectionAdapter { return { diff --git a/src/lineup/selection/internal/ABaseSelectionAdapter.ts b/src/lineup/selection/internal/ABaseSelectionAdapter.ts index be9cf4056..c02312f42 100644 --- a/src/lineup/selection/internal/ABaseSelectionAdapter.ts +++ b/src/lineup/selection/internal/ABaseSelectionAdapter.ts @@ -3,7 +3,7 @@ import { IAdditionalColumnDesc } from '../../../base/interfaces'; import { ISelectionColumn, IContext, ISelectionAdapter } from '../ISelectionAdapter'; export abstract class ABaseSelectionAdapter implements ISelectionAdapter { - protected addDynamicColumns(context: IContext, ids: string[]) { + protected async addDynamicColumns(context: IContext, ids: string[]) { return Promise.all(ids.map((id) => this.createColumnsFor(context, id))).then((columns) => { // sort new columns to insert them in the correct order const flattenedColumns = [].concat(...columns).map((d, i) => ({ d, i })); diff --git a/src/lineup/selection/internal/MultiSelectionAdapter.ts b/src/lineup/selection/internal/MultiSelectionAdapter.ts index 9a28af719..4109e8129 100644 --- a/src/lineup/selection/internal/MultiSelectionAdapter.ts +++ b/src/lineup/selection/internal/MultiSelectionAdapter.ts @@ -1,46 +1,77 @@ -import { difference } from 'lodash'; -import { IContext } from '../ISelectionAdapter'; +import { difference, isFunction } from 'lodash'; +import { IContext, ISelectionColumn } from '../ISelectionAdapter'; import { IAdditionalColumnDesc, IScoreRow } from '../../../base/interfaces'; import { ABaseSelectionAdapter } from './ABaseSelectionAdapter'; -export interface IMultiSelectionAdapter { +export interface IMultiSelectionAdapter { /** - * returns the list of currently selected sub types - * @returns {string[]} + * Returns the list of currently selected subtypes + * By default the generic `T` defaults to a list of strings. + * @returns List of subtypes */ - getSelectedSubTypes(): string[]; + getSelectedSubTypes(): T[]; // TODO rename to `getSelectedSubtypes` with lower-case `T` /** - * create the column descriptions for the given selection and sub types - * @param {string} id the id - * @param {string[]} subTypes the currently selected sub types - * @returns {Promise} the created descriptions + * Create the column descriptions for the given selection and subtypes + * @param id the id + * @param subtypes the currently selected subtypes + * @returns the created column descs */ - createDescs(id: string, subTypes: string[]): Promise | IAdditionalColumnDesc[]; + createDescs(id: string, subtypes: T[]): Promise | IAdditionalColumnDesc[]; /** - * load the data for the given selection and the selected descriptions + * Load the data for the given selection and the selected descriptions * @param {string} id the id * @param {IAdditionalColumnDesc[]} descs list of scores to load * @returns {Promise[][]>} data */ loadData(id: string, descs: IAdditionalColumnDesc[]): Promise[]>[]; + + /** + * Compute the difference between the subtypes from the columns in the context and + * the selected subtypes. The returned list of subtypes is used to remove the + * corresponding columns from the ranking. + * + * If this function is undefined the `MultiSelectionAdapter` uses lodash's `difference` + * function to retrieve the list. + * + * @param columnSubtypes Subtypes from the columns in the ranking + * @param selectedSubtypes Selected subtypes from `getSelectedSubTypes()` + * @returns A list of remove subtypes + */ + diffSubtypes?(columnSubtypes: string[], selectedSubtypes: T[]): string[]; } -export class MultiSelectionAdapter extends ABaseSelectionAdapter { - constructor(private readonly adapter: IMultiSelectionAdapter) { +export class MultiSelectionAdapter extends ABaseSelectionAdapter { + constructor(private readonly adapter: IMultiSelectionAdapter) { super(); } - protected parameterChangedImpl(context: IContext) { + /** + * Update columns in ranking when the parameter (e.g., subtype) of a view changes. + * Columns are automatically removed and added to keep the columns from the context + * and the selected subtypes in sync. + * + * @param context selection adapter context + * @returns A promise to wait until all new columns have been added + */ + protected parameterChangedImpl(context: IContext): Promise { const selectedIds = context.selection.ids; - this.removePartialDynamicColumns(context, selectedIds); - return this.addDynamicColumns(context, selectedIds); + this.removePartialDynamicColumns(context, selectedIds); // sync function + return this.addDynamicColumns(context, selectedIds); // async function } - protected createColumnsFor(context: IContext, id: string) { - const selectedSubTypes = this.adapter.getSelectedSubTypes(); - return Promise.resolve(this.adapter.createDescs(id, selectedSubTypes)).then((descs) => { + /** + * Create one or multiple LineUp column descs + additional information for each selected sub-type and given id. + * + * @param context selection adapter context + * @param id id for which columns should be added + * @returns a promise that returns a list of LineUp column desc and additional information to add them to the ranking + */ + protected createColumnsFor(context: IContext, id: string): PromiseLike { + const selectedSubtypes = this.adapter.getSelectedSubTypes(); + + return Promise.resolve(this.adapter.createDescs(id, selectedSubtypes)).then((descs) => { if (descs.length <= 0) { return []; } @@ -69,8 +100,8 @@ export class MultiSelectionAdapter extends ABaseSelectionAdapter { private removePartialDynamicColumns(context: IContext, ids: string[]): void { const { columns } = context; - const selectedSubTypes = this.adapter.getSelectedSubTypes(); - if (selectedSubTypes.length === 0) { + const selectedSubtypes = this.adapter.getSelectedSubTypes(); + if (selectedSubtypes.length === 0) { ids.forEach((id) => context.freeColor(id)); } @@ -79,19 +110,17 @@ export class MultiSelectionAdapter extends ABaseSelectionAdapter { // get available all current subtypes from lineup const dynamicColumnSubtypes = usedCols.map((col) => (col.desc).selectedSubtype); - // check which parameters have been removed - const removedParameters = difference(dynamicColumnSubtypes, selectedSubTypes); + // check which subtypes have been removed + const removedSubtypes = isFunction(this.adapter.diffSubtypes) + ? this.adapter.diffSubtypes(dynamicColumnSubtypes, selectedSubtypes) + : difference(dynamicColumnSubtypes, selectedSubtypes as unknown as string[]); // type cast to string[] because of generic `T = string` + + const columsToRemove = removedSubtypes.map((subtype) => usedCols.filter((d) => (d.desc).selectedSubtype === subtype)).flat(); - context.remove( - [].concat( - ...removedParameters.map((param) => { - return usedCols.filter((d) => (d.desc).selectedSubtype === param); - }), - ), - ); + context.remove(columsToRemove); } - private computePositionToInsert(context: IContext, id: string) { + private computePositionToInsert(context: IContext, id: string): number { const ids = context.columns.map((col) => (col.desc).selectedId); // find index to insert the column or append it at the end diff --git a/src/lineup/selection/internal/ReprovisynMultiSelectionAdapter.ts b/src/lineup/selection/internal/ReprovisynMultiSelectionAdapter.ts deleted file mode 100644 index ccca85bc9..000000000 --- a/src/lineup/selection/internal/ReprovisynMultiSelectionAdapter.ts +++ /dev/null @@ -1,103 +0,0 @@ -import { difference } from 'lodash'; -import { IContext } from '../ISelectionAdapter'; -import { IAdditionalColumnDesc, IScoreRow } from '../../../base/interfaces'; -import { ABaseSelectionAdapter } from './ABaseSelectionAdapter'; - -export interface IReprovisynMultiSelectionAdapter { - /** - * returns the list of currently selected sub types - * @returns {string[]} - */ - getSelectedSubTypes(): { entityId: string; columnSelection: string }[]; - - /** - * create the column descriptions for the given selection and sub types - * @param {string} id the id - * @param {string[]} subTypes the currently selected sub types - * @returns {Promise} the created descriptions - */ - createDescs(id: string, subTypes: { entityId: string; columnSelection: string }[]): Promise | IAdditionalColumnDesc[]; - - /** - * load the data for the given selection and the selected descriptions - * @param {string} id the id - * @param {IAdditionalColumnDesc[]} descs list of scores to load - * @returns {Promise[][]>} data - */ - loadData(id: string, descs: IAdditionalColumnDesc[]): Promise[]>[]; -} - -export class ReprovisynMultiSelectionAdapter extends ABaseSelectionAdapter { - constructor(private readonly adapter: IReprovisynMultiSelectionAdapter) { - super(); - } - - protected parameterChangedImpl(context: IContext) { - const selectedIds = context.selection.ids; - this.removePartialDynamicColumns(context, selectedIds); - return this.addDynamicColumns(context, selectedIds); - } - - protected createColumnsFor(context: IContext, id: string) { - return Promise.resolve(this.adapter.createDescs(id, this.adapter.getSelectedSubTypes())).then((descs) => { - if (descs.length <= 0) { - return []; - } - descs.forEach((d) => ABaseSelectionAdapter.patchDesc(d, id)); - - const usedCols = context.columns.filter((col) => (col.desc).selectedSubtype !== undefined); - const dynamicColumnIDs = usedCols.map((col) => `${(col.desc).selectedId}_${(col.desc).selectedSubtype}`); - // Save which columns have been added for a specific element in the selection - const selectedElements = descs.map((desc) => `${id}_${desc.selectedSubtype}`); - - // Check which items are new and should therefore be added as columns - const addedParameters = difference(selectedElements, dynamicColumnIDs); - - if (addedParameters.length <= 0) { - return []; - } - // Filter the descriptions to only leave the new columns and load them - const columnsToBeAdded = descs.filter((desc) => addedParameters.includes(`${id}_${desc.selectedSubtype}`)); - const data = this.adapter.loadData(id, columnsToBeAdded); - - const position = this.computePositionToInsert(context, id); - - return columnsToBeAdded.map((desc, i) => ({ desc, data: data[i], id, position })); - }); - } - - private removePartialDynamicColumns(context: IContext, ids: string[]): void { - const { columns } = context; - const selectedSubTypes = this.adapter.getSelectedSubTypes(); - if (selectedSubTypes.length === 0) { - ids.forEach((id) => context.freeColor(id)); - } - - const usedCols = columns.filter((col) => (col.desc).selectedSubtype !== undefined); - - // get available all current subtypes from lineup - const dynamicColumnSubtypes = usedCols.map((col) => (col.desc).selectedSubtype); - - // check which parameters have been removed - const removedParameters = difference( - dynamicColumnSubtypes, - selectedSubTypes.map((s) => s.columnSelection), - ); - - context.remove( - [].concat( - ...removedParameters.map((param) => { - return usedCols.filter((d) => (d.desc).selectedSubtype === param); - }), - ), - ); - } - - private computePositionToInsert(context: IContext, id: string) { - const ids = context.columns.map((col) => (col.desc).selectedId); - - // find index to insert the column or append it at the end - const lastIndex = ids.lastIndexOf(id); - return lastIndex === -1 ? context.columns.length : lastIndex + 1; - } -} diff --git a/src/lineup/selection/internal/SingleSelectionAdapter.ts b/src/lineup/selection/internal/SingleSelectionAdapter.ts index 1c3b55c3b..34f7b73b9 100644 --- a/src/lineup/selection/internal/SingleSelectionAdapter.ts +++ b/src/lineup/selection/internal/SingleSelectionAdapter.ts @@ -1,5 +1,5 @@ import { ABaseSelectionAdapter } from './ABaseSelectionAdapter'; -import { IContext } from '../ISelectionAdapter'; +import { IContext, ISelectionColumn } from '../ISelectionAdapter'; import { IAdditionalColumnDesc, IScoreRow } from '../../../base/interfaces'; export interface ISingleSelectionAdapter { @@ -40,7 +40,7 @@ export class SingleSelectionAdapter extends ABaseSelectionAdapter { return this.addDynamicColumns(context, selectedIds); } - protected createColumnsFor(context: IContext, id: string) { + protected createColumnsFor(context: IContext, id: string): PromiseLike { return Promise.resolve(this.adapter.createDesc(id)).then((desc) => [ { desc: ABaseSelectionAdapter.patchDesc(desc, id), From 7c1aa95a22cac6ddc7045924d3e81db9fce15518 Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Fri, 13 May 2022 14:18:14 +0200 Subject: [PATCH 05/46] Replace `PromiseLike` with `Promise` + async/await See also https://masteringjs.io/tutorials/fundamentals/promise-resolve --- dist/lineup/selection/AdapterUtils.d.ts | 21 +++-- dist/lineup/selection/AdapterUtils.d.ts.map | 2 +- dist/lineup/selection/AdapterUtils.js | 21 +++-- dist/lineup/selection/AdapterUtils.js.map | 2 +- dist/lineup/selection/ISelectionAdapter.d.ts | 4 +- .../selection/ISelectionAdapter.d.ts.map | 2 +- .../internal/ABaseSelectionAdapter.d.ts | 30 ++++++- .../internal/ABaseSelectionAdapter.d.ts.map | 2 +- .../internal/ABaseSelectionAdapter.js | 14 +++- .../internal/ABaseSelectionAdapter.js.map | 2 +- .../internal/MultiSelectionAdapter.d.ts | 62 ++++++++++----- .../internal/MultiSelectionAdapter.d.ts.map | 2 +- .../internal/MultiSelectionAdapter.js | 79 +++++++++++-------- .../internal/MultiSelectionAdapter.js.map | 2 +- .../internal/SingleSelectionAdapter.d.ts | 15 ++-- .../internal/SingleSelectionAdapter.d.ts.map | 2 +- .../internal/SingleSelectionAdapter.js | 14 +++- .../internal/SingleSelectionAdapter.js.map | 2 +- src/lineup/selection/ISelectionAdapter.ts | 4 +- .../internal/ABaseSelectionAdapter.ts | 35 ++++++-- .../internal/MultiSelectionAdapter.ts | 43 +++++----- .../internal/SingleSelectionAdapter.ts | 14 +++- 22 files changed, 243 insertions(+), 131 deletions(-) diff --git a/dist/lineup/selection/AdapterUtils.d.ts b/dist/lineup/selection/AdapterUtils.d.ts index 75a0c2e79..5ef7e989e 100644 --- a/dist/lineup/selection/AdapterUtils.d.ts +++ b/dist/lineup/selection/AdapterUtils.d.ts @@ -1,24 +1,23 @@ import { ISelectionAdapter } from './ISelectionAdapter'; import { ISingleSelectionAdapter } from './internal/SingleSelectionAdapter'; import { IMultiSelectionAdapter } from './internal/MultiSelectionAdapter'; -import { IReprovisynMultiSelectionAdapter } from './internal/ReprovisynMultiSelectionAdapter'; export declare class AdapterUtils { /** - * create a single selection adapter, i.e. that one selected item results in one additional column in LineUp - * @param {ISingleSelectionAdapter} adapter for loading and creating of those columns - * @returns {ISelectionAdapter} + * Create a single selection adapter, i.e. that one selected item results in one additional column in LineUp + * @param adapter Adapter for loading and creating of those columns + * @returns Returns the selection adapter */ static single(adapter: ISingleSelectionAdapter): ISelectionAdapter; /** - * create a multi selection adapter, i.e that one selected item results in N additional columsn in LineUp - * @param {IMultiSelectionAdapter} adapter adapter for loading and creating of those columns - * @returns {ISelectionAdapter} + * Create a multi selection adapter, i.e that one selected item results in N additional columms in LineUp + * The generic `T` is typing the _selected subtypes_ which is by default a list of strings. + * @param adapter Adapter adapter for loading and creating of those columns + * @returns Returns the selection adapter */ - static multi(adapter: IMultiSelectionAdapter): ISelectionAdapter; - static reprovisynMulti(adapter: IReprovisynMultiSelectionAdapter): ISelectionAdapter; + static multi(adapter: IMultiSelectionAdapter): ISelectionAdapter; /** - * no columns for selected items - * @returns {ISelectionAdapter} + * No columns for selected items + * @returns Returns a no-op selection adapter */ static none(): ISelectionAdapter; } diff --git a/dist/lineup/selection/AdapterUtils.d.ts.map b/dist/lineup/selection/AdapterUtils.d.ts.map index e3d6072b5..19e342b86 100644 --- a/dist/lineup/selection/AdapterUtils.d.ts.map +++ b/dist/lineup/selection/AdapterUtils.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"AdapterUtils.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/AdapterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAA0B,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AACpG,OAAO,EAAyB,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AACjG,OAAO,EAAE,gCAAgC,EAAmC,MAAM,4CAA4C,CAAC;AAE/H,qBAAa,YAAY;IACvB;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,uBAAuB,GAAG,iBAAiB;IAIlE;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,sBAAsB,GAAG,iBAAiB;IAIhE,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,gCAAgC,GAAG,iBAAiB;IAIpF;;;OAGG;IACH,MAAM,CAAC,IAAI,IAAI,iBAAiB;CAMjC"} \ No newline at end of file +{"version":3,"file":"AdapterUtils.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/AdapterUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAA0B,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AACpG,OAAO,EAAyB,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAEjG,qBAAa,YAAY;IACvB;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,uBAAuB,GAAG,iBAAiB;IAIlE;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,GAAG,iBAAiB;IAI/E;;;OAGG;IACH,MAAM,CAAC,IAAI,IAAI,iBAAiB;CAMjC"} \ No newline at end of file diff --git a/dist/lineup/selection/AdapterUtils.js b/dist/lineup/selection/AdapterUtils.js index 99e652f6e..c0f013adf 100644 --- a/dist/lineup/selection/AdapterUtils.js +++ b/dist/lineup/selection/AdapterUtils.js @@ -1,29 +1,26 @@ import { SingleSelectionAdapter } from './internal/SingleSelectionAdapter'; import { MultiSelectionAdapter } from './internal/MultiSelectionAdapter'; -import { ReprovisynMultiSelectionAdapter } from './internal/ReprovisynMultiSelectionAdapter'; export class AdapterUtils { /** - * create a single selection adapter, i.e. that one selected item results in one additional column in LineUp - * @param {ISingleSelectionAdapter} adapter for loading and creating of those columns - * @returns {ISelectionAdapter} + * Create a single selection adapter, i.e. that one selected item results in one additional column in LineUp + * @param adapter Adapter for loading and creating of those columns + * @returns Returns the selection adapter */ static single(adapter) { return new SingleSelectionAdapter(adapter); } /** - * create a multi selection adapter, i.e that one selected item results in N additional columsn in LineUp - * @param {IMultiSelectionAdapter} adapter adapter for loading and creating of those columns - * @returns {ISelectionAdapter} + * Create a multi selection adapter, i.e that one selected item results in N additional columms in LineUp + * The generic `T` is typing the _selected subtypes_ which is by default a list of strings. + * @param adapter Adapter adapter for loading and creating of those columns + * @returns Returns the selection adapter */ static multi(adapter) { return new MultiSelectionAdapter(adapter); } - static reprovisynMulti(adapter) { - return new ReprovisynMultiSelectionAdapter(adapter); - } /** - * no columns for selected items - * @returns {ISelectionAdapter} + * No columns for selected items + * @returns Returns a no-op selection adapter */ static none() { return { diff --git a/dist/lineup/selection/AdapterUtils.js.map b/dist/lineup/selection/AdapterUtils.js.map index 1f288d711..6c35b59d0 100644 --- a/dist/lineup/selection/AdapterUtils.js.map +++ b/dist/lineup/selection/AdapterUtils.js.map @@ -1 +1 @@ -{"version":3,"file":"AdapterUtils.js","sourceRoot":"","sources":["../../../src/lineup/selection/AdapterUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAA2B,MAAM,mCAAmC,CAAC;AACpG,OAAO,EAAE,qBAAqB,EAA0B,MAAM,kCAAkC,CAAC;AACjG,OAAO,EAAoC,+BAA+B,EAAE,MAAM,4CAA4C,CAAC;AAE/H,MAAM,OAAO,YAAY;IACvB;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,OAAgC;QAC5C,OAAO,IAAI,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,OAA+B;QAC1C,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,OAAyC;QAC9D,OAAO,IAAI,+BAA+B,CAAC,OAAO,CAAC,CAAC;IACtD,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,IAAI;QACT,OAAO;YACL,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;YACjC,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;SAClC,CAAC;IACJ,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"AdapterUtils.js","sourceRoot":"","sources":["../../../src/lineup/selection/AdapterUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAA2B,MAAM,mCAAmC,CAAC;AACpG,OAAO,EAAE,qBAAqB,EAA0B,MAAM,kCAAkC,CAAC;AAEjG,MAAM,OAAO,YAAY;IACvB;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,OAAgC;QAC5C,OAAO,IAAI,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAa,OAAkC;QACzD,OAAO,IAAI,qBAAqB,CAAI,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,IAAI;QACT,OAAO;YACL,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;YACjC,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;SAClC,CAAC;IACJ,CAAC;CACF"} \ No newline at end of file diff --git a/dist/lineup/selection/ISelectionAdapter.d.ts b/dist/lineup/selection/ISelectionAdapter.d.ts index 647888a9b..527c3fa9d 100644 --- a/dist/lineup/selection/ISelectionAdapter.d.ts +++ b/dist/lineup/selection/ISelectionAdapter.d.ts @@ -42,11 +42,11 @@ export interface ISelectionAdapter { * called when a parameter has changed * @param {IContext} context */ - parameterChanged(waitForIt: Promise | null, context: () => IContext): PromiseLike; + parameterChanged(waitForIt: Promise | null, context: () => IContext): Promise; /** * called when the input selection has changed * @param {IContext} context */ - selectionChanged(waitForIt: Promise | null, context: () => IContext): PromiseLike; + selectionChanged(waitForIt: Promise | null, context: () => IContext): Promise; } //# sourceMappingURL=ISelectionAdapter.d.ts.map \ No newline at end of file diff --git a/dist/lineup/selection/ISelectionAdapter.d.ts.map b/dist/lineup/selection/ISelectionAdapter.d.ts.map index 67c05950b..0045162cf 100644 --- a/dist/lineup/selection/ISelectionAdapter.d.ts.map +++ b/dist/lineup/selection/ISelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ISelectionAdapter.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/ISelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAEvC;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAE;IAE1B;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAE5F;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;CAC7F"} \ No newline at end of file +{"version":3,"file":"ISelectionAdapter.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/ISelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAEvC;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAE;IAE1B;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAExF;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACzF"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts index d31959626..ba5f2a120 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts @@ -5,11 +5,33 @@ export declare abstract class ABaseSelectionAdapter implements ISelectionAdapter protected removeDynamicColumns(context: IContext, ids: string[]): void; private waitingForSelection; private waitingForParameter; - selectionChanged(waitForIt: PromiseLike | null, context: () => IContext): PromiseLike; - parameterChanged(waitForIt: PromiseLike | null, context: () => IContext): PromiseLike; - protected abstract parameterChangedImpl(context: IContext): PromiseLike; + /** + * Add or remove columns in LineUp ranking when the selected items in the selection adapter context change + * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing + * @param context selection adapter context + * @returns A promise that can waited for until the columns have been changed. + */ + selectionChanged(waitForIt: Promise | null, context: () => IContext): Promise; + /** + * Add or remove columns in LineUp ranking when the parametrs in the selection adapter context change + * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing + * @param context selection adapter context + * @returns A promise that can waited for until the columns have been changed. + */ + parameterChanged(waitForIt: Promise | null, context: () => IContext): Promise; + protected abstract parameterChangedImpl(context: IContext): Promise; protected selectionChangedImpl(context: IContext): Promise; - protected abstract createColumnsFor(context: IContext, id: string): PromiseLike; + /** + * Create a column desc with additional metadata for a given selected id. + * + * The function is marked as abstract, because based on the implementation one or multiple columns + * can be added for the given id. + * + * @param context selection adapter context + * @param id id of the selected item + * @returns A promise with the list of columns + additional metadata + */ + protected abstract createColumnsFor(context: IContext, id: string): Promise; static patchDesc(desc: IAdditionalColumnDesc, selectedId: string): IAdditionalColumnDesc; } //# sourceMappingURL=ABaseSelectionAdapter.d.ts.map \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map index d0226a522..1a3a2b010 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ABaseSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAErF,8BAAsB,qBAAsB,YAAW,iBAAiB;IACtE,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE;IAe5D,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI;IAYtE,OAAO,CAAC,mBAAmB,CAAiC;IAE5D,OAAO,CAAC,mBAAmB,CAAiC;IAE5D,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ;IAW5E,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ;IAmB5E,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC;IAE5E,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ;IAqBhD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,WAAW,CAAC,gBAAgB,EAAE,CAAC;IAEnG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM;CAIjE"} \ No newline at end of file +{"version":3,"file":"ABaseSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAErF,8BAAsB,qBAAsB,YAAW,iBAAiB;cACtD,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE;IAelE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI;IAYtE,OAAO,CAAC,mBAAmB,CAA6B;IAExD,OAAO,CAAC,mBAAmB,CAA6B;IAExD;;;;;OAKG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAYvF;;;;;OAKG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ;IAmBxE,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAExE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ;IAqBhD;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE/F,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM;CAIjE"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.js b/dist/lineup/selection/internal/ABaseSelectionAdapter.js index f5f3e6c26..e94015d13 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.js +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.js @@ -4,7 +4,7 @@ export class ABaseSelectionAdapter { this.waitingForSelection = null; this.waitingForParameter = null; } - addDynamicColumns(context, ids) { + async addDynamicColumns(context, ids) { return Promise.all(ids.map((id) => this.createColumnsFor(context, id))).then((columns) => { // sort new columns to insert them in the correct order const flattenedColumns = [].concat(...columns).map((d, i) => ({ d, i })); @@ -25,6 +25,12 @@ export class ABaseSelectionAdapter { return columns.filter((d) => d.desc.selectedId === id); }))); } + /** + * Add or remove columns in LineUp ranking when the selected items in the selection adapter context change + * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing + * @param context selection adapter context + * @returns A promise that can waited for until the columns have been changed. + */ selectionChanged(waitForIt, context) { if (this.waitingForSelection) { return this.waitingForSelection; @@ -35,6 +41,12 @@ export class ABaseSelectionAdapter { this.waitingForSelection = null; })); } + /** + * Add or remove columns in LineUp ranking when the parametrs in the selection adapter context change + * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing + * @param context selection adapter context + * @returns A promise that can waited for until the columns have been changed. + */ parameterChanged(waitForIt, context) { if (this.waitingForSelection) { return this.waitingForSelection; diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map b/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map index 21fede5ff..98200f586 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"ABaseSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ABaseSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts b/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts index 60df02bf7..ae36ab4aa 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts @@ -1,37 +1,61 @@ -import { IContext } from '../ISelectionAdapter'; +import { IContext, ISelectionColumn } from '../ISelectionAdapter'; import { IAdditionalColumnDesc, IScoreRow } from '../../../base/interfaces'; import { ABaseSelectionAdapter } from './ABaseSelectionAdapter'; -export interface IMultiSelectionAdapter { +export interface IMultiSelectionAdapter { /** - * returns the list of currently selected sub types - * @returns {string[]} + * Returns the list of currently selected subtypes + * By default the generic `T` defaults to a list of strings. + * @returns List of subtypes */ - getSelectedSubTypes(): string[]; + getSelectedSubTypes(): T[]; /** - * create the column descriptions for the given selection and sub types - * @param {string} id the id - * @param {string[]} subTypes the currently selected sub types - * @returns {Promise} the created descriptions + * Create the column descriptions for the given selection and subtypes + * @param id the id + * @param subtypes the currently selected subtypes + * @returns the created column descs */ - createDescs(id: string, subTypes: string[]): Promise | IAdditionalColumnDesc[]; + createDescs(id: string, subtypes: T[]): Promise | IAdditionalColumnDesc[]; /** - * load the data for the given selection and the selected descriptions + * Load the data for the given selection and the selected descriptions * @param {string} id the id * @param {IAdditionalColumnDesc[]} descs list of scores to load * @returns {Promise[][]>} data */ loadData(id: string, descs: IAdditionalColumnDesc[]): Promise[]>[]; + /** + * Compute the difference between the subtypes from the columns in the context and + * the selected subtypes. The returned list of subtypes is used to remove the + * corresponding columns from the ranking. + * + * If this function is undefined the `MultiSelectionAdapter` uses lodash's `difference` + * function to retrieve the list. + * + * @param columnSubtypes Subtypes from the columns in the ranking + * @param selectedSubtypes Selected subtypes from `getSelectedSubTypes()` + * @returns A list of remove subtypes + */ + diffSubtypes?(columnSubtypes: string[], selectedSubtypes: T[]): string[]; } -export declare class MultiSelectionAdapter extends ABaseSelectionAdapter { +export declare class MultiSelectionAdapter extends ABaseSelectionAdapter { private readonly adapter; - constructor(adapter: IMultiSelectionAdapter); + constructor(adapter: IMultiSelectionAdapter); + /** + * Update columns in ranking when the parameter (e.g., subtype) of a view changes. + * Columns are automatically removed and added to keep the columns from the context + * and the selected subtypes in sync. + * + * @param context selection adapter context + * @returns A promise to wait until all new columns have been added + */ protected parameterChangedImpl(context: IContext): Promise; - protected createColumnsFor(context: IContext, id: string): Promise<{ - desc: IAdditionalColumnDesc; - data: Promise[]>; - id: string; - position: number; - }[]>; + /** + * Create one or multiple LineUp column descs + additional information for each selected sub-type and given id. + * + * @param context selection adapter context + * @param id id for which columns should be added + * @returns a promise that returns a list of LineUp column desc and additional information to add them to the ranking + */ + protected createColumnsFor(context: IContext, id: string): Promise; private removePartialDynamicColumns; private computePositionToInsert; } diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map index 47f94173d..afad866a1 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"MultiSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,mBAAmB,IAAI,MAAM,EAAE,CAAC;IAEhC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,qBAAqB,EAAE,CAAC;IAExG;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;CACnF;AAED,qBAAa,qBAAsB,SAAQ,qBAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,sBAAsB;IAI5D,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ;IAMhD,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM;;;;;;IA6BxD,OAAO,CAAC,2BAA2B;IAwBnC,OAAO,CAAC,uBAAuB;CAOhC"} \ No newline at end of file +{"version":3,"file":"MultiSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,MAAM;IAChD;;;;OAIG;IACH,mBAAmB,IAAI,CAAC,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,qBAAqB,EAAE,CAAC;IAEnG;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;IAElF;;;;;;;;;;;OAWG;IACH,YAAY,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC;CAC1E;AAED,qBAAa,qBAAqB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,qBAAqB;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAI/D;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAMhE;;;;;;OAMG;cACa,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA+B5F,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,uBAAuB;CAOhC"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.js b/dist/lineup/selection/internal/MultiSelectionAdapter.js index af025f8b9..e3c745cbb 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.js +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.js @@ -1,52 +1,67 @@ -import { difference } from 'lodash'; +import { difference, isFunction } from 'lodash'; import { ABaseSelectionAdapter } from './ABaseSelectionAdapter'; export class MultiSelectionAdapter extends ABaseSelectionAdapter { constructor(adapter) { super(); this.adapter = adapter; } + /** + * Update columns in ranking when the parameter (e.g., subtype) of a view changes. + * Columns are automatically removed and added to keep the columns from the context + * and the selected subtypes in sync. + * + * @param context selection adapter context + * @returns A promise to wait until all new columns have been added + */ parameterChangedImpl(context) { const selectedIds = context.selection.ids; - this.removePartialDynamicColumns(context, selectedIds); - return this.addDynamicColumns(context, selectedIds); + this.removePartialDynamicColumns(context, selectedIds); // sync function + return this.addDynamicColumns(context, selectedIds); // async function } - createColumnsFor(context, id) { - const selectedSubTypes = this.adapter.getSelectedSubTypes(); - return Promise.resolve(this.adapter.createDescs(id, selectedSubTypes)).then((descs) => { - if (descs.length <= 0) { - return []; - } - descs.forEach((d) => ABaseSelectionAdapter.patchDesc(d, id)); - const usedCols = context.columns.filter((col) => col.desc.selectedSubtype !== undefined); - const dynamicColumnIDs = usedCols.map((col) => `${col.desc.selectedId}_${col.desc.selectedSubtype}`); - // Save which columns have been added for a specific element in the selection - const selectedElements = descs.map((desc) => `${id}_${desc.selectedSubtype}`); - // Check which items are new and should therefore be added as columns - const addedParameters = difference(selectedElements, dynamicColumnIDs); - if (addedParameters.length <= 0) { - return []; - } - // Filter the descriptions to only leave the new columns and load them - const columnsToBeAdded = descs.filter((desc) => addedParameters.includes(`${id}_${desc.selectedSubtype}`)); - const data = this.adapter.loadData(id, columnsToBeAdded); - const position = this.computePositionToInsert(context, id); - return columnsToBeAdded.map((desc, i) => ({ desc, data: data[i], id, position })); - }); + /** + * Create one or multiple LineUp column descs + additional information for each selected sub-type and given id. + * + * @param context selection adapter context + * @param id id for which columns should be added + * @returns a promise that returns a list of LineUp column desc and additional information to add them to the ranking + */ + async createColumnsFor(context, id) { + const selectedSubtypes = this.adapter.getSelectedSubTypes(); + const descs = await this.adapter.createDescs(id, selectedSubtypes); + if (descs.length <= 0) { + return []; + } + descs.forEach((d) => ABaseSelectionAdapter.patchDesc(d, id)); + const usedCols = context.columns.filter((col) => col.desc.selectedSubtype !== undefined); + const dynamicColumnIDs = usedCols.map((col) => `${col.desc.selectedId}_${col.desc.selectedSubtype}`); + // Save which columns have been added for a specific element in the selection + const selectedElements = descs.map((desc) => `${id}_${desc.selectedSubtype}`); + // Check which items are new and should therefore be added as columns + const addedParameters = difference(selectedElements, dynamicColumnIDs); + if (addedParameters.length <= 0) { + return []; + } + // Filter the descriptions to only leave the new columns and load them + const columnsToBeAdded = descs.filter((desc) => addedParameters.includes(`${id}_${desc.selectedSubtype}`)); + const data = this.adapter.loadData(id, columnsToBeAdded); + const position = this.computePositionToInsert(context, id); + return columnsToBeAdded.map((desc, i) => ({ desc, data: data[i], id, position })); } removePartialDynamicColumns(context, ids) { const { columns } = context; - const selectedSubTypes = this.adapter.getSelectedSubTypes(); - if (selectedSubTypes.length === 0) { + const selectedSubtypes = this.adapter.getSelectedSubTypes(); + if (selectedSubtypes.length === 0) { ids.forEach((id) => context.freeColor(id)); } const usedCols = columns.filter((col) => col.desc.selectedSubtype !== undefined); // get available all current subtypes from lineup const dynamicColumnSubtypes = usedCols.map((col) => col.desc.selectedSubtype); - // check which parameters have been removed - const removedParameters = difference(dynamicColumnSubtypes, selectedSubTypes); - context.remove([].concat(...removedParameters.map((param) => { - return usedCols.filter((d) => d.desc.selectedSubtype === param); - }))); + // check which subtypes have been removed + const removedSubtypes = isFunction(this.adapter.diffSubtypes) + ? this.adapter.diffSubtypes(dynamicColumnSubtypes, selectedSubtypes) + : difference(dynamicColumnSubtypes, selectedSubtypes); // type cast to string[] because of generic `T = string` + const columsToRemove = removedSubtypes.map((subtype) => usedCols.filter((d) => d.desc.selectedSubtype === subtype)).flat(); + context.remove(columsToRemove); } computePositionToInsert(context, id) { const ids = context.columns.map((col) => col.desc.selectedId); diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.js.map b/dist/lineup/selection/internal/MultiSelectionAdapter.js.map index ea2c047db..540bdbfcc 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"MultiSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"MultiSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts b/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts index bd27d456b..100a1a6b1 100644 --- a/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts +++ b/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts @@ -1,5 +1,5 @@ import { ABaseSelectionAdapter } from './ABaseSelectionAdapter'; -import { IContext } from '../ISelectionAdapter'; +import { IContext, ISelectionColumn } from '../ISelectionAdapter'; import { IAdditionalColumnDesc, IScoreRow } from '../../../base/interfaces'; export interface ISingleSelectionAdapter { /** @@ -19,10 +19,13 @@ export declare class SingleSelectionAdapter extends ABaseSelectionAdapter { private readonly adapter; constructor(adapter: ISingleSelectionAdapter); protected parameterChangedImpl(context: IContext): Promise; - protected createColumnsFor(context: IContext, id: string): Promise<{ - desc: IAdditionalColumnDesc; - data: Promise[]>; - id: string; - }[]>; + /** + * Creates a single column desc with additional metadata for a given selected id. + * + * @param context selection adapter context + * @param id id of the selected item + * @returns A promise with a list containing a single columns + additional metadata + */ + protected createColumnsFor(_context: IContext, id: string): Promise; } //# sourceMappingURL=SingleSelectionAdapter.d.ts.map \ No newline at end of file diff --git a/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map index 71547c96b..203ffae92 100644 --- a/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"SingleSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE5E,MAAM,WAAW,uBAAuB;IACtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,CAAC;IAE/E;;;;OAIG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CACjD;AAED,qBAAa,sBAAuB,SAAQ,qBAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,uBAAuB;IAI7D,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ;IAiBhD,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM;;;;;CASzD"} \ No newline at end of file +{"version":3,"file":"SingleSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE5E,MAAM,WAAW,uBAAuB;IACtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,CAAC;IAE/E;;;;OAIG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CACjD;AAED,qBAAa,sBAAuB,SAAQ,qBAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,uBAAuB;IAI7D,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ;IAiBhD;;;;;;OAMG;cACa,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAU9F"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/SingleSelectionAdapter.js b/dist/lineup/selection/internal/SingleSelectionAdapter.js index a87c9b533..b0bd3efdf 100644 --- a/dist/lineup/selection/internal/SingleSelectionAdapter.js +++ b/dist/lineup/selection/internal/SingleSelectionAdapter.js @@ -19,14 +19,22 @@ export class SingleSelectionAdapter extends ABaseSelectionAdapter { } return this.addDynamicColumns(context, selectedIds); } - createColumnsFor(context, id) { - return Promise.resolve(this.adapter.createDesc(id)).then((desc) => [ + /** + * Creates a single column desc with additional metadata for a given selected id. + * + * @param context selection adapter context + * @param id id of the selected item + * @returns A promise with a list containing a single columns + additional metadata + */ + async createColumnsFor(_context, id) { + const desc = await this.adapter.createDesc(id); + return [ { desc: ABaseSelectionAdapter.patchDesc(desc, id), data: this.adapter.loadData(id), id, }, - ]); + ]; } } //# sourceMappingURL=SingleSelectionAdapter.js.map \ No newline at end of file diff --git a/dist/lineup/selection/internal/SingleSelectionAdapter.js.map b/dist/lineup/selection/internal/SingleSelectionAdapter.js.map index 5e2cfd6b5..e42c33c95 100644 --- a/dist/lineup/selection/internal/SingleSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/SingleSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"SingleSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAoBhE,MAAM,OAAO,sBAAuB,SAAQ,qBAAqB;IAC/D,YAA6B,OAAgC;QAC3D,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAyB;IAE7D,CAAC;IAES,oBAAoB,CAAC,OAAiB;QAC9C,6BAA6B;QAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;QAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,CAAC,CAAC;QAErF,4BAA4B;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;SAClD;QACD,6BAA6B;QAC7B,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAES,gBAAgB,CAAC,OAAiB,EAAE,EAAU;QACtD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YACjE;gBACE,IAAI,EAAE,qBAAqB,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC/C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/B,EAAE;aACH;SACF,CAAC,CAAC;IACL,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"SingleSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAoBhE,MAAM,OAAO,sBAAuB,SAAQ,qBAAqB;IAC/D,YAA6B,OAAgC;QAC3D,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAyB;IAE7D,CAAC;IAES,oBAAoB,CAAC,OAAiB;QAC9C,6BAA6B;QAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;QAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,CAAC,CAAC;QAErF,4BAA4B;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;SAClD;QACD,6BAA6B;QAC7B,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,gBAAgB,CAAC,QAAkB,EAAE,EAAU;QAC7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC/C,OAAO;YACL;gBACE,IAAI,EAAE,qBAAqB,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC/C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/B,EAAE;aACH;SACF,CAAC;IACJ,CAAC;CACF"} \ No newline at end of file diff --git a/src/lineup/selection/ISelectionAdapter.ts b/src/lineup/selection/ISelectionAdapter.ts index cd3f258c6..4367395ba 100644 --- a/src/lineup/selection/ISelectionAdapter.ts +++ b/src/lineup/selection/ISelectionAdapter.ts @@ -48,11 +48,11 @@ export interface ISelectionAdapter { * called when a parameter has changed * @param {IContext} context */ - parameterChanged(waitForIt: Promise | null, context: () => IContext): PromiseLike; + parameterChanged(waitForIt: Promise | null, context: () => IContext): Promise; /** * called when the input selection has changed * @param {IContext} context */ - selectionChanged(waitForIt: Promise | null, context: () => IContext): PromiseLike; + selectionChanged(waitForIt: Promise | null, context: () => IContext): Promise; } diff --git a/src/lineup/selection/internal/ABaseSelectionAdapter.ts b/src/lineup/selection/internal/ABaseSelectionAdapter.ts index c02312f42..5744f0a92 100644 --- a/src/lineup/selection/internal/ABaseSelectionAdapter.ts +++ b/src/lineup/selection/internal/ABaseSelectionAdapter.ts @@ -30,14 +30,21 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { ); } - private waitingForSelection: PromiseLike | null = null; + private waitingForSelection: Promise | null = null; - private waitingForParameter: PromiseLike | null = null; + private waitingForParameter: Promise | null = null; - selectionChanged(waitForIt: PromiseLike | null, context: () => IContext) { + /** + * Add or remove columns in LineUp ranking when the selected items in the selection adapter context change + * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing + * @param context selection adapter context + * @returns A promise that can waited for until the columns have been changed. + */ + selectionChanged(waitForIt: Promise | null, context: () => IContext): Promise { if (this.waitingForSelection) { return this.waitingForSelection; } + return (this.waitingForSelection = Promise.resolve(waitForIt) .then(() => this.selectionChangedImpl(context())) .then(() => { @@ -45,7 +52,13 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { })); } - parameterChanged(waitForIt: PromiseLike | null, context: () => IContext) { + /** + * Add or remove columns in LineUp ranking when the parametrs in the selection adapter context change + * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing + * @param context selection adapter context + * @returns A promise that can waited for until the columns have been changed. + */ + parameterChanged(waitForIt: Promise | null, context: () => IContext) { if (this.waitingForSelection) { return this.waitingForSelection; } @@ -64,7 +77,7 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { })); } - protected abstract parameterChangedImpl(context: IContext): PromiseLike; + protected abstract parameterChangedImpl(context: IContext): Promise; protected selectionChangedImpl(context: IContext) { const selectedIds = context.selection.ids; @@ -87,7 +100,17 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { return this.addDynamicColumns(context, diffAdded); } - protected abstract createColumnsFor(context: IContext, id: string): PromiseLike; + /** + * Create a column desc with additional metadata for a given selected id. + * + * The function is marked as abstract, because based on the implementation one or multiple columns + * can be added for the given id. + * + * @param context selection adapter context + * @param id id of the selected item + * @returns A promise with the list of columns + additional metadata + */ + protected abstract createColumnsFor(context: IContext, id: string): Promise; static patchDesc(desc: IAdditionalColumnDesc, selectedId: string) { desc.selectedId = selectedId; diff --git a/src/lineup/selection/internal/MultiSelectionAdapter.ts b/src/lineup/selection/internal/MultiSelectionAdapter.ts index 4109e8129..f385a0047 100644 --- a/src/lineup/selection/internal/MultiSelectionAdapter.ts +++ b/src/lineup/selection/internal/MultiSelectionAdapter.ts @@ -68,34 +68,35 @@ export class MultiSelectionAdapter extends ABaseSelectionAdapter { * @param id id for which columns should be added * @returns a promise that returns a list of LineUp column desc and additional information to add them to the ranking */ - protected createColumnsFor(context: IContext, id: string): PromiseLike { + protected async createColumnsFor(context: IContext, id: string): Promise { const selectedSubtypes = this.adapter.getSelectedSubTypes(); - return Promise.resolve(this.adapter.createDescs(id, selectedSubtypes)).then((descs) => { - if (descs.length <= 0) { - return []; - } - descs.forEach((d) => ABaseSelectionAdapter.patchDesc(d, id)); + const descs = await this.adapter.createDescs(id, selectedSubtypes); - const usedCols = context.columns.filter((col) => (col.desc).selectedSubtype !== undefined); - const dynamicColumnIDs = usedCols.map((col) => `${(col.desc).selectedId}_${(col.desc).selectedSubtype}`); - // Save which columns have been added for a specific element in the selection - const selectedElements = descs.map((desc) => `${id}_${desc.selectedSubtype}`); + if (descs.length <= 0) { + return []; + } + + descs.forEach((d) => ABaseSelectionAdapter.patchDesc(d, id)); - // Check which items are new and should therefore be added as columns - const addedParameters = difference(selectedElements, dynamicColumnIDs); + const usedCols = context.columns.filter((col) => (col.desc).selectedSubtype !== undefined); + const dynamicColumnIDs = usedCols.map((col) => `${(col.desc).selectedId}_${(col.desc).selectedSubtype}`); + // Save which columns have been added for a specific element in the selection + const selectedElements = descs.map((desc) => `${id}_${desc.selectedSubtype}`); - if (addedParameters.length <= 0) { - return []; - } - // Filter the descriptions to only leave the new columns and load them - const columnsToBeAdded = descs.filter((desc) => addedParameters.includes(`${id}_${desc.selectedSubtype}`)); - const data = this.adapter.loadData(id, columnsToBeAdded); + // Check which items are new and should therefore be added as columns + const addedParameters = difference(selectedElements, dynamicColumnIDs); + + if (addedParameters.length <= 0) { + return []; + } + // Filter the descriptions to only leave the new columns and load them + const columnsToBeAdded = descs.filter((desc) => addedParameters.includes(`${id}_${desc.selectedSubtype}`)); + const data = this.adapter.loadData(id, columnsToBeAdded); - const position = this.computePositionToInsert(context, id); + const position = this.computePositionToInsert(context, id); - return columnsToBeAdded.map((desc, i) => ({ desc, data: data[i], id, position })); - }); + return columnsToBeAdded.map((desc, i) => ({ desc, data: data[i], id, position })); } private removePartialDynamicColumns(context: IContext, ids: string[]): void { diff --git a/src/lineup/selection/internal/SingleSelectionAdapter.ts b/src/lineup/selection/internal/SingleSelectionAdapter.ts index 34f7b73b9..2ccbc24f7 100644 --- a/src/lineup/selection/internal/SingleSelectionAdapter.ts +++ b/src/lineup/selection/internal/SingleSelectionAdapter.ts @@ -40,13 +40,21 @@ export class SingleSelectionAdapter extends ABaseSelectionAdapter { return this.addDynamicColumns(context, selectedIds); } - protected createColumnsFor(context: IContext, id: string): PromiseLike { - return Promise.resolve(this.adapter.createDesc(id)).then((desc) => [ + /** + * Creates a single column desc with additional metadata for a given selected id. + * + * @param context selection adapter context + * @param id id of the selected item + * @returns A promise with a list containing a single columns + additional metadata + */ + protected async createColumnsFor(_context: IContext, id: string): Promise { + const desc = await this.adapter.createDesc(id); + return [ { desc: ABaseSelectionAdapter.patchDesc(desc, id), data: this.adapter.loadData(id), id, }, - ]); + ]; } } From 5c1891c4a7c277558d7ebf1627ae1ce6fea09c95 Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Fri, 13 May 2022 14:28:26 +0200 Subject: [PATCH 06/46] Replace `() => IContext` with `IContext` Unecessary convoluted call --- dist/lineup/ARankingView.d.ts | 2 +- dist/lineup/ARankingView.d.ts.map | 2 +- dist/lineup/ARankingView.js | 8 ++++---- dist/lineup/ARankingView.js.map | 2 +- dist/lineup/RankingViewComponent.d.ts | 1 - dist/lineup/RankingViewComponent.d.ts.map | 2 +- dist/lineup/RankingViewComponent.js | 12 ++++++------ dist/lineup/RankingViewComponent.js.map | 2 +- dist/lineup/selection/ISelectionAdapter.d.ts | 4 ++-- dist/lineup/selection/ISelectionAdapter.d.ts.map | 2 +- .../selection/internal/ABaseSelectionAdapter.d.ts | 4 ++-- .../internal/ABaseSelectionAdapter.d.ts.map | 2 +- .../selection/internal/ABaseSelectionAdapter.js | 4 ++-- .../selection/internal/ABaseSelectionAdapter.js.map | 2 +- src/lineup/ARankingView.ts | 8 ++++---- src/lineup/RankingViewComponent.tsx | 12 ++++++------ src/lineup/selection/ISelectionAdapter.ts | 4 ++-- .../selection/internal/ABaseSelectionAdapter.ts | 8 ++++---- 18 files changed, 40 insertions(+), 41 deletions(-) diff --git a/dist/lineup/ARankingView.d.ts b/dist/lineup/ARankingView.d.ts index f01adb93a..612f71942 100644 --- a/dist/lineup/ARankingView.d.ts +++ b/dist/lineup/ARankingView.d.ts @@ -90,7 +90,7 @@ export declare abstract class ARankingView extends AView { protected parameterChanged(name: string): PromiseLike | void; protected itemSelectionChanged(): PromiseLike | void; protected selectionChanged(): PromiseLike | void; - private createContext; + private createSelectionAdapterContext; /** * Expand/collapse certain columns on mode change. * Expand = focus view diff --git a/dist/lineup/ARankingView.d.ts.map b/dist/lineup/ARankingView.d.ts.map index fb5a5870a..99b3442dd 100644 --- a/dist/lineup/ARankingView.d.ts.map +++ b/dist/lineup/ARankingView.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ARankingView.d.ts","sourceRoot":"","sources":["../../src/lineup/ARankingView.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ARankingView.d.ts","sourceRoot":"","sources":["../../src/lineup/ARankingView.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/ARankingView.js b/dist/lineup/ARankingView.js index 317433fdd..6c9fd3ddc 100644 --- a/dist/lineup/ARankingView.js +++ b/dist/lineup/ARankingView.js @@ -286,7 +286,7 @@ export class ARankingView extends AView { parameterChanged(name) { super.parameterChanged(name); if (this.selectionAdapter) { - return this.selectionAdapter.parameterChanged(this.built, () => this.createContext()); + return this.selectionAdapter.parameterChanged(this.built, this.createSelectionAdapterContext()); } return undefined; } @@ -297,11 +297,11 @@ export class ARankingView extends AView { } selectionChanged() { if (this.selectionAdapter) { - return this.selectionAdapter.selectionChanged(this.built, () => this.createContext()); + return this.selectionAdapter.selectionChanged(this.built, this.createSelectionAdapterContext()); } return undefined; } - createContext() { + createSelectionAdapterContext() { const ranking = this.provider.getLastRanking(); const columns = ranking ? ranking.flatColumns : []; return { @@ -555,7 +555,7 @@ export class ARankingView extends AView { .then(() => { if (this.selectionAdapter) { // init first time - return this.selectionAdapter.selectionChanged(null, () => this.createContext()); + return this.selectionAdapter.selectionChanged(null, this.createSelectionAdapterContext()); } return undefined; }) diff --git a/dist/lineup/ARankingView.js.map b/dist/lineup/ARankingView.js.map index a5f70b8de..b1531cf18 100644 --- a/dist/lineup/ARankingView.js.map +++ b/dist/lineup/ARankingView.js.map @@ -1 +1 @@ -{"version":3,"file":"ARankingView.js","sourceRoot":"","sources":["../../src/lineup/ARankingView.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ARankingView.js","sourceRoot":"","sources":["../../src/lineup/ARankingView.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.d.ts b/dist/lineup/RankingViewComponent.d.ts index 56b84fd55..83e84acd4 100644 --- a/dist/lineup/RankingViewComponent.d.ts +++ b/dist/lineup/RankingViewComponent.d.ts @@ -1,4 +1,3 @@ -/// import { IRankingProps } from './Ranking'; import { ISelection } from '../base/interfaces'; import { ISelectionAdapter } from './selection/ISelectionAdapter'; diff --git a/dist/lineup/RankingViewComponent.d.ts.map b/dist/lineup/RankingViewComponent.d.ts.map index ccebdc50d..2124c80c9 100644 --- a/dist/lineup/RankingViewComponent.d.ts.map +++ b/dist/lineup/RankingViewComponent.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAqH5B"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAqH5B"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.js b/dist/lineup/RankingViewComponent.js index d870a750d..199e7aaab 100644 --- a/dist/lineup/RankingViewComponent.js +++ b/dist/lineup/RankingViewComponent.js @@ -16,7 +16,7 @@ export function RankingViewComponent({ data = [], selection: inputSelection, ite onAddScoreColumn, }) { const isMounted = useRef(false); const selections = new Map(); - const [context, setContext] = React.useState(null); + const [selectionAdapterContext, setSelectionAdapterContext] = React.useState(null); const viewRef = React.useRef(null); const runAuthorizations = useCallback(async () => { await TDPTokenManager.runAuthorizations(authorization, { @@ -81,11 +81,11 @@ onAddScoreColumn, }) { selections.set(name, inputSelection); if (name === AView.DEFAULT_SELECTION_NAME) { if (selectionAdapter) { - selectionAdapter.selectionChanged(null, () => context); + selectionAdapter.selectionChanged(null, selectionAdapterContext); } } } - }, [status, inputSelection, context]); + }, [status, inputSelection, selectionAdapterContext]); /** * onParametersChanged */ @@ -93,12 +93,12 @@ onAddScoreColumn, }) { // ignore first time parameter are passed since there is no change if (status === 'success' && parameters && isMounted.current) { if (selectionAdapter) { - selectionAdapter.parameterChanged(null, () => context); + selectionAdapter.parameterChanged(null, selectionAdapterContext); } } isMounted.current = true; - }, [status, parameters, context]); + }, [status, parameters, selectionAdapterContext]); return (React.createElement("div", { ref: viewRef, className: `tdp-view lineup lu-taggle lu ${status !== 'success' && 'tdp-busy'}` }, - React.createElement(Ranking, { data: data, columnDesc: columnDesc, itemSelection: itemSelection, options: options, onItemSelect: onItemSelect, onContextChanged: (context) => setContext({ ...context, selection: inputSelection }), onAddScoreColumn: onAddScoreColumn, onBuiltLineUp: onBuiltLineUp, onItemSelectionChanged: onItemSelectionChanged, onCustomizeRanking: onCustomizeRanking, onUpdateEntryPoint: onUpdateEntryPoint }))); + React.createElement(Ranking, { data: data, columnDesc: columnDesc, itemSelection: itemSelection, options: options, onItemSelect: onItemSelect, onContextChanged: (context) => setSelectionAdapterContext({ ...context, selection: inputSelection }), onAddScoreColumn: onAddScoreColumn, onBuiltLineUp: onBuiltLineUp, onItemSelectionChanged: onItemSelectionChanged, onCustomizeRanking: onCustomizeRanking, onUpdateEntryPoint: onUpdateEntryPoint }))); } //# sourceMappingURL=RankingViewComponent.js.map \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.js.map b/dist/lineup/RankingViewComponent.js.map index c9c4b8d38..61c8fb0a7 100644 --- a/dist/lineup/RankingViewComponent.js.map +++ b/dist/lineup/RankingViewComponent.js.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,oCAAoC;AACpC,iDAAiD;AACjD,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,OAAO,EAAiB,MAAM,WAAW,CAAC;AAGnD,OAAO,EAAE,0BAA0B,EAA+B,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAe/C,MAAM,UAAU,oBAAoB,CAAC,EACnC,IAAI,GAAG,EAAE,EACT,SAAS,EAAE,cAAc,EACzB,aAAa,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,EACzC,UAAU,GAAG,EAAE,EACf,UAAU,GAAG,KAAK,EAClB,gBAAgB,GAAG,IAAI,EACvB,OAAO,GAAG,EAAE,EACZ,aAAa,GAAG,IAAI,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACW;IAC3B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAChC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAsB,CAAC;IACjD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAW,IAAI,CAAC,CAAC;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAwB,IAAI,CAAC,CAAC;IAE1D,MAAM,iBAAiB,GAAG,WAAW,CAAC,KAAK,IAAmB,EAAE;QAC9D,MAAM,eAAe,CAAC,iBAAiB,CAAC,aAAa,EAAE;YACrD,MAAM,EAAE,CAAC,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;gBACxD,4CAA4C;gBAC5C,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAiB,4BAA4B,CAAC,CAAC;gBAC1F,IAAI,CAAC,OAAO,EAAE;oBACZ,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;oBAC7D,OAAO,CAAC,SAAS,GAAG,2BAA2B,CAAC;oBAChD,wDAAwD;oBACxD,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;iBACtC;gBAED,IAAI,MAAM,KAAK,0BAA0B,CAAC,OAAO,EAAE;oBACjD,OAAO,CAAC,MAAM,EAAE,CAAC;iBAClB;qBAAM;oBACL,OAAO,CAAC,SAAS,GAAG;sBAER,KAAK;wBACH,CAAC,CAAC,8CAA8C,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAC/E,oCAAoC,CACrC,IAAI,KAAK,CAAC,QAAQ,EAAE,QAAQ;wBAC/B,CAAC,CAAC,EACN;;4CAEwB,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,sCAAsC,EAAE,EAAE,IAAI,EAAE,iBAAiB,CAAC,IAAI,EAAE,CAAC;4DAC7F,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IACtF,MAAM,KAAK,SAAS;wBAClB,CAAC,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,2CAA2C,CAAC;wBAClF,CAAC,CAAC,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,oCAAoC,CAC9E;6BACmB,CAAC;oBAEpB,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,OAAO,GAAG,KAAK,IAAI,EAAE;wBACnD,OAAO,EAAE,CAAC;oBACZ,CAAC,CAAC;iBACH;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpB,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,gCAAgC;QAChC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAC;IAC/D,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAClC,eAAe,CAAC,EAAE,CAAC,YAAY,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACtE,qEAAqE;YACrE,MAAM,iBAAiB,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,yCAAyC;QACzC,MAAM,iBAAiB,EAAE,CAAC;QAE1B,qFAAqF;QACrF,eAAe,CAAC,EAAE,CAAC,YAAY,CAAC,0BAA0B,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE;YACjF,kEAAkE;YAClE,yBAAyB;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACxB,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAEtC;;OAEG;IACH,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,MAAM,KAAK,SAAS,EAAE;YACxB,MAAM,IAAI,GAAG,KAAK,CAAC,sBAAsB,CAAC;YAC1C,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,OAAO,IAAI,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE;gBACjE,OAAO;aACR;YACD,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACrC,IAAI,IAAI,KAAK,KAAK,CAAC,sBAAsB,EAAE;gBACzC,IAAI,gBAAgB,EAAE;oBACpB,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;iBACxD;aACF;SACF;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;IAEtC;;OAEG;IACH,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,kEAAkE;QAClE,IAAI,MAAM,KAAK,SAAS,IAAI,UAAU,IAAI,SAAS,CAAC,OAAO,EAAE;YAC3D,IAAI,gBAAgB,EAAE;gBACpB,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;aACxD;SACF;QACD,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC;IAC3B,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAElC,OAAO,CACL,6BAAK,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,gCAAgC,MAAM,KAAK,SAAS,IAAI,UAAU,EAAE;QAChG,oBAAC,OAAO,IACN,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,CAAC,OAAoC,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,GAAG,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,EACjH,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,aAAa,EAC5B,sBAAsB,EAAE,sBAAsB,EAC9C,kBAAkB,EAAE,kBAAkB,EACtC,kBAAkB,EAAE,kBAAkB,GACtC,CACE,CACP,CAAC;AACJ,CAAC"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/selection/ISelectionAdapter.d.ts b/dist/lineup/selection/ISelectionAdapter.d.ts index 527c3fa9d..18652aaaf 100644 --- a/dist/lineup/selection/ISelectionAdapter.d.ts +++ b/dist/lineup/selection/ISelectionAdapter.d.ts @@ -42,11 +42,11 @@ export interface ISelectionAdapter { * called when a parameter has changed * @param {IContext} context */ - parameterChanged(waitForIt: Promise | null, context: () => IContext): Promise; + parameterChanged(waitForIt: Promise | null, context: IContext): Promise; /** * called when the input selection has changed * @param {IContext} context */ - selectionChanged(waitForIt: Promise | null, context: () => IContext): Promise; + selectionChanged(waitForIt: Promise | null, context: IContext): Promise; } //# sourceMappingURL=ISelectionAdapter.d.ts.map \ No newline at end of file diff --git a/dist/lineup/selection/ISelectionAdapter.d.ts.map b/dist/lineup/selection/ISelectionAdapter.d.ts.map index 0045162cf..3b5921227 100644 --- a/dist/lineup/selection/ISelectionAdapter.d.ts.map +++ b/dist/lineup/selection/ISelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ISelectionAdapter.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/ISelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAEvC;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAE;IAE1B;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAExF;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACzF"} \ No newline at end of file +{"version":3,"file":"ISelectionAdapter.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/ISelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAEvC;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAE;IAE1B;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAElF;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACnF"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts index ba5f2a120..c19ef8fa0 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts @@ -11,14 +11,14 @@ export declare abstract class ABaseSelectionAdapter implements ISelectionAdapter * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - selectionChanged(waitForIt: Promise | null, context: () => IContext): Promise; + selectionChanged(waitForIt: Promise | null, context: IContext): Promise; /** * Add or remove columns in LineUp ranking when the parametrs in the selection adapter context change * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - parameterChanged(waitForIt: Promise | null, context: () => IContext): Promise; + parameterChanged(waitForIt: Promise | null, context: IContext): Promise; protected abstract parameterChangedImpl(context: IContext): Promise; protected selectionChangedImpl(context: IContext): Promise; /** diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map index 1a3a2b010..ab4062f93 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ABaseSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAErF,8BAAsB,qBAAsB,YAAW,iBAAiB;cACtD,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE;IAelE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI;IAYtE,OAAO,CAAC,mBAAmB,CAA6B;IAExD,OAAO,CAAC,mBAAmB,CAA6B;IAExD;;;;;OAKG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAYvF;;;;;OAKG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ;IAmBxE,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAExE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ;IAqBhD;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE/F,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM;CAIjE"} \ No newline at end of file +{"version":3,"file":"ABaseSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAErF,8BAAsB,qBAAsB,YAAW,iBAAiB;cACtD,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE;IAelE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI;IAYtE,OAAO,CAAC,mBAAmB,CAA6B;IAExD,OAAO,CAAC,mBAAmB,CAA6B;IAExD;;;;;OAKG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAYjF;;;;;OAKG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ;IAmBlE,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAExE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ;IAqBhD;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE/F,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM;CAIjE"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.js b/dist/lineup/selection/internal/ABaseSelectionAdapter.js index e94015d13..2260c695d 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.js +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.js @@ -36,7 +36,7 @@ export class ABaseSelectionAdapter { return this.waitingForSelection; } return (this.waitingForSelection = Promise.resolve(waitForIt) - .then(() => this.selectionChangedImpl(context())) + .then(() => this.selectionChangedImpl(context)) .then(() => { this.waitingForSelection = null; })); @@ -59,7 +59,7 @@ export class ABaseSelectionAdapter { if (this.waitingForSelection) { return undefined; // abort selection more important } - return this.parameterChangedImpl(context()); + return this.parameterChangedImpl(context); }) .then(() => { this.waitingForParameter = null; diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map b/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map index 98200f586..10daa762e 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"ABaseSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ABaseSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/lineup/ARankingView.ts b/src/lineup/ARankingView.ts index 7fb44aae1..3231b4404 100644 --- a/src/lineup/ARankingView.ts +++ b/src/lineup/ARankingView.ts @@ -366,7 +366,7 @@ export abstract class ARankingView extends AView { protected parameterChanged(name: string): PromiseLike | void { super.parameterChanged(name); if (this.selectionAdapter) { - return this.selectionAdapter.parameterChanged(this.built, () => this.createContext()); + return this.selectionAdapter.parameterChanged(this.built, this.createSelectionAdapterContext()); } return undefined; } @@ -379,12 +379,12 @@ export abstract class ARankingView extends AView { protected selectionChanged(): PromiseLike | void { if (this.selectionAdapter) { - return this.selectionAdapter.selectionChanged(this.built, () => this.createContext()); + return this.selectionAdapter.selectionChanged(this.built, this.createSelectionAdapterContext()); } return undefined; } - private createContext(): IContext { + private createSelectionAdapterContext(): IContext { const ranking = this.provider.getLastRanking(); const columns = ranking ? ranking.flatColumns : []; return { @@ -679,7 +679,7 @@ export abstract class ARankingView extends AView { .then(() => { if (this.selectionAdapter) { // init first time - return this.selectionAdapter.selectionChanged(null, () => this.createContext()); + return this.selectionAdapter.selectionChanged(null, this.createSelectionAdapterContext()); } return undefined; }) diff --git a/src/lineup/RankingViewComponent.tsx b/src/lineup/RankingViewComponent.tsx index 20c6e2296..93d333c5c 100644 --- a/src/lineup/RankingViewComponent.tsx +++ b/src/lineup/RankingViewComponent.tsx @@ -46,7 +46,7 @@ export function RankingViewComponent({ }: IRankingViewComponentProps) { const isMounted = useRef(false); const selections = new Map(); - const [context, setContext] = React.useState(null); + const [selectionAdapterContext, setSelectionAdapterContext] = React.useState(null); const viewRef = React.useRef(null); const runAuthorizations = useCallback(async (): Promise => { @@ -124,11 +124,11 @@ export function RankingViewComponent({ selections.set(name, inputSelection); if (name === AView.DEFAULT_SELECTION_NAME) { if (selectionAdapter) { - selectionAdapter.selectionChanged(null, () => context); + selectionAdapter.selectionChanged(null, selectionAdapterContext); } } } - }, [status, inputSelection, context]); + }, [status, inputSelection, selectionAdapterContext]); /** * onParametersChanged @@ -137,11 +137,11 @@ export function RankingViewComponent({ // ignore first time parameter are passed since there is no change if (status === 'success' && parameters && isMounted.current) { if (selectionAdapter) { - selectionAdapter.parameterChanged(null, () => context); + selectionAdapter.parameterChanged(null, selectionAdapterContext); } } isMounted.current = true; - }, [status, parameters, context]); + }, [status, parameters, selectionAdapterContext]); return (
@@ -151,7 +151,7 @@ export function RankingViewComponent({ itemSelection={itemSelection} options={options} onItemSelect={onItemSelect} - onContextChanged={(context: Omit) => setContext({ ...context, selection: inputSelection })} + onContextChanged={(context: Omit) => setSelectionAdapterContext({ ...context, selection: inputSelection })} onAddScoreColumn={onAddScoreColumn} onBuiltLineUp={onBuiltLineUp} onItemSelectionChanged={onItemSelectionChanged} diff --git a/src/lineup/selection/ISelectionAdapter.ts b/src/lineup/selection/ISelectionAdapter.ts index 4367395ba..e95816f42 100644 --- a/src/lineup/selection/ISelectionAdapter.ts +++ b/src/lineup/selection/ISelectionAdapter.ts @@ -48,11 +48,11 @@ export interface ISelectionAdapter { * called when a parameter has changed * @param {IContext} context */ - parameterChanged(waitForIt: Promise | null, context: () => IContext): Promise; + parameterChanged(waitForIt: Promise | null, context: IContext): Promise; /** * called when the input selection has changed * @param {IContext} context */ - selectionChanged(waitForIt: Promise | null, context: () => IContext): Promise; + selectionChanged(waitForIt: Promise | null, context: IContext): Promise; } diff --git a/src/lineup/selection/internal/ABaseSelectionAdapter.ts b/src/lineup/selection/internal/ABaseSelectionAdapter.ts index 5744f0a92..3995390fc 100644 --- a/src/lineup/selection/internal/ABaseSelectionAdapter.ts +++ b/src/lineup/selection/internal/ABaseSelectionAdapter.ts @@ -40,13 +40,13 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - selectionChanged(waitForIt: Promise | null, context: () => IContext): Promise { + selectionChanged(waitForIt: Promise | null, context: IContext): Promise { if (this.waitingForSelection) { return this.waitingForSelection; } return (this.waitingForSelection = Promise.resolve(waitForIt) - .then(() => this.selectionChangedImpl(context())) + .then(() => this.selectionChangedImpl(context)) .then(() => { this.waitingForSelection = null; })); @@ -58,7 +58,7 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - parameterChanged(waitForIt: Promise | null, context: () => IContext) { + parameterChanged(waitForIt: Promise | null, context: IContext) { if (this.waitingForSelection) { return this.waitingForSelection; } @@ -70,7 +70,7 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { if (this.waitingForSelection) { return undefined; // abort selection more important } - return this.parameterChangedImpl(context()); + return this.parameterChangedImpl(context); }) .then(() => { this.waitingForParameter = null; From 919cfb20fb747264b425bce7a0d8a0957d3ea5ef Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Fri, 13 May 2022 22:11:10 +0200 Subject: [PATCH 07/46] Remove `waitForIt` promise from selection adapter - Add and refactor return types `Promise` to `Promise` - Switch to async/await where possible - await `removeDynamicColumns` before `addDynamicColumns` -> previously it was not waited for the removal --- dist/lineup/ARankingView.d.ts | 28 ++++- dist/lineup/ARankingView.d.ts.map | 2 +- dist/lineup/ARankingView.js | 39 ++++-- dist/lineup/ARankingView.js.map | 2 +- dist/lineup/Ranking.d.ts.map | 2 +- dist/lineup/Ranking.js | 12 +- dist/lineup/Ranking.js.map | 2 +- dist/lineup/RankingViewComponent.js | 4 +- dist/lineup/RankingViewComponent.js.map | 2 +- dist/lineup/selection/ISelectionAdapter.d.ts | 10 +- .../selection/ISelectionAdapter.d.ts.map | 2 +- .../internal/ABaseSelectionAdapter.d.ts | 12 +- .../internal/ABaseSelectionAdapter.d.ts.map | 2 +- .../internal/ABaseSelectionAdapter.js | 63 +++------- .../internal/ABaseSelectionAdapter.js.map | 2 +- .../internal/MultiSelectionAdapter.d.ts.map | 2 +- .../internal/MultiSelectionAdapter.js | 8 +- .../internal/MultiSelectionAdapter.js.map | 2 +- .../internal/SingleSelectionAdapter.d.ts.map | 2 +- .../internal/SingleSelectionAdapter.js | 4 +- .../internal/SingleSelectionAdapter.js.map | 2 +- src/lineup/ARankingView.ts | 41 ++++-- src/lineup/Ranking.tsx | 12 +- src/lineup/RankingViewComponent.tsx | 4 +- src/lineup/selection/ISelectionAdapter.ts | 11 +- .../internal/ABaseSelectionAdapter.ts | 118 ++++++++++-------- .../internal/MultiSelectionAdapter.ts | 10 +- .../internal/SingleSelectionAdapter.ts | 4 +- 28 files changed, 230 insertions(+), 174 deletions(-) diff --git a/dist/lineup/ARankingView.d.ts b/dist/lineup/ARankingView.d.ts index 612f71942..4a1118d04 100644 --- a/dist/lineup/ARankingView.d.ts +++ b/dist/lineup/ARankingView.d.ts @@ -81,15 +81,35 @@ export declare abstract class ARankingView extends AView { /** * custom initialization function at the build will be called */ - protected initImpl(): Promise; + protected initImpl(): Promise; /** * return the idType of the shown items in LineUp * @returns {IDType} */ get itemIDType(): import("../idtype").IDType; - protected parameterChanged(name: string): PromiseLike | void; - protected itemSelectionChanged(): PromiseLike | void; - protected selectionChanged(): PromiseLike | void; + /** + * The parameter of this (ranking) view has changed and this ranking needs to adapt to the change. + * For example, depending on the set `selectionAdapter` additional dynamic columns can be added or + * removed for the paramter. + * @param name Name of the changed parameter + * @returns A promise to wait for until the ranking has been updated by the selection adapter. + */ + protected parameterChanged(name: string): Promise; + /** + * Selection of the current LineUp ranking has changed + */ + protected itemSelectionChanged(): void; + /** + * Incoming selection from another view has changed and this ranking needs to adapt to the change. + * For example, depending on the set `selectionAdapter` additional dynamic columns can be added or + * removed for the incoming selected items. + * @returns A promise to wait for until the ranking has been updated by the selection adapter. + */ + protected selectionChanged(): Promise; + /** + * Creates a selection adapter context + * @returns selection adapter context + */ private createSelectionAdapterContext; /** * Expand/collapse certain columns on mode change. diff --git a/dist/lineup/ARankingView.d.ts.map b/dist/lineup/ARankingView.d.ts.map index 99b3442dd..3e1daa7b9 100644 --- a/dist/lineup/ARankingView.d.ts.map +++ b/dist/lineup/ARankingView.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ARankingView.d.ts","sourceRoot":"","sources":["../../src/lineup/ARankingView.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ARankingView.d.ts","sourceRoot":"","sources":["../../src/lineup/ARankingView.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/ARankingView.js b/dist/lineup/ARankingView.js index 6c9fd3ddc..5faca14cc 100644 --- a/dist/lineup/ARankingView.js +++ b/dist/lineup/ARankingView.js @@ -274,7 +274,8 @@ export class ARankingView extends AView { */ initImpl() { super.initImpl(); - return (this.built = this.build()); + this.built = this.build(); + return this.built; } /** * return the idType of the shown items in LineUp @@ -283,24 +284,46 @@ export class ARankingView extends AView { get itemIDType() { return this.options.itemIDType ? IDTypeManager.getInstance().resolveIdType(this.options.itemIDType) : null; } - parameterChanged(name) { + /** + * The parameter of this (ranking) view has changed and this ranking needs to adapt to the change. + * For example, depending on the set `selectionAdapter` additional dynamic columns can be added or + * removed for the paramter. + * @param name Name of the changed parameter + * @returns A promise to wait for until the ranking has been updated by the selection adapter. + */ + async parameterChanged(name) { super.parameterChanged(name); if (this.selectionAdapter) { - return this.selectionAdapter.parameterChanged(this.built, this.createSelectionAdapterContext()); + await this.built; + return this.selectionAdapter.parameterChanged(this.createSelectionAdapterContext()); } - return undefined; + return Promise.resolve(); } + /** + * Selection of the current LineUp ranking has changed + */ itemSelectionChanged() { this.selectionHelper.setItemSelection(this.getItemSelection()); this.updateLineUpStats(); super.itemSelectionChanged(); } - selectionChanged() { + /** + * Incoming selection from another view has changed and this ranking needs to adapt to the change. + * For example, depending on the set `selectionAdapter` additional dynamic columns can be added or + * removed for the incoming selected items. + * @returns A promise to wait for until the ranking has been updated by the selection adapter. + */ + async selectionChanged() { if (this.selectionAdapter) { - return this.selectionAdapter.selectionChanged(this.built, this.createSelectionAdapterContext()); + await this.built; + return this.selectionAdapter.selectionChanged(this.createSelectionAdapterContext()); } - return undefined; + return Promise.resolve(); } + /** + * Creates a selection adapter context + * @returns selection adapter context + */ createSelectionAdapterContext() { const ranking = this.provider.getLastRanking(); const columns = ranking ? ranking.flatColumns : []; @@ -555,7 +578,7 @@ export class ARankingView extends AView { .then(() => { if (this.selectionAdapter) { // init first time - return this.selectionAdapter.selectionChanged(null, this.createSelectionAdapterContext()); + return this.selectionAdapter.selectionChanged(this.createSelectionAdapterContext()); } return undefined; }) diff --git a/dist/lineup/ARankingView.js.map b/dist/lineup/ARankingView.js.map index b1531cf18..534392943 100644 --- a/dist/lineup/ARankingView.js.map +++ b/dist/lineup/ARankingView.js.map @@ -1 +1 @@ -{"version":3,"file":"ARankingView.js","sourceRoot":"","sources":["../../src/lineup/ARankingView.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ARankingView.js","sourceRoot":"","sources":["../../src/lineup/ARankingView.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/Ranking.d.ts.map b/dist/lineup/Ranking.d.ts.map index 1c2b66426..9174ea024 100644 --- a/dist/lineup/Ranking.d.ts.map +++ b/dist/lineup/Ranking.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Ranking.d.ts","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,iBAAiB,EAajB,WAAW,EAGZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,iBAAiB,EAAc,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAoB,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAElC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC;IAElE,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAE/C,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AAiED,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,OAAO,CAAC,EACtB,IAAS,EACT,aAAyC,EACzC,UAAe,EACf,OAAO,EAAE,IAAS,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa;AACb;;GAEG;AACH,gBAAgB,GACjB,EAAE,aAAa,eAuYf"} \ No newline at end of file +{"version":3,"file":"Ranking.d.ts","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,iBAAiB,EAajB,WAAW,EAGZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,iBAAiB,EAAc,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAoB,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAElC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC;IAElE,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAE/C,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AAiED,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,OAAO,CAAC,EACtB,IAAS,EACT,aAAyC,EACzC,UAAe,EACf,OAAO,EAAE,IAAS,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa;AACb;;GAEG;AACH,gBAAgB,GACjB,EAAE,aAAa,eAyYf"} \ No newline at end of file diff --git a/dist/lineup/Ranking.js b/dist/lineup/Ranking.js index ebc895ddc..4d2112204 100644 --- a/dist/lineup/Ranking.js +++ b/dist/lineup/Ranking.js @@ -350,18 +350,20 @@ onAddScoreColumn, }) { ColumnDescUtils.createInitialRanking(providerRef.current, {}); const ranking = providerRef.current.getLastRanking(); const columns = ranking ? ranking.flatColumns : []; - const context = { + const selectionAdapterContext = { columns, freeColor: (id) => colorsRef.current.freeColumnColor(id), - add: (columns) => columns.forEach((col) => addColumn(col.desc, col.data, col.id, col.position)), - remove: (columns) => columns.forEach((c) => c.removeMe()), + // TODO The promise as return value can be removed once `ARankingView` and CLUE are gone; the promise as return value was required by CLUE + add: (columns) => Promise.resolve(columns.forEach((col) => addColumn(col.desc, col.data, col.id, col.position))), + // TODO The promise as return value can be removed once `ARankingView` and CLUE are gone; the promise as return value was required by CLUE + remove: (columns) => Promise.resolve(columns.forEach((c) => c.removeMe())), }; - onContextChanged === null || onContextChanged === void 0 ? void 0 : onContextChanged(context); + onContextChanged === null || onContextChanged === void 0 ? void 0 : onContextChanged(selectionAdapterContext); onCustomizeRanking === null || onCustomizeRanking === void 0 ? void 0 : onCustomizeRanking(LineupUtils.wrapRanking(providerRef.current, ranking)); return (Promise.resolve() // TODO: check if this is needed // .then(async () => { - // return selectionAdapter?.selectionChanged(null, () => createContext(selection)); + // return selectionAdapter?.selectionChanged(createContext(selection)); // }) .then(() => { onBuiltLineUp === null || onBuiltLineUp === void 0 ? void 0 : onBuiltLineUp(providerRef.current); diff --git a/dist/lineup/Ranking.js.map b/dist/lineup/Ranking.js.map index fad321fb8..7b7b93bd0 100644 --- a/dist/lineup/Ranking.js.map +++ b/dist/lineup/Ranking.js.map @@ -1 +1 @@ -{"version":3,"file":"Ranking.js","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Ranking.js","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.js b/dist/lineup/RankingViewComponent.js index 199e7aaab..9cc9f0524 100644 --- a/dist/lineup/RankingViewComponent.js +++ b/dist/lineup/RankingViewComponent.js @@ -81,7 +81,7 @@ onAddScoreColumn, }) { selections.set(name, inputSelection); if (name === AView.DEFAULT_SELECTION_NAME) { if (selectionAdapter) { - selectionAdapter.selectionChanged(null, selectionAdapterContext); + selectionAdapter.selectionChanged(selectionAdapterContext); } } } @@ -93,7 +93,7 @@ onAddScoreColumn, }) { // ignore first time parameter are passed since there is no change if (status === 'success' && parameters && isMounted.current) { if (selectionAdapter) { - selectionAdapter.parameterChanged(null, selectionAdapterContext); + selectionAdapter.parameterChanged(selectionAdapterContext); } } isMounted.current = true; diff --git a/dist/lineup/RankingViewComponent.js.map b/dist/lineup/RankingViewComponent.js.map index 61c8fb0a7..871d6ecbf 100644 --- a/dist/lineup/RankingViewComponent.js.map +++ b/dist/lineup/RankingViewComponent.js.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/selection/ISelectionAdapter.d.ts b/dist/lineup/selection/ISelectionAdapter.d.ts index 18652aaaf..4bf420a97 100644 --- a/dist/lineup/selection/ISelectionAdapter.d.ts +++ b/dist/lineup/selection/ISelectionAdapter.d.ts @@ -22,12 +22,12 @@ export interface IContext { * add multiple columns to LineUp * @param {ISelectionColumn[]} columns */ - add(columns: ISelectionColumn[]): void; + add(columns: ISelectionColumn[]): Promise; /** - * remove columsn from LineUp + * remove multiple columns from LineUp * @param {Column[]} columns */ - remove(columns: Column[]): any; + remove(columns: Column[]): Promise; /** * free the color from the color management * @param {string} id @@ -42,11 +42,11 @@ export interface ISelectionAdapter { * called when a parameter has changed * @param {IContext} context */ - parameterChanged(waitForIt: Promise | null, context: IContext): Promise; + parameterChanged(context: IContext): Promise; /** * called when the input selection has changed * @param {IContext} context */ - selectionChanged(waitForIt: Promise | null, context: IContext): Promise; + selectionChanged(context: IContext): Promise; } //# sourceMappingURL=ISelectionAdapter.d.ts.map \ No newline at end of file diff --git a/dist/lineup/selection/ISelectionAdapter.d.ts.map b/dist/lineup/selection/ISelectionAdapter.d.ts.map index 3b5921227..5f84a3a75 100644 --- a/dist/lineup/selection/ISelectionAdapter.d.ts.map +++ b/dist/lineup/selection/ISelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ISelectionAdapter.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/ISelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAC3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAEvC;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAE;IAE1B;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAElF;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACnF"} \ No newline at end of file +{"version":3,"file":"ISelectionAdapter.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/ISelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhD;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnD;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts index c19ef8fa0..90f322e85 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts @@ -2,24 +2,20 @@ import { IAdditionalColumnDesc } from '../../../base/interfaces'; import { ISelectionColumn, IContext, ISelectionAdapter } from '../ISelectionAdapter'; export declare abstract class ABaseSelectionAdapter implements ISelectionAdapter { protected addDynamicColumns(context: IContext, ids: string[]): Promise; - protected removeDynamicColumns(context: IContext, ids: string[]): void; - private waitingForSelection; - private waitingForParameter; + protected removeDynamicColumns(context: IContext, ids: string[]): Promise; /** * Add or remove columns in LineUp ranking when the selected items in the selection adapter context change - * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - selectionChanged(waitForIt: Promise | null, context: IContext): Promise; + selectionChanged(context: IContext): Promise; /** * Add or remove columns in LineUp ranking when the parametrs in the selection adapter context change - * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - parameterChanged(waitForIt: Promise | null, context: IContext): Promise; - protected abstract parameterChangedImpl(context: IContext): Promise; + parameterChanged(context: IContext): Promise; + protected abstract parameterChangedImpl(context: IContext): Promise; protected selectionChangedImpl(context: IContext): Promise; /** * Create a column desc with additional metadata for a given selected id. diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map index ab4062f93..550022bf1 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ABaseSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAErF,8BAAsB,qBAAsB,YAAW,iBAAiB;cACtD,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE;IAelE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI;IAYtE,OAAO,CAAC,mBAAmB,CAA6B;IAExD,OAAO,CAAC,mBAAmB,CAA6B;IAExD;;;;;OAKG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAYjF;;;;;OAKG;IACH,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,QAAQ;IAmBlE,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAExE,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ;IAqBhD;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE/F,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM;CAIjE"} \ No newline at end of file +{"version":3,"file":"ABaseSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAErF,8BAAsB,qBAAsB,YAAW,iBAAiB;cACtD,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAelF,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/E;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAmDlD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cAEzD,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtE;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE/F,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM;CAIjE"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.js b/dist/lineup/selection/internal/ABaseSelectionAdapter.js index 2260c695d..33787e1b0 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.js +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.js @@ -1,71 +1,42 @@ import { difference } from 'lodash'; export class ABaseSelectionAdapter { - constructor() { - this.waitingForSelection = null; - this.waitingForParameter = null; - } async addDynamicColumns(context, ids) { - return Promise.all(ids.map((id) => this.createColumnsFor(context, id))).then((columns) => { - // sort new columns to insert them in the correct order - const flattenedColumns = [].concat(...columns).map((d, i) => ({ d, i })); - flattenedColumns.sort(({ d: a, i: ai }, { d: b, i: bi }) => { - if (a.position === b.position) { - // equal position, sort latter element of original array to lower position in sorted array - return bi - ai; // the latter in the array the better - } - return b.position - a.position; // sort descending by default - }); - context.add(flattenedColumns.map((d) => d.d)); + const columns = await Promise.all(ids.map((id) => this.createColumnsFor(context, id))); + // sort new columns to insert them in the correct order + const flattenedColumns = [].concat(...columns).map((d, i) => ({ d, i })); + flattenedColumns.sort(({ d: a, i: ai }, { d: b, i: bi }) => { + if (a.position === b.position) { + // equal position, sort latter element of original array to lower position in sorted array + return bi - ai; // the latter in the array the better + } + return b.position - a.position; // sort descending by default }); + return context.add(flattenedColumns.map((d) => d.d)); } removeDynamicColumns(context, ids) { const { columns } = context; - context.remove([].concat(...ids.map((id) => { + return context.remove([].concat(...ids.map((id) => { context.freeColor(id); return columns.filter((d) => d.desc.selectedId === id); }))); } /** * Add or remove columns in LineUp ranking when the selected items in the selection adapter context change - * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - selectionChanged(waitForIt, context) { - if (this.waitingForSelection) { - return this.waitingForSelection; - } - return (this.waitingForSelection = Promise.resolve(waitForIt) - .then(() => this.selectionChangedImpl(context)) - .then(() => { - this.waitingForSelection = null; - })); + selectionChanged(context) { + return this.selectionChangedImpl(context); } /** * Add or remove columns in LineUp ranking when the parametrs in the selection adapter context change - * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - parameterChanged(waitForIt, context) { - if (this.waitingForSelection) { - return this.waitingForSelection; - } - if (this.waitingForParameter) { - return this.waitingForParameter; - } - return (this.waitingForParameter = Promise.resolve(waitForIt) - .then(() => { - if (this.waitingForSelection) { - return undefined; // abort selection more important - } - return this.parameterChangedImpl(context); - }) - .then(() => { - this.waitingForParameter = null; - })); + parameterChanged(context) { + return this.parameterChangedImpl(context); } - selectionChangedImpl(context) { + async selectionChangedImpl(context) { const selectedIds = context.selection.ids; const usedCols = context.columns.filter((d) => d.desc.selectedId != null); const lineupColIds = usedCols.map((d) => d.desc.selectedId); @@ -75,7 +46,7 @@ export class ABaseSelectionAdapter { // remove deselected columns if (diffRemoved.length > 0) { // console.log('remove columns', diffRemoved); - this.removeDynamicColumns(context, diffRemoved); + await this.removeDynamicColumns(context, diffRemoved); } // add new columns to the end if (diffAdded.length <= 0) { diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map b/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map index 10daa762e..95b3e4075 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"ABaseSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ABaseSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map index afad866a1..8ddb8f0f1 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"MultiSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,MAAM;IAChD;;;;OAIG;IACH,mBAAmB,IAAI,CAAC,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,qBAAqB,EAAE,CAAC;IAEnG;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;IAElF;;;;;;;;;;;OAWG;IACH,YAAY,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC;CAC1E;AAED,qBAAa,qBAAqB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,qBAAqB;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAI/D;;;;;;;OAOG;IACH,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAMhE;;;;;;OAMG;cACa,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA+B5F,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,uBAAuB;CAOhC"} \ No newline at end of file +{"version":3,"file":"MultiSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,MAAM;IAChD;;;;OAIG;IACH,mBAAmB,IAAI,CAAC,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,qBAAqB,EAAE,CAAC;IAEnG;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;IAElF;;;;;;;;;;;OAWG;IACH,YAAY,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC;CAC1E;AAED,qBAAa,qBAAqB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,qBAAqB;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAI/D;;;;;;;OAOG;cACa,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtE;;;;;;OAMG;cACa,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA+B5F,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,uBAAuB;CAOhC"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.js b/dist/lineup/selection/internal/MultiSelectionAdapter.js index e3c745cbb..97c5c2638 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.js +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.js @@ -13,10 +13,10 @@ export class MultiSelectionAdapter extends ABaseSelectionAdapter { * @param context selection adapter context * @returns A promise to wait until all new columns have been added */ - parameterChangedImpl(context) { + async parameterChangedImpl(context) { const selectedIds = context.selection.ids; - this.removePartialDynamicColumns(context, selectedIds); // sync function - return this.addDynamicColumns(context, selectedIds); // async function + await this.removePartialDynamicColumns(context, selectedIds); + return this.addDynamicColumns(context, selectedIds); } /** * Create one or multiple LineUp column descs + additional information for each selected sub-type and given id. @@ -61,7 +61,7 @@ export class MultiSelectionAdapter extends ABaseSelectionAdapter { ? this.adapter.diffSubtypes(dynamicColumnSubtypes, selectedSubtypes) : difference(dynamicColumnSubtypes, selectedSubtypes); // type cast to string[] because of generic `T = string` const columsToRemove = removedSubtypes.map((subtype) => usedCols.filter((d) => d.desc.selectedSubtype === subtype)).flat(); - context.remove(columsToRemove); + return context.remove(columsToRemove); } computePositionToInsert(context, id) { const ids = context.columns.map((col) => col.desc.selectedId); diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.js.map b/dist/lineup/selection/internal/MultiSelectionAdapter.js.map index 540bdbfcc..e51f9a7bd 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"MultiSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"MultiSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map index 203ffae92..96b6bc955 100644 --- a/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"SingleSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE5E,MAAM,WAAW,uBAAuB;IACtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,CAAC;IAE/E;;;;OAIG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CACjD;AAED,qBAAa,sBAAuB,SAAQ,qBAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,uBAAuB;IAI7D,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ;IAiBhD;;;;;;OAMG;cACa,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAU9F"} \ No newline at end of file +{"version":3,"file":"SingleSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE5E,MAAM,WAAW,uBAAuB;IACtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,CAAC;IAE/E;;;;OAIG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CACjD;AAED,qBAAa,sBAAuB,SAAQ,qBAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,uBAAuB;cAI7C,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBtE;;;;;;OAMG;cACa,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAU9F"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/SingleSelectionAdapter.js b/dist/lineup/selection/internal/SingleSelectionAdapter.js index b0bd3efdf..0e9c89f2d 100644 --- a/dist/lineup/selection/internal/SingleSelectionAdapter.js +++ b/dist/lineup/selection/internal/SingleSelectionAdapter.js @@ -4,14 +4,14 @@ export class SingleSelectionAdapter extends ABaseSelectionAdapter { super(); this.adapter = adapter; } - parameterChangedImpl(context) { + async parameterChangedImpl(context) { // remove all and start again const selectedIds = context.selection.ids; const usedCols = context.columns.filter((d) => d.desc.selectedId != null); const lineupColIds = usedCols.map((d) => d.desc.selectedId); // remove deselected columns if (lineupColIds.length > 0) { - this.removeDynamicColumns(context, lineupColIds); + await this.removeDynamicColumns(context, lineupColIds); } // add new columns to the end if (selectedIds.length <= 0) { diff --git a/dist/lineup/selection/internal/SingleSelectionAdapter.js.map b/dist/lineup/selection/internal/SingleSelectionAdapter.js.map index e42c33c95..0737e3609 100644 --- a/dist/lineup/selection/internal/SingleSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/SingleSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"SingleSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAoBhE,MAAM,OAAO,sBAAuB,SAAQ,qBAAqB;IAC/D,YAA6B,OAAgC;QAC3D,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAyB;IAE7D,CAAC;IAES,oBAAoB,CAAC,OAAiB;QAC9C,6BAA6B;QAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;QAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,CAAC,CAAC;QAErF,4BAA4B;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;SAClD;QACD,6BAA6B;QAC7B,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,gBAAgB,CAAC,QAAkB,EAAE,EAAU;QAC7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC/C,OAAO;YACL;gBACE,IAAI,EAAE,qBAAqB,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC/C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/B,EAAE;aACH;SACF,CAAC;IACJ,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"SingleSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAoBhE,MAAM,OAAO,sBAAuB,SAAQ,qBAAqB;IAC/D,YAA6B,OAAgC;QAC3D,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAyB;IAE7D,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,OAAiB;QACpD,6BAA6B;QAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;QAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,CAAC,CAAC;QAErF,4BAA4B;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;SACxD;QACD,6BAA6B;QAC7B,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,gBAAgB,CAAC,QAAkB,EAAE,EAAU;QAC7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC/C,OAAO;YACL;gBACE,IAAI,EAAE,qBAAqB,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC/C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/B,EAAE;aACH;SACF,CAAC;IACJ,CAAC;CACF"} \ No newline at end of file diff --git a/src/lineup/ARankingView.ts b/src/lineup/ARankingView.ts index 3231b4404..d05270417 100644 --- a/src/lineup/ARankingView.ts +++ b/src/lineup/ARankingView.ts @@ -352,7 +352,8 @@ export abstract class ARankingView extends AView { */ protected initImpl() { super.initImpl(); - return (this.built = this.build()); + this.built = this.build(); + return this.built; } /** @@ -363,27 +364,49 @@ export abstract class ARankingView extends AView { return this.options.itemIDType ? IDTypeManager.getInstance().resolveIdType(this.options.itemIDType) : null; } - protected parameterChanged(name: string): PromiseLike | void { + /** + * The parameter of this (ranking) view has changed and this ranking needs to adapt to the change. + * For example, depending on the set `selectionAdapter` additional dynamic columns can be added or + * removed for the paramter. + * @param name Name of the changed parameter + * @returns A promise to wait for until the ranking has been updated by the selection adapter. + */ + protected async parameterChanged(name: string): Promise { super.parameterChanged(name); if (this.selectionAdapter) { - return this.selectionAdapter.parameterChanged(this.built, this.createSelectionAdapterContext()); + await this.built; + return this.selectionAdapter.parameterChanged(this.createSelectionAdapterContext()); } - return undefined; + return Promise.resolve(); } - protected itemSelectionChanged(): PromiseLike | void { + /** + * Selection of the current LineUp ranking has changed + */ + protected itemSelectionChanged(): void { this.selectionHelper.setItemSelection(this.getItemSelection()); this.updateLineUpStats(); super.itemSelectionChanged(); } - protected selectionChanged(): PromiseLike | void { + /** + * Incoming selection from another view has changed and this ranking needs to adapt to the change. + * For example, depending on the set `selectionAdapter` additional dynamic columns can be added or + * removed for the incoming selected items. + * @returns A promise to wait for until the ranking has been updated by the selection adapter. + */ + protected async selectionChanged(): Promise { if (this.selectionAdapter) { - return this.selectionAdapter.selectionChanged(this.built, this.createSelectionAdapterContext()); + await this.built; + return this.selectionAdapter.selectionChanged(this.createSelectionAdapterContext()); } - return undefined; + return Promise.resolve(); } + /** + * Creates a selection adapter context + * @returns selection adapter context + */ private createSelectionAdapterContext(): IContext { const ranking = this.provider.getLastRanking(); const columns = ranking ? ranking.flatColumns : []; @@ -679,7 +702,7 @@ export abstract class ARankingView extends AView { .then(() => { if (this.selectionAdapter) { // init first time - return this.selectionAdapter.selectionChanged(null, this.createSelectionAdapterContext()); + return this.selectionAdapter.selectionChanged(this.createSelectionAdapterContext()); } return undefined; }) diff --git a/src/lineup/Ranking.tsx b/src/lineup/Ranking.tsx index a04125f8a..e855d7d9e 100644 --- a/src/lineup/Ranking.tsx +++ b/src/lineup/Ranking.tsx @@ -460,20 +460,22 @@ export function Ranking({ ColumnDescUtils.createInitialRanking(providerRef.current, {}); const ranking = providerRef.current.getLastRanking(); const columns = ranking ? ranking.flatColumns : []; - const context = { + const selectionAdapterContext: Omit = { columns, freeColor: (id: string) => colorsRef.current.freeColumnColor(id), - add: (columns: ISelectionColumn[]) => columns.forEach((col) => addColumn(col.desc, col.data, col.id, col.position)), - remove: (columns: Column[]) => columns.forEach((c) => c.removeMe()), + // TODO The promise as return value can be removed once `ARankingView` and CLUE are gone; the promise as return value was required by CLUE + add: (columns: ISelectionColumn[]) => Promise.resolve(columns.forEach((col) => addColumn(col.desc, col.data, col.id, col.position))), + // TODO The promise as return value can be removed once `ARankingView` and CLUE are gone; the promise as return value was required by CLUE + remove: (columns: Column[]) => Promise.resolve(columns.forEach((c) => c.removeMe())), }; - onContextChanged?.(context); + onContextChanged?.(selectionAdapterContext); onCustomizeRanking?.(LineupUtils.wrapRanking(providerRef.current, ranking)); return ( Promise.resolve() // TODO: check if this is needed // .then(async () => { - // return selectionAdapter?.selectionChanged(null, () => createContext(selection)); + // return selectionAdapter?.selectionChanged(createContext(selection)); // }) .then(() => { onBuiltLineUp?.(providerRef.current); diff --git a/src/lineup/RankingViewComponent.tsx b/src/lineup/RankingViewComponent.tsx index 93d333c5c..fe06d7890 100644 --- a/src/lineup/RankingViewComponent.tsx +++ b/src/lineup/RankingViewComponent.tsx @@ -124,7 +124,7 @@ export function RankingViewComponent({ selections.set(name, inputSelection); if (name === AView.DEFAULT_SELECTION_NAME) { if (selectionAdapter) { - selectionAdapter.selectionChanged(null, selectionAdapterContext); + selectionAdapter.selectionChanged(selectionAdapterContext); } } } @@ -137,7 +137,7 @@ export function RankingViewComponent({ // ignore first time parameter are passed since there is no change if (status === 'success' && parameters && isMounted.current) { if (selectionAdapter) { - selectionAdapter.parameterChanged(null, selectionAdapterContext); + selectionAdapter.parameterChanged(selectionAdapterContext); } } isMounted.current = true; diff --git a/src/lineup/selection/ISelectionAdapter.ts b/src/lineup/selection/ISelectionAdapter.ts index e95816f42..497ad6f3e 100644 --- a/src/lineup/selection/ISelectionAdapter.ts +++ b/src/lineup/selection/ISelectionAdapter.ts @@ -16,6 +16,7 @@ export interface IContext { * list of currently visible columns */ readonly columns: Column[]; + /** * the current input selection */ @@ -25,13 +26,13 @@ export interface IContext { * add multiple columns to LineUp * @param {ISelectionColumn[]} columns */ - add(columns: ISelectionColumn[]): void; + add(columns: ISelectionColumn[]): Promise; /** - * remove columsn from LineUp + * remove multiple columns from LineUp * @param {Column[]} columns */ - remove(columns: Column[]); + remove(columns: Column[]): Promise; /** * free the color from the color management @@ -48,11 +49,11 @@ export interface ISelectionAdapter { * called when a parameter has changed * @param {IContext} context */ - parameterChanged(waitForIt: Promise | null, context: IContext): Promise; + parameterChanged(context: IContext): Promise; /** * called when the input selection has changed * @param {IContext} context */ - selectionChanged(waitForIt: Promise | null, context: IContext): Promise; + selectionChanged(context: IContext): Promise; } diff --git a/src/lineup/selection/internal/ABaseSelectionAdapter.ts b/src/lineup/selection/internal/ABaseSelectionAdapter.ts index 3995390fc..0b7e7080f 100644 --- a/src/lineup/selection/internal/ABaseSelectionAdapter.ts +++ b/src/lineup/selection/internal/ABaseSelectionAdapter.ts @@ -3,24 +3,24 @@ import { IAdditionalColumnDesc } from '../../../base/interfaces'; import { ISelectionColumn, IContext, ISelectionAdapter } from '../ISelectionAdapter'; export abstract class ABaseSelectionAdapter implements ISelectionAdapter { - protected async addDynamicColumns(context: IContext, ids: string[]) { - return Promise.all(ids.map((id) => this.createColumnsFor(context, id))).then((columns) => { - // sort new columns to insert them in the correct order - const flattenedColumns = [].concat(...columns).map((d, i) => ({ d, i })); - flattenedColumns.sort(({ d: a, i: ai }, { d: b, i: bi }) => { - if (a.position === b.position) { - // equal position, sort latter element of original array to lower position in sorted array - return bi - ai; // the latter in the array the better - } - return b.position - a.position; // sort descending by default - }); - context.add(flattenedColumns.map((d) => d.d)); + protected async addDynamicColumns(context: IContext, ids: string[]): Promise { + const columns = await Promise.all(ids.map((id) => this.createColumnsFor(context, id))); + + // sort new columns to insert them in the correct order + const flattenedColumns = [].concat(...columns).map((d, i) => ({ d, i })); + flattenedColumns.sort(({ d: a, i: ai }, { d: b, i: bi }) => { + if (a.position === b.position) { + // equal position, sort latter element of original array to lower position in sorted array + return bi - ai; // the latter in the array the better + } + return b.position - a.position; // sort descending by default }); + return context.add(flattenedColumns.map((d) => d.d)); } - protected removeDynamicColumns(context: IContext, ids: string[]): void { + protected removeDynamicColumns(context: IContext, ids: string[]): Promise { const { columns } = context; - context.remove( + return context.remove( [].concat( ...ids.map((id) => { context.freeColor(id); @@ -30,56 +30,74 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { ); } - private waitingForSelection: Promise | null = null; - - private waitingForParameter: Promise | null = null; - /** * Add or remove columns in LineUp ranking when the selected items in the selection adapter context change - * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - selectionChanged(waitForIt: Promise | null, context: IContext): Promise { - if (this.waitingForSelection) { - return this.waitingForSelection; - } - - return (this.waitingForSelection = Promise.resolve(waitForIt) - .then(() => this.selectionChangedImpl(context)) - .then(() => { - this.waitingForSelection = null; - })); + selectionChanged(context: IContext): Promise { + return this.selectionChangedImpl(context); } /** * Add or remove columns in LineUp ranking when the parametrs in the selection adapter context change - * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - parameterChanged(waitForIt: Promise | null, context: IContext) { - if (this.waitingForSelection) { - return this.waitingForSelection; - } - if (this.waitingForParameter) { - return this.waitingForParameter; - } - return (this.waitingForParameter = Promise.resolve(waitForIt) - .then(() => { - if (this.waitingForSelection) { - return undefined; // abort selection more important - } - return this.parameterChangedImpl(context); - }) - .then(() => { - this.waitingForParameter = null; - })); + parameterChanged(context: IContext): Promise { + return this.parameterChangedImpl(context); } - protected abstract parameterChangedImpl(context: IContext): Promise; + // private waitingForSelection: Promise | null = null; + + // private waitingForParameter: Promise | null = null; + + // /** + // * Add or remove columns in LineUp ranking when the selected items in the selection adapter context change + // * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing + // * @param context selection adapter context + // * @returns A promise that can waited for until the columns have been changed. + // */ + // selectionChanged(waitForIt: Promise | null, context: IContext): Promise { + // if (this.waitingForSelection) { + // return this.waitingForSelection; + // } + + // return (this.waitingForSelection = Promise.resolve(waitForIt) + // .then(() => this.selectionChangedImpl(context)) + // .then(() => { + // this.waitingForSelection = null; + // })); + // } + + // /** + // * Add or remove columns in LineUp ranking when the parametrs in the selection adapter context change + // * @param waitForIt additional promise to wait (e.g., wait for view to be loaded) before continuing + // * @param context selection adapter context + // * @returns A promise that can waited for until the columns have been changed. + // */ + // parameterChanged(waitForIt: Promise | null, context: IContext): Promise { + // if (this.waitingForSelection) { + // return this.waitingForSelection; + // } + // if (this.waitingForParameter) { + // return this.waitingForParameter; + // } + // return (this.waitingForParameter = Promise.resolve(waitForIt) + // .then(() => { + // if (this.waitingForSelection) { + // return undefined; // abort selection more important + // } + // return this.parameterChangedImpl(context); + // }) + // .then(() => { + // this.waitingForParameter = null; + // })); + // } + + protected abstract parameterChangedImpl(context: IContext): Promise; - protected selectionChangedImpl(context: IContext) { + protected async selectionChangedImpl(context: IContext): Promise { const selectedIds = context.selection.ids; const usedCols = context.columns.filter((d) => (d.desc).selectedId != null); const lineupColIds = usedCols.map((d) => (d.desc).selectedId); @@ -91,7 +109,7 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { // remove deselected columns if (diffRemoved.length > 0) { // console.log('remove columns', diffRemoved); - this.removeDynamicColumns(context, diffRemoved); + await this.removeDynamicColumns(context, diffRemoved); } // add new columns to the end if (diffAdded.length <= 0) { diff --git a/src/lineup/selection/internal/MultiSelectionAdapter.ts b/src/lineup/selection/internal/MultiSelectionAdapter.ts index f385a0047..4983744eb 100644 --- a/src/lineup/selection/internal/MultiSelectionAdapter.ts +++ b/src/lineup/selection/internal/MultiSelectionAdapter.ts @@ -55,10 +55,10 @@ export class MultiSelectionAdapter extends ABaseSelectionAdapter { * @param context selection adapter context * @returns A promise to wait until all new columns have been added */ - protected parameterChangedImpl(context: IContext): Promise { + protected async parameterChangedImpl(context: IContext): Promise { const selectedIds = context.selection.ids; - this.removePartialDynamicColumns(context, selectedIds); // sync function - return this.addDynamicColumns(context, selectedIds); // async function + await this.removePartialDynamicColumns(context, selectedIds); + return this.addDynamicColumns(context, selectedIds); } /** @@ -99,7 +99,7 @@ export class MultiSelectionAdapter extends ABaseSelectionAdapter { return columnsToBeAdded.map((desc, i) => ({ desc, data: data[i], id, position })); } - private removePartialDynamicColumns(context: IContext, ids: string[]): void { + private removePartialDynamicColumns(context: IContext, ids: string[]): Promise { const { columns } = context; const selectedSubtypes = this.adapter.getSelectedSubTypes(); if (selectedSubtypes.length === 0) { @@ -118,7 +118,7 @@ export class MultiSelectionAdapter extends ABaseSelectionAdapter { const columsToRemove = removedSubtypes.map((subtype) => usedCols.filter((d) => (d.desc).selectedSubtype === subtype)).flat(); - context.remove(columsToRemove); + return context.remove(columsToRemove); } private computePositionToInsert(context: IContext, id: string): number { diff --git a/src/lineup/selection/internal/SingleSelectionAdapter.ts b/src/lineup/selection/internal/SingleSelectionAdapter.ts index 2ccbc24f7..484633f89 100644 --- a/src/lineup/selection/internal/SingleSelectionAdapter.ts +++ b/src/lineup/selection/internal/SingleSelectionAdapter.ts @@ -23,7 +23,7 @@ export class SingleSelectionAdapter extends ABaseSelectionAdapter { super(); } - protected parameterChangedImpl(context: IContext) { + protected async parameterChangedImpl(context: IContext): Promise { // remove all and start again const selectedIds = context.selection.ids; const usedCols = context.columns.filter((d) => (d.desc).selectedId != null); @@ -31,7 +31,7 @@ export class SingleSelectionAdapter extends ABaseSelectionAdapter { // remove deselected columns if (lineupColIds.length > 0) { - this.removeDynamicColumns(context, lineupColIds); + await this.removeDynamicColumns(context, lineupColIds); } // add new columns to the end if (selectedIds.length <= 0) { From cb7c8adab488fe7e15b9a78d72015b508dbe8746 Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Sat, 14 May 2022 01:15:59 +0200 Subject: [PATCH 08/46] Add unit tests for SelectionAdapter --- dist/lineup/selection/ISelectionAdapter.d.ts | 6 +- .../selection/ISelectionAdapter.d.ts.map | 2 +- .../internal/ABaseSelectionAdapter.d.ts.map | 2 +- .../internal/ABaseSelectionAdapter.js | 2 + .../internal/ABaseSelectionAdapter.js.map | 2 +- .../internal/SingleSelectionAdapter.d.ts.map | 2 +- .../internal/SingleSelectionAdapter.js | 3 +- .../internal/SingleSelectionAdapter.js.map | 2 +- src/lineup/selection/ISelectionAdapter.ts | 6 +- .../internal/ABaseSelectionAdapter.ts | 5 +- .../internal/SingleSelectionAdapter.ts | 3 +- tests/lineup/selection/AdapterUtils.test.ts | 987 ++++++++++++++++++ 12 files changed, 1008 insertions(+), 14 deletions(-) create mode 100644 tests/lineup/selection/AdapterUtils.test.ts diff --git a/dist/lineup/selection/ISelectionAdapter.d.ts b/dist/lineup/selection/ISelectionAdapter.d.ts index 4bf420a97..3fdba2336 100644 --- a/dist/lineup/selection/ISelectionAdapter.d.ts +++ b/dist/lineup/selection/ISelectionAdapter.d.ts @@ -1,8 +1,8 @@ -import { Column, IColumnDesc } from 'lineupjs'; -import { ISelection, IScoreRow } from '../../base/interfaces'; +import { Column } from 'lineupjs'; +import { ISelection, IScoreRow, IAdditionalColumnDesc } from '../../base/interfaces'; export interface ISelectionColumn { readonly id: string; - readonly desc: IColumnDesc; + readonly desc: IAdditionalColumnDesc; readonly data: Promise[]>; readonly position?: number; } diff --git a/dist/lineup/selection/ISelectionAdapter.d.ts.map b/dist/lineup/selection/ISelectionAdapter.d.ts.map index 5f84a3a75..315fb7252 100644 --- a/dist/lineup/selection/ISelectionAdapter.d.ts.map +++ b/dist/lineup/selection/ISelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ISelectionAdapter.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/ISelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhD;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnD;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD"} \ No newline at end of file +{"version":3,"file":"ISelectionAdapter.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/ISelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAErF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhD;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnD;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map index 550022bf1..ff9ae15e4 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ABaseSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAErF,8BAAsB,qBAAsB,YAAW,iBAAiB;cACtD,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAelF,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/E;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAmDlD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cAEzD,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtE;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE/F,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM;CAIjE"} \ No newline at end of file +{"version":3,"file":"ABaseSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAErF,8BAAsB,qBAAsB,YAAW,iBAAiB;cACtD,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAelF,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/E;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDlD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cAEzD,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtE;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAG/F,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,GAAG,qBAAqB;CAKzF"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.js b/dist/lineup/selection/internal/ABaseSelectionAdapter.js index 33787e1b0..332215d61 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.js +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.js @@ -54,7 +54,9 @@ export class ABaseSelectionAdapter { } return this.addDynamicColumns(context, diffAdded); } + // TODO this function is currently useless, because it requires an `IAdditionalColumnDesc` where `selectedId` is mandatory and then assigns it again static patchDesc(desc, selectedId) { + // FIXME avoid mutation of original desc desc.selectedId = selectedId; return desc; } diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map b/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map index 95b3e4075..574fe2697 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"ABaseSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ABaseSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map index 96b6bc955..9c95997b3 100644 --- a/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/SingleSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"SingleSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE5E,MAAM,WAAW,uBAAuB;IACtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,CAAC;IAE/E;;;;OAIG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CACjD;AAED,qBAAa,sBAAuB,SAAQ,qBAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,uBAAuB;cAI7C,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBtE;;;;;;OAMG;cACa,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAU9F"} \ No newline at end of file +{"version":3,"file":"SingleSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE5E,MAAM,WAAW,uBAAuB;IACtC;;;;OAIG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,CAAC;IAE/E;;;;OAIG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;CACjD;AAED,qBAAa,sBAAuB,SAAQ,qBAAqB;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,uBAAuB;cAI7C,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBtE;;;;;;OAMG;cACa,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAU9F"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/SingleSelectionAdapter.js b/dist/lineup/selection/internal/SingleSelectionAdapter.js index 0e9c89f2d..07ab598d2 100644 --- a/dist/lineup/selection/internal/SingleSelectionAdapter.js +++ b/dist/lineup/selection/internal/SingleSelectionAdapter.js @@ -5,7 +5,8 @@ export class SingleSelectionAdapter extends ABaseSelectionAdapter { this.adapter = adapter; } async parameterChangedImpl(context) { - // remove all and start again + // TODO check if why it is necessary to remove **all** dynamic columns on parameter change and if it can be refactored so that it works the same as `MultiSelectionAdapter.parameterChangedImpl()` + // remove **all** dynamic columns and start again const selectedIds = context.selection.ids; const usedCols = context.columns.filter((d) => d.desc.selectedId != null); const lineupColIds = usedCols.map((d) => d.desc.selectedId); diff --git a/dist/lineup/selection/internal/SingleSelectionAdapter.js.map b/dist/lineup/selection/internal/SingleSelectionAdapter.js.map index 0737e3609..4a6215510 100644 --- a/dist/lineup/selection/internal/SingleSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/SingleSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"SingleSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAoBhE,MAAM,OAAO,sBAAuB,SAAQ,qBAAqB;IAC/D,YAA6B,OAAgC;QAC3D,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAyB;IAE7D,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,OAAiB;QACpD,6BAA6B;QAC7B,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;QAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,CAAC,CAAC;QAErF,4BAA4B;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;SACxD;QACD,6BAA6B;QAC7B,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,gBAAgB,CAAC,QAAkB,EAAE,EAAU;QAC7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC/C,OAAO;YACL;gBACE,IAAI,EAAE,qBAAqB,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC/C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/B,EAAE;aACH;SACF,CAAC;IACJ,CAAC;CACF"} \ No newline at end of file +{"version":3,"file":"SingleSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/SingleSelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAoBhE,MAAM,OAAO,sBAAuB,SAAQ,qBAAqB;IAC/D,YAA6B,OAAgC;QAC3D,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAyB;IAE7D,CAAC;IAES,KAAK,CAAC,oBAAoB,CAAC,OAAiB;QACpD,kMAAkM;QAClM,iDAAiD;QACjD,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;QAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAyB,CAAC,CAAC,IAAK,CAAC,UAAU,CAAC,CAAC;QAErF,4BAA4B;QAC5B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;SACxD;QACD,6BAA6B;QAC7B,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,gBAAgB,CAAC,QAAkB,EAAE,EAAU;QAC7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC/C,OAAO;YACL;gBACE,IAAI,EAAE,qBAAqB,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC/C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC/B,EAAE;aACH;SACF,CAAC;IACJ,CAAC;CACF"} \ No newline at end of file diff --git a/src/lineup/selection/ISelectionAdapter.ts b/src/lineup/selection/ISelectionAdapter.ts index 497ad6f3e..ec3ef42d2 100644 --- a/src/lineup/selection/ISelectionAdapter.ts +++ b/src/lineup/selection/ISelectionAdapter.ts @@ -1,9 +1,9 @@ -import { Column, IColumnDesc } from 'lineupjs'; -import { ISelection, IScoreRow } from '../../base/interfaces'; +import { Column } from 'lineupjs'; +import { ISelection, IScoreRow, IAdditionalColumnDesc } from '../../base/interfaces'; export interface ISelectionColumn { readonly id: string; - readonly desc: IColumnDesc; + readonly desc: IAdditionalColumnDesc; readonly data: Promise[]>; readonly position?: number; } diff --git a/src/lineup/selection/internal/ABaseSelectionAdapter.ts b/src/lineup/selection/internal/ABaseSelectionAdapter.ts index 0b7e7080f..7f9e9d6cb 100644 --- a/src/lineup/selection/internal/ABaseSelectionAdapter.ts +++ b/src/lineup/selection/internal/ABaseSelectionAdapter.ts @@ -48,6 +48,7 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { return this.parameterChangedImpl(context); } + // TODO test at run-time if we really need the following promises or if it can be removed. it might be necessary when replaying the a CLUE provenence graph. if we need it, a queue might be the better solution. // private waitingForSelection: Promise | null = null; // private waitingForParameter: Promise | null = null; @@ -130,7 +131,9 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { */ protected abstract createColumnsFor(context: IContext, id: string): Promise; - static patchDesc(desc: IAdditionalColumnDesc, selectedId: string) { + // TODO this function is currently useless, because it requires an `IAdditionalColumnDesc` where `selectedId` is mandatory and then assigns it again + static patchDesc(desc: IAdditionalColumnDesc, selectedId: string): IAdditionalColumnDesc { + // FIXME avoid mutation of original desc desc.selectedId = selectedId; return desc; } diff --git a/src/lineup/selection/internal/SingleSelectionAdapter.ts b/src/lineup/selection/internal/SingleSelectionAdapter.ts index 484633f89..bec2ca99a 100644 --- a/src/lineup/selection/internal/SingleSelectionAdapter.ts +++ b/src/lineup/selection/internal/SingleSelectionAdapter.ts @@ -24,7 +24,8 @@ export class SingleSelectionAdapter extends ABaseSelectionAdapter { } protected async parameterChangedImpl(context: IContext): Promise { - // remove all and start again + // TODO check if why it is necessary to remove **all** dynamic columns on parameter change and if it can be refactored so that it works the same as `MultiSelectionAdapter.parameterChangedImpl()` + // remove **all** dynamic columns and start again const selectedIds = context.selection.ids; const usedCols = context.columns.filter((d) => (d.desc).selectedId != null); const lineupColIds = usedCols.map((d) => (d.desc).selectedId); diff --git a/tests/lineup/selection/AdapterUtils.test.ts b/tests/lineup/selection/AdapterUtils.test.ts new file mode 100644 index 000000000..6c3a490fb --- /dev/null +++ b/tests/lineup/selection/AdapterUtils.test.ts @@ -0,0 +1,987 @@ +/// +import { buildCategoricalColumn, CategoricalColumn, Column } from 'lineupjs'; +import { difference } from 'lodash'; +import { IAdditionalColumnDesc } from '../../../src/base'; +import { IDTypeManager } from '../../../src/idtype'; +import { AdapterUtils, IContext, ISelectionColumn } from '../../../src/lineup'; + +describe('SingleSelectionAdapter', () => { + const singleSelectionAdapter = AdapterUtils.single({ + createDesc: (id: string) => { + return Promise.resolve({ + selectedId: id, + label: `Dynamic column for ${id}`, + type: 'number', + initialRanking: false, + }); + }, + loadData: () => { + return Promise.resolve([]); + }, + }); + + const selection = { + idtype: IDTypeManager.getInstance().resolveIdType('foo'), + ids: ['id1', 'id2'], + }; + const freeColor = jest.fn(); // unused in this test + + describe('With empty ranking', () => { + const emptyRanking = []; // simulate empty ranking + + it('Trigger parameterChanged() with two selected ids', async () => { + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(2); // two columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2'); + expect(columns[1].desc.label).toBe('Dynamic column for id1'); + + return Promise.resolve(); + }); + + const remove = jest.fn(); + + const context: IContext = { + columns: emptyRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await singleSelectionAdapter.parameterChanged(context); + + // remove() should not be called, because the ranking is empty + expect(remove).toHaveBeenCalledTimes(0); + }); + + // Note: selectionChanged() has the same results as parameterChanged(), because of the empty ranking + it('Trigger selectionChanged() with two selected ids', async () => { + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(2); // two columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2'); + expect(columns[1].desc.label).toBe('Dynamic column for id1'); + + return Promise.resolve(); + }); + + const remove = jest.fn(); + + const context: IContext = { + columns: emptyRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await singleSelectionAdapter.parameterChanged(context); + + // remove() should not be called, because the ranking is empty + expect(remove).toHaveBeenCalledTimes(0); + }); + }); + + describe('With initial columns in ranking, but without dynamic columns', () => { + const columnsInRanking = [ + new CategoricalColumn('cat1', buildCategoricalColumn('Cat 1', []).build([])), + new CategoricalColumn('cat2', buildCategoricalColumn('Cat 2', []).build([])), + ]; + + it('Trigger parameterChanged() with two selected ids', async () => { + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(2); // two columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2'); + expect(columns[1].desc.label).toBe('Dynamic column for id1'); + + return Promise.resolve(); + }); + + const remove = jest.fn(); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await singleSelectionAdapter.parameterChanged(context); + + // remove() should not be called, because the ranking does not contain dynamic columns that can be removed + expect(remove).toHaveBeenCalledTimes(0); + }); + + // selectionChanged() has the same results as parameterChanged(), because of the empty ranking + it('Trigger selectionChanged() with two selected ids', async () => { + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(2); // two columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2'); + expect(columns[1].desc.label).toBe('Dynamic column for id1'); + + return Promise.resolve(); + }); + + const remove = jest.fn(); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await singleSelectionAdapter.parameterChanged(context); + + // remove() should not be called, because the ranking does not contain dynamic columns that can be removed + expect(remove).toHaveBeenCalledTimes(0); + }); + }); + + describe('With existing dynamic columns in ranking', () => { + // Note the property `selectedId` additionally to the original categorical column desc + const columnDesc1: IAdditionalColumnDesc = { ...buildCategoricalColumn('Cat 1', []).build([]), selectedId: 'id1', initialRanking: true }; + const columnDesc2: IAdditionalColumnDesc = { ...buildCategoricalColumn('Cat 2', []).build([]), selectedId: 'id2', initialRanking: true }; + + it('Trigger parameterChanged() with the same selected ids as existing dynamic columns', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1), new CategoricalColumn('cat2', columnDesc2)]; + + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(2); // two columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2'); + expect(columns[1].desc.label).toBe('Dynamic column for id1'); + + return Promise.resolve(); + }); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(2); // two columns for two ids + + // notice correct order! -> [0] = id1 + expect((columns[0].desc).selectedId).toBe('id1'); + expect((columns[1].desc).selectedId).toBe('id2'); + + expect(columns[0].desc.label).toBe('Cat 1'); + expect(columns[1].desc.label).toBe('Cat 2'); + + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await singleSelectionAdapter.parameterChanged(context); + + // add() will be called once because it will add two dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will be called once because the `SingleSelectionAdapter` removes **all** columns first and then adds them again + expect(remove).toHaveBeenCalledTimes(1); + }); + + it('Trigger parameterChanged() with a new selected id -> adds a dynamic column', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1)]; // only cat1 + + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(2); // two columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2'); + expect(columns[1].desc.label).toBe('Dynamic column for id1'); + + return Promise.resolve(); + }); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(1); // two columns for two ids + + // notice correct order! -> [0] = id1 + expect((columns[0].desc).selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Cat 1'); + + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await singleSelectionAdapter.parameterChanged(context); + + // add() will be called once because it will add two dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will be called once because the `SingleSelectionAdapter` removes **all** columns first and then adds them again + expect(remove).toHaveBeenCalledTimes(1); + }); + + it('Trigger selectionChanged() with the same selected ids as existing dynamic columns', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1), new CategoricalColumn('cat2', columnDesc2)]; + + const add = jest.fn(); + const remove = jest.fn(); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await singleSelectionAdapter.selectionChanged(context); + + // add() will not be called because the two dynamic columns are matching the ids in `selection` + expect(add).toHaveBeenCalledTimes(0); + + // remove() will not be called because the two dynamic columns are matching the ids in `selection` + expect(remove).toHaveBeenCalledTimes(0); + }); + + it('Trigger selectionChanged() with a new selected id -> adds a dynamic column', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1)]; // only cat1 + + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(1); // one column for the additional id + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[0].desc.label).toBe('Dynamic column for id2'); + + return Promise.resolve(); + }); + + const remove = jest.fn(); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await singleSelectionAdapter.selectionChanged(context); + + // add() will be called once because it will add two dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will not be called because the two dynamic columns are matching the ids in `selection` + expect(remove).toHaveBeenCalledTimes(0); + }); + + it('Trigger selectionChanged() with a missing selected id -> remove dynamic column', async () => { + const selectionWithSingleId = { + idtype: IDTypeManager.getInstance().resolveIdType('foo'), + ids: ['id2'], + }; + + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1), new CategoricalColumn('cat2', columnDesc2)]; // only cat1 + + const add = jest.fn(); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(1); // two columns for two ids + + // notice correct order! -> [0] = id1 + expect((columns[0].desc).selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Cat 1'); + + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection: selectionWithSingleId, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await singleSelectionAdapter.selectionChanged(context); + + // add() will not be called because the two dynamic columns are matching the ids in `selection` + expect(add).toHaveBeenCalledTimes(0); + + // remove() will not be called because the two dynamic columns are matching the ids in `selection` + expect(remove).toHaveBeenCalledTimes(1); + }); + }); +}); + +describe('MultiSelectionAdapter with subtypes of type string (default)', () => { + const multiSelectionAdapter = AdapterUtils.multi({ + getSelectedSubTypes: () => { + return ['subtype1', 'subtype2']; + }, + createDescs: (id: string, subtypes: string[]) => { + const descs = subtypes.map((subtype) => { + return { + selectedId: id, + label: `Dynamic column for ${id} and ${subtype}`, + type: 'number', + initialRanking: false, + }; + }); + return Promise.resolve(descs); + }, + loadData: (_id: string, descs: IAdditionalColumnDesc[]) => { + return descs.map(() => Promise.resolve([])); + }, + }); + + const selection = { + idtype: IDTypeManager.getInstance().resolveIdType('foo'), + ids: ['id1', 'id2'], + }; + const freeColor = jest.fn(); // unused in this test + + describe('With empty ranking', () => { + const emptyRanking = []; // simulate empty ranking + + it('Trigger parameterChanged() with two selected ids', async () => { + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(4); // two columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id2'); + expect(columns[2].desc.selectedId).toBe('id1'); + expect(columns[3].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2 and subtype2'); + expect(columns[1].desc.label).toBe('Dynamic column for id2 and subtype1'); + expect(columns[2].desc.label).toBe('Dynamic column for id1 and subtype2'); + expect(columns[3].desc.label).toBe('Dynamic column for id1 and subtype1'); + + return Promise.resolve(); + }); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(0); // no columns to remove + return Promise.resolve(); + }); + + const context: IContext = { + columns: emptyRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.parameterChanged(context); + + // add() will be called once because it will add four dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will be called but with zero columns to remove + expect(remove).toHaveBeenCalledTimes(1); + }); + + // Note: selectionChanged() has the same results as parameterChanged(), because of the empty ranking + it('Trigger selectionChanged() with two selected ids', async () => { + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(4); // two columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id2'); + expect(columns[2].desc.selectedId).toBe('id1'); + expect(columns[3].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2 and subtype2'); + expect(columns[1].desc.label).toBe('Dynamic column for id2 and subtype1'); + expect(columns[2].desc.label).toBe('Dynamic column for id1 and subtype2'); + expect(columns[3].desc.label).toBe('Dynamic column for id1 and subtype1'); + + return Promise.resolve(); + }); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(0); // no columns to remove + return Promise.resolve(); + }); + + const context: IContext = { + columns: emptyRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.parameterChanged(context); + + // add() will be called once because it will add four dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will be called but with zero columns to remove + expect(remove).toHaveBeenCalledTimes(1); + }); + }); + + describe('With initial columns in ranking, but without dynamic columns', () => { + const columnsInRanking = [ + new CategoricalColumn('cat1', buildCategoricalColumn('Cat 1', []).build([])), + new CategoricalColumn('cat2', buildCategoricalColumn('Cat 2', []).build([])), + ]; + + it('Trigger parameterChanged() with two selected ids', async () => { + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(4); // two columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id2'); + expect(columns[2].desc.selectedId).toBe('id1'); + expect(columns[3].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2 and subtype2'); + expect(columns[1].desc.label).toBe('Dynamic column for id2 and subtype1'); + expect(columns[2].desc.label).toBe('Dynamic column for id1 and subtype2'); + expect(columns[3].desc.label).toBe('Dynamic column for id1 and subtype1'); + + return Promise.resolve(); + }); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(0); // no columns to remove + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.parameterChanged(context); + + // add() will be called once because it will add four dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will be called but with zero columns to remove + expect(remove).toHaveBeenCalledTimes(1); + }); + + // selectionChanged() has the same results as parameterChanged(), because of the empty ranking + it('Trigger selectionChanged() with two selected ids', async () => { + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(4); // two columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id2'); + expect(columns[2].desc.selectedId).toBe('id1'); + expect(columns[3].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2 and subtype2'); + expect(columns[1].desc.label).toBe('Dynamic column for id2 and subtype1'); + expect(columns[2].desc.label).toBe('Dynamic column for id1 and subtype2'); + expect(columns[3].desc.label).toBe('Dynamic column for id1 and subtype1'); + + return Promise.resolve(); + }); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(0); // no columns to remove + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.parameterChanged(context); + + // add() will be called once because it will add four dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will be called but with zero columns to remove + expect(remove).toHaveBeenCalledTimes(1); + }); + }); + + describe('With existing dynamic columns in ranking', () => { + // Note the property `selectedId` additionally to the original categorical column desc + const columnDesc1: IAdditionalColumnDesc = { ...buildCategoricalColumn('Cat 1', []).build([]), selectedId: 'id1', initialRanking: true }; + const columnDesc2: IAdditionalColumnDesc = { ...buildCategoricalColumn('Cat 2', []).build([]), selectedId: 'id2', initialRanking: true }; + + it('Trigger parameterChanged() with the same selected ids as existing dynamic columns', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1), new CategoricalColumn('cat2', columnDesc2)]; + + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(4); // four columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id2'); + expect(columns[2].desc.selectedId).toBe('id1'); + expect(columns[3].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2 and subtype2'); + expect(columns[1].desc.label).toBe('Dynamic column for id2 and subtype1'); + expect(columns[2].desc.label).toBe('Dynamic column for id1 and subtype2'); + expect(columns[3].desc.label).toBe('Dynamic column for id1 and subtype1'); + + return Promise.resolve(); + }); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(0); // no columns to remove + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.parameterChanged(context); + + // add() will be called once because it will add four dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will be called but with zero columns to remove + expect(remove).toHaveBeenCalledTimes(1); + }); + + it('Trigger parameterChanged() with a new selected id -> adds four dynamic columns', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1)]; // only cat1 + + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(4); // four columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id2'); + expect(columns[2].desc.selectedId).toBe('id1'); + expect(columns[3].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2 and subtype2'); + expect(columns[1].desc.label).toBe('Dynamic column for id2 and subtype1'); + expect(columns[2].desc.label).toBe('Dynamic column for id1 and subtype2'); + expect(columns[3].desc.label).toBe('Dynamic column for id1 and subtype1'); + + return Promise.resolve(); + }); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(0); // no column to remove + + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.parameterChanged(context); + + // add() will be called once because it will add four dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will be called but with zero columns to remove + expect(remove).toHaveBeenCalledTimes(1); + }); + + it('Trigger selectionChanged() with the same selected ids as existing dynamic columns', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1), new CategoricalColumn('cat2', columnDesc2)]; + + const add = jest.fn(); + const remove = jest.fn(); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.selectionChanged(context); + + // add() will not be called because the two dynamic columns are matching the ids in `selection` + expect(add).toHaveBeenCalledTimes(0); + + // remove() will not be called because the two dynamic columns are matching the ids in `selection` + expect(remove).toHaveBeenCalledTimes(0); + }); + + it('Trigger selectionChanged() with a new selected id -> adds two dynamic columns', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1)]; // only cat1 + + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(2); // one column for the additional id + + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[0].desc.label).toBe('Dynamic column for id2 and subtype2'); + + expect(columns[1].desc.selectedId).toBe('id2'); + expect(columns[1].desc.label).toBe('Dynamic column for id2 and subtype1'); + + return Promise.resolve(); + }); + + const remove = jest.fn(); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.selectionChanged(context); + + // add() will be called once because it will add four dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will not be called because the two dynamic columns are matching the ids in `selection` + expect(remove).toHaveBeenCalledTimes(0); + }); + + it('Trigger selectionChanged() with a missing selected id -> remove dynamic column', async () => { + const selectionWithSingleId = { + idtype: IDTypeManager.getInstance().resolveIdType('foo'), + ids: ['id2'], + }; + + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1), new CategoricalColumn('cat2', columnDesc2)]; // only cat1 + + const add = jest.fn(); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(1); // two columns for two ids + + // notice correct order! -> [0] = id1 + expect((columns[0].desc).selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Cat 1'); + + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection: selectionWithSingleId, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.selectionChanged(context); + + // add() will not be called because the two dynamic columns are matching the ids in `selection` + expect(add).toHaveBeenCalledTimes(0); + + // remove() will not be called because the two dynamic columns are matching the ids in `selection` + expect(remove).toHaveBeenCalledTimes(1); + }); + }); +}); + +describe('MultiSelectionAdapter with subtypes of custom type', () => { + // define interface and use it as generic below + interface ICustomType { + entityId: string; + columnSelection: string; + } + + const multiSelectionAdapter = AdapterUtils.multi({ + getSelectedSubTypes: () => { + return [ + { entityId: 'entityId1', columnSelection: 'columnSelection1' }, + { entityId: 'entityId2', columnSelection: 'columnSelection2' }, + ]; + }, + // Note this additional function when using a custom type! + diffSubtypes: (columnSubtypes: string[], selectedSubtypes: ICustomType[]) => { + return difference( + columnSubtypes, + selectedSubtypes.map((mapping) => mapping.columnSelection), + ); + }, + createDescs: (id: string, subtypes: ICustomType[]) => { + const descs = subtypes.map((subtype) => { + return { + selectedId: id, + label: `Dynamic column for ${id} and ${subtype.entityId}`, + type: 'number', + initialRanking: false, + }; + }); + return Promise.resolve(descs); + }, + loadData: (_id: string, descs: IAdditionalColumnDesc[]) => { + return descs.map(() => Promise.resolve([])); + }, + }); + + const selection = { + idtype: IDTypeManager.getInstance().resolveIdType('foo'), + ids: ['id1', 'id2'], + }; + const freeColor = jest.fn(); // unused in this test + describe('With existing dynamic columns in ranking', () => { + // Note the property `selectedId` additionally to the original categorical column desc + const columnDesc1: IAdditionalColumnDesc = { ...buildCategoricalColumn('Cat 1', []).build([]), selectedId: 'id1', initialRanking: true }; + const columnDesc2: IAdditionalColumnDesc = { ...buildCategoricalColumn('Cat 2', []).build([]), selectedId: 'id2', initialRanking: true }; + + it('Trigger parameterChanged() with the same selected ids as existing dynamic columns', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1), new CategoricalColumn('cat2', columnDesc2)]; + + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(4); // four columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id2'); + expect(columns[2].desc.selectedId).toBe('id1'); + expect(columns[3].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2 and entityId2'); + expect(columns[1].desc.label).toBe('Dynamic column for id2 and entityId1'); + expect(columns[2].desc.label).toBe('Dynamic column for id1 and entityId2'); + expect(columns[3].desc.label).toBe('Dynamic column for id1 and entityId1'); + + return Promise.resolve(); + }); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(0); // no columns to remove + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.parameterChanged(context); + + // add() will be called once because it will add four dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will be called but with zero columns to remove + expect(remove).toHaveBeenCalledTimes(1); + }); + + it('Trigger parameterChanged() with a new selected id -> adds four dynamic columns', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1)]; // only cat1 + + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(4); // four columns for two ids + + // notice reverse order! -> [0] = id2 + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[1].desc.selectedId).toBe('id2'); + expect(columns[2].desc.selectedId).toBe('id1'); + expect(columns[3].desc.selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Dynamic column for id2 and entityId2'); + expect(columns[1].desc.label).toBe('Dynamic column for id2 and entityId1'); + expect(columns[2].desc.label).toBe('Dynamic column for id1 and entityId2'); + expect(columns[3].desc.label).toBe('Dynamic column for id1 and entityId1'); + + return Promise.resolve(); + }); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(0); // no column to remove + + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.parameterChanged(context); + + // add() will be called once because it will add four dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will be called but with zero columns to remove + expect(remove).toHaveBeenCalledTimes(1); + }); + + it('Trigger selectionChanged() with the same selected ids as existing dynamic columns', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1), new CategoricalColumn('cat2', columnDesc2)]; + + const add = jest.fn(); + const remove = jest.fn(); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.selectionChanged(context); + + // add() will not be called because the two dynamic columns are matching the ids in `selection` + expect(add).toHaveBeenCalledTimes(0); + + // remove() will not be called because the two dynamic columns are matching the ids in `selection` + expect(remove).toHaveBeenCalledTimes(0); + }); + + it('Trigger selectionChanged() with a new selected id -> adds two dynamic columns', async () => { + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1)]; // only cat1 + + const add = jest.fn((columns: ISelectionColumn[]) => { + expect(columns.length).toBe(2); // one column for the additional id + + expect(columns[0].desc.selectedId).toBe('id2'); + expect(columns[0].desc.label).toBe('Dynamic column for id2 and entityId2'); + + expect(columns[1].desc.selectedId).toBe('id2'); + expect(columns[1].desc.label).toBe('Dynamic column for id2 and entityId1'); + + return Promise.resolve(); + }); + + const remove = jest.fn(); + + const context: IContext = { + columns: columnsInRanking, + selection, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.selectionChanged(context); + + // add() will be called once because it will add four dynamic columns for the ids in `selection` + expect(add).toHaveBeenCalledTimes(1); + + // remove() will not be called because the two dynamic columns are matching the ids in `selection` + expect(remove).toHaveBeenCalledTimes(0); + }); + + it('Trigger selectionChanged() with a missing selected id -> remove dynamic column', async () => { + const selectionWithSingleId = { + idtype: IDTypeManager.getInstance().resolveIdType('foo'), + ids: ['id2'], + }; + + const columnsInRanking = [new CategoricalColumn('cat1', columnDesc1), new CategoricalColumn('cat2', columnDesc2)]; // only cat1 + + const add = jest.fn(); + + const remove = jest.fn((columns: Column[]) => { + expect(columns.length).toBe(1); // two columns for two ids + + // notice correct order! -> [0] = id1 + expect((columns[0].desc).selectedId).toBe('id1'); + + expect(columns[0].desc.label).toBe('Cat 1'); + + return Promise.resolve(); + }); + + const context: IContext = { + columns: columnsInRanking, + selection: selectionWithSingleId, + freeColor, + add, + remove, + }; + + // wait for the promise to resolve before checking for number of function calls + await multiSelectionAdapter.selectionChanged(context); + + // add() will not be called because the two dynamic columns are matching the ids in `selection` + expect(add).toHaveBeenCalledTimes(0); + + // remove() will not be called because the two dynamic columns are matching the ids in `selection` + expect(remove).toHaveBeenCalledTimes(1); + }); + }); +}); From 75e34dfb770fe6845d12d36dcef9d546a715a4d8 Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Thu, 19 May 2022 18:37:44 +0200 Subject: [PATCH 09/46] adding parameters check on use effect --- dist/base/rest.d.ts | 2 +- dist/lineup/RankingViewComponent.d.ts | 2 +- dist/lineup/RankingViewComponent.d.ts.map | 2 +- dist/lineup/RankingViewComponent.js | 32 ++++++++++++---- dist/lineup/RankingViewComponent.js.map | 2 +- dist/lineup/internal/ScoreUtils.d.ts | 16 +++++--- dist/lineup/internal/ScoreUtils.d.ts.map | 2 +- dist/utils/TDPApplicationUtils.d.ts | 6 +-- dist/utils/TDPApplicationUtils.d.ts.map | 2 +- dist/views/visyn/demo/VisynDemoView.d.ts | 1 - dist/views/visyn/demo/VisynDemoView.d.ts.map | 2 +- dist/vis/Vis.d.ts | 1 - dist/vis/Vis.d.ts.map | 2 +- dist/vis/VisSidebar.d.ts | 1 - dist/vis/VisSidebar.d.ts.map | 2 +- src/lineup/RankingViewComponent.tsx | 40 +++++++++++++++----- 16 files changed, 78 insertions(+), 37 deletions(-) diff --git a/dist/base/rest.d.ts b/dist/base/rest.d.ts index 23fc930f5..fdf2099ee 100644 --- a/dist/base/rest.d.ts +++ b/dist/base/rest.d.ts @@ -165,7 +165,7 @@ export declare class RestBaseUtils { * @param filters URL filter parameters */ static mergeParamAndFilters(params: IParams, filters: IParams): { - [x: string]: string | number | boolean | number[] | string[] | boolean[]; + [x: string]: string | number | boolean | string[] | number[] | boolean[]; }; /** * query the TDP rest api to read data with additional given filters diff --git a/dist/lineup/RankingViewComponent.d.ts b/dist/lineup/RankingViewComponent.d.ts index 83e84acd4..f346db09e 100644 --- a/dist/lineup/RankingViewComponent.d.ts +++ b/dist/lineup/RankingViewComponent.d.ts @@ -10,7 +10,7 @@ export interface IRankingViewComponentProps extends IRankingProps { * Selection of the previous view */ selection?: ISelection; - parameters: any; + parameters: any[]; selectionAdapter?: ISelectionAdapter; authorization?: string | string[] | IAuthorizationConfiguration | IAuthorizationConfiguration[] | null; } diff --git a/dist/lineup/RankingViewComponent.d.ts.map b/dist/lineup/RankingViewComponent.d.ts.map index 18aa91dc5..bc1230844 100644 --- a/dist/lineup/RankingViewComponent.d.ts.map +++ b/dist/lineup/RankingViewComponent.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAiI5B"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAwB7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAoI5B"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.js b/dist/lineup/RankingViewComponent.js index b22eb9572..132d846ad 100644 --- a/dist/lineup/RankingViewComponent.js +++ b/dist/lineup/RankingViewComponent.js @@ -1,5 +1,5 @@ /* eslint-disable import/no-cycle */ -import React, { useCallback, useMemo } from 'react'; +import React, { useCallback, useMemo, useState } from 'react'; import { Ranking } from './Ranking'; import { ERenderAuthorizationStatus } from '../auth/interfaces'; import { TDPTokenManager, TokenManager } from '../auth/TokenManager'; @@ -7,6 +7,21 @@ import { I18nextManager } from '../i18n/I18nextManager'; import { AView } from '../views/AView'; import { useAsync } from '../hooks/useAsync'; import { ViewUtils } from '../views/ViewUtils'; +function isSameParameters(current, inputSelection) { + if (!current || !inputSelection || current.length !== inputSelection.length) { + return false; + } + for (let i = 0; i < current.length; ++i) { + const a = current[i]; + const b = inputSelection[i]; + for (const key in Object.keys(a)) { + if (a[key] !== b[key]) { + return false; + } + } + } + return true; +} export function RankingViewComponent({ data = [], selection: inputSelection, itemSelection = { idtype: null, ids: [] }, columnDesc = [], parameters = false, selectionAdapter = null, options = {}, authorization = null, onItemSelect, onItemSelectionChanged, onCustomizeRanking, onBuiltLineUp, onUpdateEntryPoint, /** * Maybe refactor this when using the native lineup implementation of scores @@ -15,6 +30,7 @@ onAddScoreColumn, }) { const selections = useMemo(() => { return new Map(); }, []); + const [prevParameters, setPrevParameters] = useState(null); const [selectionAdapterContext, setSelectionAdapterContext] = React.useState(null); const viewRef = React.useRef(null); const runAuthorizations = useCallback(async () => { @@ -83,23 +99,25 @@ onAddScoreColumn, }) { selections.set(name, inputSelection); if (name === AView.DEFAULT_SELECTION_NAME) { if (selectionAdapter) { - console.log('calling selection changed'); selectionAdapter.selectionChanged({ ...selectionAdapterContext, selection: inputSelection }); } } } - }, [status, selectionAdapterContext, selectionAdapter, inputSelection, selections]); + }, [status, inputSelection, selectionAdapterContext, selections, selectionAdapter]); /** * onParametersChanged */ React.useEffect(() => { - if (status === 'success' && parameters) { + if (isSameParameters(parameters, prevParameters)) { + return; + } + if (status === 'success') { if (selectionAdapter) { - console.log('calling parameters changed'); - selectionAdapter.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }); + selectionAdapter === null || selectionAdapter === void 0 ? void 0 : selectionAdapter.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }); + setPrevParameters(parameters); } } - }, [status, selectionAdapter]); + }, [status, selectionAdapter, selectionAdapterContext, inputSelection, selections, parameters, prevParameters]); const onContextChangedCallback = useCallback((newContext) => { setSelectionAdapterContext(newContext); }, []); diff --git a/dist/lineup/RankingViewComponent.js.map b/dist/lineup/RankingViewComponent.js.map index 4642e7e9d..ee1efdd0c 100644 --- a/dist/lineup/RankingViewComponent.js.map +++ b/dist/lineup/RankingViewComponent.js.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/internal/ScoreUtils.d.ts b/dist/lineup/internal/ScoreUtils.d.ts index babc1be1e..ebc2fce4b 100644 --- a/dist/lineup/internal/ScoreUtils.d.ts +++ b/dist/lineup/internal/ScoreUtils.d.ts @@ -4,12 +4,18 @@ export declare class ScoreUtils { static readonly CMD_ADD_SCORE = "tdpAddScore"; static readonly CMD_REMOVE_SCORE = "tdpRemoveScore"; private static addScoreLogic; - static addScoreImpl(inputs: IObjectRef[], parameter: any): any; - static addScoreAsync(inputs: IObjectRef[], parameter: any): Promise; - static removeScoreImpl(inputs: IObjectRef[], parameter: any): any; - static addScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any): any; + static addScoreImpl(inputs: IObjectRef[], parameter: any): Promise<{ + inverse: import("../../clue/provenance").IAction; + }>; + static addScoreAsync(inputs: IObjectRef[], parameter: any): Promise<{ + inverse: import("../../clue/provenance").IAction; + }>; + static removeScoreImpl(inputs: IObjectRef[], parameter: any): Promise<{ + inverse: import("../../clue/provenance").IAction; + }>; + static addScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any): import("../../clue/provenance").IAction; static pushScoreAsync(graph: ProvenanceGraph, provider: IObjectRef, scoreName: string, scoreId: string, params: any): Promise; - static removeScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any, columnId: string | string[]): any; + static removeScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any, columnId: string | string[]): import("../../clue/provenance").IAction; private static shallowEqualObjects; /** * compresses score creation and removal diff --git a/dist/lineup/internal/ScoreUtils.d.ts.map b/dist/lineup/internal/ScoreUtils.d.ts.map index 5f357b40e..c7067b460 100644 --- a/dist/lineup/internal/ScoreUtils.d.ts.map +++ b/dist/lineup/internal/ScoreUtils.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ScoreUtils.d.ts","sourceRoot":"","sources":["../../../src/lineup/internal/ScoreUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAE,UAAU,EAA+C,eAAe,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE7H,qBAAa,UAAU;IACrB,gBAAuB,aAAa,iBAAiB;IAErD,gBAAuB,gBAAgB,oBAAoB;mBAEtC,aAAa;IA4BlC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;WAI1D,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;WAIjE,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;IAYhF,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;WAiBvF,cAAc,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IA0BxI,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBpI,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAsBlC;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE;IAIlC,OAAO,CAAC,MAAM,CAAC,YAAY;IAwB3B,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE;CAGvC"} \ No newline at end of file +{"version":3,"file":"ScoreUtils.d.ts","sourceRoot":"","sources":["../../../src/lineup/internal/ScoreUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAE,UAAU,EAA+C,eAAe,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE7H,qBAAa,UAAU;IACrB,gBAAuB,aAAa,iBAAiB;IAErD,gBAAuB,gBAAgB,oBAAoB;mBAEtC,aAAa;IA4BlC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;;;WAI1D,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;;;WAIjE,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;;;IAYhF,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;WAiBvF,cAAc,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IA0BxI,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBpI,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAsBlC;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE;IAIlC,OAAO,CAAC,MAAM,CAAC,YAAY;IAwB3B,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE;CAGvC"} \ No newline at end of file diff --git a/dist/utils/TDPApplicationUtils.d.ts b/dist/utils/TDPApplicationUtils.d.ts index 1fda5a116..34cb07273 100644 --- a/dist/utils/TDPApplicationUtils.d.ts +++ b/dist/utils/TDPApplicationUtils.d.ts @@ -41,10 +41,8 @@ export declare class TDPApplicationUtils { inverse: import("../clue/provenance").IAction; }; static initSession(map: object): import("../clue/provenance").IAction; - static setParameterImpl(inputs: IObjectRef[], parameter: any, graph: ProvenanceGraph): Promise<{ - inverse: import("../clue/provenance").IAction; - }>; - static setParameter(view: IObjectRef, name: string, value: any, previousValue: any): import("../clue/provenance").IAction; + static setParameterImpl(inputs: IObjectRef[], parameter: any, graph: ProvenanceGraph): any; + static setParameter(view: IObjectRef, name: string, value: any, previousValue: any): any; static compressSetParameter(path: ActionNode[]): ActionNode[]; /** * @deprecated diff --git a/dist/utils/TDPApplicationUtils.d.ts.map b/dist/utils/TDPApplicationUtils.d.ts.map index 32a0ca604..f29523624 100644 --- a/dist/utils/TDPApplicationUtils.d.ts.map +++ b/dist/utils/TDPApplicationUtils.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"TDPApplicationUtils.d.ts","sourceRoot":"","sources":["../../src/utils/TDPApplicationUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA+C,eAAe,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAI1H,OAAO,EAAe,WAAW,EAAyB,MAAM,aAAa,CAAC;AAG9E,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IAEhC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAE;CAC5C;AAED,qBAAa,mBAAmB;IAC9B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM;IAEzB,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAgC;IAEpD,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAiC;IAGpD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,oBAAoB;IAEpD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,qBAAqB;IAEtD,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,EAAE,CA2B1E;IAEF;;;OAGG;IAEH,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAalC,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;IAIlD;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,OAAO,GAAE,OAAO,CAAC,sBAAsB,CAAM;;wBAqLnE,QAAQ,KAAG,QAAQ,WAAW,CAAC;;IAyBnD;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM;;;IAerE,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM;WAcjB,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,KAAA,EAAE,KAAK,EAAE,eAAe;;;IAW1F,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG;IAmBlG,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE;IAI9C;;OAEG;IACH,MAAM,CAAC,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE;CAGlD"} \ No newline at end of file +{"version":3,"file":"TDPApplicationUtils.d.ts","sourceRoot":"","sources":["../../src/utils/TDPApplicationUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA+C,eAAe,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAI1H,OAAO,EAAe,WAAW,EAAyB,MAAM,aAAa,CAAC;AAG9E,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IAEhC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAE;CAC5C;AAED,qBAAa,mBAAmB;IAC9B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM;IAEzB,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAgC;IAEpD,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAiC;IAGpD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,oBAAoB;IAEpD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,qBAAqB;IAEtD,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,EAAE,CA2B1E;IAEF;;;OAGG;IAEH,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAalC,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;IAIlD;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,OAAO,GAAE,OAAO,CAAC,sBAAsB,CAAM;;wBAqLnE,QAAQ,KAAG,QAAQ,WAAW,CAAC;;IAyBnD;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM;;;IAerE,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM;WAcjB,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,KAAA,EAAE,KAAK,EAAE,eAAe;IAW1F,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG;IAmBlG,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE;IAI9C;;OAEG;IACH,MAAM,CAAC,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE;CAGlD"} \ No newline at end of file diff --git a/dist/views/visyn/demo/VisynDemoView.d.ts b/dist/views/visyn/demo/VisynDemoView.d.ts index 6e4ff5068..4df3855fd 100644 --- a/dist/views/visyn/demo/VisynDemoView.d.ts +++ b/dist/views/visyn/demo/VisynDemoView.d.ts @@ -1,4 +1,3 @@ -/// import { DemoVisynViewPluginType } from './interfaces'; export declare function VisynDemoView({ desc, parameters, onParametersChanged }: DemoVisynViewPluginType['props']): JSX.Element; export declare function VisynDemoViewSidebar({ parameters, onParametersChanged }: DemoVisynViewPluginType['props']): JSX.Element; diff --git a/dist/views/visyn/demo/VisynDemoView.d.ts.map b/dist/views/visyn/demo/VisynDemoView.d.ts.map index d3da0fa6e..54d6675d1 100644 --- a/dist/views/visyn/demo/VisynDemoView.d.ts.map +++ b/dist/views/visyn/demo/VisynDemoView.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"VisynDemoView.d.ts","sourceRoot":"","sources":["../../../../src/views/visyn/demo/VisynDemoView.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAkEvD,wBAAgB,aAAa,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eA0BxG;AAED,wBAAgB,oBAAoB,CAAC,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiBzG;AAED,wBAAgB,mBAAmB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiCnH;AAED,wBAAgB,mBAAmB,IAAI,uBAAuB,CAAC,YAAY,CAAC,CAY3E"} \ No newline at end of file +{"version":3,"file":"VisynDemoView.d.ts","sourceRoot":"","sources":["../../../../src/views/visyn/demo/VisynDemoView.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAkEvD,wBAAgB,aAAa,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eA0BxG;AAED,wBAAgB,oBAAoB,CAAC,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiBzG;AAED,wBAAgB,mBAAmB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiCnH;AAED,wBAAgB,mBAAmB,IAAI,uBAAuB,CAAC,YAAY,CAAC,CAY3E"} \ No newline at end of file diff --git a/dist/vis/Vis.d.ts b/dist/vis/Vis.d.ts index e2070d05c..f1af3142b 100644 --- a/dist/vis/Vis.d.ts +++ b/dist/vis/Vis.d.ts @@ -1,4 +1,3 @@ -/// import { IVisConfig, VisColumn, EFilterOptions } from './interfaces'; export declare function Vis({ columns, selected, colors, shapes, selectionCallback, filterCallback, setExternalConfig, closeCallback, showCloseButton, externalConfig, hideSidebar, }: { /** diff --git a/dist/vis/Vis.d.ts.map b/dist/vis/Vis.d.ts.map index 97352aa61..6744df886 100644 --- a/dist/vis/Vis.d.ts.map +++ b/dist/vis/Vis.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Vis.d.ts","sourceRoot":"","sources":["../../src/vis/Vis.tsx"],"names":[],"mappings":";AAGA,OAAO,EAEL,UAAU,EAEV,SAAS,EACT,cAAc,EAQf,MAAM,cAAc,CAAC;AAwBtB,wBAAgB,GAAG,CAAC,EAClB,OAAO,EACP,QAAa,EACb,MAAuB,EACvB,MAAuB,EACvB,iBAA8B,EAC9B,cAA2B,EAC3B,iBAA8B,EAC9B,aAA0B,EAC1B,eAAuB,EACvB,cAAqB,EACrB,WAAmB,GACpB,EAAE;IACD;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC1C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7C,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,eA4LA"} \ No newline at end of file +{"version":3,"file":"Vis.d.ts","sourceRoot":"","sources":["../../src/vis/Vis.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,UAAU,EAEV,SAAS,EACT,cAAc,EAQf,MAAM,cAAc,CAAC;AAwBtB,wBAAgB,GAAG,CAAC,EAClB,OAAO,EACP,QAAa,EACb,MAAuB,EACvB,MAAuB,EACvB,iBAA8B,EAC9B,cAA2B,EAC3B,iBAA8B,EAC9B,aAA0B,EAC1B,eAAuB,EACvB,cAAqB,EACrB,WAAmB,GACpB,EAAE;IACD;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC1C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7C,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,eA4LA"} \ No newline at end of file diff --git a/dist/vis/VisSidebar.d.ts b/dist/vis/VisSidebar.d.ts index a0d76cd45..a354f7263 100644 --- a/dist/vis/VisSidebar.d.ts +++ b/dist/vis/VisSidebar.d.ts @@ -1,4 +1,3 @@ -/// import { IVisConfig, VisColumn, ICommonVisSideBarProps } from './interfaces'; export declare type VisSidebarProps = { /** diff --git a/dist/vis/VisSidebar.d.ts.map b/dist/vis/VisSidebar.d.ts.map index 63c5bf3fa..1910646d5 100644 --- a/dist/vis/VisSidebar.d.ts.map +++ b/dist/vis/VisSidebar.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"VisSidebar.d.ts","sourceRoot":"","sources":["../../src/vis/VisSidebar.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAU7E,oBAAY,eAAe,GAAG;IAC5B;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,cAAc,EAAE,UAAU,CAAC;IAC3B,iBAAiB,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;CAC5C,GAAG,sBAAsB,CAAC;AAE3B,wBAAgB,UAAU,CAAC,EAAE,OAAO,EAAE,cAA2B,EAAE,cAAqB,EAAE,iBAAwB,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,eAAe,eAmDtJ"} \ No newline at end of file +{"version":3,"file":"VisSidebar.d.ts","sourceRoot":"","sources":["../../src/vis/VisSidebar.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAU7E,oBAAY,eAAe,GAAG;IAC5B;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,cAAc,EAAE,UAAU,CAAC;IAC3B,iBAAiB,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;CAC5C,GAAG,sBAAsB,CAAC;AAE3B,wBAAgB,UAAU,CAAC,EAAE,OAAO,EAAE,cAA2B,EAAE,cAAqB,EAAE,iBAAwB,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,eAAe,eAmDtJ"} \ No newline at end of file diff --git a/src/lineup/RankingViewComponent.tsx b/src/lineup/RankingViewComponent.tsx index 71b1c6697..0b4b9dab7 100644 --- a/src/lineup/RankingViewComponent.tsx +++ b/src/lineup/RankingViewComponent.tsx @@ -1,5 +1,6 @@ /* eslint-disable import/no-cycle */ -import React, { useCallback, useMemo } from 'react'; +import React, { useCallback, useMemo, useState } from 'react'; +import { param } from 'jquery'; import { Ranking, IRankingProps } from './Ranking'; import { ISelection } from '../base/interfaces'; import { IContext, ISelectionAdapter } from './selection/ISelectionAdapter'; @@ -10,6 +11,23 @@ import { AView } from '../views/AView'; import { useAsync } from '../hooks/useAsync'; import { ViewUtils } from '../views/ViewUtils'; +function isSameParameters(current: any[], inputSelection: any[]) { + if (!current || !inputSelection || current.length !== inputSelection.length) { + return false; + } + + for (let i = 0; i < current.length; ++i) { + const a = current[i]; + const b = inputSelection[i]; + + for (const key in Object.keys(a)) { + if (a[key] !== b[key]) { + return false; + } + } + } + return true; +} /** * */ @@ -18,7 +36,7 @@ export interface IRankingViewComponentProps extends IRankingProps { * Selection of the previous view */ selection?: ISelection; - parameters: any; + parameters: any[]; selectionAdapter?: ISelectionAdapter; authorization?: string | string[] | IAuthorizationConfiguration | IAuthorizationConfiguration[] | null; } @@ -46,6 +64,8 @@ export function RankingViewComponent({ return new Map(); }, []); + const [prevParameters, setPrevParameters] = useState(null); + const [selectionAdapterContext, setSelectionAdapterContext] = React.useState>(null); const viewRef = React.useRef(null); @@ -128,25 +148,27 @@ export function RankingViewComponent({ selections.set(name, inputSelection); if (name === AView.DEFAULT_SELECTION_NAME) { if (selectionAdapter) { - console.log('calling selection changed'); selectionAdapter.selectionChanged({ ...selectionAdapterContext, selection: inputSelection }); } } } - }, [status, selectionAdapterContext, selectionAdapter, inputSelection, selections]); + }, [status, inputSelection, selectionAdapterContext, selections, selectionAdapter]); /** * onParametersChanged */ React.useEffect(() => { - if (status === 'success' && parameters) { - if (selectionAdapter) { - console.log('calling parameters changed'); + if (isSameParameters(parameters, prevParameters)) { + return; + } - selectionAdapter.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }); + if (status === 'success') { + if (selectionAdapter) { + selectionAdapter?.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }); + setPrevParameters(parameters); } } - }, [status, selectionAdapter]); + }, [status, selectionAdapter, selectionAdapterContext, inputSelection, selections, parameters, prevParameters]); const onContextChangedCallback = useCallback((newContext: Omit) => { setSelectionAdapterContext(newContext); From 726ca43ed797a9982564a5ccca2a72582d1f61bb Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Mon, 23 May 2022 10:52:32 +0200 Subject: [PATCH 10/46] removing outdated todo --- dist/lineup/RankingViewComponent.d.ts.map | 2 +- dist/lineup/RankingViewComponent.js | 4 +--- dist/lineup/RankingViewComponent.js.map | 2 +- src/lineup/RankingViewComponent.tsx | 5 +---- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dist/lineup/RankingViewComponent.d.ts.map b/dist/lineup/RankingViewComponent.d.ts.map index bc1230844..bace9877f 100644 --- a/dist/lineup/RankingViewComponent.d.ts.map +++ b/dist/lineup/RankingViewComponent.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAwB7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAoI5B"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAwB7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAiI5B"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.js b/dist/lineup/RankingViewComponent.js index 132d846ad..e06a38af8 100644 --- a/dist/lineup/RankingViewComponent.js +++ b/dist/lineup/RankingViewComponent.js @@ -84,8 +84,6 @@ onAddScoreColumn, }) { }); }, [runAuthorizations]); const { status } = useAsync(init, []); - // TODO:: Pretty sure this only works by blind luck, because the parameter changed update gets canceled on - // selection change because theyre both running at the same time, but its a race case /** * onInputSelectionChanged */ @@ -113,7 +111,7 @@ onAddScoreColumn, }) { } if (status === 'success') { if (selectionAdapter) { - selectionAdapter === null || selectionAdapter === void 0 ? void 0 : selectionAdapter.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }); + selectionAdapter.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }); setPrevParameters(parameters); } } diff --git a/dist/lineup/RankingViewComponent.js.map b/dist/lineup/RankingViewComponent.js.map index ee1efdd0c..d6d57a03d 100644 --- a/dist/lineup/RankingViewComponent.js.map +++ b/dist/lineup/RankingViewComponent.js.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/lineup/RankingViewComponent.tsx b/src/lineup/RankingViewComponent.tsx index 0b4b9dab7..e5e351fe2 100644 --- a/src/lineup/RankingViewComponent.tsx +++ b/src/lineup/RankingViewComponent.tsx @@ -132,9 +132,6 @@ export function RankingViewComponent({ }, [runAuthorizations]); const { status } = useAsync(init, []); - // TODO:: Pretty sure this only works by blind luck, because the parameter changed update gets canceled on - // selection change because theyre both running at the same time, but its a race case - /** * onInputSelectionChanged */ @@ -164,7 +161,7 @@ export function RankingViewComponent({ if (status === 'success') { if (selectionAdapter) { - selectionAdapter?.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }); + selectionAdapter.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }); setPrevParameters(parameters); } } From 3d1d98c82ab7971836ac33e6bf69f4742fbda3e9 Mon Sep 17 00:00:00 2001 From: oltionchampari Date: Tue, 24 May 2022 17:55:01 +0200 Subject: [PATCH 11/46] Update context inside selection adapter --- dist/lineup/RankingViewComponent.js | 14 ++++++------- dist/lineup/RankingViewComponent.js.map | 2 +- dist/lineup/selection/ISelectionAdapter.d.ts | 4 ++-- .../selection/ISelectionAdapter.d.ts.map | 2 +- .../internal/ABaseSelectionAdapter.d.ts | 8 ++++---- .../internal/ABaseSelectionAdapter.d.ts.map | 2 +- .../internal/ABaseSelectionAdapter.js | 16 +++++++-------- .../internal/ABaseSelectionAdapter.js.map | 2 +- .../internal/MultiSelectionAdapter.d.ts | 2 +- .../internal/MultiSelectionAdapter.d.ts.map | 2 +- .../internal/MultiSelectionAdapter.js | 5 +++-- .../internal/MultiSelectionAdapter.js.map | 2 +- src/lineup/RankingViewComponent.tsx | 16 +++++++-------- src/lineup/selection/ISelectionAdapter.ts | 4 ++-- .../internal/ABaseSelectionAdapter.ts | 20 +++++++++---------- .../internal/MultiSelectionAdapter.ts | 5 +++-- 16 files changed, 54 insertions(+), 52 deletions(-) diff --git a/dist/lineup/RankingViewComponent.js b/dist/lineup/RankingViewComponent.js index e06a38af8..4227ab7ae 100644 --- a/dist/lineup/RankingViewComponent.js +++ b/dist/lineup/RankingViewComponent.js @@ -84,6 +84,9 @@ onAddScoreColumn, }) { }); }, [runAuthorizations]); const { status } = useAsync(init, []); + const onContextChangedCallback = useCallback((newContext) => { + setSelectionAdapterContext(newContext); + }, []); /** * onInputSelectionChanged */ @@ -97,11 +100,11 @@ onAddScoreColumn, }) { selections.set(name, inputSelection); if (name === AView.DEFAULT_SELECTION_NAME) { if (selectionAdapter) { - selectionAdapter.selectionChanged({ ...selectionAdapterContext, selection: inputSelection }); + selectionAdapter.selectionChanged({ ...selectionAdapterContext, selection: inputSelection }, onContextChangedCallback); } } } - }, [status, inputSelection, selectionAdapterContext, selections, selectionAdapter]); + }, [status, inputSelection, selectionAdapterContext, selections, selectionAdapter, onContextChangedCallback]); /** * onParametersChanged */ @@ -111,14 +114,11 @@ onAddScoreColumn, }) { } if (status === 'success') { if (selectionAdapter) { - selectionAdapter.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }); + selectionAdapter.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }, onContextChangedCallback); setPrevParameters(parameters); } } - }, [status, selectionAdapter, selectionAdapterContext, inputSelection, selections, parameters, prevParameters]); - const onContextChangedCallback = useCallback((newContext) => { - setSelectionAdapterContext(newContext); - }, []); + }, [status, selectionAdapter, selectionAdapterContext, inputSelection, selections, parameters, prevParameters, onContextChangedCallback]); return (React.createElement("div", { ref: viewRef, className: `tdp-view lineup lu-taggle lu ${status !== 'success' && 'tdp-busy'}` }, React.createElement(Ranking, { data: data, columnDesc: columnDesc, itemSelection: itemSelection, options: options, onItemSelect: onItemSelect, onContextChanged: onContextChangedCallback, onAddScoreColumn: onAddScoreColumn, onBuiltLineUp: onBuiltLineUp, onItemSelectionChanged: onItemSelectionChanged, onCustomizeRanking: onCustomizeRanking, onUpdateEntryPoint: onUpdateEntryPoint }))); } diff --git a/dist/lineup/RankingViewComponent.js.map b/dist/lineup/RankingViewComponent.js.map index d6d57a03d..cd198ba83 100644 --- a/dist/lineup/RankingViewComponent.js.map +++ b/dist/lineup/RankingViewComponent.js.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/selection/ISelectionAdapter.d.ts b/dist/lineup/selection/ISelectionAdapter.d.ts index 3fdba2336..972ccaa7d 100644 --- a/dist/lineup/selection/ISelectionAdapter.d.ts +++ b/dist/lineup/selection/ISelectionAdapter.d.ts @@ -42,11 +42,11 @@ export interface ISelectionAdapter { * called when a parameter has changed * @param {IContext} context */ - parameterChanged(context: IContext): Promise; + parameterChanged(context: IContext, onContextChanged?: (context: IContext) => void): Promise; /** * called when the input selection has changed * @param {IContext} context */ - selectionChanged(context: IContext): Promise; + selectionChanged(context: IContext, onContextChanged?: (context: IContext) => void): Promise; } //# sourceMappingURL=ISelectionAdapter.d.ts.map \ No newline at end of file diff --git a/dist/lineup/selection/ISelectionAdapter.d.ts.map b/dist/lineup/selection/ISelectionAdapter.d.ts.map index 315fb7252..ec9f9f12d 100644 --- a/dist/lineup/selection/ISelectionAdapter.d.ts.map +++ b/dist/lineup/selection/ISelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ISelectionAdapter.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/ISelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAErF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhD;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnD;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD"} \ No newline at end of file +{"version":3,"file":"ISelectionAdapter.d.ts","sourceRoot":"","sources":["../../../src/lineup/selection/ISelectionAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAErF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,qBAAqB,CAAC;IACrC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAE/B;;;OAGG;IACH,GAAG,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhD;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC;;;OAGG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnG;;;OAGG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpG"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts index 90f322e85..5a153fb4d 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts @@ -8,15 +8,15 @@ export declare abstract class ABaseSelectionAdapter implements ISelectionAdapter * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - selectionChanged(context: IContext): Promise; + selectionChanged(context: IContext, onContextChanged?: (context: IContext) => void): Promise; /** * Add or remove columns in LineUp ranking when the parametrs in the selection adapter context change * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - parameterChanged(context: IContext): Promise; - protected abstract parameterChangedImpl(context: IContext): Promise; - protected selectionChangedImpl(context: IContext): Promise; + parameterChanged(context: IContext, onContextChanged?: (context: IContext) => void): Promise; + protected abstract parameterChangedImpl(context: IContext, onContextChanged?: (context: IContext) => void): Promise; + protected selectionChangedImpl(context: IContext, onContextChanged?: (context: IContext) => void): Promise; /** * Create a column desc with additional metadata for a given selected id. * diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map index ff9ae15e4..353070066 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ABaseSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAErF,8BAAsB,qBAAsB,YAAW,iBAAiB;cACtD,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAelF,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/E;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDlD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;cAEzD,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtE;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAG/F,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,GAAG,qBAAqB;CAKzF"} \ No newline at end of file +{"version":3,"file":"ABaseSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAErF,8BAAsB,qBAAsB,YAAW,iBAAiB;cACtD,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAelF,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/E;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlG;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDlG,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAEzG,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtH;;;;;;;;;OASG;IACH,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAG/F,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,GAAG,qBAAqB;CAKzF"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.js b/dist/lineup/selection/internal/ABaseSelectionAdapter.js index 332215d61..8c7403653 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.js +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.js @@ -25,18 +25,18 @@ export class ABaseSelectionAdapter { * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - selectionChanged(context) { - return this.selectionChangedImpl(context); + selectionChanged(context, onContextChanged) { + return this.selectionChangedImpl(context, onContextChanged); } /** * Add or remove columns in LineUp ranking when the parametrs in the selection adapter context change * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - parameterChanged(context) { - return this.parameterChangedImpl(context); + parameterChanged(context, onContextChanged) { + return this.parameterChangedImpl(context, onContextChanged); } - async selectionChangedImpl(context) { + async selectionChangedImpl(context, onContextChanged) { const selectedIds = context.selection.ids; const usedCols = context.columns.filter((d) => d.desc.selectedId != null); const lineupColIds = usedCols.map((d) => d.desc.selectedId); @@ -49,10 +49,10 @@ export class ABaseSelectionAdapter { await this.removeDynamicColumns(context, diffRemoved); } // add new columns to the end - if (diffAdded.length <= 0) { - return null; + if (diffAdded.length) { + await this.addDynamicColumns(context, diffAdded); } - return this.addDynamicColumns(context, diffAdded); + return onContextChanged === null || onContextChanged === void 0 ? void 0 : onContextChanged(context); } // TODO this function is currently useless, because it requires an `IAdditionalColumnDesc` where `selectedId` is mandatory and then assigns it again static patchDesc(desc, selectedId) { diff --git a/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map b/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map index 574fe2697..3e68a4f2f 100644 --- a/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/ABaseSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"ABaseSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ABaseSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/ABaseSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts b/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts index ae36ab4aa..7324dac47 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts @@ -47,7 +47,7 @@ export declare class MultiSelectionAdapter extends ABaseSelectionAda * @param context selection adapter context * @returns A promise to wait until all new columns have been added */ - protected parameterChangedImpl(context: IContext): Promise; + protected parameterChangedImpl(context: IContext, onContextChanged?: (context: IContext) => void): Promise; /** * Create one or multiple LineUp column descs + additional information for each selected sub-type and given id. * diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map b/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map index 8ddb8f0f1..9abe73df3 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"MultiSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,MAAM;IAChD;;;;OAIG;IACH,mBAAmB,IAAI,CAAC,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,qBAAqB,EAAE,CAAC;IAEnG;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;IAElF;;;;;;;;;;;OAWG;IACH,YAAY,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC;CAC1E;AAED,qBAAa,qBAAqB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,qBAAqB;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAI/D;;;;;;;OAOG;cACa,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAMtE;;;;;;OAMG;cACa,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA+B5F,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,uBAAuB;CAOhC"} \ No newline at end of file +{"version":3,"file":"MultiSelectionAdapter.d.ts","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,MAAM;IAChD;;;;OAIG;IACH,mBAAmB,IAAI,CAAC,EAAE,CAAC;IAE3B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC,GAAG,qBAAqB,EAAE,CAAC;IAEnG;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;IAElF;;;;;;;;;;;OAWG;IACH,YAAY,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC;CAC1E;AAED,qBAAa,qBAAqB,CAAC,CAAC,GAAG,MAAM,CAAE,SAAQ,qBAAqB;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAI/D;;;;;;;OAOG;cACa,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtH;;;;;;OAMG;cACa,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA+B5F,OAAO,CAAC,2BAA2B;IAsBnC,OAAO,CAAC,uBAAuB;CAOhC"} \ No newline at end of file diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.js b/dist/lineup/selection/internal/MultiSelectionAdapter.js index 97c5c2638..0aa74f724 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.js +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.js @@ -13,10 +13,11 @@ export class MultiSelectionAdapter extends ABaseSelectionAdapter { * @param context selection adapter context * @returns A promise to wait until all new columns have been added */ - async parameterChangedImpl(context) { + async parameterChangedImpl(context, onContextChanged) { const selectedIds = context.selection.ids; await this.removePartialDynamicColumns(context, selectedIds); - return this.addDynamicColumns(context, selectedIds); + await this.addDynamicColumns(context, selectedIds); + onContextChanged === null || onContextChanged === void 0 ? void 0 : onContextChanged(context); } /** * Create one or multiple LineUp column descs + additional information for each selected sub-type and given id. diff --git a/dist/lineup/selection/internal/MultiSelectionAdapter.js.map b/dist/lineup/selection/internal/MultiSelectionAdapter.js.map index e51f9a7bd..08d580269 100644 --- a/dist/lineup/selection/internal/MultiSelectionAdapter.js.map +++ b/dist/lineup/selection/internal/MultiSelectionAdapter.js.map @@ -1 +1 @@ -{"version":3,"file":"MultiSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"MultiSelectionAdapter.js","sourceRoot":"","sources":["../../../../src/lineup/selection/internal/MultiSelectionAdapter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/lineup/RankingViewComponent.tsx b/src/lineup/RankingViewComponent.tsx index e5e351fe2..f71a7d1f3 100644 --- a/src/lineup/RankingViewComponent.tsx +++ b/src/lineup/RankingViewComponent.tsx @@ -132,6 +132,10 @@ export function RankingViewComponent({ }, [runAuthorizations]); const { status } = useAsync(init, []); + const onContextChangedCallback = useCallback((newContext: Omit) => { + setSelectionAdapterContext(newContext); + }, []); + /** * onInputSelectionChanged */ @@ -145,11 +149,11 @@ export function RankingViewComponent({ selections.set(name, inputSelection); if (name === AView.DEFAULT_SELECTION_NAME) { if (selectionAdapter) { - selectionAdapter.selectionChanged({ ...selectionAdapterContext, selection: inputSelection }); + selectionAdapter.selectionChanged({ ...selectionAdapterContext, selection: inputSelection }, onContextChangedCallback); } } } - }, [status, inputSelection, selectionAdapterContext, selections, selectionAdapter]); + }, [status, inputSelection, selectionAdapterContext, selections, selectionAdapter, onContextChangedCallback]); /** * onParametersChanged @@ -161,15 +165,11 @@ export function RankingViewComponent({ if (status === 'success') { if (selectionAdapter) { - selectionAdapter.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }); + selectionAdapter.parameterChanged({ ...selectionAdapterContext, selection: inputSelection }, onContextChangedCallback); setPrevParameters(parameters); } } - }, [status, selectionAdapter, selectionAdapterContext, inputSelection, selections, parameters, prevParameters]); - - const onContextChangedCallback = useCallback((newContext: Omit) => { - setSelectionAdapterContext(newContext); - }, []); + }, [status, selectionAdapter, selectionAdapterContext, inputSelection, selections, parameters, prevParameters, onContextChangedCallback]); return (
diff --git a/src/lineup/selection/ISelectionAdapter.ts b/src/lineup/selection/ISelectionAdapter.ts index ec3ef42d2..351275a4f 100644 --- a/src/lineup/selection/ISelectionAdapter.ts +++ b/src/lineup/selection/ISelectionAdapter.ts @@ -49,11 +49,11 @@ export interface ISelectionAdapter { * called when a parameter has changed * @param {IContext} context */ - parameterChanged(context: IContext): Promise; + parameterChanged(context: IContext, onContextChanged?: (context: IContext) => void): Promise; /** * called when the input selection has changed * @param {IContext} context */ - selectionChanged(context: IContext): Promise; + selectionChanged(context: IContext, onContextChanged?: (context: IContext) => void): Promise; } diff --git a/src/lineup/selection/internal/ABaseSelectionAdapter.ts b/src/lineup/selection/internal/ABaseSelectionAdapter.ts index 7f9e9d6cb..2d7d7546a 100644 --- a/src/lineup/selection/internal/ABaseSelectionAdapter.ts +++ b/src/lineup/selection/internal/ABaseSelectionAdapter.ts @@ -35,8 +35,8 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - selectionChanged(context: IContext): Promise { - return this.selectionChangedImpl(context); + selectionChanged(context: IContext, onContextChanged?: (context: IContext) => void): Promise { + return this.selectionChangedImpl(context, onContextChanged); } /** @@ -44,8 +44,8 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { * @param context selection adapter context * @returns A promise that can waited for until the columns have been changed. */ - parameterChanged(context: IContext): Promise { - return this.parameterChangedImpl(context); + parameterChanged(context: IContext, onContextChanged?: (context: IContext) => void): Promise { + return this.parameterChangedImpl(context, onContextChanged); } // TODO test at run-time if we really need the following promises or if it can be removed. it might be necessary when replaying the a CLUE provenence graph. if we need it, a queue might be the better solution. @@ -96,9 +96,9 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { // })); // } - protected abstract parameterChangedImpl(context: IContext): Promise; + protected abstract parameterChangedImpl(context: IContext, onContextChanged?: (context: IContext) => void): Promise; - protected async selectionChangedImpl(context: IContext): Promise { + protected async selectionChangedImpl(context: IContext, onContextChanged?: (context: IContext) => void): Promise { const selectedIds = context.selection.ids; const usedCols = context.columns.filter((d) => (d.desc).selectedId != null); const lineupColIds = usedCols.map((d) => (d.desc).selectedId); @@ -106,17 +106,17 @@ export abstract class ABaseSelectionAdapter implements ISelectionAdapter { // compute the difference const diffAdded = difference(selectedIds, lineupColIds); const diffRemoved = difference(lineupColIds, selectedIds); - // remove deselected columns if (diffRemoved.length > 0) { // console.log('remove columns', diffRemoved); await this.removeDynamicColumns(context, diffRemoved); } // add new columns to the end - if (diffAdded.length <= 0) { - return null; + if (diffAdded.length) { + await this.addDynamicColumns(context, diffAdded); } - return this.addDynamicColumns(context, diffAdded); + + return onContextChanged?.(context); } /** diff --git a/src/lineup/selection/internal/MultiSelectionAdapter.ts b/src/lineup/selection/internal/MultiSelectionAdapter.ts index 4983744eb..3d7b8605e 100644 --- a/src/lineup/selection/internal/MultiSelectionAdapter.ts +++ b/src/lineup/selection/internal/MultiSelectionAdapter.ts @@ -55,10 +55,11 @@ export class MultiSelectionAdapter extends ABaseSelectionAdapter { * @param context selection adapter context * @returns A promise to wait until all new columns have been added */ - protected async parameterChangedImpl(context: IContext): Promise { + protected async parameterChangedImpl(context: IContext, onContextChanged?: (context: IContext) => void): Promise { const selectedIds = context.selection.ids; await this.removePartialDynamicColumns(context, selectedIds); - return this.addDynamicColumns(context, selectedIds); + await this.addDynamicColumns(context, selectedIds); + onContextChanged?.(context); } /** From 35b456bca86d1abf91ba3194f17120d663d3bff6 Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Mon, 30 May 2022 11:23:34 +0200 Subject: [PATCH 12/46] fixing default params value --- dist/lineup/RankingViewComponent.d.ts.map | 2 +- dist/lineup/RankingViewComponent.js | 2 +- dist/lineup/RankingViewComponent.js.map | 2 +- src/lineup/RankingViewComponent.tsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/lineup/RankingViewComponent.d.ts.map b/dist/lineup/RankingViewComponent.d.ts.map index bace9877f..1ac4db7ff 100644 --- a/dist/lineup/RankingViewComponent.d.ts.map +++ b/dist/lineup/RankingViewComponent.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAwB7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAiI5B"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAwB7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAiB,EACjB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAiI5B"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.js b/dist/lineup/RankingViewComponent.js index 4227ab7ae..f5244a588 100644 --- a/dist/lineup/RankingViewComponent.js +++ b/dist/lineup/RankingViewComponent.js @@ -22,7 +22,7 @@ function isSameParameters(current, inputSelection) { } return true; } -export function RankingViewComponent({ data = [], selection: inputSelection, itemSelection = { idtype: null, ids: [] }, columnDesc = [], parameters = false, selectionAdapter = null, options = {}, authorization = null, onItemSelect, onItemSelectionChanged, onCustomizeRanking, onBuiltLineUp, onUpdateEntryPoint, +export function RankingViewComponent({ data = [], selection: inputSelection, itemSelection = { idtype: null, ids: [] }, columnDesc = [], parameters = null, selectionAdapter = null, options = {}, authorization = null, onItemSelect, onItemSelectionChanged, onCustomizeRanking, onBuiltLineUp, onUpdateEntryPoint, /** * Maybe refactor this when using the native lineup implementation of scores */ diff --git a/dist/lineup/RankingViewComponent.js.map b/dist/lineup/RankingViewComponent.js.map index cd198ba83..20f68d480 100644 --- a/dist/lineup/RankingViewComponent.js.map +++ b/dist/lineup/RankingViewComponent.js.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.js","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/lineup/RankingViewComponent.tsx b/src/lineup/RankingViewComponent.tsx index f71a7d1f3..6489f754c 100644 --- a/src/lineup/RankingViewComponent.tsx +++ b/src/lineup/RankingViewComponent.tsx @@ -46,7 +46,7 @@ export function RankingViewComponent({ selection: inputSelection, itemSelection = { idtype: null, ids: [] }, columnDesc = [], - parameters = false, + parameters = null, selectionAdapter = null, options = {}, authorization = null, From 595bdc823fad043e6a98f8f2fcbdff767bd17800 Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Mon, 30 May 2022 13:24:01 +0200 Subject: [PATCH 13/46] builds --- dist/base/rest.d.ts | 2 +- dist/lineup/Ranking.d.ts | 1 - dist/lineup/Ranking.d.ts.map | 2 +- dist/lineup/RankingViewComponent.d.ts | 1 - dist/lineup/RankingViewComponent.d.ts.map | 2 +- dist/lineup/internal/ScoreUtils.d.ts | 16 +++++++++++----- dist/lineup/internal/ScoreUtils.d.ts.map | 2 +- dist/utils/TDPApplicationUtils.d.ts | 6 ++---- dist/utils/TDPApplicationUtils.d.ts.map | 2 +- dist/views/visyn/demo/VisynDemoView.d.ts | 1 - dist/views/visyn/demo/VisynDemoView.d.ts.map | 2 +- dist/vis/Vis.d.ts | 1 - dist/vis/Vis.d.ts.map | 2 +- dist/vis/VisSidebar.d.ts | 1 - dist/vis/VisSidebar.d.ts.map | 2 +- 15 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dist/base/rest.d.ts b/dist/base/rest.d.ts index 23fc930f5..fdf2099ee 100644 --- a/dist/base/rest.d.ts +++ b/dist/base/rest.d.ts @@ -165,7 +165,7 @@ export declare class RestBaseUtils { * @param filters URL filter parameters */ static mergeParamAndFilters(params: IParams, filters: IParams): { - [x: string]: string | number | boolean | number[] | string[] | boolean[]; + [x: string]: string | number | boolean | string[] | number[] | boolean[]; }; /** * query the TDP rest api to read data with additional given filters diff --git a/dist/lineup/Ranking.d.ts b/dist/lineup/Ranking.d.ts index a2510c020..8905d9138 100644 --- a/dist/lineup/Ranking.d.ts +++ b/dist/lineup/Ranking.d.ts @@ -1,4 +1,3 @@ -/// import { LocalDataProvider, IColumnDesc } from 'lineupjs'; import { ILazyLoadedColumn } from './internal/column'; import { EViewMode, IAdditionalColumnDesc, IScoreRow, ISelection } from '../base/interfaces'; diff --git a/dist/lineup/Ranking.d.ts.map b/dist/lineup/Ranking.d.ts.map index eda38256f..1c2b66426 100644 --- a/dist/lineup/Ranking.d.ts.map +++ b/dist/lineup/Ranking.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Ranking.d.ts","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":";AAGA,OAAO,EAEL,iBAAiB,EAajB,WAAW,EAGZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,iBAAiB,EAAc,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAoB,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAElC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC;IAElE,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAE/C,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AA+DD,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,OAAO,CAAC,EACtB,IAAS,EACT,aAAyC,EACzC,UAAe,EACf,OAAO,EAAE,IAAS,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa;AACb;;GAEG;AACH,gBAAgB,GACjB,EAAE,aAAa,eAuYf"} \ No newline at end of file +{"version":3,"file":"Ranking.d.ts","sourceRoot":"","sources":["../../src/lineup/Ranking.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,iBAAiB,EAajB,WAAW,EAGZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,iBAAiB,EAAc,MAAM,mBAAmB,CAAC;AAKlE,OAAO,EAAE,SAAS,EAAE,qBAAqB,EAAU,SAAS,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAoB,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAoB9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,EAAE,WAAW,GAAG;QACrB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,aAAa,EAAE,UAAU,CAAC;IAC1B,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IAElC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC;IAElE,sBAAsB,CAAC,EAAE,MAAM,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClF,gBAAgB,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,IAAI,CAAC;IAE/C,kBAAkB,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,kBAAkB,CAAC,EAAE,CAAC,cAAc,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/D,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AAiED,MAAM,WAAW,eAAgB,SAAQ,oBAAoB;IAC3D,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,wBAAgB,OAAO,CAAC,EACtB,IAAS,EACT,aAAyC,EACzC,UAAe,EACf,OAAO,EAAE,IAAS,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa;AACb;;GAEG;AACH,gBAAgB,GACjB,EAAE,aAAa,eAuYf"} \ No newline at end of file diff --git a/dist/lineup/RankingViewComponent.d.ts b/dist/lineup/RankingViewComponent.d.ts index 56b84fd55..83e84acd4 100644 --- a/dist/lineup/RankingViewComponent.d.ts +++ b/dist/lineup/RankingViewComponent.d.ts @@ -1,4 +1,3 @@ -/// import { IRankingProps } from './Ranking'; import { ISelection } from '../base/interfaces'; import { ISelectionAdapter } from './selection/ISelectionAdapter'; diff --git a/dist/lineup/RankingViewComponent.d.ts.map b/dist/lineup/RankingViewComponent.d.ts.map index ccebdc50d..2124c80c9 100644 --- a/dist/lineup/RankingViewComponent.d.ts.map +++ b/dist/lineup/RankingViewComponent.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAqH5B"} \ No newline at end of file +{"version":3,"file":"RankingViewComponent.d.ts","sourceRoot":"","sources":["../../src/lineup/RankingViewComponent.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAW,aAAa,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAY,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAA8B,2BAA2B,EAAE,MAAM,oBAAoB,CAAC;AAO7F;;GAEG;AACH,MAAM,WAAW,0BAA2B,SAAQ,aAAa;IAC/D;;OAEG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,GAAG,CAAC;IAChB,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,2BAA2B,GAAG,2BAA2B,EAAE,GAAG,IAAI,CAAC;CACxG;AAED,wBAAgB,oBAAoB,CAAC,EACnC,IAAS,EACT,SAAS,EAAE,cAAc,EACzB,aAAyC,EACzC,UAAe,EACf,UAAkB,EAClB,gBAAuB,EACvB,OAAY,EACZ,aAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,aAAa,EACb,kBAAkB;AAClB;;GAEG;AACH,gBAAgB,GACjB,EAAE,0BAA0B,eAqH5B"} \ No newline at end of file diff --git a/dist/lineup/internal/ScoreUtils.d.ts b/dist/lineup/internal/ScoreUtils.d.ts index babc1be1e..ebc2fce4b 100644 --- a/dist/lineup/internal/ScoreUtils.d.ts +++ b/dist/lineup/internal/ScoreUtils.d.ts @@ -4,12 +4,18 @@ export declare class ScoreUtils { static readonly CMD_ADD_SCORE = "tdpAddScore"; static readonly CMD_REMOVE_SCORE = "tdpRemoveScore"; private static addScoreLogic; - static addScoreImpl(inputs: IObjectRef[], parameter: any): any; - static addScoreAsync(inputs: IObjectRef[], parameter: any): Promise; - static removeScoreImpl(inputs: IObjectRef[], parameter: any): any; - static addScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any): any; + static addScoreImpl(inputs: IObjectRef[], parameter: any): Promise<{ + inverse: import("../../clue/provenance").IAction; + }>; + static addScoreAsync(inputs: IObjectRef[], parameter: any): Promise<{ + inverse: import("../../clue/provenance").IAction; + }>; + static removeScoreImpl(inputs: IObjectRef[], parameter: any): Promise<{ + inverse: import("../../clue/provenance").IAction; + }>; + static addScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any): import("../../clue/provenance").IAction; static pushScoreAsync(graph: ProvenanceGraph, provider: IObjectRef, scoreName: string, scoreId: string, params: any): Promise; - static removeScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any, columnId: string | string[]): any; + static removeScore(provider: IObjectRef, scoreName: string, scoreId: string, params: any, columnId: string | string[]): import("../../clue/provenance").IAction; private static shallowEqualObjects; /** * compresses score creation and removal diff --git a/dist/lineup/internal/ScoreUtils.d.ts.map b/dist/lineup/internal/ScoreUtils.d.ts.map index 5f357b40e..c7067b460 100644 --- a/dist/lineup/internal/ScoreUtils.d.ts.map +++ b/dist/lineup/internal/ScoreUtils.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"ScoreUtils.d.ts","sourceRoot":"","sources":["../../../src/lineup/internal/ScoreUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAE,UAAU,EAA+C,eAAe,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE7H,qBAAa,UAAU;IACrB,gBAAuB,aAAa,iBAAiB;IAErD,gBAAuB,gBAAgB,oBAAoB;mBAEtC,aAAa;IA4BlC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;WAI1D,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;WAIjE,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;IAYhF,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;WAiBvF,cAAc,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IA0BxI,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBpI,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAsBlC;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE;IAIlC,OAAO,CAAC,MAAM,CAAC,YAAY;IAwB3B,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE;CAGvC"} \ No newline at end of file +{"version":3,"file":"ScoreUtils.d.ts","sourceRoot":"","sources":["../../../src/lineup/internal/ScoreUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAE,UAAU,EAA+C,eAAe,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAE7H,qBAAa,UAAU;IACrB,gBAAuB,aAAa,iBAAiB;IAErD,gBAAuB,gBAAgB,oBAAoB;mBAEtC,aAAa;IA4BlC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;;;WAI1D,aAAa,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;;;WAIjE,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG;;;IAYhF,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;WAiBvF,cAAc,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG;IA0BxI,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAkBpI,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAsBlC;;OAEG;IACH,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE;IAIlC,OAAO,CAAC,MAAM,CAAC,YAAY;IAwB3B,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE;CAGvC"} \ No newline at end of file diff --git a/dist/utils/TDPApplicationUtils.d.ts b/dist/utils/TDPApplicationUtils.d.ts index 1fda5a116..34cb07273 100644 --- a/dist/utils/TDPApplicationUtils.d.ts +++ b/dist/utils/TDPApplicationUtils.d.ts @@ -41,10 +41,8 @@ export declare class TDPApplicationUtils { inverse: import("../clue/provenance").IAction; }; static initSession(map: object): import("../clue/provenance").IAction; - static setParameterImpl(inputs: IObjectRef[], parameter: any, graph: ProvenanceGraph): Promise<{ - inverse: import("../clue/provenance").IAction; - }>; - static setParameter(view: IObjectRef, name: string, value: any, previousValue: any): import("../clue/provenance").IAction; + static setParameterImpl(inputs: IObjectRef[], parameter: any, graph: ProvenanceGraph): any; + static setParameter(view: IObjectRef, name: string, value: any, previousValue: any): any; static compressSetParameter(path: ActionNode[]): ActionNode[]; /** * @deprecated diff --git a/dist/utils/TDPApplicationUtils.d.ts.map b/dist/utils/TDPApplicationUtils.d.ts.map index 32a0ca604..f29523624 100644 --- a/dist/utils/TDPApplicationUtils.d.ts.map +++ b/dist/utils/TDPApplicationUtils.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"TDPApplicationUtils.d.ts","sourceRoot":"","sources":["../../src/utils/TDPApplicationUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA+C,eAAe,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAI1H,OAAO,EAAe,WAAW,EAAyB,MAAM,aAAa,CAAC;AAG9E,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IAEhC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAE;CAC5C;AAED,qBAAa,mBAAmB;IAC9B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM;IAEzB,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAgC;IAEpD,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAiC;IAGpD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,oBAAoB;IAEpD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,qBAAqB;IAEtD,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,EAAE,CA2B1E;IAEF;;;OAGG;IAEH,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAalC,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;IAIlD;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,OAAO,GAAE,OAAO,CAAC,sBAAsB,CAAM;;wBAqLnE,QAAQ,KAAG,QAAQ,WAAW,CAAC;;IAyBnD;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM;;;IAerE,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM;WAcjB,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,KAAA,EAAE,KAAK,EAAE,eAAe;;;IAW1F,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG;IAmBlG,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE;IAI9C;;OAEG;IACH,MAAM,CAAC,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE;CAGlD"} \ No newline at end of file +{"version":3,"file":"TDPApplicationUtils.d.ts","sourceRoot":"","sources":["../../src/utils/TDPApplicationUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA+C,eAAe,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAI1H,OAAO,EAAe,WAAW,EAAyB,MAAM,aAAa,CAAC;AAG9E,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,QAAQ,CAAC;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;IAEhC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAE;CAC5C;AAED,qBAAa,mBAAmB;IAC9B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM;IAEzB,MAAM,CAAC,QAAQ,CAAC,IAAI,SAAgC;IAEpD,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAiC;IAGpD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,oBAAoB;IAEpD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,qBAAqB;IAEtD,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,EAAE,CA2B1E;IAEF;;;OAGG;IAEH,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAalC,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;IAIlD;;;OAGG;IACH,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,OAAO,GAAE,OAAO,CAAC,sBAAsB,CAAM;;wBAqLnE,QAAQ,KAAG,QAAQ,WAAW,CAAC;;IAyBnD;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM;;;IAerE,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM;WAcjB,gBAAgB,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,KAAA,EAAE,KAAK,EAAE,eAAe;IAW1F,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG;IAmBlG,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE;IAI9C;;OAEG;IACH,MAAM,CAAC,uBAAuB,CAAC,IAAI,EAAE,UAAU,EAAE;CAGlD"} \ No newline at end of file diff --git a/dist/views/visyn/demo/VisynDemoView.d.ts b/dist/views/visyn/demo/VisynDemoView.d.ts index 6e4ff5068..4df3855fd 100644 --- a/dist/views/visyn/demo/VisynDemoView.d.ts +++ b/dist/views/visyn/demo/VisynDemoView.d.ts @@ -1,4 +1,3 @@ -/// import { DemoVisynViewPluginType } from './interfaces'; export declare function VisynDemoView({ desc, parameters, onParametersChanged }: DemoVisynViewPluginType['props']): JSX.Element; export declare function VisynDemoViewSidebar({ parameters, onParametersChanged }: DemoVisynViewPluginType['props']): JSX.Element; diff --git a/dist/views/visyn/demo/VisynDemoView.d.ts.map b/dist/views/visyn/demo/VisynDemoView.d.ts.map index d3da0fa6e..54d6675d1 100644 --- a/dist/views/visyn/demo/VisynDemoView.d.ts.map +++ b/dist/views/visyn/demo/VisynDemoView.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"VisynDemoView.d.ts","sourceRoot":"","sources":["../../../../src/views/visyn/demo/VisynDemoView.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAkEvD,wBAAgB,aAAa,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eA0BxG;AAED,wBAAgB,oBAAoB,CAAC,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiBzG;AAED,wBAAgB,mBAAmB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiCnH;AAED,wBAAgB,mBAAmB,IAAI,uBAAuB,CAAC,YAAY,CAAC,CAY3E"} \ No newline at end of file +{"version":3,"file":"VisynDemoView.d.ts","sourceRoot":"","sources":["../../../../src/views/visyn/demo/VisynDemoView.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAkEvD,wBAAgB,aAAa,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eA0BxG;AAED,wBAAgB,oBAAoB,CAAC,EAAE,UAAU,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiBzG;AAED,wBAAgB,mBAAmB,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAAE,uBAAuB,CAAC,OAAO,CAAC,eAiCnH;AAED,wBAAgB,mBAAmB,IAAI,uBAAuB,CAAC,YAAY,CAAC,CAY3E"} \ No newline at end of file diff --git a/dist/vis/Vis.d.ts b/dist/vis/Vis.d.ts index e2070d05c..f1af3142b 100644 --- a/dist/vis/Vis.d.ts +++ b/dist/vis/Vis.d.ts @@ -1,4 +1,3 @@ -/// import { IVisConfig, VisColumn, EFilterOptions } from './interfaces'; export declare function Vis({ columns, selected, colors, shapes, selectionCallback, filterCallback, setExternalConfig, closeCallback, showCloseButton, externalConfig, hideSidebar, }: { /** diff --git a/dist/vis/Vis.d.ts.map b/dist/vis/Vis.d.ts.map index 97352aa61..6744df886 100644 --- a/dist/vis/Vis.d.ts.map +++ b/dist/vis/Vis.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Vis.d.ts","sourceRoot":"","sources":["../../src/vis/Vis.tsx"],"names":[],"mappings":";AAGA,OAAO,EAEL,UAAU,EAEV,SAAS,EACT,cAAc,EAQf,MAAM,cAAc,CAAC;AAwBtB,wBAAgB,GAAG,CAAC,EAClB,OAAO,EACP,QAAa,EACb,MAAuB,EACvB,MAAuB,EACvB,iBAA8B,EAC9B,cAA2B,EAC3B,iBAA8B,EAC9B,aAA0B,EAC1B,eAAuB,EACvB,cAAqB,EACrB,WAAmB,GACpB,EAAE;IACD;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC1C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7C,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,eA4LA"} \ No newline at end of file +{"version":3,"file":"Vis.d.ts","sourceRoot":"","sources":["../../src/vis/Vis.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,UAAU,EAEV,SAAS,EACT,cAAc,EAQf,MAAM,cAAc,CAAC;AAwBtB,wBAAgB,GAAG,CAAC,EAClB,OAAO,EACP,QAAa,EACb,MAAuB,EACvB,MAAuB,EACvB,iBAA8B,EAC9B,cAA2B,EAC3B,iBAA8B,EAC9B,aAA0B,EAC1B,eAAuB,EACvB,cAAqB,EACrB,WAAmB,GACpB,EAAE;IACD;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC1C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7C,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,eA4LA"} \ No newline at end of file diff --git a/dist/vis/VisSidebar.d.ts b/dist/vis/VisSidebar.d.ts index a0d76cd45..a354f7263 100644 --- a/dist/vis/VisSidebar.d.ts +++ b/dist/vis/VisSidebar.d.ts @@ -1,4 +1,3 @@ -/// import { IVisConfig, VisColumn, ICommonVisSideBarProps } from './interfaces'; export declare type VisSidebarProps = { /** diff --git a/dist/vis/VisSidebar.d.ts.map b/dist/vis/VisSidebar.d.ts.map index 63c5bf3fa..1910646d5 100644 --- a/dist/vis/VisSidebar.d.ts.map +++ b/dist/vis/VisSidebar.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"VisSidebar.d.ts","sourceRoot":"","sources":["../../src/vis/VisSidebar.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAU7E,oBAAY,eAAe,GAAG;IAC5B;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,cAAc,EAAE,UAAU,CAAC;IAC3B,iBAAiB,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;CAC5C,GAAG,sBAAsB,CAAC;AAE3B,wBAAgB,UAAU,CAAC,EAAE,OAAO,EAAE,cAA2B,EAAE,cAAqB,EAAE,iBAAwB,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,eAAe,eAmDtJ"} \ No newline at end of file +{"version":3,"file":"VisSidebar.d.ts","sourceRoot":"","sources":["../../src/vis/VisSidebar.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAU7E,oBAAY,eAAe,GAAG;IAC5B;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,cAAc,EAAE,UAAU,CAAC;IAC3B,iBAAiB,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;CAC5C,GAAG,sBAAsB,CAAC;AAE3B,wBAAgB,UAAU,CAAC,EAAE,OAAO,EAAE,cAA2B,EAAE,cAAqB,EAAE,iBAAwB,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,eAAe,eAmDtJ"} \ No newline at end of file From ed4117b6c2a1139e3cfc039ae6851b8e0fcb5b3b Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Mon, 30 May 2022 18:45:56 +0200 Subject: [PATCH 14/46] fixing bar selection --- dist/vis/Vis.d.ts.map | 2 +- dist/vis/Vis.js | 2 +- dist/vis/Vis.js.map | 2 +- dist/vis/bar/BarVis.d.ts | 7 ++- dist/vis/bar/BarVis.d.ts.map | 2 +- dist/vis/bar/BarVis.js | 61 +++++++++++++++++++++++--- dist/vis/bar/BarVis.js.map | 2 +- dist/vis/bar/utils.d.ts.map | 2 +- dist/vis/bar/utils.js | 71 +++++++++++++++++++++++++++++- dist/vis/bar/utils.js.map | 2 +- src/vis/Vis.tsx | 3 ++ src/vis/bar/BarVis.tsx | 74 ++++++++++++++++++++++++++++--- src/vis/bar/utils.ts | 84 ++++++++++++++++++++++++++++++++++-- 13 files changed, 287 insertions(+), 27 deletions(-) diff --git a/dist/vis/Vis.d.ts.map b/dist/vis/Vis.d.ts.map index 6744df886..bf12677ad 100644 --- a/dist/vis/Vis.d.ts.map +++ b/dist/vis/Vis.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"Vis.d.ts","sourceRoot":"","sources":["../../src/vis/Vis.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,UAAU,EAEV,SAAS,EACT,cAAc,EAQf,MAAM,cAAc,CAAC;AAwBtB,wBAAgB,GAAG,CAAC,EAClB,OAAO,EACP,QAAa,EACb,MAAuB,EACvB,MAAuB,EACvB,iBAA8B,EAC9B,cAA2B,EAC3B,iBAA8B,EAC9B,aAA0B,EAC1B,eAAuB,EACvB,cAAqB,EACrB,WAAmB,GACpB,EAAE;IACD;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC1C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7C,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,eA4LA"} \ No newline at end of file +{"version":3,"file":"Vis.d.ts","sourceRoot":"","sources":["../../src/vis/Vis.tsx"],"names":[],"mappings":"AAGA,OAAO,EAEL,UAAU,EAEV,SAAS,EACT,cAAc,EAQf,MAAM,cAAc,CAAC;AAwBtB,wBAAgB,GAAG,CAAC,EAClB,OAAO,EACP,QAAa,EACb,MAAuB,EACvB,MAAuB,EACvB,iBAA8B,EAC9B,cAA2B,EAC3B,iBAA8B,EAC9B,aAA0B,EAC1B,eAAuB,EACvB,cAAqB,EACrB,WAAmB,GACpB,EAAE;IACD;;OAEG;IACH,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;OAEG;IACH,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC1C;;OAEG;IACH,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,IAAI,CAAC;IAC7C,iBAAiB,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACjD,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,eA+LA"} \ No newline at end of file diff --git a/dist/vis/Vis.js b/dist/vis/Vis.js index a065c48c9..4aad601fc 100644 --- a/dist/vis/Vis.js +++ b/dist/vis/Vis.js @@ -128,6 +128,6 @@ export function Vis({ columns, selected = [], colors = DEFAULT_COLORS, shapes = }, setConfig: setVisConfig, columns: columns, scales: scales, hideSidebar: hideSidebar, showCloseButton: showCloseButton, closeButtonCallback: closeCallback })) : null, isStrip(visConfig) ? (React.createElement(StripVis, { config: visConfig, selectionCallback: selectionCallback, setConfig: setVisConfig, selected: selectedMap, columns: columns, scales: scales, hideSidebar: hideSidebar, showCloseButton: showCloseButton, closeButtonCallback: closeCallback })) : null, isPCP(visConfig) ? (React.createElement(PCPVis, { config: visConfig, selected: selectedMap, setConfig: setVisConfig, columns: columns, hideSidebar: hideSidebar, showCloseButton: showCloseButton, closeButtonCallback: closeCallback })) : null, - isBar(visConfig) ? (React.createElement(BarVis, { config: visConfig, setConfig: setVisConfig, columns: columns, scales: scales, hideSidebar: hideSidebar, showCloseButton: showCloseButton, closeButtonCallback: closeCallback })) : null)); + isBar(visConfig) ? (React.createElement(BarVis, { config: visConfig, setConfig: setVisConfig, selectionCallback: selectionCallback, selectedMap: selectedMap, selectedList: selected, columns: columns, scales: scales, hideSidebar: hideSidebar, showCloseButton: showCloseButton, closeButtonCallback: closeCallback })) : null)); } //# sourceMappingURL=Vis.js.map \ No newline at end of file diff --git a/dist/vis/Vis.js.map b/dist/vis/Vis.js.map index 89e22c653..ad6894bc1 100644 --- a/dist/vis/Vis.js.map +++ b/dist/vis/Vis.js.map @@ -1 +1 @@ -{"version":3,"file":"Vis.js","sourceRoot":"","sources":["../../src/vis/Vis.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Vis.js","sourceRoot":"","sources":["../../src/vis/Vis.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/vis/bar/BarVis.d.ts b/dist/vis/bar/BarVis.d.ts index 8f889f333..bb4a0ac25 100644 --- a/dist/vis/bar/BarVis.d.ts +++ b/dist/vis/bar/BarVis.d.ts @@ -33,10 +33,15 @@ interface BarVisProps { columns: VisColumn[]; closeButtonCallback?: () => void; showCloseButton?: boolean; + selectionCallback?: (ids: string[]) => void; + selectedMap?: { + [key: string]: boolean; + }; + selectedList: string[]; setConfig: (config: IVisConfig) => void; scales: Scales; hideSidebar?: boolean; } -export declare function BarVis({ config, optionsConfig, extensions, columns, setConfig, scales, hideSidebar, showCloseButton, closeButtonCallback, }: BarVisProps): JSX.Element; +export declare function BarVis({ config, optionsConfig, extensions, columns, setConfig, scales, selectionCallback, selectedMap, selectedList, hideSidebar, showCloseButton, closeButtonCallback, }: BarVisProps): JSX.Element; export {}; //# sourceMappingURL=BarVis.d.ts.map \ No newline at end of file diff --git a/dist/vis/bar/BarVis.d.ts.map b/dist/vis/bar/BarVis.d.ts.map index f7366d923..51ee41ea1 100644 --- a/dist/vis/bar/BarVis.d.ts.map +++ b/dist/vis/bar/BarVis.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"BarVis.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAoB,MAAM,eAAe,CAAC;AAU5F,UAAU,WAAW;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,KAAK,CAAC,EAAE;YACN,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,YAAY,CAAC,EAAE;YACb,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;KACH,CAAC;IACF,UAAU,CAAC,EAAE;QACX,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC3B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC7B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AASD,wBAAgB,MAAM,CAAC,EACrB,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EACP,SAAS,EACT,MAAM,EACN,WAAmB,EACnB,eAAuB,EACvB,mBAAgC,GACjC,EAAE,WAAW,eAwGb"} \ No newline at end of file +{"version":3,"file":"BarVis.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAoB,MAAM,eAAe,CAAC;AAU5F,UAAU,WAAW;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,KAAK,CAAC,EAAE;YACN,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,YAAY,CAAC,EAAE;YACb,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;KACH,CAAC;IACF,UAAU,CAAC,EAAE;QACX,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC3B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC7B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACzC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AASD,wBAAgB,MAAM,CAAC,EACrB,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EACP,SAAS,EACT,MAAM,EACN,iBAA8B,EAC9B,WAAgB,EAChB,YAAiB,EACjB,WAAmB,EACnB,eAAuB,EACvB,mBAAgC,GACjC,EAAE,WAAW,eA+Jb"} \ No newline at end of file diff --git a/dist/vis/bar/BarVis.js b/dist/vis/bar/BarVis.js index 0d20716e6..585b8ac96 100644 --- a/dist/vis/bar/BarVis.js +++ b/dist/vis/bar/BarVis.js @@ -1,7 +1,7 @@ import * as React from 'react'; import d3 from 'd3'; import { merge, uniqueId } from 'lodash'; -import { useEffect } from 'react'; +import { useEffect, useMemo, useState } from 'react'; import { EBarGroupingType } from '../interfaces'; import { PlotlyComponent, Plotly } from '../Plot'; import { InvalidCols } from '../general'; @@ -17,13 +17,14 @@ const defaultExtensions = { preSidebar: null, postSidebar: null, }; -export function BarVis({ config, optionsConfig, extensions, columns, setConfig, scales, hideSidebar = false, showCloseButton = false, closeButtonCallback = () => null, }) { +export function BarVis({ config, optionsConfig, extensions, columns, setConfig, scales, selectionCallback = () => null, selectedMap = {}, selectedList = [], hideSidebar = false, showCloseButton = false, closeButtonCallback = () => null, }) { const mergedExtensions = React.useMemo(() => { return merge({}, defaultExtensions, extensions); }, [extensions]); const { value: traces, status: traceStatus, error: traceError } = useAsync(createBarTraces, [columns, config, scales]); const id = React.useMemo(() => uniqueId('BarVis'), []); const plotlyDivRef = React.useRef(null); + const [selectedCategories, setSelectedCategories] = useState([]); useEffect(() => { const ro = new ResizeObserver(() => { Plotly.Plots.resize(document.getElementById(`plotlyDiv${id}`)); @@ -64,14 +65,60 @@ export function BarVis({ config, optionsConfig, extensions, columns, setConfig, }; return beautifyLayout(traces, innerLayout); }, [traces, config.groupType]); + // Make sure selected values is right for each plot. + useEffect(() => { + let selectedFlag = false; + const allSelected = []; + traces === null || traces === void 0 ? void 0 : traces.plots.forEach((plot) => { + const tracePoints = plot.data.customdata; + const selectedArr = []; + tracePoints.forEach((trace, index) => { + if (trace.length === 0 || selectedList.length < trace.length) { + return; + } + for (const i of trace) { + if (!selectedMap[i]) { + return; + } + } + selectedArr.push(index); + allSelected.push(trace); + selectedFlag = true; + }); + if (selectedArr.length > 0) { + plot.data.selectedpoints = selectedArr; + } + else { + plot.data.selectedpoints = null; + } + }); + if (selectedFlag) { + traces === null || traces === void 0 ? void 0 : traces.plots.forEach((plot) => { + if (plot.data.selectedpoints === null) { + plot.data.selectedpoints = []; + } + }); + } + setSelectedCategories(allSelected); + }, [traces, selectedMap, selectedList]); + const traceData = useMemo(() => { + if (!traces) { + return null; + } + return [...traces.plots.map((p) => p.data), ...traces.legendPlots.map((p) => p.data)]; + }, [traces]); return (React.createElement("div", { ref: plotlyDivRef, className: "d-flex flex-row w-100 h-100", style: { minHeight: '0px' } }, React.createElement("div", { className: `position-relative d-flex justify-content-center align-items-center flex-grow-1 ${traceStatus === 'pending' ? 'tdp-busy-partial-overlay' : ''}` }, mergedExtensions.prePlot, - traceStatus === 'success' && (traces === null || traces === void 0 ? void 0 : traces.plots.length) > 0 ? (React.createElement(PlotlyComponent, { divId: `plotlyDiv${id}`, data: [...traces.plots.map((p) => p.data), ...traces.legendPlots.map((p) => p.data)], layout: layout, config: { responsive: true, displayModeBar: false }, useResizeHandler: true, style: { width: '100%', height: '100%' }, onClick: (e) => { - const clickedCategory = e.points[0].id; - console.log(e); - console.log(config.group); - console.log(clickedCategory); + traceStatus === 'success' && (traces === null || traces === void 0 ? void 0 : traces.plots.length) > 0 ? (React.createElement(PlotlyComponent, { divId: `plotlyDiv${id}`, data: traceData, layout: layout, config: { responsive: true, displayModeBar: false }, useResizeHandler: true, style: { width: '100%', height: '100%' }, onClick: (e) => { + const selectedPoints = e.points[0].customdata; + if (e.event.ctrlKey) { + const newList = Array.from(new Set([...selectedList, ...selectedPoints])); + selectionCallback(newList); + } + else { + selectionCallback(selectedPoints); + } }, // plotly redraws everything on updates, so you need to reappend title and onUpdate: () => { diff --git a/dist/vis/bar/BarVis.js.map b/dist/vis/bar/BarVis.js.map index 15f585487..b7b34b806 100644 --- a/dist/vis/bar/BarVis.js.map +++ b/dist/vis/bar/BarVis.js.map @@ -1 +1 @@ -{"version":3,"file":"BarVis.js","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAA6C,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAyCrD,MAAM,iBAAiB,GAAG;IACxB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,IAAI;IAChB,WAAW,EAAE,IAAI;CAClB,CAAC;AAEF,MAAM,UAAU,MAAM,CAAC,EACrB,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EACP,SAAS,EACT,MAAM,EACN,WAAW,GAAG,KAAK,EACnB,eAAe,GAAG,KAAK,EACvB,mBAAmB,GAAG,GAAG,EAAE,CAAC,IAAI,GACpB;IACZ,MAAM,gBAAgB,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1C,OAAO,KAAK,CAAC,EAAE,EAAE,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAClD,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEjB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAEvH,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEvD,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAExC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,EAAE,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE;YACjC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,IAAI,YAAY,EAAE;YAChB,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SAClC;QAED,IAAI,WAAW,EAAE;YACf,OAAO;SACR;QAED,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,GAAG,EAAE;YAC/C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,GAAG,EAAE;YAC9C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IAEpC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAChC,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QAED,MAAM,WAAW,GAAkB;YACjC,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE;gBACN,aAAa;gBACb,SAAS,EAAE,KAAK;gBAChB,eAAe,EAAE,KAAK;aACvB;YACD,IAAI,EAAE;gBACJ,MAAM,EAAE,oBAAoB;aAC7B;YACD,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE;YACpF,MAAM,EAAE,EAAE;YACV,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,MAAM,CAAC,SAAS,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO;SACzE,CAAC;QAEF,OAAO,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC7C,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAE/B,OAAO,CACL,6BAAK,GAAG,EAAE,YAAY,EAAE,SAAS,EAAC,6BAA6B,EAAC,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;QACzF,6BACE,SAAS,EAAE,kFACT,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAC3D,EAAE;YAED,gBAAgB,CAAC,OAAO;YACxB,WAAW,KAAK,SAAS,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,MAAM,IAAG,CAAC,CAAC,CAAC,CAAC,CACvD,oBAAC,eAAe,IACd,KAAK,EAAE,YAAY,EAAE,EAAE,EACvB,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EACpF,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,EACnD,gBAAgB,QAChB,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EACxC,OAAO,EAAE,CAAC,CAAM,EAAE,EAAE;oBAClB,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACvC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBACf,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBACzB,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC/B,CAAC;gBACD,0EAA0E;gBAC1E,QAAQ,EAAE,GAAG,EAAE;oBACb,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,EAAE;wBAC5B,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;wBAEnG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;qBACpG;gBACH,CAAC,GACD,CACH,CAAC,CAAC,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,CAC9B,oBAAC,WAAW,IAAC,aAAa,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,EAAE,WAAW,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,MAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAA,GAAI,CACrH,CAAC,CAAC,CAAC,IAAI;YACP,gBAAgB,CAAC,QAAQ;YACzB,eAAe,CAAC,CAAC,CAAC,oBAAC,WAAW,IAAC,aAAa,EAAE,mBAAmB,GAAI,CAAC,CAAC,CAAC,IAAI,CACzE;QACL,CAAC,WAAW,CAAC,CAAC,CAAC,CACd,oBAAC,iBAAiB,IAAC,EAAE,EAAE,EAAE;YACvB,oBAAC,aAAa,IAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,GAAI,CAC7G,CACrB,CAAC,CAAC,CAAC,IAAI,CACJ,CACP,CAAC;AACJ,CAAC"} \ No newline at end of file +{"version":3,"file":"BarVis.js","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/vis/bar/utils.d.ts.map b/dist/vis/bar/utils.d.ts.map index 184920ce2..f244ba78e 100644 --- a/dist/vis/bar/utils.d.ts.map +++ b/dist/vis/bar/utils.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,UAAU,EAKV,UAAU,EACV,MAAM,EACN,SAAS,EAET,UAAU,EAOX,MAAM,eAAe,CAAC;AAIvB,wBAAgB,KAAK,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,IAAI,UAAU,CAEpD;AAiBD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,CAe1F;AAqVD,wBAAsB,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA4CnH"} \ No newline at end of file +{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,UAAU,EAKV,UAAU,EACV,MAAM,EACN,SAAS,EAET,UAAU,EAOX,MAAM,eAAe,CAAC;AAIvB,wBAAgB,KAAK,CAAC,CAAC,EAAE,UAAU,GAAG,CAAC,IAAI,UAAU,CAEpD;AAkBD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,UAAU,CAe1F;AAiaD,wBAAsB,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA4CnH"} \ No newline at end of file diff --git a/dist/vis/bar/utils.js b/dist/vis/bar/utils.js index 6e3788dd1..09cd527bf 100644 --- a/dist/vis/bar/utils.js +++ b/dist/vis/bar/utils.js @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-ts-comment */ /* eslint-disable @typescript-eslint/naming-convention */ import { merge, sum, mean, min, max } from 'lodash'; import { median } from 'd3'; @@ -8,6 +9,7 @@ import { getCol } from '../sidebar'; export function isBar(s) { return s.type === ESupportedPlotlyVis.BAR; } +const UNSELECTED_OPACITY = '0.2'; const defaultConfig = { type: ESupportedPlotlyVis.BAR, numColumnsSelected: [], @@ -100,12 +102,16 @@ async function setPlotsWithGroupsAndMultiples(columns, catCol, aggregateType, ag }) .flat(); const plotAggregateAxisName = createAxisLabel(aggregateType, aggregateColumn); + let valIdArr = uniqueColVals.map((val) => []); + catColValues.resolvedValues.forEach((row) => valIdArr[uniqueColVals.indexOf(row.val)].push(row.id)); + valIdArr = valIdArr.map((arr) => arr.filter((val) => allGroupObjsIds.has(val) && allMultiplesObjsIds.has(val))); plots.push({ data: { x: vertFlag ? uniqueColVals : aggregateVals, y: !vertFlag ? uniqueColVals : aggregateVals, text: uniqueColVals, ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueMultiples}, ${uniqueGroup}`), + customdata: valIdArr, textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', orientation: vertFlag ? 'v' : 'h', @@ -117,6 +123,17 @@ async function setPlotsWithGroupsAndMultiples(columns, catCol, aggregateType, ag marker: { color: scales.color(uniqueGroup), }, + // @ts-ignore + selected: { + marker: { + opacity: '1', + }, + }, + unselected: { + marker: { + opacity: UNSELECTED_OPACITY, + }, + }, }, xLabel: vertFlag ? catColValues.info.name : normalizedFlag ? 'Percent of Total' : plotAggregateAxisName, yLabel: vertFlag ? (normalizedFlag ? 'Percent of Total' : plotAggregateAxisName) : catColValues.info.name, @@ -151,12 +168,16 @@ async function setPlotsWithGroups(columns, catCol, aggregateType, aggregateColum }) .flat(); const plotAggregateAxisName = createAxisLabel(aggregateType, aggregateColumn); + let valIdArr = uniqueColVals.map((val) => []); + catColValues.resolvedValues.forEach((row) => valIdArr[uniqueColVals.indexOf(row.val)].push(row.id)); + valIdArr = valIdArr.map((arr) => arr.filter((val) => allGroupObjsIds.has(val))); plots.push({ data: { x: vertFlag ? uniqueColVals : finalAggregateValues, y: !vertFlag ? uniqueColVals : finalAggregateValues, text: uniqueColVals, ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueVal}`), + customdata: valIdArr, textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', orientation: vertFlag ? 'v' : 'h', @@ -168,6 +189,17 @@ async function setPlotsWithGroups(columns, catCol, aggregateType, aggregateColum marker: { color: scales.color(uniqueVal), }, + // @ts-ignore + selected: { + marker: { + opacity: '1', + }, + }, + unselected: { + marker: { + opacity: UNSELECTED_OPACITY, + }, + }, }, xLabel: vertFlag ? catColValues.info.name : normalizedFlag ? 'Percent of Total' : plotAggregateAxisName, yLabel: vertFlag ? (normalizedFlag ? 'Percent of Total' : plotAggregateAxisName) : catColValues.info.name, @@ -177,6 +209,15 @@ async function setPlotsWithGroups(columns, catCol, aggregateType, aggregateColum yTickLabels: !vertFlag ? uniqueColVals.map((v) => truncateText(v, TICK_LABEL_LENGTH)) : null, }); }); + // const hasSelected = plots.find((plot) => plot.data.selectedpoints !== null); + // // Need to check if we need to tell all of the traces that there is a selection so they can be opaque + // if (hasSelected) { + // plots.forEach((p) => { + // if (p.data.selectedpoints === null) { + // p.data.selectedpoints = []; + // } + // }); + // } return plotCounter; } async function setPlotsWithMultiples(columns, catCol, aggregateType, aggregateColumn, config, plots, plotCounter) { @@ -197,6 +238,9 @@ async function setPlotsWithMultiples(columns, catCol, aggregateType, aggregateCo }) .flat(); const plotAggregateAxisName = createAxisLabel(aggregateType, aggregateColumn); + let valIdArr = uniqueColVals.map((val) => []); + catColValues.resolvedValues.forEach((row) => valIdArr[uniqueColVals.indexOf(row.val)].push(row.id)); + valIdArr = valIdArr.map((arr) => arr.filter((val) => allMultiplesObjsIds.has(val))); plots.push({ data: { x: vertFlag ? uniqueColVals : finalAggregateValues, @@ -204,6 +248,7 @@ async function setPlotsWithMultiples(columns, catCol, aggregateType, aggregateCo ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueVal}`), text: uniqueColVals, textposition: 'none', + customdata: valIdArr, hoverinfo: vertFlag ? 'y+text' : 'x+text', orientation: vertFlag ? 'v' : 'h', xaxis: plotCounterEdit === 1 ? 'x' : `x${plotCounterEdit}`, @@ -211,6 +256,17 @@ async function setPlotsWithMultiples(columns, catCol, aggregateType, aggregateCo showlegend: false, type: 'bar', name: uniqueVal, + // @ts-ignore + selected: { + marker: { + opacity: '1', + }, + }, + unselected: { + marker: { + opacity: UNSELECTED_OPACITY, + }, + }, }, xLabel: vertFlag ? catColValues.info.name : plotAggregateAxisName, yLabel: vertFlag ? plotAggregateAxisName : catColValues.info.name, @@ -221,7 +277,7 @@ async function setPlotsWithMultiples(columns, catCol, aggregateType, aggregateCo }); plotCounterEdit += 1; }); - return plotCounter; + return plotCounterEdit; } async function setPlotsBasic(columns, aggregateType, aggregateColumn, catCol, config, plots, scales, plotCounter) { let plotCounterEdit = plotCounter; @@ -235,17 +291,28 @@ async function setPlotsBasic(columns, aggregateType, aggregateColumn, catCol, co const plotAggregateAxisName = createAxisLabel(aggregateType, aggregateColumn); plots.push({ data: { + type: 'bar', x: vertFlag ? valArr : aggValues, y: !vertFlag ? valArr : aggValues, text: valArr, textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', ids: valArr, + // @ts-ignore + selected: { + marker: { + opacity: '1', + }, + }, + unselected: { + marker: { + opacity: UNSELECTED_OPACITY, + }, + }, customdata: valIdArr, orientation: vertFlag ? 'v' : 'h', xaxis: plotCounter === 1 ? 'x' : `x${plotCounter}`, yaxis: plotCounter === 1 ? 'y' : `y${plotCounter}`, - type: 'bar', name: catColValues.info.name, showlegend: false, }, diff --git a/dist/vis/bar/utils.js.map b/dist/vis/bar/utils.js.map index b7c169b44..9e90928cd 100644 --- a/dist/vis/bar/utils.js.map +++ b/dist/vis/bar/utils.js.map @@ -1 +1 @@ -{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/vis/bar/utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/vis/bar/utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/vis/Vis.tsx b/src/vis/Vis.tsx index ce9f2116c..a28244a69 100644 --- a/src/vis/Vis.tsx +++ b/src/vis/Vis.tsx @@ -259,6 +259,9 @@ export function Vis({ void; showCloseButton?: boolean; - + selectionCallback?: (ids: string[]) => void; + selectedMap?: { [key: string]: boolean }; + selectedList: string[]; setConfig: (config: IVisConfig) => void; scales: Scales; hideSidebar?: boolean; @@ -65,6 +67,9 @@ export function BarVis({ columns, setConfig, scales, + selectionCallback = () => null, + selectedMap = {}, + selectedList = [], hideSidebar = false, showCloseButton = false, closeButtonCallback = () => null, @@ -79,6 +84,8 @@ export function BarVis({ const plotlyDivRef = React.useRef(null); + const [selectedCategories, setSelectedCategories] = useState([]); + useEffect(() => { const ro = new ResizeObserver(() => { Plotly.Plots.resize(document.getElementById(`plotlyDiv${id}`)); @@ -128,6 +135,55 @@ export function BarVis({ return beautifyLayout(traces, innerLayout); }, [traces, config.groupType]); + // Make sure selected values is right for each plot. + useEffect(() => { + let selectedFlag = false; + const allSelected = []; + traces?.plots.forEach((plot) => { + const tracePoints = plot.data.customdata; + + const selectedArr = []; + tracePoints.forEach((trace, index) => { + if (trace.length === 0 || selectedList.length < trace.length) { + return; + } + for (const i of trace) { + if (!selectedMap[i]) { + return; + } + } + + selectedArr.push(index); + allSelected.push(trace); + selectedFlag = true; + }); + + if (selectedArr.length > 0) { + plot.data.selectedpoints = selectedArr; + } else { + plot.data.selectedpoints = null; + } + }); + + if (selectedFlag) { + traces?.plots.forEach((plot) => { + if (plot.data.selectedpoints === null) { + plot.data.selectedpoints = []; + } + }); + } + + setSelectedCategories(allSelected); + }, [traces, selectedMap, selectedList]); + + const traceData = useMemo(() => { + if (!traces) { + return null; + } + + return [...traces.plots.map((p) => p.data), ...traces.legendPlots.map((p) => p.data)]; + }, [traces]); + return (
0 ? ( p.data), ...traces.legendPlots.map((p) => p.data)]} + data={traceData} layout={layout} config={{ responsive: true, displayModeBar: false }} useResizeHandler style={{ width: '100%', height: '100%' }} onClick={(e: any) => { - const clickedCategory = e.points[0].id; - console.log(e); - console.log(config.group) - console.log(clickedCategory); + const selectedPoints: string[] = e.points[0].customdata; + + if (e.event.ctrlKey) { + const newList = Array.from(new Set([...selectedList, ...selectedPoints])); + selectionCallback(newList); + } else { + selectionCallback(selectedPoints); + } }} // plotly redraws everything on updates, so you need to reappend title and onUpdate={() => { diff --git a/src/vis/bar/utils.ts b/src/vis/bar/utils.ts index 82b17f140..4ca73d683 100644 --- a/src/vis/bar/utils.ts +++ b/src/vis/bar/utils.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-ts-comment */ /* eslint-disable @typescript-eslint/naming-convention */ import { merge, sum, mean, min, max } from 'lodash'; import { median } from 'd3'; @@ -27,6 +28,7 @@ export function isBar(s: IVisConfig): s is IBarConfig { return s.type === ESupportedPlotlyVis.BAR; } +const UNSELECTED_OPACITY = '0.2'; const defaultConfig: IBarConfig = { type: ESupportedPlotlyVis.BAR, numColumnsSelected: [], @@ -173,12 +175,19 @@ async function setPlotsWithGroupsAndMultiples( const plotAggregateAxisName = createAxisLabel(aggregateType, aggregateColumn); + let valIdArr = uniqueColVals.map((val) => []); + + catColValues.resolvedValues.forEach((row) => valIdArr[uniqueColVals.indexOf(row.val as string)].push(row.id)); + + valIdArr = valIdArr.map((arr) => arr.filter((val) => allGroupObjsIds.has(val) && allMultiplesObjsIds.has(val))); + plots.push({ data: { x: vertFlag ? uniqueColVals : aggregateVals, y: !vertFlag ? uniqueColVals : aggregateVals, text: uniqueColVals, ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueMultiples}, ${uniqueGroup}`), + customdata: valIdArr, textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', @@ -191,6 +200,17 @@ async function setPlotsWithGroupsAndMultiples( marker: { color: scales.color(uniqueGroup), }, + // @ts-ignore + selected: { + marker: { + opacity: '1', + }, + }, + unselected: { + marker: { + opacity: UNSELECTED_OPACITY, + }, + }, }, xLabel: vertFlag ? catColValues.info.name : normalizedFlag ? 'Percent of Total' : plotAggregateAxisName, yLabel: vertFlag ? (normalizedFlag ? 'Percent of Total' : plotAggregateAxisName) : catColValues.info.name, @@ -250,12 +270,19 @@ async function setPlotsWithGroups( const plotAggregateAxisName = createAxisLabel(aggregateType, aggregateColumn); + let valIdArr = uniqueColVals.map((val) => []); + + catColValues.resolvedValues.forEach((row) => valIdArr[uniqueColVals.indexOf(row.val as string)].push(row.id)); + + valIdArr = valIdArr.map((arr) => arr.filter((val) => allGroupObjsIds.has(val))); + plots.push({ data: { x: vertFlag ? uniqueColVals : finalAggregateValues, y: !vertFlag ? uniqueColVals : finalAggregateValues, text: uniqueColVals, ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueVal}`), + customdata: valIdArr, textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', @@ -268,6 +295,17 @@ async function setPlotsWithGroups( marker: { color: scales.color(uniqueVal), }, + // @ts-ignore + selected: { + marker: { + opacity: '1', + }, + }, + unselected: { + marker: { + opacity: UNSELECTED_OPACITY, + }, + }, }, xLabel: vertFlag ? catColValues.info.name : normalizedFlag ? 'Percent of Total' : plotAggregateAxisName, yLabel: vertFlag ? (normalizedFlag ? 'Percent of Total' : plotAggregateAxisName) : catColValues.info.name, @@ -278,6 +316,17 @@ async function setPlotsWithGroups( }); }); + // const hasSelected = plots.find((plot) => plot.data.selectedpoints !== null); + + // // Need to check if we need to tell all of the traces that there is a selection so they can be opaque + // if (hasSelected) { + // plots.forEach((p) => { + // if (p.data.selectedpoints === null) { + // p.data.selectedpoints = []; + // } + // }); + // } + return plotCounter; } @@ -313,6 +362,12 @@ async function setPlotsWithMultiples( .flat(); const plotAggregateAxisName = createAxisLabel(aggregateType, aggregateColumn); + let valIdArr = uniqueColVals.map((val) => []); + + catColValues.resolvedValues.forEach((row) => valIdArr[uniqueColVals.indexOf(row.val as string)].push(row.id)); + + valIdArr = valIdArr.map((arr) => arr.filter((val) => allMultiplesObjsIds.has(val))); + plots.push({ data: { x: vertFlag ? uniqueColVals : finalAggregateValues, @@ -320,6 +375,7 @@ async function setPlotsWithMultiples( ids: uniqueColVals.map((colVal) => `${colVal}, ${uniqueVal}`), text: uniqueColVals, textposition: 'none', + customdata: valIdArr, hoverinfo: vertFlag ? 'y+text' : 'x+text', orientation: vertFlag ? 'v' : 'h', xaxis: plotCounterEdit === 1 ? 'x' : `x${plotCounterEdit}`, @@ -327,6 +383,17 @@ async function setPlotsWithMultiples( showlegend: false, type: 'bar', name: uniqueVal, + // @ts-ignore + selected: { + marker: { + opacity: '1', + }, + }, + unselected: { + marker: { + opacity: UNSELECTED_OPACITY, + }, + }, }, xLabel: vertFlag ? catColValues.info.name : plotAggregateAxisName, yLabel: vertFlag ? plotAggregateAxisName : catColValues.info.name, @@ -338,7 +405,7 @@ async function setPlotsWithMultiples( plotCounterEdit += 1; }); - return plotCounter; + return plotCounterEdit; } async function setPlotsBasic( @@ -364,7 +431,7 @@ async function setPlotsBasic( ) as any[]; const valArr = [...new Set(catColValues.resolvedValues.map((v) => v.val as string))]; - const valIdArr = valArr.map((val) => []); + const valIdArr: string[][] = valArr.map((val) => []); catColValues.resolvedValues.forEach((row) => valIdArr[valArr.indexOf(row.val as string)].push(row.id)); @@ -372,17 +439,28 @@ async function setPlotsBasic( plots.push({ data: { + type: 'bar', x: vertFlag ? valArr : aggValues, y: !vertFlag ? valArr : aggValues, text: valArr, textposition: 'none', hoverinfo: vertFlag ? 'y+text' : 'x+text', ids: valArr, + // @ts-ignore + selected: { + marker: { + opacity: '1', + }, + }, + unselected: { + marker: { + opacity: UNSELECTED_OPACITY, + }, + }, customdata: valIdArr, orientation: vertFlag ? 'v' : 'h', xaxis: plotCounter === 1 ? 'x' : `x${plotCounter}`, yaxis: plotCounter === 1 ? 'y' : `y${plotCounter}`, - type: 'bar', name: catColValues.info.name, showlegend: false, }, From 0434485ea9db5bd9e0c4d8466685c84e2e386f09 Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Tue, 31 May 2022 13:52:52 +0200 Subject: [PATCH 15/46] making bar click removal work --- dist/vis/bar/BarVis.d.ts.map | 2 +- dist/vis/bar/BarVis.js | 15 +++++++++++++-- dist/vis/bar/BarVis.js.map | 2 +- src/vis/bar/BarVis.tsx | 16 ++++++++++++++-- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dist/vis/bar/BarVis.d.ts.map b/dist/vis/bar/BarVis.d.ts.map index 51ee41ea1..c2709b207 100644 --- a/dist/vis/bar/BarVis.d.ts.map +++ b/dist/vis/bar/BarVis.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"BarVis.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAoB,MAAM,eAAe,CAAC;AAU5F,UAAU,WAAW;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,KAAK,CAAC,EAAE;YACN,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,YAAY,CAAC,EAAE;YACb,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;KACH,CAAC;IACF,UAAU,CAAC,EAAE;QACX,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC3B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC7B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACzC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AASD,wBAAgB,MAAM,CAAC,EACrB,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EACP,SAAS,EACT,MAAM,EACN,iBAA8B,EAC9B,WAAgB,EAChB,YAAiB,EACjB,WAAmB,EACnB,eAAuB,EACvB,mBAAgC,GACjC,EAAE,WAAW,eA+Jb"} \ No newline at end of file +{"version":3,"file":"BarVis.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAoB,MAAM,eAAe,CAAC;AAU5F,UAAU,WAAW;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,KAAK,CAAC,EAAE;YACN,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,YAAY,CAAC,EAAE;YACb,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;KACH,CAAC;IACF,UAAU,CAAC,EAAE;QACX,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC3B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC7B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACzC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AASD,wBAAgB,MAAM,CAAC,EACrB,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EACP,SAAS,EACT,MAAM,EACN,iBAA8B,EAC9B,WAAgB,EAChB,YAAiB,EACjB,WAAmB,EACnB,eAAuB,EACvB,mBAAgC,GACjC,EAAE,WAAW,eA2Kb"} \ No newline at end of file diff --git a/dist/vis/bar/BarVis.js b/dist/vis/bar/BarVis.js index 585b8ac96..2deb4fa1d 100644 --- a/dist/vis/bar/BarVis.js +++ b/dist/vis/bar/BarVis.js @@ -1,6 +1,6 @@ import * as React from 'react'; import d3 from 'd3'; -import { merge, uniqueId } from 'lodash'; +import { merge, uniqueId, difference } from 'lodash'; import { useEffect, useMemo, useState } from 'react'; import { EBarGroupingType } from '../interfaces'; import { PlotlyComponent, Plotly } from '../Plot'; @@ -112,7 +112,18 @@ export function BarVis({ config, optionsConfig, extensions, columns, setConfig, mergedExtensions.prePlot, traceStatus === 'success' && (traces === null || traces === void 0 ? void 0 : traces.plots.length) > 0 ? (React.createElement(PlotlyComponent, { divId: `plotlyDiv${id}`, data: traceData, layout: layout, config: { responsive: true, displayModeBar: false }, useResizeHandler: true, style: { width: '100%', height: '100%' }, onClick: (e) => { const selectedPoints = e.points[0].customdata; - if (e.event.ctrlKey) { + let removeSelectionFlag = true; + for (const j of selectedPoints) { + if (!selectedMap[j]) { + removeSelectionFlag = false; + break; + } + } + if (removeSelectionFlag) { + const newList = difference(selectedList, selectedPoints); + selectionCallback(newList); + } + else if (e.event.ctrlKey) { const newList = Array.from(new Set([...selectedList, ...selectedPoints])); selectionCallback(newList); } diff --git a/dist/vis/bar/BarVis.js.map b/dist/vis/bar/BarVis.js.map index b7b34b806..802288e8c 100644 --- a/dist/vis/bar/BarVis.js.map +++ b/dist/vis/bar/BarVis.js.map @@ -1 +1 @@ -{"version":3,"file":"BarVis.js","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"BarVis.js","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/vis/bar/BarVis.tsx b/src/vis/bar/BarVis.tsx index 72ca63d87..398adbf45 100644 --- a/src/vis/bar/BarVis.tsx +++ b/src/vis/bar/BarVis.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import d3 from 'd3'; -import { merge, uniqueId } from 'lodash'; +import { merge, uniqueId, difference } from 'lodash'; import { useEffect, useMemo, useState } from 'react'; import { Scales, VisColumn, IVisConfig, IBarConfig, EBarGroupingType } from '../interfaces'; import { PlotlyComponent, Plotly } from '../Plot'; @@ -203,7 +203,19 @@ export function BarVis({ onClick={(e: any) => { const selectedPoints: string[] = e.points[0].customdata; - if (e.event.ctrlKey) { + let removeSelectionFlag = true; + + for (const j of selectedPoints) { + if (!selectedMap[j]) { + removeSelectionFlag = false; + break; + } + } + + if (removeSelectionFlag) { + const newList = difference(selectedList, selectedPoints); + selectionCallback(newList); + } else if (e.event.ctrlKey) { const newList = Array.from(new Set([...selectedList, ...selectedPoints])); selectionCallback(newList); } else { From ecaeeb65f4310a48c3a422a446dbf15fdbd529be Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Tue, 31 May 2022 14:04:30 +0200 Subject: [PATCH 16/46] code improvements --- dist/vis/bar/BarVis.d.ts.map | 2 +- dist/vis/bar/BarVis.js | 101 ++++++++++++++++--------------- dist/vis/bar/BarVis.js.map | 2 +- src/vis/bar/BarVis.tsx | 112 ++++++++++++++++++----------------- 4 files changed, 114 insertions(+), 103 deletions(-) diff --git a/dist/vis/bar/BarVis.d.ts.map b/dist/vis/bar/BarVis.d.ts.map index c2709b207..b4292cb7b 100644 --- a/dist/vis/bar/BarVis.d.ts.map +++ b/dist/vis/bar/BarVis.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"BarVis.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAoB,MAAM,eAAe,CAAC;AAU5F,UAAU,WAAW;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,KAAK,CAAC,EAAE;YACN,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,YAAY,CAAC,EAAE;YACb,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;KACH,CAAC;IACF,UAAU,CAAC,EAAE;QACX,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC3B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC7B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACzC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AASD,wBAAgB,MAAM,CAAC,EACrB,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EACP,SAAS,EACT,MAAM,EACN,iBAA8B,EAC9B,WAAgB,EAChB,YAAiB,EACjB,WAAmB,EACnB,eAAuB,EACvB,mBAAgC,GACjC,EAAE,WAAW,eA2Kb"} \ No newline at end of file +{"version":3,"file":"BarVis.d.ts","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAoB,MAAM,eAAe,CAAC;AAU5F,UAAU,WAAW;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,aAAa,CAAC,EAAE;QACd,KAAK,CAAC,EAAE;YACN,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,SAAS,CAAC,EAAE;YACV,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,YAAY,CAAC,EAAE;YACb,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;QACF,OAAO,CAAC,EAAE;YACR,MAAM,CAAC,EAAE,OAAO,CAAC;YACjB,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;SACnC,CAAC;KACH,CAAC;IACF,UAAU,CAAC,EAAE;QACX,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC3B,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;QAC7B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;KAC/B,CAAC;IACF,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC5C,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACzC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AASD,wBAAgB,MAAM,CAAC,EACrB,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EACP,SAAS,EACT,MAAM,EACN,iBAA8B,EAC9B,WAAgB,EAChB,YAAiB,EACjB,WAAmB,EACnB,eAAuB,EACvB,mBAAgC,GACjC,EAAE,WAAW,eAiLb"} \ No newline at end of file diff --git a/dist/vis/bar/BarVis.js b/dist/vis/bar/BarVis.js index 2deb4fa1d..7e8cb2108 100644 --- a/dist/vis/bar/BarVis.js +++ b/dist/vis/bar/BarVis.js @@ -1,7 +1,7 @@ import * as React from 'react'; import d3 from 'd3'; import { merge, uniqueId, difference } from 'lodash'; -import { useEffect, useMemo, useState } from 'react'; +import { useEffect, useMemo } from 'react'; import { EBarGroupingType } from '../interfaces'; import { PlotlyComponent, Plotly } from '../Plot'; import { InvalidCols } from '../general'; @@ -22,9 +22,48 @@ export function BarVis({ config, optionsConfig, extensions, columns, setConfig, return merge({}, defaultExtensions, extensions); }, [extensions]); const { value: traces, status: traceStatus, error: traceError } = useAsync(createBarTraces, [columns, config, scales]); + // Make sure selected values is right for each plot. + const finalTraces = useMemo(() => { + if (!traces) { + return null; + } + let selectedFlag = false; + const editedTraces = { ...traces }; + const allSelected = []; + editedTraces === null || editedTraces === void 0 ? void 0 : editedTraces.plots.forEach((plot) => { + const tracePoints = plot.data.customdata; + const selectedArr = []; + tracePoints.forEach((trace, index) => { + if (trace.length === 0 || selectedList.length < trace.length) { + return; + } + for (const i of trace) { + if (!selectedMap[i]) { + return; + } + } + selectedArr.push(index); + allSelected.push(trace); + selectedFlag = true; + }); + if (selectedArr.length > 0) { + plot.data.selectedpoints = selectedArr; + } + else { + plot.data.selectedpoints = null; + } + }); + if (selectedFlag) { + editedTraces === null || editedTraces === void 0 ? void 0 : editedTraces.plots.forEach((plot) => { + if (plot.data.selectedpoints === null) { + plot.data.selectedpoints = []; + } + }); + } + return editedTraces; + }, [traces, selectedMap, selectedList]); const id = React.useMemo(() => uniqueId('BarVis'), []); const plotlyDivRef = React.useRef(null); - const [selectedCategories, setSelectedCategories] = useState([]); useEffect(() => { const ro = new ResizeObserver(() => { Plotly.Plots.resize(document.getElementById(`plotlyDiv${id}`)); @@ -44,7 +83,7 @@ export function BarVis({ config, optionsConfig, extensions, columns, setConfig, }); }, [id, hideSidebar, plotlyDivRef]); const layout = React.useMemo(() => { - if (!traces) { + if (!finalTraces) { return null; } const innerLayout = { @@ -58,59 +97,25 @@ export function BarVis({ config, optionsConfig, extensions, columns, setConfig, family: 'Roboto, sans-serif', }, autosize: true, - grid: { rows: traces.rows, columns: traces.cols, xgap: 0.3, pattern: 'independent' }, + grid: { rows: finalTraces.rows, columns: finalTraces.cols, xgap: 0.3, pattern: 'independent' }, shapes: [], violingap: 0, barmode: config.groupType === EBarGroupingType.STACK ? 'stack' : 'group', }; - return beautifyLayout(traces, innerLayout); - }, [traces, config.groupType]); - // Make sure selected values is right for each plot. - useEffect(() => { - let selectedFlag = false; - const allSelected = []; - traces === null || traces === void 0 ? void 0 : traces.plots.forEach((plot) => { - const tracePoints = plot.data.customdata; - const selectedArr = []; - tracePoints.forEach((trace, index) => { - if (trace.length === 0 || selectedList.length < trace.length) { - return; - } - for (const i of trace) { - if (!selectedMap[i]) { - return; - } - } - selectedArr.push(index); - allSelected.push(trace); - selectedFlag = true; - }); - if (selectedArr.length > 0) { - plot.data.selectedpoints = selectedArr; - } - else { - plot.data.selectedpoints = null; - } - }); - if (selectedFlag) { - traces === null || traces === void 0 ? void 0 : traces.plots.forEach((plot) => { - if (plot.data.selectedpoints === null) { - plot.data.selectedpoints = []; - } - }); - } - setSelectedCategories(allSelected); - }, [traces, selectedMap, selectedList]); + return beautifyLayout(finalTraces, innerLayout); + }, [finalTraces, config.groupType]); const traceData = useMemo(() => { - if (!traces) { + if (!finalTraces) { return null; } - return [...traces.plots.map((p) => p.data), ...traces.legendPlots.map((p) => p.data)]; - }, [traces]); + return [...finalTraces.plots.map((p) => p.data), ...finalTraces.legendPlots.map((p) => p.data)]; + }, [finalTraces]); return (React.createElement("div", { ref: plotlyDivRef, className: "d-flex flex-row w-100 h-100", style: { minHeight: '0px' } }, React.createElement("div", { className: `position-relative d-flex justify-content-center align-items-center flex-grow-1 ${traceStatus === 'pending' ? 'tdp-busy-partial-overlay' : ''}` }, mergedExtensions.prePlot, - traceStatus === 'success' && (traces === null || traces === void 0 ? void 0 : traces.plots.length) > 0 ? (React.createElement(PlotlyComponent, { divId: `plotlyDiv${id}`, data: traceData, layout: layout, config: { responsive: true, displayModeBar: false }, useResizeHandler: true, style: { width: '100%', height: '100%' }, onClick: (e) => { + traceStatus === 'success' && (finalTraces === null || finalTraces === void 0 ? void 0 : finalTraces.plots.length) > 0 ? (React.createElement(PlotlyComponent, { divId: `plotlyDiv${id}`, data: traceData, layout: layout, config: { responsive: true, displayModeBar: false }, useResizeHandler: true, style: { width: '100%', height: '100%' }, + // The types on this event dont seem to work correctly with Plotly types, thus the any typing. + onClick: (e) => { const selectedPoints = e.points[0].customdata; let removeSelectionFlag = true; for (const j of selectedPoints) { @@ -133,11 +138,11 @@ export function BarVis({ config, optionsConfig, extensions, columns, setConfig, }, // plotly redraws everything on updates, so you need to reappend title and onUpdate: () => { - for (const p of traces.plots) { + for (const p of finalTraces.plots) { d3.select(`g .${p.data.xaxis}title`).style('pointer-events', 'all').append('title').text(p.xLabel); d3.select(`g .${p.data.yaxis}title`).style('pointer-events', 'all').append('title').text(p.yLabel); } - } })) : traceStatus !== 'pending' ? (React.createElement(InvalidCols, { headerMessage: traces === null || traces === void 0 ? void 0 : traces.errorMessageHeader, bodyMessage: (traceError === null || traceError === void 0 ? void 0 : traceError.message) || (traces === null || traces === void 0 ? void 0 : traces.errorMessage) })) : null, + } })) : traceStatus !== 'pending' ? (React.createElement(InvalidCols, { headerMessage: finalTraces === null || finalTraces === void 0 ? void 0 : finalTraces.errorMessageHeader, bodyMessage: (traceError === null || traceError === void 0 ? void 0 : traceError.message) || (finalTraces === null || finalTraces === void 0 ? void 0 : finalTraces.errorMessage) })) : null, mergedExtensions.postPlot, showCloseButton ? React.createElement(CloseButton, { closeCallback: closeButtonCallback }) : null), !hideSidebar ? (React.createElement(VisSidebarWrapper, { id: id }, diff --git a/dist/vis/bar/BarVis.js.map b/dist/vis/bar/BarVis.js.map index 802288e8c..b05d2bfa7 100644 --- a/dist/vis/bar/BarVis.js.map +++ b/dist/vis/bar/BarVis.js.map @@ -1 +1 @@ -{"version":3,"file":"BarVis.js","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"BarVis.js","sourceRoot":"","sources":["../../../src/vis/bar/BarVis.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/vis/bar/BarVis.tsx b/src/vis/bar/BarVis.tsx index 398adbf45..182bc54e1 100644 --- a/src/vis/bar/BarVis.tsx +++ b/src/vis/bar/BarVis.tsx @@ -80,12 +80,58 @@ export function BarVis({ const { value: traces, status: traceStatus, error: traceError } = useAsync(createBarTraces, [columns, config, scales]); + // Make sure selected values is right for each plot. + const finalTraces = useMemo(() => { + if (!traces) { + return null; + } + + let selectedFlag = false; + + const editedTraces = { ...traces }; + + const allSelected = []; + editedTraces?.plots.forEach((plot) => { + const tracePoints = plot.data.customdata; + + const selectedArr = []; + tracePoints.forEach((trace, index) => { + if (trace.length === 0 || selectedList.length < trace.length) { + return; + } + for (const i of trace) { + if (!selectedMap[i]) { + return; + } + } + + selectedArr.push(index); + allSelected.push(trace); + selectedFlag = true; + }); + + if (selectedArr.length > 0) { + plot.data.selectedpoints = selectedArr; + } else { + plot.data.selectedpoints = null; + } + }); + + if (selectedFlag) { + editedTraces?.plots.forEach((plot) => { + if (plot.data.selectedpoints === null) { + plot.data.selectedpoints = []; + } + }); + } + + return editedTraces; + }, [traces, selectedMap, selectedList]); + const id = React.useMemo(() => uniqueId('BarVis'), []); const plotlyDivRef = React.useRef(null); - const [selectedCategories, setSelectedCategories] = useState([]); - useEffect(() => { const ro = new ResizeObserver(() => { Plotly.Plots.resize(document.getElementById(`plotlyDiv${id}`)); @@ -111,7 +157,7 @@ export function BarVis({ }, [id, hideSidebar, plotlyDivRef]); const layout = React.useMemo(() => { - if (!traces) { + if (!finalTraces) { return null; } @@ -126,63 +172,22 @@ export function BarVis({ family: 'Roboto, sans-serif', }, autosize: true, - grid: { rows: traces.rows, columns: traces.cols, xgap: 0.3, pattern: 'independent' }, + grid: { rows: finalTraces.rows, columns: finalTraces.cols, xgap: 0.3, pattern: 'independent' }, shapes: [], violingap: 0, barmode: config.groupType === EBarGroupingType.STACK ? 'stack' : 'group', }; - return beautifyLayout(traces, innerLayout); - }, [traces, config.groupType]); - - // Make sure selected values is right for each plot. - useEffect(() => { - let selectedFlag = false; - const allSelected = []; - traces?.plots.forEach((plot) => { - const tracePoints = plot.data.customdata; - - const selectedArr = []; - tracePoints.forEach((trace, index) => { - if (trace.length === 0 || selectedList.length < trace.length) { - return; - } - for (const i of trace) { - if (!selectedMap[i]) { - return; - } - } - - selectedArr.push(index); - allSelected.push(trace); - selectedFlag = true; - }); - - if (selectedArr.length > 0) { - plot.data.selectedpoints = selectedArr; - } else { - plot.data.selectedpoints = null; - } - }); - - if (selectedFlag) { - traces?.plots.forEach((plot) => { - if (plot.data.selectedpoints === null) { - plot.data.selectedpoints = []; - } - }); - } - - setSelectedCategories(allSelected); - }, [traces, selectedMap, selectedList]); + return beautifyLayout(finalTraces, innerLayout); + }, [finalTraces, config.groupType]); const traceData = useMemo(() => { - if (!traces) { + if (!finalTraces) { return null; } - return [...traces.plots.map((p) => p.data), ...traces.legendPlots.map((p) => p.data)]; - }, [traces]); + return [...finalTraces.plots.map((p) => p.data), ...finalTraces.legendPlots.map((p) => p.data)]; + }, [finalTraces]); return (
@@ -192,7 +197,7 @@ export function BarVis({ }`} > {mergedExtensions.prePlot} - {traceStatus === 'success' && traces?.plots.length > 0 ? ( + {traceStatus === 'success' && finalTraces?.plots.length > 0 ? ( { const selectedPoints: string[] = e.points[0].customdata; @@ -224,7 +230,7 @@ export function BarVis({ }} // plotly redraws everything on updates, so you need to reappend title and onUpdate={() => { - for (const p of traces.plots) { + for (const p of finalTraces.plots) { d3.select(`g .${p.data.xaxis}title`).style('pointer-events', 'all').append('title').text(p.xLabel); d3.select(`g .${p.data.yaxis}title`).style('pointer-events', 'all').append('title').text(p.yLabel); @@ -232,7 +238,7 @@ export function BarVis({ }} /> ) : traceStatus !== 'pending' ? ( - + ) : null} {mergedExtensions.postPlot} {showCloseButton ? : null} From 7e7b44df6e80cbcaacd249eb1b7500b0d6730efd Mon Sep 17 00:00:00 2001 From: dvzacharycutler Date: Tue, 31 May 2022 14:56:26 +0200 Subject: [PATCH 17/46] fixing uncontrolled error --- dist/vis/sidebar/AggregateTypeSelect.d.ts.map | 2 +- dist/vis/sidebar/AggregateTypeSelect.js | 19 ++++------- dist/vis/sidebar/AggregateTypeSelect.js.map | 2 +- src/vis/sidebar/AggregateTypeSelect.tsx | 32 ++++++------------- 4 files changed, 18 insertions(+), 37 deletions(-) diff --git a/dist/vis/sidebar/AggregateTypeSelect.d.ts.map b/dist/vis/sidebar/AggregateTypeSelect.d.ts.map index d82766143..2920588c8 100644 --- a/dist/vis/sidebar/AggregateTypeSelect.d.ts.map +++ b/dist/vis/sidebar/AggregateTypeSelect.d.ts.map @@ -1 +1 @@ -{"version":3,"file":"AggregateTypeSelect.d.ts","sourceRoot":"","sources":["../../../src/vis/sidebar/AggregateTypeSelect.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAgB,SAAS,EAAE,MAAM,eAAe,CAAC;AAGrF,UAAU,wBAAwB;IAChC,2BAA2B,EAAE,CAAC,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;IAC1D,eAAe,EAAE,UAAU,GAAG,IAAI,CAAC;IACnC,6BAA6B,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACvD,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,eAAe,EAAE,eAAe,CAAC;CAClC;AAYD,wBAAgB,mBAAmB,CAAC,EAClC,2BAA2B,EAC3B,6BAA6B,EAC7B,OAAO,EACP,eAAe,EACf,eAAe,GAChB,EAAE,wBAAwB,eAwC1B"} \ No newline at end of file +{"version":3,"file":"AggregateTypeSelect.d.ts","sourceRoot":"","sources":["../../../src/vis/sidebar/AggregateTypeSelect.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAgB,SAAS,EAAE,MAAM,eAAe,CAAC;AAGrF,UAAU,wBAAwB;IAChC,2BAA2B,EAAE,CAAC,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;IAC1D,eAAe,EAAE,UAAU,GAAG,IAAI,CAAC;IACnC,6BAA6B,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;IACvD,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,eAAe,EAAE,eAAe,CAAC;CAClC;AAED,wBAAgB,mBAAmB,CAAC,EAClC,2BAA2B,EAC3B,6BAA6B,EAC7B,OAAO,EACP,eAAe,EACf,eAAe,GAChB,EAAE,wBAAwB,eAuC1B"} \ No newline at end of file diff --git a/dist/vis/sidebar/AggregateTypeSelect.js b/dist/vis/sidebar/AggregateTypeSelect.js index 73bad73c1..4b86db2f3 100644 --- a/dist/vis/sidebar/AggregateTypeSelect.js +++ b/dist/vis/sidebar/AggregateTypeSelect.js @@ -1,31 +1,24 @@ import * as React from 'react'; import { useMemo } from 'react'; -import Highlighter from 'react-highlight-words'; import Select from 'react-select'; import { EAggregateTypes, EColumnTypes } from '../interfaces'; import { SingleColumnSelect } from './SingleColumnSelect'; -function formatOptionLabel(option, ctx) { - return (React.createElement(React.Fragment, null, - React.createElement(Highlighter, { searchWords: [ctx.inputValue], autoEscape: true, textToHighlight: option.name }), - option.description && React.createElement("span", { className: "small text-muted ms-1" }, option.description), - option.disabled ? React.createElement("i", { className: "ms-1 fas fa-question-circle", title: "No numerical columns available for this aggregation type" }) : null)); -} export function AggregateTypeSelect({ aggregateTypeSelectCallback, aggregateColumnSelectCallback, columns, currentSelected, aggregateColumn, }) { const hasNumCols = useMemo(() => { return !!columns.find((col) => col.type === EColumnTypes.NUMERICAL); }, [columns]); const selectOptions = React.useMemo(() => { return [ - { disabled: false, id: EAggregateTypes.COUNT, name: EAggregateTypes.COUNT }, - { disabled: !hasNumCols, id: EAggregateTypes.AVG, name: EAggregateTypes.AVG }, - { disabled: !hasNumCols, id: EAggregateTypes.MIN, name: EAggregateTypes.MIN }, - { disabled: !hasNumCols, id: EAggregateTypes.MAX, name: EAggregateTypes.MAX }, - { disabled: !hasNumCols, id: EAggregateTypes.MED, name: EAggregateTypes.MED }, + { disabled: false, value: EAggregateTypes.COUNT, label: EAggregateTypes.COUNT }, + { disabled: !hasNumCols, value: EAggregateTypes.AVG, label: EAggregateTypes.AVG }, + { disabled: !hasNumCols, value: EAggregateTypes.MIN, label: EAggregateTypes.MIN }, + { disabled: !hasNumCols, value: EAggregateTypes.MAX, label: EAggregateTypes.MAX }, + { disabled: !hasNumCols, value: EAggregateTypes.MED, label: EAggregateTypes.MED }, ]; }, [hasNumCols]); return (React.createElement(React.Fragment, null, React.createElement("label", { className: "pt-2 pb-1" }, "Aggregate Type"), - React.createElement(Select, { closeMenuOnSelect: true, formatOptionLabel: formatOptionLabel, getOptionLabel: (option) => option.name, getOptionValue: (option) => option.id, onChange: (e) => aggregateTypeSelectCallback(e.id), name: "numColumns", options: selectOptions || [], isOptionDisabled: (option) => (option.id === EAggregateTypes.COUNT ? false : !hasNumCols), value: { label: currentSelected, id: currentSelected, name: currentSelected } }), + React.createElement(Select, { closeMenuOnSelect: true, getOptionLabel: (option) => option.label, getOptionValue: (option) => option.value, onChange: (e) => aggregateTypeSelectCallback(e.value), name: "numColumns", options: selectOptions || [], isOptionDisabled: (option) => (option.value === EAggregateTypes.COUNT ? false : !hasNumCols), value: { label: currentSelected || '', value: currentSelected || '', disabled: false } }), currentSelected !== EAggregateTypes.COUNT ? (React.createElement(SingleColumnSelect, { type: [EColumnTypes.NUMERICAL], label: "Aggregate Column", callback: (c) => aggregateColumnSelectCallback(c), columns: columns, currentSelected: aggregateColumn })) : null)); } //# sourceMappingURL=AggregateTypeSelect.js.map \ No newline at end of file diff --git a/dist/vis/sidebar/AggregateTypeSelect.js.map b/dist/vis/sidebar/AggregateTypeSelect.js.map index f77732243..057d88250 100644 --- a/dist/vis/sidebar/AggregateTypeSelect.js.map +++ b/dist/vis/sidebar/AggregateTypeSelect.js.map @@ -1 +1 @@ -{"version":3,"file":"AggregateTypeSelect.js","sourceRoot":"","sources":["../../../src/vis/sidebar/AggregateTypeSelect.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,WAAW,MAAM,uBAAuB,CAAC;AAChD,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAc,eAAe,EAAE,YAAY,EAAa,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAU1D,SAAS,iBAAiB,CAAC,MAAM,EAAE,GAAG;IACpC,OAAO,CACL;QACE,oBAAC,WAAW,IAAC,WAAW,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,UAAU,QAAC,eAAe,EAAE,MAAM,CAAC,IAAI,GAAI;QACtF,MAAM,CAAC,WAAW,IAAI,8BAAM,SAAS,EAAC,uBAAuB,IAAE,MAAM,CAAC,WAAW,CAAQ;QACzF,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,2BAAG,SAAS,EAAC,6BAA6B,EAAC,KAAK,EAAC,0DAA0D,GAAG,CAAC,CAAC,CAAC,IAAI,CACvI,CACJ,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,EAClC,2BAA2B,EAC3B,6BAA6B,EAC7B,OAAO,EACP,eAAe,EACf,eAAe,GACU;IACzB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACvC,OAAO;YACL,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,eAAe,CAAC,KAAK,EAAE;YAC3E,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE,EAAE,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,eAAe,CAAC,GAAG,EAAE;YAC7E,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE,EAAE,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,eAAe,CAAC,GAAG,EAAE;YAC7E,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE,EAAE,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,eAAe,CAAC,GAAG,EAAE;YAC7E,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE,EAAE,eAAe,CAAC,GAAG,EAAE,IAAI,EAAE,eAAe,CAAC,GAAG,EAAE;SAC9E,CAAC;IACJ,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEjB,OAAO,CACL;QACE,+BAAO,SAAS,EAAC,WAAW,qBAAuB;QACnD,oBAAC,MAAM,IACL,iBAAiB,QACjB,iBAAiB,EAAE,iBAAiB,EACpC,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EACvC,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,EACrC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC,EAAE,CAAC,EAClD,IAAI,EAAC,YAAY,EACjB,OAAO,EAAE,aAAa,IAAI,EAAE,EAC5B,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EACzF,KAAK,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,GAC7E;QACD,eAAe,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAC3C,oBAAC,kBAAkB,IACjB,IAAI,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,EAC9B,KAAK,EAAC,kBAAkB,EACxB,QAAQ,EAAE,CAAC,CAAa,EAAE,EAAE,CAAC,6BAA6B,CAAC,CAAC,CAAC,EAC7D,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,eAAe,GAChC,CACH,CAAC,CAAC,CAAC,IAAI,CACP,CACJ,CAAC;AACJ,CAAC"} \ No newline at end of file +{"version":3,"file":"AggregateTypeSelect.js","sourceRoot":"","sources":["../../../src/vis/sidebar/AggregateTypeSelect.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAc,eAAe,EAAE,YAAY,EAAa,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAU1D,MAAM,UAAU,mBAAmB,CAAC,EAClC,2BAA2B,EAC3B,6BAA6B,EAC7B,OAAO,EACP,eAAe,EACf,eAAe,GACU;IACzB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,YAAY,CAAC,SAAS,CAAC,CAAC;IACtE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACvC,OAAO;YACL,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,KAAK,EAAE;YAC/E,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE;YACjF,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE;YACjF,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE;YACjF,EAAE,QAAQ,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,eAAe,CAAC,GAAG,EAAE;SAClF,CAAC;IACJ,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEjB,OAAO,CACL;QACE,+BAAO,SAAS,EAAC,WAAW,qBAAuB;QACnD,oBAAC,MAAM,IACL,iBAAiB,QACjB,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EACxC,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EACxC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC,KAAK,CAAC,EACrD,IAAI,EAAC,YAAY,EACjB,OAAO,EAAE,aAAa,IAAI,EAAE,EAC5B,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,EAC5F,KAAK,EAAE,EAAE,KAAK,EAAE,eAAe,IAAI,EAAE,EAAE,KAAK,EAAE,eAAe,IAAI,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,GACtF;QACD,eAAe,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAC3C,oBAAC,kBAAkB,IACjB,IAAI,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,EAC9B,KAAK,EAAC,kBAAkB,EACxB,QAAQ,EAAE,CAAC,CAAa,EAAE,EAAE,CAAC,6BAA6B,CAAC,CAAC,CAAC,EAC7D,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,eAAe,GAChC,CACH,CAAC,CAAC,CAAC,IAAI,CACP,CACJ,CAAC;AACJ,CAAC"} \ No newline at end of file diff --git a/src/vis/sidebar/AggregateTypeSelect.tsx b/src/vis/sidebar/AggregateTypeSelect.tsx index 54cb96db0..0812c4d74 100644 --- a/src/vis/sidebar/AggregateTypeSelect.tsx +++ b/src/vis/sidebar/AggregateTypeSelect.tsx @@ -1,6 +1,5 @@ import * as React from 'react'; import { useMemo } from 'react'; -import Highlighter from 'react-highlight-words'; import Select from 'react-select'; import { ColumnInfo, EAggregateTypes, EColumnTypes, VisColumn } from '../interfaces'; import { SingleColumnSelect } from './SingleColumnSelect'; @@ -13,16 +12,6 @@ interface AggregateTypeSelectProps { currentSelected: EAggregateTypes; } -function formatOptionLabel(option, ctx) { - return ( - <> - - {option.description && {option.description}} - {option.disabled ? : null} - - ); -} - export function AggregateTypeSelect({ aggregateTypeSelectCallback, aggregateColumnSelectCallback, @@ -36,11 +25,11 @@ export function AggregateTypeSelect({ const selectOptions = React.useMemo(() => { return [ - { disabled: false, id: EAggregateTypes.COUNT, name: EAggregateTypes.COUNT }, - { disabled: !hasNumCols, id: EAggregateTypes.AVG, name: EAggregateTypes.AVG }, - { disabled: !hasNumCols, id: EAggregateTypes.MIN, name: EAggregateTypes.MIN }, - { disabled: !hasNumCols, id: EAggregateTypes.MAX, name: EAggregateTypes.MAX }, - { disabled: !hasNumCols, id: EAggregateTypes.MED, name: EAggregateTypes.MED }, + { disabled: false, value: EAggregateTypes.COUNT, label: EAggregateTypes.COUNT }, + { disabled: !hasNumCols, value: EAggregateTypes.AVG, label: EAggregateTypes.AVG }, + { disabled: !hasNumCols, value: EAggregateTypes.MIN, label: EAggregateTypes.MIN }, + { disabled: !hasNumCols, value: EAggregateTypes.MAX, label: EAggregateTypes.MAX }, + { disabled: !hasNumCols, value: EAggregateTypes.MED, label: EAggregateTypes.MED }, ]; }, [hasNumCols]); @@ -49,14 +38,13 @@ export function AggregateTypeSelect({