@genesislcap/foundation-workspace 15.78.2 → 15.79.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -46,22 +46,22 @@ export declare const WorkspaceManager: React.ForwardRefExoticComponent<
46
46
  >;
47
47
  export type WorkspaceManagerRef = WorkspaceManagerWC;
48
48
 
49
- export declare const GridRegister: React.ForwardRefExoticComponent<
49
+ export declare const LayoutWrapper: React.ForwardRefExoticComponent<
50
50
  React.PropsWithChildren<
51
- Omit<PublicOf<GridRegisterWC>, 'children' | 'style'> &
51
+ Omit<PublicOf<LayoutWrapperWC>, 'children' | 'style'> &
52
52
  HTMLWCProps & {
53
53
  }
54
- > & React.RefAttributes<GridRegisterWC>
54
+ > & React.RefAttributes<LayoutWrapperWC>
55
55
  >;
56
- export type GridRegisterRef = GridRegisterWC;
56
+ export type LayoutWrapperRef = LayoutWrapperWC;
57
57
 
58
- export declare const LayoutWrapper: React.ForwardRefExoticComponent<
58
+ export declare const GridRegister: React.ForwardRefExoticComponent<
59
59
  React.PropsWithChildren<
60
- Omit<PublicOf<LayoutWrapperWC>, 'children' | 'style'> &
60
+ Omit<PublicOf<GridRegisterWC>, 'children' | 'style'> &
61
61
  HTMLWCProps & {
62
62
  }
63
- > & React.RefAttributes<LayoutWrapperWC>
63
+ > & React.RefAttributes<GridRegisterWC>
64
64
  >;
65
- export type LayoutWrapperRef = LayoutWrapperWC;
65
+ export type GridRegisterRef = GridRegisterWC;
66
66
 
67
67
  export {};
@@ -17,14 +17,26 @@ export interface FilterRegistration {
17
17
  setFilterValue: (value: string) => void;
18
18
  }
19
19
  /**
20
+ * Default filter registry implementation.
21
+ *
22
+ * @remarks
23
+ * Keeps a store of every filter's last known value by key, so a workspace covers filters that
24
+ * aren't currently mounted (e.g. on another route):
25
+ * - `unregisterFilter` stores the filter's last value; `registerFilter` applies any stored value.
26
+ * - `applyFiltersValues` (workspace load) replaces the store with the loaded values and applies
27
+ * them to mounted filters; unmounted ones pick theirs up when they register.
28
+ * - `getAllFiltersValues` (workspace save) returns the store with mounted filters' live values on
29
+ * top, so a filter the user never visited keeps its loaded value rather than being dropped.
20
30
  * @alpha
21
31
  */
22
32
  export declare class DefaultFilterRegistry implements FilterRegistry {
23
33
  private filters;
34
+ private stored;
24
35
  registerFilter(filterKey: string, getFilterValue: () => SavedFilterValue | null, setFilterValue: (value: string) => void): void;
25
36
  unregisterFilter(filterKey: string): void;
26
37
  getAllFiltersValues(): SavedFilterValue[];
27
38
  applyFiltersValues(filtersValues: SavedFilterValue[]): void;
39
+ private readValue;
28
40
  }
