@oneteme/jquery-organizer 0.0.5 → 0.0.7
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.
- package/README.md +49 -2
- package/esm2022/lib/group-by-manager/group-by-manager.mjs +3 -1
- package/esm2022/lib/models/organizer-chart-adapter.mjs +1 -17
- package/esm2022/lib/models/organizer-chart-config.mjs +2 -1
- package/esm2022/lib/models/organizer-config.interface.mjs +1 -1
- package/esm2022/lib/models/organizer-utils.mjs +4 -1
- package/esm2022/lib/organizer-button/organizer-button.component.mjs +58 -28
- package/esm2022/lib/organizer-facade/organizer-facade.mjs +31 -21
- package/esm2022/lib/organizer-facade/organizer-facade.types.mjs +1 -1
- package/esm2022/lib/slice-panel/slice-panel.component.mjs +68 -52
- package/esm2022/lib/slice-panel/slice-panel.model.mjs +1 -1
- package/esm2022/public-api.mjs +2 -2
- package/fesm2022/oneteme-jquery-organizer.mjs +162 -206
- package/fesm2022/oneteme-jquery-organizer.mjs.map +1 -1
- package/lib/models/organizer-chart-config.d.ts +3 -1
- package/lib/models/organizer-config.interface.d.ts +10 -1
- package/lib/models/organizer-utils.d.ts +5 -3
- package/lib/organizer-button/organizer-button.component.d.ts +9 -3
- package/lib/organizer-facade/organizer-facade.d.ts +8 -3
- package/lib/organizer-facade/organizer-facade.types.d.ts +2 -2
- package/lib/slice-panel/slice-panel.component.d.ts +7 -2
- package/lib/slice-panel/slice-panel.model.d.ts +4 -4
- package/package.json +2 -2
- package/public-api.d.ts +1 -1
- package/esm2022/lib/lazy-field-manager/lazy-field-manager.mjs +0 -91
- package/lib/lazy-field-manager/lazy-field-manager.d.ts +0 -25
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import { OrganizerTemplate } from './organizer-config.interface';
|
|
1
2
|
import { OrganizerChartItem, OrganizerChartSection } from './organizer-chart-adapter';
|
|
2
3
|
export interface OrganizerChartConfig {
|
|
3
4
|
groups?: OrganizerChartSection;
|
|
4
5
|
indicators?: OrganizerChartSection;
|
|
5
6
|
filters?: OrganizerChartSection;
|
|
6
|
-
templates?:
|
|
7
|
+
templates?: OrganizerTemplate[];
|
|
7
8
|
}
|
|
8
9
|
export declare enum SyntheticItemKeys {
|
|
9
10
|
EMPTY = "__empty__",
|
|
@@ -24,6 +25,7 @@ export declare enum OrganizerButtonEventType {
|
|
|
24
25
|
GROUP_BY_SELECTED = "groupBySelected",
|
|
25
26
|
TEMPLATE_SELECTED = "templateSelected",
|
|
26
27
|
SLICE_SELECTED = "sliceSelected",
|
|
28
|
+
CHART_TYPE_SELECTED = "chartTypeSelected",
|
|
27
29
|
VIEW_SWITCHED = "viewSwitched"
|
|
28
30
|
}
|
|
29
31
|
export declare function getGroupItems(config: OrganizerChartConfig | null | undefined): OrganizerChartItem[];
|
|
@@ -34,9 +34,16 @@ export interface OrganizerViewSlice {
|
|
|
34
34
|
label: string;
|
|
35
35
|
icon?: string;
|
|
36
36
|
}
|
|
37
|
+
export interface OrganizerChartType {
|
|
38
|
+
id: string;
|
|
39
|
+
label: string;
|
|
40
|
+
icon?: string;
|
|
41
|
+
disabled?: boolean;
|
|
42
|
+
}
|
|
37
43
|
export interface OrganizerTemplate {
|
|
38
44
|
id: string;
|
|
39
45
|
label: string;
|
|
46
|
+
description?: string;
|
|
40
47
|
icon?: string;
|
|
41
48
|
xField?: string;
|
|
42
49
|
yField?: string;
|
|
@@ -61,6 +68,7 @@ export interface OrganizerConfig {
|
|
|
61
68
|
groups?: OrganizerViewGroup[];
|
|
62
69
|
slices?: OrganizerViewSlice[];
|
|
63
70
|
templates?: OrganizerTemplate[];
|
|
71
|
+
chartTypes?: OrganizerChartType[];
|
|
64
72
|
onFetchFieldData?: (fieldId: string) => Promise<string[] | Record<string, any>[]>;
|
|
65
73
|
onFetchSliceData?: (filterKey: string) => Observable<any[]> | Promise<any[]>;
|
|
66
74
|
onSliceClick?: () => void;
|
|
@@ -98,6 +106,7 @@ export interface OrganizerSliceState {
|
|
|
98
106
|
export interface OrganizerState {
|
|
99
107
|
viewMode?: 'chart' | 'table';
|
|
100
108
|
visibleFields?: string[];
|
|
109
|
+
selectedChartType?: string;
|
|
101
110
|
selectedX?: string;
|
|
102
111
|
selectedY?: string;
|
|
103
112
|
selectedYAggregate?: string;
|
|
@@ -106,7 +115,7 @@ export interface OrganizerState {
|
|
|
106
115
|
selectedTemplate?: string;
|
|
107
116
|
}
|
|
108
117
|
export interface OrganizerButtonEvent {
|
|
109
|
-
type: 'fieldToggled' | 'xSelected' | 'ySelected' | 'groupBySelected' | 'templateSelected' | 'sliceSelected' | 'reset' | 'viewSwitched';
|
|
118
|
+
type: 'fieldToggled' | 'xSelected' | 'ySelected' | 'groupBySelected' | 'templateSelected' | 'sliceSelected' | 'chartTypeSelected' | 'reset' | 'viewSwitched';
|
|
110
119
|
state: OrganizerState;
|
|
111
120
|
source?: 'user' | 'api';
|
|
112
121
|
resolvedYUnit?: string | UnitConfig;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { OrganizerConfig, OrganizerState, OrganizerTemplate, OrganizerYField } from './organizer-config.interface';
|
|
2
|
+
type OrganizerStateConfig = Pick<OrganizerConfig, 'xFields' | 'yFields' | 'groups' | 'slices' | 'templates' | 'chartTypes'>;
|
|
2
3
|
export interface OrganizerYIndicator {
|
|
3
4
|
id: string;
|
|
4
5
|
label: string;
|
|
@@ -6,6 +7,7 @@ export interface OrganizerYIndicator {
|
|
|
6
7
|
}
|
|
7
8
|
export declare function buildYFields(indicators: OrganizerYIndicator[]): OrganizerYField[];
|
|
8
9
|
export declare function resolveYKey(selectedY: string | undefined, selectedYAggregate: string | undefined): string | undefined;
|
|
9
|
-
export declare function normalizeOrganizerState(state: OrganizerState | undefined, config:
|
|
10
|
-
export declare function normalizeTemplateToState(template: OrganizerTemplate, currentState: OrganizerState | undefined, config:
|
|
11
|
-
export declare function resolveMatchingTemplateId(templates: OrganizerTemplate[] | undefined, state: OrganizerState | undefined, config:
|
|
10
|
+
export declare function normalizeOrganizerState(state: OrganizerState | undefined, config: OrganizerStateConfig): OrganizerState;
|
|
11
|
+
export declare function normalizeTemplateToState(template: OrganizerTemplate, currentState: OrganizerState | undefined, config: OrganizerStateConfig): OrganizerState;
|
|
12
|
+
export declare function resolveMatchingTemplateId(templates: OrganizerTemplate[] | undefined, state: OrganizerState | undefined, config: OrganizerStateConfig): string | undefined;
|
|
13
|
+
export {};
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { EventEmitter,
|
|
1
|
+
import { EventEmitter, ChangeDetectorRef, OnDestroy } from '@angular/core';
|
|
2
2
|
import { MatMenuTrigger } from '@angular/material/menu';
|
|
3
3
|
import { OrganizerConfig, OrganizerButtonEvent, OrganizerSliceState, OrganizerState } from '../models';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
|
-
export declare class OrganizerButtonComponent implements
|
|
5
|
+
export declare class OrganizerButtonComponent implements OnDestroy {
|
|
6
6
|
private cdr;
|
|
7
7
|
config: OrganizerConfig;
|
|
8
8
|
state?: OrganizerState;
|
|
@@ -12,9 +12,11 @@ export declare class OrganizerButtonComponent implements OnInit, OnDestroy {
|
|
|
12
12
|
loadingFieldId?: string;
|
|
13
13
|
private fieldDataCache;
|
|
14
14
|
private destroy$;
|
|
15
|
+
private destroyed;
|
|
16
|
+
private sliceRequestId;
|
|
17
|
+
private sliceSubscription?;
|
|
15
18
|
mainMenuTrigger?: MatMenuTrigger;
|
|
16
19
|
constructor(cdr: ChangeDetectorRef);
|
|
17
|
-
ngOnInit(): void;
|
|
18
20
|
ngOnDestroy(): void;
|
|
19
21
|
isFieldVisible(fieldId: string): boolean;
|
|
20
22
|
fieldsSummary(): string;
|
|
@@ -23,6 +25,7 @@ export declare class OrganizerButtonComponent implements OnInit, OnDestroy {
|
|
|
23
25
|
onYFieldSelect(fieldId: string): void;
|
|
24
26
|
onYAggregateSelect(yFieldId: string, aggregateId: string): void;
|
|
25
27
|
onGroupBySelect(groupId: string): void;
|
|
28
|
+
onChartTypeSelect(chartType: string): void;
|
|
26
29
|
onTemplateSelect(templateId: string): void;
|
|
27
30
|
onSliceClick(sliceId?: string): void;
|
|
28
31
|
private syncSliceState;
|
|
@@ -48,12 +51,15 @@ export declare class OrganizerButtonComponent implements OnInit, OnDestroy {
|
|
|
48
51
|
activeXLabel(): string;
|
|
49
52
|
activeYLabel(): string;
|
|
50
53
|
activeGroupByLabel(): string;
|
|
54
|
+
activeChartTypeLabel(): string;
|
|
51
55
|
activeSlicesLabel(): string;
|
|
52
56
|
activeTemplateLabel(): string;
|
|
53
57
|
hasChartFields(): boolean;
|
|
58
|
+
hasChartTypes(): boolean;
|
|
54
59
|
hasTableFields(): boolean;
|
|
55
60
|
isYActive(yFieldId: string): boolean;
|
|
56
61
|
isYAggregateActive(yFieldId: string, aggregateId: string): boolean;
|
|
62
|
+
isChartTypeActive(chartType: string): boolean;
|
|
57
63
|
private emitChange;
|
|
58
64
|
static ɵfac: i0.ɵɵFactoryDeclaration<OrganizerButtonComponent, never>;
|
|
59
65
|
static ɵcmp: i0.ɵɵComponentDeclaration<OrganizerButtonComponent, "organizer-button", never, { "config": { "alias": "config"; "required": false; }; "state": { "alias": "state"; "required": false; }; "hideMenuValues": { "alias": "hideMenuValues"; "required": false; }; }, { "viewChange": "viewChange"; "sliceStateChange": "sliceStateChange"; }, never, never, true, never>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ChartOrganizerEvent, ChartOrganizerState } from '@oneteme/jquery-core';
|
|
2
2
|
import { OrganizerFieldDef, OrganizerFieldsState, OrganizerGroupByState, OrganizerPanelConfig, OrganizerSliceByState } from './organizer-facade.types';
|
|
3
3
|
export declare function humanizeKey(key: string): string;
|
|
4
4
|
export declare class OrganizerFacade<TField extends OrganizerFieldDef = OrganizerFieldDef> {
|
|
@@ -8,7 +8,7 @@ export declare class OrganizerFacade<TField extends OrganizerFieldDef = Organize
|
|
|
8
8
|
private _panelConfig;
|
|
9
9
|
private _hiddenStaticKeys;
|
|
10
10
|
private readonly _events$;
|
|
11
|
-
readonly events$: import("rxjs").Observable<
|
|
11
|
+
readonly events$: import("rxjs").Observable<ChartOrganizerEvent>;
|
|
12
12
|
get enabled(): boolean;
|
|
13
13
|
get showFields(): boolean;
|
|
14
14
|
get showGroupBySection(): boolean;
|
|
@@ -41,10 +41,15 @@ export declare class OrganizerFacade<TField extends OrganizerFieldDef = Organize
|
|
|
41
41
|
setGroupBy(key: string | null): void;
|
|
42
42
|
onDynamicSliceKeysChange(keys: string[]): void;
|
|
43
43
|
isDynamicSliceActive(key: string): boolean;
|
|
44
|
-
toOrganizerState():
|
|
44
|
+
toOrganizerState(): ChartOrganizerState;
|
|
45
45
|
destroy(): void;
|
|
46
46
|
updateHiddenStaticKeys(keys: Set<string>): void;
|
|
47
47
|
private _refreshDefaultFields;
|
|
48
|
+
/** Première définition de chaque clé dans la config courante. */
|
|
49
|
+
private _definitionsByKey;
|
|
50
|
+
private _staticSliceKeys;
|
|
51
|
+
/** Champs proposables en slice dynamique, hors slices statiques et slices déjà actifs. */
|
|
52
|
+
private _availableForDynamic;
|
|
48
53
|
private _refreshDynamicSliceMeta;
|
|
49
54
|
private _computeSliceLabel;
|
|
50
55
|
private _uniqueByKey;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { SliceConfig } from '../slice-panel/slice-panel.model';
|
|
2
|
-
import {
|
|
2
|
+
import { ChartOrganizerConfig } from '@oneteme/jquery-core';
|
|
3
3
|
export interface OrganizerFieldDef {
|
|
4
4
|
key: string;
|
|
5
5
|
header?: string;
|
|
@@ -9,7 +9,7 @@ export interface OrganizerFieldDef {
|
|
|
9
9
|
sliceable?: boolean;
|
|
10
10
|
}
|
|
11
11
|
export interface OrganizerPanelConfig<TField extends OrganizerFieldDef = OrganizerFieldDef> {
|
|
12
|
-
config?:
|
|
12
|
+
config?: ChartOrganizerConfig;
|
|
13
13
|
fields: TField[];
|
|
14
14
|
sliceConfigs: SliceConfig<any>[];
|
|
15
15
|
noneLabel?: string;
|
|
@@ -6,7 +6,6 @@ export declare class SlicePanelComponent<T = any> implements OnChanges, OnInit {
|
|
|
6
6
|
sliceConfigs: SliceConfig<T>[];
|
|
7
7
|
columns: SliceColumnDef<T>[];
|
|
8
8
|
data: T[];
|
|
9
|
-
lazyData: Map<string, Map<any, any>>;
|
|
10
9
|
lazyStatus: Map<string, 'idle' | 'loading' | 'loaded' | 'error'>;
|
|
11
10
|
showToggle: boolean;
|
|
12
11
|
showCounts: boolean;
|
|
@@ -39,6 +38,7 @@ export declare class SlicePanelComponent<T = any> implements OnChanges, OnInit {
|
|
|
39
38
|
readonly trackByCategoryKey: (_: number, cat: any) => string;
|
|
40
39
|
ngOnInit(): void;
|
|
41
40
|
ngOnChanges(changes: SimpleChanges): void;
|
|
41
|
+
private _hasActiveFilters;
|
|
42
42
|
get showPanel(): boolean;
|
|
43
43
|
get slices(): SliceConfig<T>[];
|
|
44
44
|
get staticSliceCount(): number;
|
|
@@ -71,12 +71,17 @@ export declare class SlicePanelComponent<T = any> implements OnChanges, OnInit {
|
|
|
71
71
|
private _getPersistentSliceKey;
|
|
72
72
|
private _getSliceIdentity;
|
|
73
73
|
private _materializeSlice;
|
|
74
|
+
private _buildCategories;
|
|
74
75
|
private _buildCategoryFromValue;
|
|
76
|
+
/** Valeurs distinctes (triées, « vide » en dernier) et effectifs, calculés en un seul passage. */
|
|
75
77
|
private _computeDistinctValues;
|
|
78
|
+
private _columnsRef?;
|
|
79
|
+
private _columnIndex;
|
|
80
|
+
private _column;
|
|
76
81
|
private _getLazyAwareValue;
|
|
77
82
|
private _rebuildCache;
|
|
78
83
|
private _refreshDynamicSlices;
|
|
79
84
|
private _scrollSliceTitleIntoView;
|
|
80
85
|
static ɵfac: i0.ɵɵFactoryDeclaration<SlicePanelComponent<any>, never>;
|
|
81
|
-
static ɵcmp: i0.ɵɵComponentDeclaration<SlicePanelComponent<any>, "slice-panel", never, { "sliceConfigs": { "alias": "sliceConfigs"; "required": false; }; "columns": { "alias": "columns"; "required": false; }; "data": { "alias": "data"; "required": false; }; "
|
|
86
|
+
static ɵcmp: i0.ɵɵComponentDeclaration<SlicePanelComponent<any>, "slice-panel", never, { "sliceConfigs": { "alias": "sliceConfigs"; "required": false; }; "columns": { "alias": "columns"; "required": false; }; "data": { "alias": "data"; "required": false; }; "lazyStatus": { "alias": "lazyStatus"; "required": false; }; "showToggle": { "alias": "showToggle"; "required": false; }; "showCounts": { "alias": "showCounts"; "required": false; }; "collapsedByDefault": { "alias": "collapsedByDefault"; "required": false; }; "alwaysShow": { "alias": "alwaysShow"; "required": false; }; }, { "filterChange": "filterChange"; "activeKeysChange": "activeKeysChange"; "dynamicSliceKeysChange": "dynamicSliceKeysChange"; "collapsedChange": "collapsedChange"; }, never, never, true, never>;
|
|
82
87
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { DataProvider } from '@oneteme/jquery-core';
|
|
2
|
-
import { Observable } from 'rxjs';
|
|
3
2
|
export interface SliceCategory<T = any> {
|
|
4
3
|
key: string;
|
|
5
4
|
label: string;
|
|
6
5
|
filter?: (row: T) => boolean;
|
|
6
|
+
/** Effectif précalculé (rempli par le panneau pour les catégories dérivées d'une colonne). */
|
|
7
|
+
count?: number;
|
|
7
8
|
}
|
|
8
9
|
export interface SliceConfig<T = any> {
|
|
9
10
|
title?: string;
|
|
@@ -19,7 +20,6 @@ export interface SliceColumnDef<T = any> {
|
|
|
19
20
|
header?: string;
|
|
20
21
|
icon?: string;
|
|
21
22
|
value?: DataProvider<any>;
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
23
|
+
/** Colonne absente de la requête de base : ses valeurs sont dans les lignes une fois chargée (`lazyStatus`). */
|
|
24
|
+
lazy?: true;
|
|
25
25
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oneteme/jquery-organizer",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.7",
|
|
4
4
|
"description": "Independent Organizer Button component library - decentralized organizer management for charts, tables",
|
|
5
5
|
"homepage": "https://github.com/oneteme/jquery-charts",
|
|
6
6
|
"bugs": "https://github.com/oneteme/jquery-charts/issues",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"@angular/core": ">=16.1.0",
|
|
14
14
|
"@angular/material": "^16.1.0",
|
|
15
15
|
"@angular/cdk": "^16.1.0",
|
|
16
|
-
"@oneteme/jquery-core": "^0.0.
|
|
16
|
+
"@oneteme/jquery-core": "^0.0.38"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"tslib": "^2.3.0"
|
package/public-api.d.ts
CHANGED
|
@@ -4,9 +4,9 @@ export * from './lib/slice-panel/slice-panel.component';
|
|
|
4
4
|
export * from './lib/slice-panel/slice-panel.model';
|
|
5
5
|
export * from './lib/models/organizer-config.interface';
|
|
6
6
|
export * from './lib/models/organizer-menu.model';
|
|
7
|
+
export { OrganizerButtonEventType } from './lib/models/organizer-chart-config';
|
|
7
8
|
export { buildYFields, resolveYKey, OrganizerYIndicator } from './lib/models/organizer-utils';
|
|
8
9
|
export { buildOrganizerChartBinding, chartConfigToOrganizer, chartConfigToState, chartConfigToUnifiedState, applyOrganizerEventToChart, handleOrganizerChartEvent, resolveYUnit, OrganizerChartItem, OrganizerChartSection, OrganizerChartConfig, OrganizerChartBridgeOptions, OrganizerChartBinding, OrganizerChartEventResult, } from './lib/models/organizer-chart-adapter';
|
|
9
10
|
export { OrganizerFacade, humanizeKey } from './lib/organizer-facade/organizer-facade';
|
|
10
11
|
export { OrganizerFieldDef, OrganizerPanelConfig, OrganizerFieldsState, OrganizerGroupByState, OrganizerSliceByState, } from './lib/organizer-facade/organizer-facade.types';
|
|
11
12
|
export { GroupByManager } from './lib/group-by-manager/group-by-manager';
|
|
12
|
-
export { LazyFieldManager, LazyFieldDef, LazyFieldCallbacks, LAZY_FIELD_LOADING_VALUE, LAZY_FIELD_ERROR_VALUE, } from './lib/lazy-field-manager/lazy-field-manager';
|
|
@@ -1,91 +0,0 @@
|
|
|
1
|
-
import { Subject, take, takeUntil } from 'rxjs';
|
|
2
|
-
export const LAZY_FIELD_LOADING_VALUE = '__lazy_loading__';
|
|
3
|
-
export const LAZY_FIELD_ERROR_VALUE = '__lazy_error__';
|
|
4
|
-
export class LazyFieldManager {
|
|
5
|
-
constructor() {
|
|
6
|
-
this._status = new Map();
|
|
7
|
-
this._data = new Map();
|
|
8
|
-
this._cancels = new Map();
|
|
9
|
-
}
|
|
10
|
-
get status() {
|
|
11
|
-
return this._status;
|
|
12
|
-
}
|
|
13
|
-
get data() {
|
|
14
|
-
return this._data;
|
|
15
|
-
}
|
|
16
|
-
getStatus(key) {
|
|
17
|
-
return this._status.get(key) ?? 'idle';
|
|
18
|
-
}
|
|
19
|
-
getRenderType(rowValue) {
|
|
20
|
-
if (rowValue === LAZY_FIELD_LOADING_VALUE)
|
|
21
|
-
return 'loading';
|
|
22
|
-
if (rowValue === LAZY_FIELD_ERROR_VALUE)
|
|
23
|
-
return 'error';
|
|
24
|
-
return 'value';
|
|
25
|
-
}
|
|
26
|
-
cancelAll() {
|
|
27
|
-
this._cancels.forEach(s => { s.next(); s.complete(); });
|
|
28
|
-
this._cancels.clear();
|
|
29
|
-
this._status = new Map();
|
|
30
|
-
this._data = new Map();
|
|
31
|
-
}
|
|
32
|
-
retry(field, resolvedData, callbacks) {
|
|
33
|
-
const k = field.key;
|
|
34
|
-
const prev = this._cancels.get(k);
|
|
35
|
-
if (prev) {
|
|
36
|
-
prev.next();
|
|
37
|
-
prev.complete();
|
|
38
|
-
}
|
|
39
|
-
this._cancels.delete(k);
|
|
40
|
-
const newStatus = new Map(this._status);
|
|
41
|
-
newStatus.delete(k);
|
|
42
|
-
this._status = newStatus;
|
|
43
|
-
const newData = new Map(this._data);
|
|
44
|
-
newData.delete(k);
|
|
45
|
-
this._data = newData;
|
|
46
|
-
this.fetch(field, resolvedData, callbacks);
|
|
47
|
-
}
|
|
48
|
-
fetch(field, resolvedData, callbacks) {
|
|
49
|
-
if (!field.lazy)
|
|
50
|
-
return;
|
|
51
|
-
const k = field.key;
|
|
52
|
-
if (this._status.get(k) === 'loading')
|
|
53
|
-
return;
|
|
54
|
-
const prev = this._cancels.get(k);
|
|
55
|
-
if (prev) {
|
|
56
|
-
prev.next();
|
|
57
|
-
prev.complete();
|
|
58
|
-
}
|
|
59
|
-
const cancel$ = new Subject();
|
|
60
|
-
this._cancels.set(k, cancel$);
|
|
61
|
-
const newStatus = new Map(this._status);
|
|
62
|
-
newStatus.set(k, 'loading');
|
|
63
|
-
this._status = newStatus;
|
|
64
|
-
callbacks.onRefresh();
|
|
65
|
-
field.lazy.fetchFn().pipe(take(1), takeUntil(cancel$)).subscribe({
|
|
66
|
-
next: (values) => {
|
|
67
|
-
const rowMap = new Map();
|
|
68
|
-
values.forEach((value, i) => {
|
|
69
|
-
if (i < resolvedData.length)
|
|
70
|
-
rowMap.set(resolvedData[i], value);
|
|
71
|
-
});
|
|
72
|
-
const newData = new Map(this._data);
|
|
73
|
-
newData.set(k, rowMap);
|
|
74
|
-
this._data = newData;
|
|
75
|
-
const newStatus2 = new Map(this._status);
|
|
76
|
-
newStatus2.set(k, 'loaded');
|
|
77
|
-
this._status = newStatus2;
|
|
78
|
-
callbacks.onRefresh();
|
|
79
|
-
callbacks.onMarkForCheck();
|
|
80
|
-
},
|
|
81
|
-
error: () => {
|
|
82
|
-
const newStatusErr = new Map(this._status);
|
|
83
|
-
newStatusErr.set(k, 'error');
|
|
84
|
-
this._status = newStatusErr;
|
|
85
|
-
callbacks.onRefresh();
|
|
86
|
-
callbacks.onMarkForCheck();
|
|
87
|
-
},
|
|
88
|
-
});
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"lazy-field-manager.js","sourceRoot":"","sources":["../../../../../../projects/oneteme/jquery-organizer/src/lib/lazy-field-manager/lazy-field-manager.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable, Subject, take, takeUntil } from 'rxjs';\n\nexport interface LazyFieldDef {\n  key: string;\n  lazy?: {\n    fetchFn: () => Observable<any[]>;\n  };\n}\nexport interface LazyFieldCallbacks {\n  onRefresh(): void;\n  onMarkForCheck(): void;\n}\n\nexport const LAZY_FIELD_LOADING_VALUE = '__lazy_loading__';\nexport const LAZY_FIELD_ERROR_VALUE = '__lazy_error__';\n\nexport class LazyFieldManager<TField extends LazyFieldDef = LazyFieldDef> {\n\n  private _status = new Map<string, 'idle' | 'loading' | 'loaded' | 'error'>();\n  private _data = new Map<string, Map<any, any>>();\n  private _cancels = new Map<string, Subject<void>>();\n\n  get status(): Map<string, 'idle' | 'loading' | 'loaded' | 'error'> {\n    return this._status;\n  }\n\n  get data(): Map<string, Map<any, any>> {\n    return this._data;\n  }\n\n  getStatus(key: string): 'idle' | 'loading' | 'loaded' | 'error' {\n    return this._status.get(key) ?? 'idle';\n  }\n\n  getRenderType(rowValue: any): 'loading' | 'error' | 'value' {\n    if (rowValue === LAZY_FIELD_LOADING_VALUE) return 'loading';\n    if (rowValue === LAZY_FIELD_ERROR_VALUE) return 'error';\n    return 'value';\n  }\n\n  cancelAll(): void {\n    this._cancels.forEach(s => { s.next(); s.complete(); });\n    this._cancels.clear();\n    this._status = new Map();\n    this._data = new Map();\n  }\n\n  retry<TRow>(field: TField, resolvedData: TRow[], callbacks: LazyFieldCallbacks): void {\n    const k = field.key;\n    const prev = this._cancels.get(k);\n    if (prev) { prev.next(); prev.complete(); }\n    this._cancels.delete(k);\n\n    const newStatus = new Map(this._status);\n    newStatus.delete(k);\n    this._status = newStatus;\n\n    const newData = new Map(this._data);\n    newData.delete(k);\n    this._data = newData;\n\n    this.fetch(field, resolvedData, callbacks);\n  }\n\n  fetch<TRow>(field: TField, resolvedData: TRow[], callbacks: LazyFieldCallbacks): void {\n    if (!field.lazy) return;\n    const k = field.key;\n    if (this._status.get(k) === 'loading') return;\n\n    const prev = this._cancels.get(k);\n    if (prev) { prev.next(); prev.complete(); }\n    const cancel$ = new Subject<void>();\n    this._cancels.set(k, cancel$);\n\n    const newStatus = new Map(this._status);\n    newStatus.set(k, 'loading');\n    this._status = newStatus;\n    callbacks.onRefresh();\n\n    field.lazy.fetchFn().pipe(\n      take(1),\n      takeUntil(cancel$),\n    ).subscribe({\n      next: (values: any[]) => {\n        const rowMap = new Map<any, any>();\n        values.forEach((value, i) => {\n          if (i < resolvedData.length) rowMap.set(resolvedData[i], value);\n        });\n        const newData = new Map(this._data);\n        newData.set(k, rowMap);\n        this._data = newData;\n\n        const newStatus2 = new Map(this._status);\n        newStatus2.set(k, 'loaded');\n        this._status = newStatus2;\n\n        callbacks.onRefresh();\n        callbacks.onMarkForCheck();\n      },\n      error: () => {\n        const newStatusErr = new Map(this._status);\n        newStatusErr.set(k, 'error');\n        this._status = newStatusErr;\n\n        callbacks.onRefresh();\n        callbacks.onMarkForCheck();\n      },\n    });\n  }\n}\n"]}
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
import { Observable } from 'rxjs';
|
|
2
|
-
export interface LazyFieldDef {
|
|
3
|
-
key: string;
|
|
4
|
-
lazy?: {
|
|
5
|
-
fetchFn: () => Observable<any[]>;
|
|
6
|
-
};
|
|
7
|
-
}
|
|
8
|
-
export interface LazyFieldCallbacks {
|
|
9
|
-
onRefresh(): void;
|
|
10
|
-
onMarkForCheck(): void;
|
|
11
|
-
}
|
|
12
|
-
export declare const LAZY_FIELD_LOADING_VALUE = "__lazy_loading__";
|
|
13
|
-
export declare const LAZY_FIELD_ERROR_VALUE = "__lazy_error__";
|
|
14
|
-
export declare class LazyFieldManager<TField extends LazyFieldDef = LazyFieldDef> {
|
|
15
|
-
private _status;
|
|
16
|
-
private _data;
|
|
17
|
-
private _cancels;
|
|
18
|
-
get status(): Map<string, 'idle' | 'loading' | 'loaded' | 'error'>;
|
|
19
|
-
get data(): Map<string, Map<any, any>>;
|
|
20
|
-
getStatus(key: string): 'idle' | 'loading' | 'loaded' | 'error';
|
|
21
|
-
getRenderType(rowValue: any): 'loading' | 'error' | 'value';
|
|
22
|
-
cancelAll(): void;
|
|
23
|
-
retry<TRow>(field: TField, resolvedData: TRow[], callbacks: LazyFieldCallbacks): void;
|
|
24
|
-
fetch<TRow>(field: TField, resolvedData: TRow[], callbacks: LazyFieldCallbacks): void;
|
|
25
|
-
}
|