summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app
diff options
context:
space:
mode:
authorvasraz <vasyl.razinkov@est.tech>2023-01-18 22:16:17 +0000
committerVasyl Razinkov <vasyl.razinkov@est.tech>2023-01-19 12:30:39 +0000
commit8edfa4dee9fed9be5b38133847c60136294eba80 (patch)
treecd5d9593ed7c8778912a1941e52dde2c8a0748b7 /catalog-ui/src/app
parentc183513f5c5813f6a911a5ceb7ac81405007aaff (diff)
Fix 'Primitive types should not be shown under data types in catalog'-bug
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Ic20f7c5a0784c2107061f268c5c2e03ab34c13cc Issue-ID: SDC-4338
Diffstat (limited to 'catalog-ui/src/app')
-rw-r--r--catalog-ui/src/app/ng2/services/catalog.service.ts2
-rw-r--r--catalog-ui/src/app/services/data-types-service.ts4
2 files changed, 3 insertions, 3 deletions
diff --git a/catalog-ui/src/app/ng2/services/catalog.service.ts b/catalog-ui/src/app/ng2/services/catalog.service.ts
index fcb9dd4006..02ba33088f 100644
--- a/catalog-ui/src/app/ng2/services/catalog.service.ts
+++ b/catalog-ui/src/app/ng2/services/catalog.service.ts
@@ -51,7 +51,7 @@ export class CatalogService {
let searchParams = new HttpParams();
searchParams = searchParams.append('excludeTypes', ResourceType.VFCMT).append('excludeTypes', ResourceType.CONFIGURATION);
const observableComponents = this.http.get<IComponentsArray>(this.baseMicroServiceUrl + this.api.GET_uicache_catalog, {params: searchParams});
- const observableDataTypes = this.dataTypesService.getDataTypesFromAllModel();
+ const observableDataTypes = this.dataTypesService.getDataTypesFromAllModelExcludePrimitives();
return zip(observableComponents, observableDataTypes)
.pipe(map(res => this.processComponentsResponse(res, true)));
}
diff --git a/catalog-ui/src/app/services/data-types-service.ts b/catalog-ui/src/app/services/data-types-service.ts
index b27f4222c4..f3d02a20c0 100644
--- a/catalog-ui/src/app/services/data-types-service.ts
+++ b/catalog-ui/src/app/services/data-types-service.ts
@@ -98,9 +98,9 @@ export class DataTypesService implements IDataTypesService {
return this.dataTypes;
}
- public getDataTypesFromAllModel = (): Observable<Array<DataTypeModel>> => {
+ public getDataTypesFromAllModelExcludePrimitives = (): Observable<Array<DataTypeModel>> => {
return new Observable<Array<DataTypeModel>>(subscriber => {
- this.$http.get<List<DataTypesMap>>(this.baseUrl + "allDataTypes")
+ this.$http.get<List<DataTypesMap>>(this.baseUrl + "allDataTypes?excludePrimitives=true")
.then(promiseValue => {
const allDataTypes = this.getDataTypesItems(promiseValue.data);
subscriber.next(allDataTypes);