@hmcts/ccd-case-ui-toolkit 7.0.17-beta01 → 7.0.17
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/esm2020/lib/shared/services/organisation/organisation.service.mjs +3 -6
- package/fesm2015/hmcts-ccd-case-ui-toolkit.mjs +1 -4
- package/fesm2015/hmcts-ccd-case-ui-toolkit.mjs.map +1 -1
- package/fesm2020/hmcts-ccd-case-ui-toolkit.mjs +1 -4
- package/fesm2020/hmcts-ccd-case-ui-toolkit.mjs.map +1 -1
- package/lib/shared/services/organisation/organisation.service.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { HttpClient } from '@angular/common/http';
|
|
2
2
|
import { Injectable } from '@angular/core';
|
|
3
|
-
import { of
|
|
3
|
+
import { of } from 'rxjs';
|
|
4
4
|
import { catchError, map, publishReplay, refCount, take } from 'rxjs/operators';
|
|
5
5
|
import { AbstractAppConfig } from '../../../app.config';
|
|
6
6
|
import * as i0 from "@angular/core";
|
|
@@ -37,14 +37,11 @@ export class OrganisationService {
|
|
|
37
37
|
const url = this.appconfig.getPrdUrl();
|
|
38
38
|
const cacheTimeOut = this.appconfig.getCacheTimeOut();
|
|
39
39
|
this.organisations$ = this.http.get(url)
|
|
40
|
-
.pipe(map((orgs) => OrganisationService.mapOrganisation(orgs)), publishReplay(1), refCount(), take(1), catchError(e => {
|
|
40
|
+
.pipe(map((orgs) => OrganisationService.mapOrganisation(orgs)), publishReplay(1, cacheTimeOut), refCount(), take(1), catchError(e => {
|
|
41
41
|
console.log(e);
|
|
42
42
|
// Handle error and return blank Observable array
|
|
43
43
|
return of([]);
|
|
44
44
|
}));
|
|
45
|
-
timer(cacheTimeOut).subscribe(() => {
|
|
46
|
-
this.organisations$ = null;
|
|
47
|
-
});
|
|
48
45
|
}
|
|
49
46
|
return this.organisations$;
|
|
50
47
|
}
|
|
@@ -54,4 +51,4 @@ OrganisationService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: Orga
|
|
|
54
51
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(OrganisationService, [{
|
|
55
52
|
type: Injectable
|
|
56
53
|
}], function () { return [{ type: i1.HttpClient }, { type: i2.AbstractAppConfig }]; }, null); })();
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
54
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib3JnYW5pc2F0aW9uLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9jY2QtY2FzZS11aS10b29sa2l0L3NyYy9saWIvc2hhcmVkL3NlcnZpY2VzL29yZ2FuaXNhdGlvbi9vcmdhbmlzYXRpb24uc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQWMsRUFBRSxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQ3RDLE9BQU8sRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLGFBQWEsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDaEYsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0scUJBQXFCLENBQUM7Ozs7QUE2Q3hELE1BQU0sT0FBTyxtQkFBbUI7SUFFNUIsWUFBNkIsSUFBZ0IsRUFDaEIsU0FBNEI7UUFENUIsU0FBSSxHQUFKLElBQUksQ0FBWTtRQUNoQixjQUFTLEdBQVQsU0FBUyxDQUFtQjtJQUFHLENBQUM7SUFHdEQsTUFBTSxDQUFDLGVBQWUsQ0FBQyxhQUE2QjtRQUN2RCxNQUFNLGVBQWUsR0FBRyxJQUFJLEtBQUssRUFBa0IsQ0FBQztRQUNwRCxhQUFhLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFO1lBQ3hCLElBQUksa0JBQWtCLEdBQUcsSUFBSSxDQUFDO1lBQzlCLElBQUksR0FBRyxDQUFDLGtCQUFrQixJQUFLLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsRUFBRTtnQkFDdEQsa0JBQWtCLEdBQUcsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ2xEO1lBQ0QsZUFBZSxDQUFDLElBQUksQ0FBQztnQkFDakIsc0JBQXNCLEVBQUUsR0FBRyxDQUFDLHNCQUFzQjtnQkFDbEQsSUFBSSxFQUFFLEdBQUcsQ0FBQyxJQUFJO2dCQUNkLFlBQVksRUFBRSxrQkFBa0IsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsSUFBSTtnQkFDbEYsWUFBWSxFQUFFLGtCQUFrQixLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxJQUFJO2dCQUNsRixZQUFZLEVBQUUsa0JBQWtCLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLElBQUk7Z0JBQ2xGLFFBQVEsRUFBRSxrQkFBa0IsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSTtnQkFDMUUsTUFBTSxFQUFFLGtCQUFrQixLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxJQUFJO2dCQUN0RSxPQUFPLEVBQUUsa0JBQWtCLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUk7Z0JBQ3hFLFFBQVEsRUFBRSxrQkFBa0IsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsSUFBSTthQUM3RSxDQUFDLENBQUM7UUFDUCxDQUFDLENBQUMsQ0FBQztRQUNILE9BQU8sZUFBZSxDQUFDO0lBQzNCLENBQUM7SUFFTSxzQkFBc0I7UUFDekIsSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUU7WUFDdEIsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUN2QyxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ3RELElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQWlCLEdBQUcsQ0FBQztpQkFDdkQsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsbUJBQW1CLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQzlELGFBQWEsQ0FBQyxDQUFDLEVBQUUsWUFBWSxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsRUFBRTtnQkFDaEUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDZixpREFBaUQ7Z0JBQ2pELE9BQU8sRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ2xCLENBQUMsQ0FBQyxDQUFDLENBQUM7U0FDUDtRQUNELE9BQU8sSUFBSSxDQUFDLGNBQWMsQ0FBQztJQUMvQixDQUFDOztzRkF6Q1EsbUJBQW1CO3lFQUFuQixtQkFBbUIsV0FBbkIsbUJBQW1CO3VGQUFuQixtQkFBbUI7Y0FEL0IsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEh0dHBDbGllbnQgfSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBPYnNlcnZhYmxlLCBvZiB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgY2F0Y2hFcnJvciwgbWFwLCBwdWJsaXNoUmVwbGF5LCByZWZDb3VudCwgdGFrZSB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IEFic3RyYWN0QXBwQ29uZmlnIH0gZnJvbSAnLi4vLi4vLi4vYXBwLmNvbmZpZyc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgT3JnYW5pc2F0aW9uU3VwZXJVc2VyIHtcbiAgICBmaXJzdE5hbWU6IHN0cmluZztcbiAgICBsYXN0TmFtZTogc3RyaW5nO1xuICAgIGVtYWlsOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgT3JnYW5pc2F0aW9uQWRkcmVzcyB7XG4gICAgYWRkcmVzc0xpbmUxOiBzdHJpbmc7XG4gICAgYWRkcmVzc0xpbmUyOiBzdHJpbmc7XG4gICAgYWRkcmVzc0xpbmUzOiBzdHJpbmc7XG4gICAgdG93bkNpdHk6IHN0cmluZztcbiAgICBjb3VudHk6IHN0cmluZztcbiAgICBjb3VudHJ5OiBzdHJpbmc7XG4gICAgcG9zdENvZGU6IHN0cmluZztcbiAgICBkeEFkZHJlc3M6IGFueSBbXTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBPcmdhbmlzYXRpb24ge1xuICAgIG9yZ2FuaXNhdGlvbklkZW50aWZpZXI6IHN0cmluZztcbiAgICBuYW1lOiBzdHJpbmc7XG4gICAgc3RhdHVzOiBzdHJpbmc7XG4gICAgc3JhSWQ6IHN0cmluZztcbiAgICBzcmFSZWd1bGF0ZWQ6IGJvb2xlYW47XG4gICAgY29tcGFueU51bWJlcjogc3RyaW5nO1xuICAgIGNvbXBhbnlVcmw6IHN0cmluZztcbiAgICBzdXBlclVzZXI6IE9yZ2FuaXNhdGlvblN1cGVyVXNlcjtcbiAgICBwYXltZW50QWNjb3VudDogc3RyaW5nIFtdO1xuICAgIGNvbnRhY3RJbmZvcm1hdGlvbjogT3JnYW5pc2F0aW9uQWRkcmVzcyBbXTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBPcmdhbmlzYXRpb25WbSB7XG4gICAgb3JnYW5pc2F0aW9uSWRlbnRpZmllcjogc3RyaW5nO1xuICAgIG5hbWU6IHN0cmluZztcbiAgICBhZGRyZXNzTGluZTE6IHN0cmluZztcbiAgICBhZGRyZXNzTGluZTI6IHN0cmluZztcbiAgICBhZGRyZXNzTGluZTM6IHN0cmluZztcbiAgICB0b3duQ2l0eTogc3RyaW5nO1xuICAgIGNvdW50eTogc3RyaW5nO1xuICAgIGNvdW50cnk6IHN0cmluZztcbiAgICBwb3N0Q29kZTogc3RyaW5nO1xufVxuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgT3JnYW5pc2F0aW9uU2VydmljZSB7XG5cbiAgICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJlYWRvbmx5IGh0dHA6IEh0dHBDbGllbnQsXG4gICAgICAgICAgICAgICAgcHJpdmF0ZSByZWFkb25seSBhcHBjb25maWc6IEFic3RyYWN0QXBwQ29uZmlnKSB7fVxuXG4gICAgcHJpdmF0ZSBvcmdhbmlzYXRpb25zJDogT2JzZXJ2YWJsZTxPcmdhbmlzYXRpb25WbVtdPjtcbiAgICBwdWJsaWMgc3RhdGljIG1hcE9yZ2FuaXNhdGlvbihvcmdhbmlzYXRpb25zOiBPcmdhbmlzYXRpb25bXSk6IE9yZ2FuaXNhdGlvblZtIFtdIHtcbiAgICAgICAgY29uc3Qgb3JnYW5pc2F0aW9uc1ZtID0gbmV3IEFycmF5PE9yZ2FuaXNhdGlvblZtPigpO1xuICAgICAgICBvcmdhbmlzYXRpb25zLmZvckVhY2gob3JnID0+IHtcbiAgICAgICAgICAgIGxldCBjb250YWN0SW5mb3JtYXRpb24gPSBudWxsO1xuICAgICAgICAgICAgaWYgKG9yZy5jb250YWN0SW5mb3JtYXRpb24gJiYgIG9yZy5jb250YWN0SW5mb3JtYXRpb25bMF0pIHtcbiAgICAgICAgICAgICAgICBjb250YWN0SW5mb3JtYXRpb24gPSBvcmcuY29udGFjdEluZm9ybWF0aW9uWzBdO1xuICAgICAgICAgICAgfVxuICAgICAgICAgICAgb3JnYW5pc2F0aW9uc1ZtLnB1c2goe1xuICAgICAgICAgICAgICAgIG9yZ2FuaXNhdGlvbklkZW50aWZpZXI6IG9yZy5vcmdhbmlzYXRpb25JZGVudGlmaWVyLFxuICAgICAgICAgICAgICAgIG5hbWU6IG9yZy5uYW1lLFxuICAgICAgICAgICAgICAgIGFkZHJlc3NMaW5lMTogY29udGFjdEluZm9ybWF0aW9uICE9PSBudWxsID8gY29udGFjdEluZm9ybWF0aW9uLmFkZHJlc3NMaW5lMSA6IG51bGwsXG4gICAgICAgICAgICAgICAgYWRkcmVzc0xpbmUyOiBjb250YWN0SW5mb3JtYXRpb24gIT09IG51bGwgPyBjb250YWN0SW5mb3JtYXRpb24uYWRkcmVzc0xpbmUyIDogbnVsbCxcbiAgICAgICAgICAgICAgICBhZGRyZXNzTGluZTM6IGNvbnRhY3RJbmZvcm1hdGlvbiAhPT0gbnVsbCA/IGNvbnRhY3RJbmZvcm1hdGlvbi5hZGRyZXNzTGluZTMgOiBudWxsLFxuICAgICAgICAgICAgICAgIHRvd25DaXR5OiBjb250YWN0SW5mb3JtYXRpb24gIT09IG51bGwgPyBjb250YWN0SW5mb3JtYXRpb24udG93bkNpdHkgOiBudWxsLFxuICAgICAgICAgICAgICAgIGNvdW50eTogY29udGFjdEluZm9ybWF0aW9uICE9PSBudWxsID8gY29udGFjdEluZm9ybWF0aW9uLmNvdW50eSA6IG51bGwsXG4gICAgICAgICAgICAgICAgY291bnRyeTogY29udGFjdEluZm9ybWF0aW9uICE9PSBudWxsID8gY29udGFjdEluZm9ybWF0aW9uLmNvdW50cnkgOiBudWxsLFxuICAgICAgICAgICAgICAgIHBvc3RDb2RlOiBjb250YWN0SW5mb3JtYXRpb24gIT09IG51bGwgPyBjb250YWN0SW5mb3JtYXRpb24ucG9zdENvZGUgOiBudWxsLFxuICAgICAgICAgICAgfSk7XG4gICAgICAgIH0pO1xuICAgICAgICByZXR1cm4gb3JnYW5pc2F0aW9uc1ZtO1xuICAgIH1cblxuICAgIHB1YmxpYyBnZXRBY3RpdmVPcmdhbmlzYXRpb25zKCk6IE9ic2VydmFibGU8T3JnYW5pc2F0aW9uVm1bXT4ge1xuICAgICAgICBpZiAoIXRoaXMub3JnYW5pc2F0aW9ucyQpIHtcbiAgICAgICAgICAgIGNvbnN0IHVybCA9IHRoaXMuYXBwY29uZmlnLmdldFByZFVybCgpO1xuICAgICAgICAgICAgY29uc3QgY2FjaGVUaW1lT3V0ID0gdGhpcy5hcHBjb25maWcuZ2V0Q2FjaGVUaW1lT3V0KCk7XG4gICAgICAgICAgICB0aGlzLm9yZ2FuaXNhdGlvbnMkID0gdGhpcy5odHRwLmdldDxPcmdhbmlzYXRpb25bXT4odXJsKVxuICAgICAgICAgICAgLnBpcGUobWFwKChvcmdzKSA9PiBPcmdhbmlzYXRpb25TZXJ2aWNlLm1hcE9yZ2FuaXNhdGlvbihvcmdzKSksXG4gICAgICAgICAgICBwdWJsaXNoUmVwbGF5KDEsIGNhY2hlVGltZU91dCksIHJlZkNvdW50KCksIHRha2UoMSksIGNhdGNoRXJyb3IoZSA9PiB7XG4gICAgICAgICAgICAgICAgY29uc29sZS5sb2coZSk7XG4gICAgICAgICAgICAgICAgLy8gSGFuZGxlIGVycm9yIGFuZCByZXR1cm4gYmxhbmsgT2JzZXJ2YWJsZSBhcnJheVxuICAgICAgICAgICAgICAgIHJldHVybiBvZihbXSk7XG4gICAgICAgICAgICB9KSk7XG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIHRoaXMub3JnYW5pc2F0aW9ucyQ7XG4gICAgfVxufVxuIl19
|
|
@@ -7537,14 +7537,11 @@ class OrganisationService {
|
|
|
7537
7537
|
const url = this.appconfig.getPrdUrl();
|
|
7538
7538
|
const cacheTimeOut = this.appconfig.getCacheTimeOut();
|
|
7539
7539
|
this.organisations$ = this.http.get(url)
|
|
7540
|
-
.pipe(map((orgs) => OrganisationService.mapOrganisation(orgs)), publishReplay(1), refCount(), take(1), catchError(e => {
|
|
7540
|
+
.pipe(map((orgs) => OrganisationService.mapOrganisation(orgs)), publishReplay(1, cacheTimeOut), refCount(), take(1), catchError(e => {
|
|
7541
7541
|
console.log(e);
|
|
7542
7542
|
// Handle error and return blank Observable array
|
|
7543
7543
|
return of([]);
|
|
7544
7544
|
}));
|
|
7545
|
-
timer(cacheTimeOut).subscribe(() => {
|
|
7546
|
-
this.organisations$ = null;
|
|
7547
|
-
});
|
|
7548
7545
|
}
|
|
7549
7546
|
return this.organisations$;
|
|
7550
7547
|
}
|