@hmcts/ccd-case-ui-toolkit 7.0.54 → 7.0.55
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.
|
@@ -26,26 +26,24 @@ export class CaseFlagRefdataService {
|
|
|
26
26
|
let url = this.appConfig.getCaseFlagsRefdataApiUrl();
|
|
27
27
|
if (url) {
|
|
28
28
|
url = url.replace(':sid', serviceId);
|
|
29
|
+
const requestSearchParams = new URLSearchParams();
|
|
29
30
|
if (flagType) {
|
|
30
|
-
|
|
31
|
+
requestSearchParams.set('flag-type', flagType);
|
|
31
32
|
}
|
|
32
33
|
if (typeof welshRequired === 'boolean') {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
welshRequired ? url += 'welsh-required=Y' : url += 'welsh-required=N';
|
|
36
|
-
}
|
|
37
|
-
if (externalFlagsOnly) {
|
|
38
|
-
// Check if anything has been added to the query string; if so, append available-external-flag with '&'
|
|
39
|
-
url.indexOf('?') > -1 ? url += '&' : url += '?';
|
|
40
|
-
url += 'available-external-flag=Y';
|
|
34
|
+
const welshFlagValue = welshRequired ? 'Y' : 'N';
|
|
35
|
+
requestSearchParams.set('welsh-required', welshFlagValue);
|
|
41
36
|
}
|
|
37
|
+
const externalFlagsValue = externalFlagsOnly ? 'Y' : 'N';
|
|
38
|
+
requestSearchParams.set('available-external-flag', externalFlagsValue);
|
|
39
|
+
url = `${url}?${requestSearchParams.toString()}`;
|
|
42
40
|
return this.http
|
|
43
41
|
.get(url, { observe: 'body' })
|
|
44
42
|
.pipe(
|
|
45
43
|
// Reference Data Common API returns a single object with a "flags" array, which itself contains a single object
|
|
46
44
|
// with a "FlagDetails" array, which contains a hierarchy of flag types in an object - one each for "Party" flags
|
|
47
45
|
// and "Case" flags
|
|
48
|
-
map(body => {
|
|
46
|
+
map((body) => {
|
|
49
47
|
if (!body || !body.flags || !body.flags.length || !body.flags[0].FlagDetails || !body.flags[0].FlagDetails.length) {
|
|
50
48
|
// Note: Reference Data Common API appears to respond with a 404 error rather than send an empty response,
|
|
51
49
|
// so this may be redundant
|
|
@@ -101,4 +99,4 @@ export class CaseFlagRefdataService {
|
|
|
101
99
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(CaseFlagRefdataService, [{
|
|
102
100
|
type: Injectable
|
|
103
101
|
}], () => [{ type: i1.HttpService }, { type: i2.AbstractAppConfig }], null); })();
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"case-flag-refdata.service.js","sourceRoot":"","sources":["../../../../../../../projects/ccd-case-ui-toolkit/src/lib/shared/services/case-flag/case-flag-refdata.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { Observable, of, throwError } from 'rxjs';\nimport { map } from 'rxjs/operators';\nimport { AbstractAppConfig } from '../../../app.config';\nimport { FlagType, HmctsServiceDetail } from '../../domain/case-flag';\nimport { HttpService } from '../http';\nimport { RefdataCaseFlagType } from './refdata-case-flag-type.enum';\n\n@Injectable()\nexport class CaseFlagRefdataService {\n  constructor(\n    private readonly http: HttpService,\n    private readonly appConfig: AbstractAppConfig\n  ) { }\n\n  /**\n   * Retrieves the Case Flag types for an HMCTS service.\n   *\n   * @param serviceId The HMCTS Service Code for a jurisdiction or service. **Note:** This is _not_ the service name\n   * @param flagType `PARTY` for party-level flags; `CASE` for case-level\n   * @param welshRequired `true` if Welsh language versions of flags are required; `false` otherwise\n   * @param externalFlagsOnly Only flags with the attribute `availableExternally` set to `true` will be returned\n   * @returns An `Observable` of an array of flag types\n   */\n  public getCaseFlagsRefdata(serviceId: string, flagType?: RefdataCaseFlagType, welshRequired?: boolean, externalFlagsOnly?: boolean): Observable<FlagType[]> {\n    let url = this.appConfig.getCaseFlagsRefdataApiUrl();\n    if (url) {\n      url = url.replace(':sid', serviceId);\n      const requestSearchParams = new URLSearchParams();\n      if (flagType) {\n        requestSearchParams.set('flag-type', flagType);\n      }\n      if (typeof welshRequired === 'boolean') {\n        const welshFlagValue = welshRequired ? 'Y' : 'N';\n        requestSearchParams.set('welsh-required', welshFlagValue);\n      }\n      const externalFlagsValue = externalFlagsOnly ? 'Y' : 'N';\n      requestSearchParams.set('available-external-flag', externalFlagsValue);\n      url = `${url}?${requestSearchParams.toString()}`;\n      return this.http\n        .get(url, { observe: 'body' })\n        .pipe(\n          // Reference Data Common API returns a single object with a \"flags\" array, which itself contains a single object\n          // with a \"FlagDetails\" array, which contains a hierarchy of flag types in an object - one each for \"Party\" flags\n          // and \"Case\" flags\n          map((body) => {\n            if (!body || !body.flags || !body.flags.length || !body.flags[0].FlagDetails || !body.flags[0].FlagDetails.length) {\n              // Note: Reference Data Common API appears to respond with a 404 error rather than send an empty response,\n              // so this may be redundant\n              return throwError(new Error('No flag types could be retrieved'));\n            }\n            return body.flags[0].FlagDetails;\n          })\n        );\n    }\n\n    return of(null);\n  }\n\n  /**\n   * Retrieves the HMCTS service details for a jurisdiction or service, including service codes. More than one\n   * service code may be present. For example, the Divorce jurisdiction/service has corresponding service codes of\n   * \"ABA1\" and \"ABA2\".\n   *\n   * @param serviceNames The service name(s) to look up, comma-separated if more than one\n   * @returns An `Observable` of an array of service details\n   */\n  public getHmctsServiceDetailsByServiceName(serviceNames?: string): Observable<HmctsServiceDetail[]> {\n    let url = this.appConfig.getLocationRefApiUrl();\n\n    if (url) {\n      url += '/orgServices';\n      if (serviceNames) {\n        url += `?ccdServiceNames=${serviceNames}`;\n      }\n\n      return this.http.get(url, {observe: 'body'});\n    }\n\n    return of(null);\n  }\n\n  /**\n   * Retrieves the HMCTS service details for a case type, including service code. For example, the\n   * \"FinancialRemedyContested\" case type is associated with the Divorce jurisdiction/service and service code \"ABA2\".\n   *\n   * Note that a case type might not be associated with any service codes of a jurisdiction or service.\n   *\n   * @param caseTypeId The case type ID to look up\n   * @returns An `Observable` of an array of service details\n   */\n  public getHmctsServiceDetailsByCaseType(caseTypeId?: string): Observable<HmctsServiceDetail[]> {\n    let url = this.appConfig.getLocationRefApiUrl();\n\n    if (url) {\n      url += '/orgServices';\n      if (caseTypeId) {\n        url += `?ccdCaseType=${caseTypeId}`;\n      }\n\n      return this.http.get(url, {observe: 'body'});\n    }\n\n    return of(null);\n  }\n}\n"]}
|
|
@@ -6785,26 +6785,24 @@ class CaseFlagRefdataService {
|
|
|
6785
6785
|
let url = this.appConfig.getCaseFlagsRefdataApiUrl();
|
|
6786
6786
|
if (url) {
|
|
6787
6787
|
url = url.replace(':sid', serviceId);
|
|
6788
|
+
const requestSearchParams = new URLSearchParams();
|
|
6788
6789
|
if (flagType) {
|
|
6789
|
-
|
|
6790
|
+
requestSearchParams.set('flag-type', flagType);
|
|
6790
6791
|
}
|
|
6791
6792
|
if (typeof welshRequired === 'boolean') {
|
|
6792
|
-
|
|
6793
|
-
|
|
6794
|
-
welshRequired ? url += 'welsh-required=Y' : url += 'welsh-required=N';
|
|
6795
|
-
}
|
|
6796
|
-
if (externalFlagsOnly) {
|
|
6797
|
-
// Check if anything has been added to the query string; if so, append available-external-flag with '&'
|
|
6798
|
-
url.indexOf('?') > -1 ? url += '&' : url += '?';
|
|
6799
|
-
url += 'available-external-flag=Y';
|
|
6793
|
+
const welshFlagValue = welshRequired ? 'Y' : 'N';
|
|
6794
|
+
requestSearchParams.set('welsh-required', welshFlagValue);
|
|
6800
6795
|
}
|
|
6796
|
+
const externalFlagsValue = externalFlagsOnly ? 'Y' : 'N';
|
|
6797
|
+
requestSearchParams.set('available-external-flag', externalFlagsValue);
|
|
6798
|
+
url = `${url}?${requestSearchParams.toString()}`;
|
|
6801
6799
|
return this.http
|
|
6802
6800
|
.get(url, { observe: 'body' })
|
|
6803
6801
|
.pipe(
|
|
6804
6802
|
// Reference Data Common API returns a single object with a "flags" array, which itself contains a single object
|
|
6805
6803
|
// with a "FlagDetails" array, which contains a hierarchy of flag types in an object - one each for "Party" flags
|
|
6806
6804
|
// and "Case" flags
|
|
6807
|
-
map(body => {
|
|
6805
|
+
map((body) => {
|
|
6808
6806
|
if (!body || !body.flags || !body.flags.length || !body.flags[0].FlagDetails || !body.flags[0].FlagDetails.length) {
|
|
6809
6807
|
// Note: Reference Data Common API appears to respond with a 404 error rather than send an empty response,
|
|
6810
6808
|
// so this may be redundant
|