29
41
  /**
30
42
  * DI token for filter registry.
@@ -1 +1 @@
1
- {"version":3,"file":"filter-registry.d.ts","sourceRoot":"","sources":["../../../src/workspace/filter-registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,cAAc,CACZ,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,gBAAgB,GAAG,IAAI,EAC7C,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GACtC,IAAI,CAAC;IACR,mBAAmB,IAAI,gBAAgB,EAAE,CAAC;IAC1C,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;CAC5D;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,gBAAgB,GAAG,IAAI,CAAC;IAC9C,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAED;;GAEG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAC1D,OAAO,CAAC,OAAO,CAA8C;IAE7D,cAAc,CACZ,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,gBAAgB,GAAG,IAAI,EAC7C,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GACtC,IAAI;IAQP,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIzC,mBAAmB,IAAI,gBAAgB,EAAE;IAYzC,kBAAkB,CAAC,aAAa,EAAE,gBAAgB,EAAE,GAAG,IAAI;CAU5D;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,sEAE1B,CAAC"}
1
+ {"version":3,"file":"filter-registry.d.ts","sourceRoot":"","sources":["../../../src/workspace/filter-registry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,cAAc,CACZ,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,gBAAgB,GAAG,IAAI,EAC7C,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GACtC,IAAI,CAAC;IACR,mBAAmB,IAAI,gBAAgB,EAAE,CAAC;IAC1C,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,kBAAkB,CAAC,YAAY,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;CAC5D;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,gBAAgB,GAAG,IAAI,CAAC;IAC9C,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAED;;;;;;;;;;;;GAYG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAC1D,OAAO,CAAC,OAAO,CAA8C;IAC7D,OAAO,CAAC,MAAM,CAA4C;IAE1D,cAAc,CACZ,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,gBAAgB,GAAG,IAAI,EAC7C,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GACtC,IAAI;IAUP,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAQzC,mBAAmB,IAAI,gBAAgB,EAAE;IAOzC,kBAAkB,CAAC,aAAa,EAAE,gBAAgB,EAAE,GAAG,IAAI;IAO3D,OAAO,CAAC,SAAS;CAGlB;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,sEAE1B,CAAC"}
@@ -1,15 +1,15 @@
1
1
  import { FoundationElement } from '@genesislcap/web-core';
2
2
  import { GridRegistry } from '../grid-registry';
3
- import { WorkspaceState } from '../workspace-state';
4
3
  /**
5
- * Registers an AG Grid instance so workspace state can apply/load it.
4
+ * Registers an AG Grid instance so workspace state can apply/load it. Registering applies the
5
+ * grid's stored column state (from the loaded workspace, or its last state this session) — see
6
+ * `DefaultGridRegistry`.
6
7
  * @alpha
7
8
  */
