diff --git a/vuu-ui/packages/vuu-data-remote/src/server-proxy/server-proxy.ts b/vuu-ui/packages/vuu-data-remote/src/server-proxy/server-proxy.ts index 1e36492e9..f5d06a6ac 100644 --- a/vuu-ui/packages/vuu-data-remote/src/server-proxy/server-proxy.ts +++ b/vuu-ui/packages/vuu-data-remote/src/server-proxy/server-proxy.ts @@ -306,7 +306,8 @@ export class ServerProxy { // Resend requests for links from other viewports already on page, they may be linkable to this viewport Array.from(this.viewports.entries()) .filter( - ([id, { disabled }]) => id !== serverViewportId && !disabled, + ([id, { disabled, status }]) => + id !== serverViewportId && !disabled && status === "subscribed", ) .forEach(([vpId]) => { this.sendMessageToServer({ diff --git a/vuu-ui/packages/vuu-datatable/src/linked-table-view/LinkedTableView.tsx b/vuu-ui/packages/vuu-datatable/src/linked-table-view/LinkedTableView.tsx index ee1d7b8f9..5287568b0 100644 --- a/vuu-ui/packages/vuu-datatable/src/linked-table-view/LinkedTableView.tsx +++ b/vuu-ui/packages/vuu-datatable/src/linked-table-view/LinkedTableView.tsx @@ -17,6 +17,7 @@ import { import css from "./LinkedTableView.css"; import { TableLayoutToggleButton } from "./TableLayoutToggleButton"; +import { Filter } from "@finos/vuu-filter-types"; const classBase = "vuuLinkedTableView"; @@ -47,10 +48,25 @@ export type LinkedDataSources = { /** * Displays a vertical 'tower' of Tables with a hierarchical relationship. - * Selection of row(s) on tables higher in the hierarchy drives the population - * of data in tables below. (could be two-way ?) + * Currently supported levels are: + * - tier 1 - parent table(s) + * - tier 2 - child table(s) + * -tier 3 (optional) - grandchild table(s) + * + * Selection of row(s) on tables higher in the hierarchy drives the display + * of data in tables below. Currently this is one-way, top-down only */ export interface LinkedTableViewProps extends HTMLAttributes { + /** + * Optional filter to allow externally controlled filter to be applied. This will + * be applied to tier 1 table(s). + * If applicable, it will also be applied to tier2/tier3 table(s) when no selection + * is in effect from parent table, 'If applicable' means if the filter column is + * available on tier 2/tier 3 tables). + * If a filter is provided and it cannot be applied - because + * column name of filter is not available in tier 1 table, an exception will be thrown. + */ + filter?: Filter; linkedDataSources: LinkedDataSources; } const LinkedTables = ({ diff --git a/vuu-ui/packages/vuu-ui-controls/src/split-button/SplitButton.css b/vuu-ui/packages/vuu-ui-controls/src/split-button/SplitButton.css index 176d79d17..2104ebc80 100644 --- a/vuu-ui/packages/vuu-ui-controls/src/split-button/SplitButton.css +++ b/vuu-ui/packages/vuu-ui-controls/src/split-button/SplitButton.css @@ -104,7 +104,7 @@ .vuuSplitButton-cta { --split-background: var(--background, var(--salt-actionable-accented-bold-background)); - --split-background-active: var(--salt-actionable-accented-bold-background-active; + --split-background-active: var(--salt-actionable-accented-bold-background-active); --split-color-active: var(--salt-actionable-bold-foreground-active); } .vuuSplitButton-cta:hover:not(.vuuSplitButton-disabled) {