From 5df3bfc70f59e2c83ed286bee565ab5c76bc8a97 Mon Sep 17 00:00:00 2001 From: AnurosePrakash Date: Thu, 13 Jul 2023 17:11:14 +0200 Subject: [PATCH 1/5] feat:adding parameterization options to asset details card --- fake-backend/json/assets.json | 6 +- .../asset-property-grid-group-builder.ts | 68 +++++++++++++------ 2 files changed, 53 insertions(+), 21 deletions(-) diff --git a/fake-backend/json/assets.json b/fake-backend/json/assets.json index 82202a573..905297ee9 100644 --- a/fake-backend/json/assets.json +++ b/fake-backend/json/assets.json @@ -18,7 +18,11 @@ "http://w3id.org/mds#dataModel": "my-data-model-001", "http://w3id.org/mds#geoReferenceMethod": "my-geo-reference-method", "http://w3id.org/mds#transportMode": "Rail", - "asset:prop:some-unsupported-property": "F10E2821BBBEA527EA02200352313BC059445190" + "asset:prop:some-unsupported-property": "test", + "asset:prop:datasource:http:hints:proxyBody":"true", + "asset:prop:datasource:http:hints:proxyMethod":"true", + "asset:prop:datasource:http:hints:proxyPath":"true", + "asset:prop:datasource:http:hints:proxyQueryParams":"true" } }, { diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts index c67aff321..2f164de2c 100644 --- a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts +++ b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts @@ -1,23 +1,21 @@ -import {Injectable} from '@angular/core'; -import {MatDialog} from '@angular/material/dialog'; -import {CatalogContractOffer} from '@sovity.de/broker-server-client'; -import {ActiveFeatureSet} from '../../../core/config/active-feature-set'; -import {Policy} from '../../../core/services/api/legacy-managent-api-client'; -import {AssetProperties} from '../../../core/services/asset-properties'; -import {Asset} from '../../../core/services/models/asset'; -import {BrokerDataOffer} from '../../../routes/broker-ui/catalog-page/catalog-page/mapping/broker-data-offer'; -import {ContractAgreementCardMapped} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped'; -import {JsonDialogComponent} from '../../json-dialog/json-dialog/json-dialog.component'; -import {JsonDialogData} from '../../json-dialog/json-dialog/json-dialog.data'; -import {PropertyGridGroup} from '../../property-grid/property-grid-group/property-grid-group'; -import {PropertyGridField} from '../../property-grid/property-grid/property-grid-field'; -import {PropertyGridFieldService} from '../../property-grid/property-grid/property-grid-field.service'; -import {formatDateAgo} from '../../ui-elements/ago/formatDateAgo'; -import { - getOnlineStatusColor, - getOnlineStatusIcon, -} from '../icon-with-online-status/online-status-utils'; -import {getLegacyPolicy} from './policy-utils'; +import { Injectable } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { CatalogContractOffer } from '@sovity.de/broker-server-client'; +import { ActiveFeatureSet } from '../../../core/config/active-feature-set'; +import { Policy } from '../../../core/services/api/legacy-managent-api-client'; +import { AssetProperties } from '../../../core/services/asset-properties'; +import { Asset } from '../../../core/services/models/asset'; +import { BrokerDataOffer } from '../../../routes/broker-ui/catalog-page/catalog-page/mapping/broker-data-offer'; +import { ContractAgreementCardMapped } from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped'; +import { JsonDialogComponent } from '../../json-dialog/json-dialog/json-dialog.component'; +import { JsonDialogData } from '../../json-dialog/json-dialog/json-dialog.data'; +import { PropertyGridGroup } from '../../property-grid/property-grid-group/property-grid-group'; +import { PropertyGridField } from '../../property-grid/property-grid/property-grid-field'; +import { PropertyGridFieldService } from '../../property-grid/property-grid/property-grid-field.service'; +import { formatDateAgo } from '../../ui-elements/ago/formatDateAgo'; +import { getOnlineStatusColor, getOnlineStatusIcon } from '../icon-with-online-status/online-status-utils'; +import { getLegacyPolicy } from './policy-utils'; + @Injectable() export class AssetPropertyGridGroupBuilder { @@ -88,6 +86,26 @@ export class AssetPropertyGridGroupBuilder { fields.push(...this.buildMdsProperties(asset, true)); } + if ( + asset.httpProxyMethod != null || + asset.httpProxyBody != null || + asset.httpProxyPath != null || + asset.httpProxyQueryParams != null + ) { + let showDetailsObject = {httpProxyMethod: asset.httpProxyPath}; + fields.push({ + icon: '', + label: 'Parameterization', + text: 'Show Details', + onclick: () => + this.onShowDetailsClick( + `Parameterization Options`, + asset.name, + showDetailsObject, + ), + }); + } + return { groupLabel, properties: fields, @@ -177,6 +195,16 @@ export class AssetPropertyGridGroupBuilder { this.matDialog.open(JsonDialogComponent, {data}); } + onShowDetailsClick(title: string, subtitle: string, details: {}) { + const data: JsonDialogData = { + title, + subtitle, + icon: 'info', + objectForJson: details, + }; + this.matDialog.open(JsonDialogComponent, {data}); + } + buildContractOfferGroup( asset: Asset, contractOffer: CatalogContractOffer, From e56241a35144fd050dfa4b876482cbf0b44accc9 Mon Sep 17 00:00:00 2001 From: AnurosePrakash Date: Tue, 18 Jul 2023 14:03:36 +0200 Subject: [PATCH 2/5] chore: adding parameterization options to asset details --- fake-backend/json/assets.json | 4 +- fake-backend/json/contractAgreementPage.json | 4 +- .../asset-property-grid-group-builder.ts | 71 ++++++++++++------- .../asset-page/asset-page.module.ts | 8 ++- ...ameterization-detail-dialog.component.html | 19 +++++ ...arameterization-detail-dialog.component.ts | 15 ++++ .../parameterization-detail-dialog.data.ts | 10 +++ 7 files changed, 99 insertions(+), 32 deletions(-) create mode 100644 src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.html create mode 100644 src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.ts create mode 100644 src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.data.ts diff --git a/fake-backend/json/assets.json b/fake-backend/json/assets.json index 905297ee9..32904814e 100644 --- a/fake-backend/json/assets.json +++ b/fake-backend/json/assets.json @@ -21,8 +21,8 @@ "asset:prop:some-unsupported-property": "test", "asset:prop:datasource:http:hints:proxyBody":"true", "asset:prop:datasource:http:hints:proxyMethod":"true", - "asset:prop:datasource:http:hints:proxyPath":"true", - "asset:prop:datasource:http:hints:proxyQueryParams":"true" + "asset:prop:datasource:http:hints:proxyPath":"false", + "asset:prop:datasource:http:hints:proxyQueryParams":"false" } }, { diff --git a/fake-backend/json/contractAgreementPage.json b/fake-backend/json/contractAgreementPage.json index 5a2aeadfb..9aee5e065 100644 --- a/fake-backend/json/contractAgreementPage.json +++ b/fake-backend/json/contractAgreementPage.json @@ -127,9 +127,9 @@ "http://w3id.org/mds#dataModel": "my-data-model-001", "http://w3id.org/mds#geoReferenceMethod": "my-geo-reference-method", "http://w3id.org/mds#transportMode": "Rail", - "asset:prop:some-unsupported-property": "F10E2821BBBEA527EA02200352313BC059445190", + "asset:prop:some-unsupported-property": "test", "asset:prop:datasource:http:hints:proxyMethod": "true", - "asset:prop:datasource:http:hints:proxyPath": "true", + "asset:prop:datasource:http:hints:proxyPath": "false", "asset:prop:datasource:http:hints:proxyQueryParams": "true", "asset:prop:datasource:http:hints:proxyBody": "true" } diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts index 2f164de2c..0908446f5 100644 --- a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts +++ b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts @@ -1,20 +1,32 @@ -import { Injectable } from '@angular/core'; -import { MatDialog } from '@angular/material/dialog'; -import { CatalogContractOffer } from '@sovity.de/broker-server-client'; -import { ActiveFeatureSet } from '../../../core/config/active-feature-set'; -import { Policy } from '../../../core/services/api/legacy-managent-api-client'; -import { AssetProperties } from '../../../core/services/asset-properties'; -import { Asset } from '../../../core/services/models/asset'; -import { BrokerDataOffer } from '../../../routes/broker-ui/catalog-page/catalog-page/mapping/broker-data-offer'; -import { ContractAgreementCardMapped } from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped'; -import { JsonDialogComponent } from '../../json-dialog/json-dialog/json-dialog.component'; -import { JsonDialogData } from '../../json-dialog/json-dialog/json-dialog.data'; -import { PropertyGridGroup } from '../../property-grid/property-grid-group/property-grid-group'; -import { PropertyGridField } from '../../property-grid/property-grid/property-grid-field'; -import { PropertyGridFieldService } from '../../property-grid/property-grid/property-grid-field.service'; -import { formatDateAgo } from '../../ui-elements/ago/formatDateAgo'; -import { getOnlineStatusColor, getOnlineStatusIcon } from '../icon-with-online-status/online-status-utils'; -import { getLegacyPolicy } from './policy-utils'; +import {Injectable} from '@angular/core'; +import {MatDialog} from '@angular/material/dialog'; +import {CatalogContractOffer} from '@sovity.de/broker-server-client'; +import {ActiveFeatureSet} from '../../../core/config/active-feature-set'; +import {Policy} from '../../../core/services/api/legacy-managent-api-client'; +import {AssetProperties} from '../../../core/services/asset-properties'; +import {Asset} from '../../../core/services/models/asset'; +import {BrokerDataOffer} from '../../../routes/broker-ui/catalog-page/catalog-page/mapping/broker-data-offer'; +import { + ParameterizationDetailDialogComponent +} from '../../../routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component'; +import { + ContractAgreementCardMapped +} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped'; +import {JsonDialogComponent} from '../../json-dialog/json-dialog/json-dialog.component'; +import {JsonDialogData} from '../../json-dialog/json-dialog/json-dialog.data'; +import {PropertyGridGroup} from '../../property-grid/property-grid-group/property-grid-group'; +import {PropertyGridField} from '../../property-grid/property-grid/property-grid-field'; +import {PropertyGridFieldService} from '../../property-grid/property-grid/property-grid-field.service'; +import {formatDateAgo} from '../../ui-elements/ago/formatDateAgo'; +import { + getOnlineStatusColor, + getOnlineStatusIcon, +} from '../icon-with-online-status/online-status-utils'; +import {getLegacyPolicy} from './policy-utils'; +import { + assetParameterizationDetail, + ParameterizationDetailDialogData +} from "../../../routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.data"; @Injectable() @@ -23,7 +35,8 @@ export class AssetPropertyGridGroupBuilder { private matDialog: MatDialog, private activeFeatureSet: ActiveFeatureSet, private propertyGridUtils: PropertyGridFieldService, - ) {} + ) { + } buildAssetPropertiesGroup( asset: Asset, @@ -92,10 +105,16 @@ export class AssetPropertyGridGroupBuilder { asset.httpProxyPath != null || asset.httpProxyQueryParams != null ) { - let showDetailsObject = {httpProxyMethod: asset.httpProxyPath}; + + let showDetailsObject = { + httpProxyMethod: asset.httpProxyMethod ? "Enabled" : "Disabled", + httpProxyBody: asset.httpProxyBody ? "Enabled" : "Disabled", + httpProxyPath: asset.httpProxyPath ? "Enabled" : "Disabled", + httpProxiedQueryParams: asset.httpProxyQueryParams ? "Enabled" : "Disabled" + }; fields.push({ - icon: '', - label: 'Parameterization', + icon: 'list', + label: 'Parameterization Options', text: 'Show Details', onclick: () => this.onShowDetailsClick( @@ -195,14 +214,14 @@ export class AssetPropertyGridGroupBuilder { this.matDialog.open(JsonDialogComponent, {data}); } - onShowDetailsClick(title: string, subtitle: string, details: {}) { - const data: JsonDialogData = { + onShowDetailsClick(title: string, subtitle: string, details: assetParameterizationDetail) { + const data: ParameterizationDetailDialogData = { title, subtitle, - icon: 'info', - objectForJson: details, + icon: 'list', + objectForDetailDialog: details, }; - this.matDialog.open(JsonDialogComponent, {data}); + this.matDialog.open(ParameterizationDetailDialogComponent, {data}); } buildContractOfferGroup( diff --git a/src/app/routes/connector-ui/asset-page/asset-page.module.ts b/src/app/routes/connector-ui/asset-page/asset-page.module.ts index 90a4bfb63..6f163bdaf 100644 --- a/src/app/routes/connector-ui/asset-page/asset-page.module.ts +++ b/src/app/routes/connector-ui/asset-page/asset-page.module.ts @@ -31,8 +31,10 @@ import {DataSubcategoryItemsPipe} from './data-subcategory-select/data-subcatego import {DataSubcategorySelectComponent} from './data-subcategory-select/data-subcategory-select.component'; import {KeywordSelectComponent} from './keyword-select/keyword-select.component'; import {LanguageSelectComponent} from './language-select/language-select.component'; +import {ParameterizationDetailDialogComponent} from './parameterization-detail-dialog/parameterization-detail-dialog.component'; import {TransportModeSelectComponent} from './transport-mode-select/transport-mode-select.component'; + @NgModule({ imports: [ // Angular @@ -71,12 +73,14 @@ import {TransportModeSelectComponent} from './transport-mode-select/transport-mo AssetCreateDialogComponent, AssetPageComponent, DataCategorySelectComponent, - DataSubcategorySelectComponent, DataSubcategoryItemsPipe, + DataSubcategorySelectComponent, KeywordSelectComponent, LanguageSelectComponent, + ParameterizationDetailDialogComponent, TransportModeSelectComponent, ], exports: [AssetPageComponent], }) -export class AssetPageModule {} +export class AssetPageModule { +} diff --git a/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.html b/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.html new file mode 100644 index 000000000..def991875 --- /dev/null +++ b/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.html @@ -0,0 +1,19 @@ +
+ {{ data.icon }} +
+
{{ data.title }}
+
{{ data.subtitle }}
+
+
+ +
+
    +
  • + {{ key }} : {{ data.objectForDetailDialog[key] }} +
  • +
+
+ +
+ +
diff --git a/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.ts b/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.ts new file mode 100644 index 000000000..fd2f28307 --- /dev/null +++ b/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.ts @@ -0,0 +1,15 @@ +import {Component, Inject} from '@angular/core'; +import {MAT_DIALOG_DATA} from '@angular/material/dialog'; +import {ParameterizationDetailDialogData} from './parameterization-detail-dialog.data'; + +@Component({ + selector: 'app-parameterization-detail-dialog', + templateUrl: './parameterization-detail-dialog.component.html', +}) +export class ParameterizationDetailDialogComponent{ + constructor( + @Inject(MAT_DIALOG_DATA) public data: ParameterizationDetailDialogData, + ) {} + + Object = Object; +} diff --git a/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.data.ts b/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.data.ts new file mode 100644 index 000000000..75eb0dc2d --- /dev/null +++ b/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.data.ts @@ -0,0 +1,10 @@ +export interface ParameterizationDetailDialogData { + title: string; + subtitle: string; + icon: string; + objectForDetailDialog: assetParameterizationDetail; +} + +export interface assetParameterizationDetail { + [key: string]: string; +} From 58871657ca60b1514f271c5b52f6158bab39b851 Mon Sep 17 00:00:00 2001 From: AnurosePrakash Date: Tue, 18 Jul 2023 14:21:36 +0200 Subject: [PATCH 3/5] chore: Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c84c3c5e..fbb4394b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ the detailed section referring to by linking pull requests or issues. #### Added +- Added viewing of parameterization options to asset details + #### Changed #### Removed From 9ab8ca5c186e4840873f7ef55d9d0eb3f9a94462 Mon Sep 17 00:00:00 2001 From: AnurosePrakash Date: Tue, 18 Jul 2023 14:26:14 +0200 Subject: [PATCH 4/5] chore: run format --- fake-backend/json/assets.json | 8 ++--- .../asset-property-grid-group-builder.ts | 35 +++++++++---------- ...arameterization-detail-dialog.component.ts | 2 +- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/fake-backend/json/assets.json b/fake-backend/json/assets.json index 32904814e..10c9df995 100644 --- a/fake-backend/json/assets.json +++ b/fake-backend/json/assets.json @@ -19,10 +19,10 @@ "http://w3id.org/mds#geoReferenceMethod": "my-geo-reference-method", "http://w3id.org/mds#transportMode": "Rail", "asset:prop:some-unsupported-property": "test", - "asset:prop:datasource:http:hints:proxyBody":"true", - "asset:prop:datasource:http:hints:proxyMethod":"true", - "asset:prop:datasource:http:hints:proxyPath":"false", - "asset:prop:datasource:http:hints:proxyQueryParams":"false" + "asset:prop:datasource:http:hints:proxyBody": "true", + "asset:prop:datasource:http:hints:proxyMethod": "true", + "asset:prop:datasource:http:hints:proxyPath": "false", + "asset:prop:datasource:http:hints:proxyQueryParams": "false" } }, { diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts index 0908446f5..fb5b5e490 100644 --- a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts +++ b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts @@ -6,12 +6,12 @@ import {Policy} from '../../../core/services/api/legacy-managent-api-client'; import {AssetProperties} from '../../../core/services/asset-properties'; import {Asset} from '../../../core/services/models/asset'; import {BrokerDataOffer} from '../../../routes/broker-ui/catalog-page/catalog-page/mapping/broker-data-offer'; +import {ParameterizationDetailDialogComponent} from '../../../routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component'; import { - ParameterizationDetailDialogComponent -} from '../../../routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component'; -import { - ContractAgreementCardMapped -} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped'; + ParameterizationDetailDialogData, + assetParameterizationDetail, +} from '../../../routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.data'; +import {ContractAgreementCardMapped} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped'; import {JsonDialogComponent} from '../../json-dialog/json-dialog/json-dialog.component'; import {JsonDialogData} from '../../json-dialog/json-dialog/json-dialog.data'; import {PropertyGridGroup} from '../../property-grid/property-grid-group/property-grid-group'; @@ -23,11 +23,6 @@ import { getOnlineStatusIcon, } from '../icon-with-online-status/online-status-utils'; import {getLegacyPolicy} from './policy-utils'; -import { - assetParameterizationDetail, - ParameterizationDetailDialogData -} from "../../../routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.data"; - @Injectable() export class AssetPropertyGridGroupBuilder { @@ -35,8 +30,7 @@ export class AssetPropertyGridGroupBuilder { private matDialog: MatDialog, private activeFeatureSet: ActiveFeatureSet, private propertyGridUtils: PropertyGridFieldService, - ) { - } + ) {} buildAssetPropertiesGroup( asset: Asset, @@ -105,12 +99,13 @@ export class AssetPropertyGridGroupBuilder { asset.httpProxyPath != null || asset.httpProxyQueryParams != null ) { - let showDetailsObject = { - httpProxyMethod: asset.httpProxyMethod ? "Enabled" : "Disabled", - httpProxyBody: asset.httpProxyBody ? "Enabled" : "Disabled", - httpProxyPath: asset.httpProxyPath ? "Enabled" : "Disabled", - httpProxiedQueryParams: asset.httpProxyQueryParams ? "Enabled" : "Disabled" + httpProxyMethod: asset.httpProxyMethod ? 'Enabled' : 'Disabled', + httpProxyBody: asset.httpProxyBody ? 'Enabled' : 'Disabled', + httpProxyPath: asset.httpProxyPath ? 'Enabled' : 'Disabled', + httpProxiedQueryParams: asset.httpProxyQueryParams + ? 'Enabled' + : 'Disabled', }; fields.push({ icon: 'list', @@ -214,7 +209,11 @@ export class AssetPropertyGridGroupBuilder { this.matDialog.open(JsonDialogComponent, {data}); } - onShowDetailsClick(title: string, subtitle: string, details: assetParameterizationDetail) { + onShowDetailsClick( + title: string, + subtitle: string, + details: assetParameterizationDetail, + ) { const data: ParameterizationDetailDialogData = { title, subtitle, diff --git a/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.ts b/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.ts index fd2f28307..219219f37 100644 --- a/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.ts +++ b/src/app/routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component.ts @@ -6,7 +6,7 @@ import {ParameterizationDetailDialogData} from './parameterization-detail-dialog selector: 'app-parameterization-detail-dialog', templateUrl: './parameterization-detail-dialog.component.html', }) -export class ParameterizationDetailDialogComponent{ +export class ParameterizationDetailDialogComponent { constructor( @Inject(MAT_DIALOG_DATA) public data: ParameterizationDetailDialogData, ) {} From 64c46c81b10dc2a42330a4937c6583b7f346b847 Mon Sep 17 00:00:00 2001 From: AnurosePrakash Date: Thu, 20 Jul 2023 15:58:13 +0200 Subject: [PATCH 5/5] chore: formatting with lines --- .../asset-property-grid-group-builder.ts | 59 +++++++++++-------- .../asset-page/asset-page.module.ts | 4 +- .../contract-agreement-page.service.ts | 1 - 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts index fb5b5e490..ed4f436e7 100644 --- a/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts +++ b/src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts @@ -6,12 +6,16 @@ import {Policy} from '../../../core/services/api/legacy-managent-api-client'; import {AssetProperties} from '../../../core/services/asset-properties'; import {Asset} from '../../../core/services/models/asset'; import {BrokerDataOffer} from '../../../routes/broker-ui/catalog-page/catalog-page/mapping/broker-data-offer'; -import {ParameterizationDetailDialogComponent} from '../../../routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component'; +import { + ParameterizationDetailDialogComponent +} from '../../../routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.component'; import { ParameterizationDetailDialogData, assetParameterizationDetail, } from '../../../routes/connector-ui/asset-page/parameterization-detail-dialog/parameterization-detail-dialog.data'; -import {ContractAgreementCardMapped} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped'; +import { + ContractAgreementCardMapped +} from '../../../routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-card-mapped'; import {JsonDialogComponent} from '../../json-dialog/json-dialog/json-dialog.component'; import {JsonDialogData} from '../../json-dialog/json-dialog/json-dialog.data'; import {PropertyGridGroup} from '../../property-grid/property-grid-group/property-grid-group'; @@ -24,13 +28,15 @@ import { } from '../icon-with-online-status/online-status-utils'; import {getLegacyPolicy} from './policy-utils'; + @Injectable() export class AssetPropertyGridGroupBuilder { constructor( private matDialog: MatDialog, private activeFeatureSet: ActiveFeatureSet, private propertyGridUtils: PropertyGridFieldService, - ) {} + ) { + } buildAssetPropertiesGroup( asset: Asset, @@ -99,25 +105,7 @@ export class AssetPropertyGridGroupBuilder { asset.httpProxyPath != null || asset.httpProxyQueryParams != null ) { - let showDetailsObject = { - httpProxyMethod: asset.httpProxyMethod ? 'Enabled' : 'Disabled', - httpProxyBody: asset.httpProxyBody ? 'Enabled' : 'Disabled', - httpProxyPath: asset.httpProxyPath ? 'Enabled' : 'Disabled', - httpProxiedQueryParams: asset.httpProxyQueryParams - ? 'Enabled' - : 'Disabled', - }; - fields.push({ - icon: 'list', - label: 'Parameterization Options', - text: 'Show Details', - onclick: () => - this.onShowDetailsClick( - `Parameterization Options`, - asset.name, - showDetailsObject, - ), - }); + this.addParametrizationFields(asset, fields); } return { @@ -126,6 +114,30 @@ export class AssetPropertyGridGroupBuilder { }; } + private addParametrizationFields(asset: Asset, fields: PropertyGridField[]) { + let showDetailsObject = { + httpProxyMethod: asset.httpProxyMethod ? 'Enabled' : 'Disabled', + httpProxyBody: asset.httpProxyBody ? 'Enabled' : 'Disabled', + httpProxyPath: asset.httpProxyPath ? 'Enabled' : 'Disabled', + httpProxiedQueryParams: asset.httpProxyQueryParams + ? 'Enabled' + : 'Disabled', + }; + + fields.push({ + icon: 'list', + label: 'Parameterization Options', + text: 'Show Details', + onclick: () => + this.onShowDetailsClick( + `Parameterization Options`, + asset.name, + 'list', + showDetailsObject, + ), + }); + } + buildAdditionalPropertiesGroup(asset: Asset): PropertyGridGroup { const fields: PropertyGridField[] = []; @@ -212,12 +224,13 @@ export class AssetPropertyGridGroupBuilder { onShowDetailsClick( title: string, subtitle: string, + icon: string, details: assetParameterizationDetail, ) { const data: ParameterizationDetailDialogData = { title, subtitle, - icon: 'list', + icon, objectForDetailDialog: details, }; this.matDialog.open(ParameterizationDetailDialogComponent, {data}); diff --git a/src/app/routes/connector-ui/asset-page/asset-page.module.ts b/src/app/routes/connector-ui/asset-page/asset-page.module.ts index 6f163bdaf..65d5d7fcd 100644 --- a/src/app/routes/connector-ui/asset-page/asset-page.module.ts +++ b/src/app/routes/connector-ui/asset-page/asset-page.module.ts @@ -34,7 +34,6 @@ import {LanguageSelectComponent} from './language-select/language-select.compone import {ParameterizationDetailDialogComponent} from './parameterization-detail-dialog/parameterization-detail-dialog.component'; import {TransportModeSelectComponent} from './transport-mode-select/transport-mode-select.component'; - @NgModule({ imports: [ // Angular @@ -82,5 +81,4 @@ import {TransportModeSelectComponent} from './transport-mode-select/transport-mo ], exports: [AssetPageComponent], }) -export class AssetPageModule { -} +export class AssetPageModule {} diff --git a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.service.ts b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.service.ts index 2ac9782bc..313f34443 100644 --- a/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.service.ts +++ b/src/app/routes/connector-ui/contract-agreement-page/contract-agreement-page/contract-agreement-page.service.ts @@ -13,7 +13,6 @@ import {ContractAgreementCardMapped} from '../contract-agreement-cards/contract- import {ContractAgreementCardMappedService} from '../contract-agreement-cards/contract-agreement-card-mapped.service'; import {ContractAgreementPageData} from './contract-agreement-page.data'; - @Injectable({providedIn: 'root'}) export class ContractAgreementPageService { constructor(