8
9
  export declare class GridRegister extends FoundationElement {
9
10
  gridKey: string;
10
11
  designSystemPrefix: string;
11
12
  gridRegistry: GridRegistry;
12
- workspaceState: WorkspaceState;
13
13
  /** `<prefix>-grid-pro` is the AG Grid v36 `GridPro` by default; `GridProLegacy` is the v29 grid. */
14
14
  private gridElement;
15
15
  private gridApi;
@@ -21,12 +21,5 @@ export declare class GridRegister extends FoundationElement {
21
21
  private readonly handleGridReady;
22
22
  private attachToGridApis;
23
23
  private detachFromGridApis;
24
- private loadWorkspaceSettings;
25
- /**
26
- * Column state comes from `gridApi` on AG Grid v36 and from `columnApi` on v29; mirrors the
27
- * fallback `GridRegistry` uses when saving.
28
- */
29
- private readColumnState;
30
- private loadWorkspaceColumnState;
31
24
  }
32
25
  //# sourceMappingURL=grid-register.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"grid-register.d.ts","sourceRoot":"","sources":["../../../../src/workspace/grid-register/grid-register.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAuB,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD;;;GAGG;AACH,qBAIa,YAAa,SAAQ,iBAAiB;IAChB,OAAO,EAAE,MAAM,CAAC;IACJ,kBAAkB,EAAE,MAAM,CAAW;IAEpE,YAAY,EAAE,YAAY,CAAC;IACzB,cAAc,EAAE,cAAc,CAAC;IAE/C,oGAAoG;IACpG,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,OAAO,CAA8D;IAC7E,sFAAsF;IACtF,OAAO,CAAC,SAAS,CAA0B;IAE3C,iBAAiB,IAAI,IAAI;IAKzB,oBAAoB,IAAI,IAAI;IAS5B,OAAO,CAAC,mBAAmB;IAqB3B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAE9B;IAEF,OAAO,CAAC,gBAAgB;IA4BxB,OAAO,CAAC,kBAAkB;YAUZ,qBAAqB;IAmCnC;;;OAGG;IACH,OAAO,CAAC,eAAe;YAKT,wBAAwB;CAGvC"}
1
+ {"version":3,"file":"grid-register.d.ts","sourceRoot":"","sources":["../../../../src/workspace/grid-register/grid-register.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAuB,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD;;;;;GAKG;AACH,qBAIa,YAAa,SAAQ,iBAAiB;IAChB,OAAO,EAAE,MAAM,CAAC;IACJ,kBAAkB,EAAE,MAAM,CAAW;IAEpE,YAAY,EAAE,YAAY,CAAC;IAEzC,oGAAoG;IACpG,OAAO,CAAC,WAAW,CAAwC;IAC3D,OAAO,CAAC,OAAO,CAA8D;IAC7E,sFAAsF;IACtF,OAAO,CAAC,SAAS,CAA0B;IAE3C,iBAAiB,IAAI,IAAI;IAKzB,oBAAoB,IAAI,IAAI;IAS5B,OAAO,CAAC,mBAAmB;IAqB3B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAE9B;IAEF,OAAO,CAAC,gBAAgB;IA0BxB,OAAO,CAAC,kBAAkB;CAS3B"}
@@ -1,5 +1,13 @@
1
1
  import type { ColumnApi, GridApi } from '@ag-grid-community/core';
2
2
  import type { SavedGridSettings } from './workspace.types';
3
+ /**
4
+ * The part of a grid element that persists its own filter model, e.g. grid-pro's
5
+ * `setFilterModel` (backed by `persist-filter-model-key`, or an in-memory cache without one).
6
+ * @alpha
7
+ */
8
+ export interface GridFilterPersistence {
9
+ setFilterModel(filterModel: Record<string, unknown>): unknown;
10
+ }
3
11
  /**
4
12
  * @alpha
5
13
  */
@@ -7,12 +15,14 @@ export interface GridRegistration {
7
15
  gridKey: string;
8
16
  gridApi: GridApi;
9
17
  columnApi: ColumnApi;
18
+ /** The grid element's own filter persistence, when the grid has one (grid-pro does). */
19
+ filterPersistence?: GridFilterPersistence;
10
20
  }
11
21
  /**
12
22
  * @alpha
13
23
  */
14
24
  export interface GridRegistry {
15
- registerGrid(gridKey: string, gridApi: unknown, columnApi: unknown): void;
25
+ registerGrid(gridKey: string, gridApi: unknown, columnApi: unknown, filterPersistence?: GridFilterPersistence): void;
16
26
  getGrid(gridKey: string): GridRegistration | null;
17
27
  unregisterGrid(gridKey: string): void;
18
28
  getAllGridsSettings(): SavedGridSettings[];
@@ -23,12 +33,57 @@ export interface GridRegistry {
23
33
  applyAllGridsSettings(gridsSettings: SavedGridSettings[]): Promise<void>;
24
34
  }
25
35
  /**
36
+ * Default grid registry implementation.
37
+ *
38
+ * @remarks
39
+ * Keeps a store of every grid's last known column state and filter model by key, so a workspace
40
+ * covers grids that aren't currently mounted (e.g. on another route):
41
+ * - `unregisterGrid` stores the grid's last state; `registerGrid` applies any stored state.
42
+ * - `applyAllGridsSettings` (workspace load) replaces the store with the loaded settings and
43
+ * applies them to mounted grids; unmounted ones pick theirs up when they register.
44
+ * - `getAllGridsSettings` (workspace save) returns the store with mounted grids' live state on
45
+ * top, so a grid the user never visited keeps its loaded state rather than being dropped.
46
+ *
47
+ * Filters race with the grid's own start-up. grid-pro restores its persisted filter model
48
+ * (`persist-filter-model-key`) asynchronously, up to three times — at grid ready, once
49
+ * datasource-driven columns exist, and on the datasource's `filtersRestored` — and a restore with
50
+ * nothing stored applies `{}`, clearing every filter. A filter for a column that doesn't exist yet
51
+ * is dropped. So when the registry applies a filter model it:
52
+ * 1. writes it into the grid's own filter persistence first (`filterPersistence`), so grid-pro's
53
+ * later restores, including a datasource re-init long after start-up, return the workspace's
54
+ * model rather than an older one;
55
+ * 2. arms a guard that re-applies it if a programmatic filter change (e.g. a restore that read
56
+ * storage before step 1 landed, as KV storage can) replaces it, and when the grid's columns
57
+ * change (so filters on columns that arrive late apply). The guard ends as soon as the user
58
+ * changes a filter, once the grid has been quiet for `filterSettleMs` after its last start-up
59
+ * event, and in any case after `filterGuardMaxMs`, so it never fights app code for long. It
60
+ * re-applies at most `maxFilterReapplies` times per arming, so it cannot loop.
61
+ *
62
+ * The guard can't tell grid-pro's restores from the app's own programmatic filter changes (both
63
+ * are `source: 'api'`), so an app that calls `setFilterModel` or clears filters while the guard
64
+ * runs has that change reverted. Since `{}` is saved for unfiltered grids, every grid with a
65
+ * stored entry is guarded when it registers.
66
+ *
67
+ * A saved entry without `filterModel` (a workspace saved before filters were captured) leaves the
68
+ * grid's filters alone.
26
69
  * @alpha
27
70
  */
28
71
  export declare class DefaultGridRegistry implements GridRegistry {
72
+ /** Quiet period after the last start-up event before the filter guard ends. */
73
+ filterSettleMs: number;
74
+ /** Longest the filter guard runs after it is armed, however often it is re-armed. */
75
+ filterGuardMaxMs: number;
76
+ /** Most re-applies the filter guard makes per arming. */
77
+ maxFilterReapplies: number;
29
78
  private grids;
30
- private cachedSettings;
31
- registerGrid(gridKey: string, gridApi: unknown, columnApi: unknown): void;
79
+ private stored;
80
+ private listeners;
81
+ private guards;
82
+ /** Registrations whose first data has rendered or whose filters the user has changed. */
83
+ private settled;
84
+ registerGrid(gridKey: string, gridApi: unknown, columnApi: unknown, filterPersistence?: GridFilterPersistence): void;
85
+ /** Applies the stored settings for a grid, unless it already has exactly that state. */
86
+ private applyStoredSettings;
32
87
  getGrid(gridKey: string): GridRegistration | null;
33
88
  unregisterGrid(gridKey: string): void;
34
89
  getAllGridsSettings(): SavedGridSettings[];
@@ -36,7 +91,43 @@ export declare class DefaultGridRegistry implements GridRegistry {
36
91
  applyColumns?: boolean;
37
92
  applyFilters?: boolean;
38
93
  }): Promise<boolean>;
39
- applyAllGridsSettings(gridsSettings: SavedGridSettings[], maxRetries?: number): Promise<void>;
94
+ applyAllGridsSettings(gridsSettings: SavedGridSettings[]): Promise<void>;
95
+ /**
96
+ * Writes a filter model into the grid's own persistence, then onto the grid, and records what
97
+ * the grid reports back so the guard can tell a later replacement from AG Grid's normalisation.
98
+ */
99
+ private applyFilterModel;
100
+ private reapplyStoredFilter;
101
+ /**
102
+ * Whether the grid's filter model moved away from what the registry last applied — a stale
103
+ * restore or other programmatic change, rather than AG Grid normalising the applied model (which
104
+ * reads back the same each time).
105
+ */
106
+ private filterWasReplaced;
107
+ private armFilterGuard;
108
+ /** Restarts the settle timer: the grid just did something that can precede a stale restore. */
109
+ private touchFilterGuard;
110
+ private guardActive;
111
+ private endFilterGuard;
112
+ private addListener;
113
+ private removeListener;
114
+ /**
115
+ * Stores a grid's live state over its stored entry, except what the grid can't report yet:
116
+ * - nothing, once its API is destroyed (grid-pro destroys the outgoing grid before the new one
117
+ * re-registers, and a destroyed v36 API returns `undefined` rather than throwing);
118
+ * - the stored column state and filter model while the grid has no columns: before datasource
119
+ * columns exist, and after a datasource restart clears them (AG Grid then drops every filter,
120
+ * before grid-pro rebuilds the grid). With nothing stored, the filter model is left out, so the
121
+ * next registration leaves grid-pro to restore its own persisted filters;
122
+ * - the stored filter model until the first data renders or the user filters, since before that
123
+ * the grid may not have applied it yet (its columns or grid-pro's restore still pending).
124
+ */
125
+ private storeSnapshot;
126
+ /** Removes a registration's grid listeners and stops its filter guard. */
127
+ private detach;
128
+ /** Whether the grid already has exactly these settings, so re-applying them is a no-op. */
129
+ private hasSettings;
130
+ private readFilterModel;
40
131
  private getGridSettings;
41
132
  }
42
133
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"grid-registry.d.ts","sourceRoot":"","sources":["../../../src/workspace/grid-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAC1E,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAAC;IAClD,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,mBAAmB,IAAI,iBAAiB,EAAE,CAAC;IAC3C,iBAAiB,CACf,WAAW,EAAE,iBAAiB,EAC9B,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE,GAC3D,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,qBAAqB,CAAC,aAAa,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1E;AAED;;GAEG;AACH,qBAAa,mBAAoB,YAAW,YAAY;IACtD,OAAO,CAAC,KAAK,CAA4C;IACzD,OAAO,CAAC,cAAc,CAA6C;IAInE,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI;IAQzE,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAIjD,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAWrC,mBAAmB,IAAI,iBAAiB,EAAE;IAWpC,iBAAiB,CACrB,WAAW,EAAE,iBAAiB,EAC9B,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE,GAC3D,OAAO,CAAC,OAAO,CAAC;IA4Cb,qBAAqB,CACzB,aAAa,EAAE,iBAAiB,EAAE,EAClC,UAAU,GAAE,MAAU,GACrB,OAAO,CAAC,IAAI,CAAC;IAsBhB,OAAO,CAAC,eAAe;CAmBxB;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,oEAExB,CAAC"}
1
+ {"version":3,"file":"grid-registry.d.ts","sourceRoot":"","sources":["../../../src/workspace/grid-registry.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,23 @@
1
- import type { FoundationLayout } from '@genesislcap/foundation-layout';
1
+ import type { SerialisedLayout } from '@genesislcap/foundation-layout';
2
2
  import type { SavedLayout } from './workspace.types';
3
+ /**
4
+ * What the layout registry needs from a registered layout. `rapid-layout` (`FoundationLayout`)
5
+ * satisfies it as-is; adapters make other layout libraries saveable, e.g.
6
+ * `useWorkspaceFlexLayout` in `@genesislcap/foundation-react-utils/workspace` for flexlayout-react.
7
+ * @alpha
8
+ */
9
+ export interface WorkspaceLayout {
10
+ /** Whether the layout has finished its first load; its config is only read after that. */
11
+ hasFirstLoaded: boolean;
12
+ /** Returns the layout's current config (serialisable JSON) for a workspace to save. */
13
+ getLayout(): SerialisedLayout;
14
+ /** Replaces the layout with a saved config. */
15
+ loadLayout(layout: SerialisedLayout, handleMissingItem?: 'placeholder' | 'error', disableCache?: boolean): void;
16
+ /** Used to wait for `first-loaded` when `hasFirstLoaded` is still false. */
17
+ addEventListener(type: string, listener: () => void, options?: {
18
+ once?: boolean;
19
+ }): void;
20
+ }
3
21
  /**
4
22
  * @alpha
5
23
  */
@@ -11,14 +29,39 @@ export interface LayoutRegistry {
11
29
  }
12
30
  /**
13
31
  * Default layout registry implementation.
32
+ *
33
+ * @remarks
34
+ * Keeps a store of every layout's last known config by key, so a workspace covers layouts that
35
+ * aren't currently mounted (e.g. on another route):
36
+ * - `unregisterLayout` stores the layout's last config; `registerLayout` loads any stored config
37
+ * once the layout has finished its first load (so its declared or autosaved layout doesn't
38
+ * overwrite it).
39
+ * - `applySavedLayouts` (workspace load) replaces the store with the loaded configs and loads them
40
+ * into mounted layouts; unmounted ones pick theirs up when they register.
41
+ * - `getLayoutsConfigs` (workspace save) returns the store with mounted layouts' live configs on
42
+ * top, so a layout the user never visited keeps its loaded config rather than being dropped.
14
43
  * @alpha
15
44
  */
16
45
  export declare class DefaultLayoutRegistry implements LayoutRegistry {
17
46
  private layouts;
18
- registerLayout(layoutKey: string, layout: FoundationLayout): void;
47
+ private stored;
48
+ /** Layouts with a stored-config load queued for their first load. */
49
+ private waiting;
50
+ registerLayout(layoutKey: string, layout: WorkspaceLayout): void;
19
51
  unregisterLayout(layoutKey: string): void;
20
52
  getLayoutsConfigs(): SavedLayout[];
21
53
  applySavedLayouts(savedLayouts: SavedLayout[]): Promise<void>;
54
+ /**
55
+ * A layout's config is only meaningful once it has finished its first load; before that it has
56
+ * no panes yet, and storing that would wipe the saved config.
57
+ */
58
+ private readLayout;
59
+ /**
60
+ * Loads a layout's stored config once it has finished its first load. The config is read at load
61
+ * time, so a workspace loaded while waiting wins, and a layout waiting already isn't queued twice;
62
+ * nothing loads into a layout that has since unregistered or been replaced under its key.
63
+ */
64
+ private loadStored;
22
65
  }
23
66
  /**
24
67
  * DI token for layout registry.
@@ -1 +1 @@
1
- {"version":3,"file":"layout-registry.d.ts","sourceRoot":"","sources":["../../../src/workspace/layout-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACzD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,iBAAiB,IAAI,WAAW,EAAE,CAAC;IACnC,iBAAiB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D;AAED;;;GAGG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAC1D,OAAO,CAAC,OAAO,CAA4C;IAE3D,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAOjE,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIzC,iBAAiB,IAAI,WAAW,EAAE;IAO5B,iBAAiB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAapE;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,sEAE1B,CAAC"}
1
+ {"version":3,"file":"layout-registry.d.ts","sourceRoot":"","sources":["../../../src/workspace/layout-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B,0FAA0F;IAC1F,cAAc,EAAE,OAAO,CAAC;IACxB,uFAAuF;IACvF,SAAS,IAAI,gBAAgB,CAAC;IAC9B,+CAA+C;IAC/C,UAAU,CACR,MAAM,EAAE,gBAAgB,EACxB,iBAAiB,CAAC,EAAE,aAAa,GAAG,OAAO,EAC3C,YAAY,CAAC,EAAE,OAAO,GACrB,IAAI,CAAC;IACR,4EAA4E;IAC5E,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,EAAE,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;CAC1F;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAAC;IACzD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C,iBAAiB,IAAI,WAAW,EAAE,CAAC;IACnC,iBAAiB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/D;AAED;;;;;;;;;;;;;;GAcG;AACH,qBAAa,qBAAsB,YAAW,cAAc;IAC1D,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,MAAM,CAA4C;IAC1D,qEAAqE;IACrE,OAAO,CAAC,OAAO,CAAkC;IAEjD,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAWhE,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IASzC,iBAAiB,IAAI,WAAW,EAAE;IAU5B,iBAAiB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAanE;;;OAGG;IACH,OAAO,CAAC,UAAU;IAYlB;;;;OAIG;IACH,OAAO,CAAC,UAAU;CAenB;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,sEAE1B,CAAC"}
@@ -6,7 +6,13 @@ import type { SerialisedLayout } from '@genesislcap/foundation-layout';
6
6
  */
7
7
  export interface SavedGridSettings {
8
8
  gridKey: string;
9
+ /** AG Grid column state; includes sort (`sort`/`sortIndex`) as well as order, width, visibility. */
9
10
  columnState: any[];
11
+ /**
12
+ * AG Grid filter model (`gridApi.getFilterModel()`); `{}` when no filters are set. Absent on
13
+ * workspaces saved before filters were captured, which then leave the grid's filters alone.
14
+ */
15
+ filterModel?: Record<string, unknown>;
10
16
  savedAt: string;
11
17
  }
12
18
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"workspace.types.d.ts","sourceRoot":"","sources":["../../../src/workspace/workspace.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,gBAAgB,CAAC;CAC1B"}
1
+ {"version":3,"file":"workspace.types.d.ts","sourceRoot":"","sources":["../../../src/workspace/workspace.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,oGAAoG;IACpG,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,gBAAgB,CAAC;CAC1B"}
@@ -42,6 +42,12 @@ export declare class WorkspaceManager extends FoundationElement {
42
42
  refreshSharedWorkspaces(): Promise<void>;
43
43
  private notifyError;
44
44
  saveWorkspace(): Promise<void>;
45
+ /**
46
+ * Seeds every registry's store with the workspace's entries (replacing whatever was stored,
47
+ * even when a list is empty) and applies them to what's mounted; unmounted grids, layouts and
48
+ * filters pick theirs up when they register. Grids and filters are seeded before layouts:
49
+ * loading a layout rebuilds its panes, and the grids/filters inside re-register straight away.
50
+ */
45
51
  private applyWorkspace;
46
52
  loadWorkspace(workspaceName: string): Promise<void>;
47
53
  private requestSharedWorkspace;
@@ -1 +1 @@
1
- {"version":3,"file":"workspace-manager.d.ts","sourceRoot":"","sources":["../../../src/workspace-manager/workspace-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workspace-manager.d.ts","sourceRoot":"","sources":["../../../src/workspace-manager/workspace-manager.ts"],"names":[],"mappings":"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"}
@@ -1,43 +1,54 @@
1
1
  import { DI } from '@genesislcap/web-core';
2
2
  /**
3
+ * Default filter registry implementation.
4
+ *
5
+ * @remarks
6
+ * Keeps a store of every filter's last known value by key, so a workspace covers filters that
7
+ * aren't currently mounted (e.g. on another route):
8
+ * - `unregisterFilter` stores the filter's last value; `registerFilter` applies any stored value.
9
+ * - `applyFiltersValues` (workspace load) replaces the store with the loaded values and applies
10
+ * them to mounted filters; unmounted ones pick theirs up when they register.
11
+ * - `getAllFiltersValues` (workspace save) returns the store with mounted filters' live values on
12
+ * top, so a filter the user never visited keeps its loaded value rather than being dropped.
3
13
  * @alpha
4
14
  */
5
15
  export class DefaultFilterRegistry {
6
16
  constructor() {
7
17
  this.filters = new Map();
18
+ this.stored = new Map();
8
19
  }
9
20
  registerFilter(filterKey, getFilterValue, setFilterValue) {
10
- this.filters.set(filterKey, {
11
- filterKey,
12
- getFilterValue,
13
- setFilterValue,
14
- });
21
+ const registration = { filterKey, getFilterValue, setFilterValue };
22
+ this.filters.set(filterKey, registration);
23
+ const stored = this.stored.get(filterKey);
24
+ if (stored && stored.value !== this.readValue(registration).value) {
25
+ setFilterValue(stored.value);
26
+ }
15
27
  }
16
28
  unregisterFilter(filterKey) {
29
+ const registration = this.filters.get(filterKey);
30
+ if (registration) {
31
+ this.stored.set(filterKey, this.readValue(registration));
32
+ }
17
33
  this.filters.delete(filterKey);
18
34
  }
19
35
  getAllFiltersValues() {
20
- return Array.from(this.filters)
21
- .map(([key, registration]) => {
22
- const result = registration.getFilterValue();
23
- if (result === null || result === undefined) {
24
- return { filterKey: key, value: '' };
25
- }
26
- return result;
27
- })
28
- .filter((f) => f !== null);
36
+ this.filters.forEach((registration, key) => {
37
+ this.stored.set(key, this.readValue(registration));
38
+ });
39
+ return Array.from(this.stored.values());
29
40
  }
30
41
  applyFiltersValues(filtersValues) {
42
+ this.stored = new Map(filtersValues.map((f) => [f.filterKey, f]));
31
43
  filtersValues.forEach((f) => {
32
- const filter = this.filters.get(f.filterKey);
33
- if (filter) {
34
- filter.setFilterValue(f.value);
35
- }
36
- else {
37
- console.warn(`layout for ${f.filterKey} not found`);
38
- }
44
+ var _a;
45
+ (_a = this.filters.get(f.filterKey)) === null || _a === void 0 ? void 0 : _a.setFilterValue(f.value);
39
46
  });
40
47
  }
48
+ readValue(registration) {
49
+ var _a;
50
+ return (_a = registration.getFilterValue()) !== null && _a !== void 0 ? _a : { filterKey: registration.filterKey, value: '' };
51
+ }
41
52
  }
42
53
  /**
43
54
  * DI token for filter registry.
@@ -1,10 +1,11 @@
1
- import { __awaiter, __decorate } from "tslib";
1
+ import { __decorate } from "tslib";
2
2
  import { FoundationElement, attr, customElement } from '@genesislcap/web-core';
3
3
  import { GridRegistry } from '../grid-registry';
4
- import { WorkspaceState } from '../workspace-state';
5
4
  import { GridRegisterTemplate as template } from './grid-register.template';
6
5
  /**
7
- * Registers an AG Grid instance so workspace state can apply/load it.
6
+ * Registers an AG Grid instance so workspace state can apply/load it. Registering applies the
7
+ * grid's stored column state (from the loaded workspace, or its last state this session) — see
8
+ * `DefaultGridRegistry`.
8
9
  * @alpha
9
10
  */
10
11
  let GridRegister = class GridRegister extends FoundationElement {
@@ -69,12 +70,11 @@ let GridRegister = class GridRegister extends FoundationElement {
69
70
  console.warn('grid-register: missing persist-column-state-key; grid state will not be saved');
70
71
  }
71
72
  else {
72
- this.gridRegistry.registerGrid(persistKey, gridApi, columnApi);
73
73
  this.gridKey = persistKey;
74
+ // The element is grid-pro's own filter persistence (`setFilterModel`), so a workspace's
75
+ // filters survive grid-pro restoring its persisted filter model after registration.
76
+ this.gridRegistry.registerGrid(persistKey, gridApi, columnApi, anyGrid);
74
77
  }
75
- this.loadWorkspaceColumnState().catch((error) => {
76
- console.warn(`Failed to apply column state for ${this.gridKey} on gridReady:`, error);
77
- });
78
78
  }
79
79
  detachFromGridApis() {
80
80
  if (this.gridElement && this.handleGridReady) {
@@ -84,50 +84,6 @@ let GridRegister = class GridRegister extends FoundationElement {
84
84
  this.gridApi = null;
85
85
  this.columnApi = null;
86
86
  }
87
- loadWorkspaceSettings(options) {
88
- return __awaiter(this, void 0, void 0, function* () {
89
- if (!this.gridKey || !this.gridApi) {
90
- return;
91
- }
92
- try {
93
- const currentWorkspace = this.workspaceState.getCurrentWorkspace();
94
- if (currentWorkspace && currentWorkspace.grids) {
95
- const gridSetting = currentWorkspace.grids.find((g) => g.gridKey === this.gridKey);
96
- if (gridSetting) {
97
- const currentColumnState = this.readColumnState();
98
- const targetColumnState = gridSetting.columnState || [];
99
- const columnsEqual = JSON.stringify(currentColumnState) === JSON.stringify(targetColumnState);
100
- const applyColumns = !options || options.applyColumns !== false;
101
- const columnsOk = !applyColumns || columnsEqual;
102
- if (columnsOk) {
103
- return;
104
- }
105
- const applied = yield this.gridRegistry.applyGridSettings(gridSetting, options);
106
- if (!applied) {
107
- console.warn(`Failed to apply grid settings for ${this.gridKey}`);
108
- }
109
- }
110
- }
111
- }
112
- catch (error) {
113
- console.warn(`Failed to load workspace settings for grid ${this.gridKey}:`, error);
114
- }
115
- });
116
- }
117
- /**
118
- * Column state comes from `gridApi` on AG Grid v36 and from `columnApi` on v29; mirrors the
119
- * fallback `GridRegistry` uses when saving.
120
- */
121
- readColumnState() {
122
- var _a, _b, _c, _d;
123
- const gridApi = this.gridApi;
124
- return (_d = (_b = (_a = gridApi === null || gridApi === void 0 ? void 0 : gridApi.getColumnState) === null || _a === void 0 ? void 0 : _a.call(gridApi)) !== null && _b !== void 0 ? _b : (_c = this.columnApi) === null || _c === void 0 ? void 0 : _c.getColumnState()) !== null && _d !== void 0 ? _d : [];
125
- }
126
- loadWorkspaceColumnState() {
127
- return __awaiter(this, void 0, void 0, function* () {
128
- return this.loadWorkspaceSettings({ applyColumns: true });
129
- });
130
- }
131
87
  };
132
88
  __decorate([
133
89
  attr({ attribute: 'grid-key' })
@@ -138,9 +94,6 @@ __decorate([
138
94
  __decorate([
139
95
  GridRegistry
140
96
  ], GridRegister.prototype, "gridRegistry", void 0);
141
- __decorate([
142
- WorkspaceState
143
- ], GridRegister.prototype, "workspaceState", void 0);
144
97
  GridRegister = __decorate([
145
98
  customElement({
146
99
  name: 'grid-register',