@iapps/ng-dhis2-ui 1.2.100 → 1.2.101

package/fesm2022/iapps-ng-dhis2-ui.mjs

@@ -2987,9 +2987,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImpor
             }] } });
 
 class OrganisationUnitSelectorModalComponent extends ReactWrapperModule {
-    constructor(elementRef, httpClient) {
+    constructor(elementRef) {
         super(elementRef);
-        this.httpClient = httpClient;
+        this.d2 = window.d2Web;
         this.selectedOrgUnits = [];
         this.orgUnitSelectionConfig = new OrganisationUnitSelectionConfig();
         this.selectOrgUnits = new EventEmitter();
@@ -3007,24 +3007,26 @@ class OrganisationUnitSelectorModalComponent extends ReactWrapperModule {
         this.reactDomRoot = ReactDOM.createRoot(this.elementRef.nativeElement);
         const rootOrgUnits = await this.getRootOrgUnits();
         const config = await this.getAppConfig();
-        this.component = () => {
-            const [selected, setSelected] = useState(this.selectedOrgUnits);
-            return (React__default.createElement(Provider, { config: config, plugin: false, parentAlertsAdd: undefined, showAlertsInPlugin: false }, React__default.createElement(Modal$1, { position: "middle", large: true },
-                React__default.createElement(ModalTitle$1, null, "Organisation unit"),
-                React__default.createElement(ModalContent$1, null,
-                    React__default.createElement(OrgUnitDimension, { selected: selected, hideGroupSelect: this.orgUnitSelectionConfig.hideGroupSelect, hideLevelSelect: this.orgUnitSelectionConfig.hideLevelSelect, hideUserOrgUnits: this.orgUnitSelectionConfig.hideUserOrgUnits, onSelect: (selectionEvent) => {
-                            setSelected(selectionEvent.items);
-                        }, orgUnitGroupPromise: this.getOrgUnitGroups(), orgUnitLevelPromise: this.getOrgUnitLevels(), roots: rootOrgUnits })),
-                React__default.createElement(ModalActions$1, null,
-                    React__default.createElement(ButtonStrip$1, { end: true },
-                        React__default.createElement(Button$1, { onClick: () => {
-                                this.onCancel();
-                            } }, "Cancel"),
-                        React__default.createElement(Button$1, { primary: true, disabled: selected.length === 0, onClick: () => {
-                                this.onConfirm(selected);
-                            } }, "Confirm"))))));
-        };
-        this.render();
+        if (config) {
+            this.component = () => {
+                const [selected, setSelected] = useState(this.selectedOrgUnits);
+                return (React__default.createElement(Provider, { config: config, plugin: false, parentAlertsAdd: undefined, showAlertsInPlugin: false }, React__default.createElement(Modal$1, { position: "middle", large: true },
+                    React__default.createElement(ModalTitle$1, null, "Organisation unit"),
+                    React__default.createElement(ModalContent$1, null,
+                        React__default.createElement(OrgUnitDimension, { selected: selected, hideGroupSelect: this.orgUnitSelectionConfig.hideGroupSelect, hideLevelSelect: this.orgUnitSelectionConfig.hideLevelSelect, hideUserOrgUnits: this.orgUnitSelectionConfig.hideUserOrgUnits, onSelect: (selectionEvent) => {
+                                setSelected(selectionEvent.items);
+                            }, orgUnitGroupPromise: this.getOrgUnitGroups(), orgUnitLevelPromise: this.getOrgUnitLevels(), roots: rootOrgUnits })),
+                    React__default.createElement(ModalActions$1, null,
+                        React__default.createElement(ButtonStrip$1, { end: true },
+                            React__default.createElement(Button$1, { onClick: () => {
+                                    this.onCancel();
+                                } }, "Cancel"),
+                            React__default.createElement(Button$1, { primary: true, disabled: selected.length === 0, onClick: () => {
+                                    this.onConfirm(selected);
+                                } }, "Confirm"))))));
+            };
+            this.render();
+        }
     }
     onCancel() {
         this.cancel.emit();
@@ -3033,12 +3035,15 @@ class OrganisationUnitSelectorModalComponent extends ReactWrapperModule {
         this.confirm.emit(selectedItems);
     }
     async getAppConfig() {
-        const systemInfo = (await firstValueFrom(this.httpClient.systemInfo()));
+        const systemInfo = this.d2.systemInfo;
+        if (!systemInfo) {
+            return systemInfo;
+        }
         return {
-            baseUrl: (document?.location?.host?.includes('localhost')
+            baseUrl: document?.location?.host?.includes('localhost')
                 ? `${document.location.protocol}//${document.location.host}`
-                : systemInfo['contextPath']),
-            apiVersion: Number(((systemInfo['version'] || '')?.split('.') || [])[1]),
+                : systemInfo.contextPath,
+            apiVersion: systemInfo.apiVersion,
         };
     }
     getOrgUnitAttributeByUsage(usageType) {
@@ -3051,32 +3056,33 @@ class OrganisationUnitSelectorModalComponent extends ReactWrapperModule {
                 return 'organisationUnits';
         }
     }
-    getRootOrgUnits() {
+    async getRootOrgUnits() {
         const orgUnitAttribute = this.getOrgUnitAttributeByUsage(this.orgUnitSelectionConfig.usageType);
-        return firstValueFrom(this.httpClient
-            .me()
-            .pipe(map((user) => (user ? user[orgUnitAttribute] : []).map((orgUnit) => orgUnit.id))));
+        const currentUser = this.d2?.currentUser;
+        return (currentUser ? currentUser[orgUnitAttribute] : []).map((orgUnit) => orgUnit.id);
     }
-    getOrgUnitGroups() {
-        return firstValueFrom(this.httpClient
-            .get('organisationUnitGroups.json?fields=id,displayName,name&paging=false')
-            .pipe(map((res) => res?.['organisationUnitGroups'])));
+    async getOrgUnitGroups() {
+        const orgUnitGroupResponse = await this.d2?.httpInstance?.get('organisationUnitGroups.json?fields=id,displayName,name&paging=false', {
+            useIndexDb: this.orgUnitSelectionConfig?.allowCaching,
+        });
+        return orgUnitGroupResponse?.data?.['organisationUnitGroups'] ?? [];
     }
-    getOrgUnitLevels() {
-        return firstValueFrom(this.httpClient
-            .get('organisationUnitLevels.json?fields=id,level,displayName,name&paging=false')
-            .pipe(map((res) => res?.['organisationUnitLevels'])));
+    async getOrgUnitLevels() {
+        const orgUnitLevelResponse = await this.d2?.httpInstance?.get('organisationUnitLevels.json?fields=id,level,displayName,name&paging=false', {
+            useIndexDb: this.orgUnitSelectionConfig?.allowCaching,
+        });
+        return orgUnitLevelResponse?.data?.['organisationUnitLevels'] ?? [];
     }
     onSelectItems(selectionEvent) {
         this.selectOrgUnits.emit(selectionEvent.items);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.8", ngImport: i0, type: OrganisationUnitSelectorModalComponent, deps: [{ token: i0.ElementRef }, { token: i1.NgxDhis2HttpClientService }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.8", ngImport: i0, type: OrganisationUnitSelectorModalComponent, deps: [{ token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.1.8", type: OrganisationUnitSelectorModalComponent, isStandalone: false, selector: "ng-dhis2-ui-org-unit-selector-modal", inputs: { selectedOrgUnits: "selectedOrgUnits", orgUnitSelectionConfig: "orgUnitSelectionConfig" }, outputs: { selectOrgUnits: "selectOrgUnits", cancel: "cancel", confirm: "confirm" }, usesInheritance: true, ngImport: i0, template: '<ng-container><ng-container>', isInline: true, styles: ["::ng-deep .layer{z-index:2!important}\n"] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImport: i0, type: OrganisationUnitSelectorModalComponent, decorators: [{
             type: Component,
             args: [{ selector: 'ng-dhis2-ui-org-unit-selector-modal', template: '<ng-container><ng-container>', standalone: false, styles: ["::ng-deep .layer{z-index:2!important}\n"] }]
-        }], ctorParameters: () => [{ type: i0.ElementRef }, { type: i1.NgxDhis2HttpClientService }], propDecorators: { selectedOrgUnits: [{
+        }], ctorParameters: () => [{ type: i0.ElementRef }], propDecorators: { selectedOrgUnits: [{
                 type: Input
             }], orgUnitSelectionConfig: [{
                 type: Input