From 890588b3e935aa278415cdf08855cb2bce13a37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= Date: Tue, 16 Dec 2025 17:04:59 +0000 Subject: [PATCH 1/4] Unify characteristic input/values into a component --- ...source-spec-characteristics.component.html | 7 ++--- .../edit-resource-spec.component.html | 12 ++++---- .../preview-resource.component.html | 6 ++-- ...ervice-spec-characteristics.component.html | 7 ++--- .../edit-service-specs.component.html | 29 ++++++++++--------- ...ervice-spec-characteristics.component.html | 15 ++++------ .../preview-service-order.component.html | 8 +++-- ...dit-service-characteristics.component.html | 15 +++++----- .../preview-service.component.html | 8 +++-- .../service-order-checkout.component.html | 12 ++++---- src/app/shared.module.ts | 8 ++++- .../characteristic-input.component.html | 11 +++++++ .../characteristic-input.component.scss | 0 .../characteristic-input.component.spec.ts | 23 +++++++++++++++ .../characteristic-input.component.ts | 16 ++++++++++ .../characteristic-value.component.html | 1 + .../characteristic-value.component.scss | 0 .../characteristic-value.component.spec.ts | 23 +++++++++++++++ .../characteristic-value.component.ts | 18 ++++++++++++ 19 files changed, 159 insertions(+), 60 deletions(-) create mode 100644 src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html create mode 100644 src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.scss create mode 100644 src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.spec.ts create mode 100644 src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts create mode 100644 src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html create mode 100644 src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.scss create mode 100644 src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.spec.ts create mode 100644 src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts diff --git a/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec-characteristics/edit-resource-spec-characteristics.component.html b/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec-characteristics/edit-resource-spec-characteristics.component.html index 3ce26fd..d8320a0 100644 --- a/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec-characteristics/edit-resource-spec-characteristics.component.html +++ b/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec-characteristics/edit-resource-spec-characteristics.component.html @@ -121,11 +121,8 @@ Alias - - Value - - - + diff --git a/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec.component.html b/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec.component.html index 2944cf1..d343c7c 100644 --- a/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec.component.html +++ b/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec.component.html @@ -149,13 +149,13 @@
{{spec.resourceSpecRelationship.length}} related Resource Specification(s) assigned
- +
- +
Apply Filter to related Resource Specifications... @@ -163,7 +163,7 @@
- +
{{relatedSpec.name}}
- \ No newline at end of file + diff --git a/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-spec-characteristics/edit-service-spec-characteristics.component.html b/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-spec-characteristics/edit-service-spec-characteristics.component.html index e3df65e..bfeddb6 100644 --- a/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-spec-characteristics/edit-service-spec-characteristics.component.html +++ b/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-spec-characteristics/edit-service-spec-characteristics.component.html @@ -123,11 +123,8 @@ Alias - - Value - - - + diff --git a/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-specs.component.html b/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-specs.component.html index 4f6bd54..6529240 100644 --- a/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-specs.component.html +++ b/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-specs.component.html @@ -119,13 +119,13 @@
-
Relationships Overview
+
Relationships Overview
Relationship graph not available
- + - +
- +
{{relatedSpec.name}} @@ -193,7 +193,7 @@
{{spec.resourceSpecification.length}} related Resource Specification(s) assigned
- +
- +
@@ -535,7 +536,7 @@ {{element.priority}} - + Actions @@ -570,7 +571,7 @@ -
+
@@ -583,4 +584,4 @@
- \ No newline at end of file + diff --git a/src/app/p_services/admin/orderManagement/preview-service-order/edit-service-order-items/edit-orders-service-spec-characteristics/edit-orders-service-spec-characteristics.component.html b/src/app/p_services/admin/orderManagement/preview-service-order/edit-service-order-items/edit-orders-service-spec-characteristics/edit-orders-service-spec-characteristics.component.html index bfd45da..6629057 100644 --- a/src/app/p_services/admin/orderManagement/preview-service-order/edit-service-order-items/edit-orders-service-spec-characteristics/edit-orders-service-spec-characteristics.component.html +++ b/src/app/p_services/admin/orderManagement/preview-service-order/edit-service-order-items/edit-orders-service-spec-characteristics/edit-orders-service-spec-characteristics.component.html @@ -47,15 +47,12 @@ - - Custom Value - - - - - + diff --git a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html index 950134d..b23460c 100644 --- a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html +++ b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html @@ -391,8 +391,10 @@ - {{specCharacteristic.value.value}} ({{specCharacteristic.value.alias}}) - + + ({{specCharacteristic.value.alias}}) @@ -515,4 +517,4 @@ - \ No newline at end of file + diff --git a/src/app/p_services/admin/serviceActivationAndConfiguration/edit-service-characteristics/edit-service-characteristics.component.html b/src/app/p_services/admin/serviceActivationAndConfiguration/edit-service-characteristics/edit-service-characteristics.component.html index 11a47b2..8700907 100644 --- a/src/app/p_services/admin/serviceActivationAndConfiguration/edit-service-characteristics/edit-service-characteristics.component.html +++ b/src/app/p_services/admin/serviceActivationAndConfiguration/edit-service-characteristics/edit-service-characteristics.component.html @@ -60,13 +60,12 @@ - - Custom Value - - - + @@ -194,4 +193,4 @@ - \ No newline at end of file + diff --git a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html index fc1630d..c4402bc 100644 --- a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html +++ b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html @@ -292,8 +292,12 @@ - {{specCharacteristic.value.value}} ({{specCharacteristic.value.alias}}) + + ({{ + specCharacteristic.value.alias + }}) diff --git a/src/app/p_services/orderCheckout/service-order-checkout/service-order-checkout.component.html b/src/app/p_services/orderCheckout/service-order-checkout/service-order-checkout.component.html index 52ba9cc..7e77428 100644 --- a/src/app/p_services/orderCheckout/service-order-checkout/service-order-checkout.component.html +++ b/src/app/p_services/orderCheckout/service-order-checkout/service-order-checkout.component.html @@ -67,11 +67,11 @@ - - Custom Value - - + @@ -218,4 +218,4 @@ - \ No newline at end of file + diff --git a/src/app/shared.module.ts b/src/app/shared.module.ts index 75e8f53..f530227 100644 --- a/src/app/shared.module.ts +++ b/src/app/shared.module.ts @@ -26,6 +26,8 @@ import { DeleteOrganizationComponent } from './shared/components/partyManagement import { ListIndividualsComponent } from './shared/components/partyManagement/list-individuals/list-individuals.component'; import { EditIndividualsComponent } from './shared/components/partyManagement/edit-individuals/edit-individuals.component'; import { DeleteIndividualComponent } from './shared/components/partyManagement/delete-individual/delete-individual.component'; +import { CharacteristicInputComponent } from './shared/components/catalogManagement/characteristic-input/characteristic-input.component'; +import { CharacteristicValueComponent } from './shared/components/inventoryManagement/characteristic-value/characteristic-value.component'; import { jsonParsePipe } from './shared/pipes/jsonParsePipe'; @@ -78,7 +80,9 @@ const routes: Routes = [ ListIndividualsComponent, EditIndividualsComponent, DeleteIndividualComponent, - AssistantComponent + AssistantComponent, + CharacteristicInputComponent, + CharacteristicValueComponent ], imports: [ RouterModule.forChild(routes), @@ -139,6 +143,8 @@ const routes: Routes = [ ListIndividualsComponent, EditIndividualsComponent, DeleteIndividualComponent, + CharacteristicInputComponent, + CharacteristicValueComponent, FormsModule, ReactiveFormsModule, MatTableModule, diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html new file mode 100644 index 0000000..223305a --- /dev/null +++ b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html @@ -0,0 +1,11 @@ + + + + + {{ label }} + + + + + diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.scss b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.spec.ts b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.spec.ts new file mode 100644 index 0000000..a70ee91 --- /dev/null +++ b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CharacteristicInputComponent } from './characteristic-input.component'; + +describe('CharacteristicInputComponent', () => { + let component: CharacteristicInputComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ CharacteristicInputComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(CharacteristicInputComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts new file mode 100644 index 0000000..78dbf87 --- /dev/null +++ b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts @@ -0,0 +1,16 @@ +import { Component, Input } from '@angular/core'; +import { NgControl } from '@angular/forms'; + +@Component({ + selector: 'app-characteristic-input', + templateUrl: './characteristic-input.component.html', + styleUrls: ['./characteristic-input.component.scss'], +}) +export class CharacteristicInputComponent { + @Input() valueType: string; + @Input() label: string = "Value"; + + @Input() appearance: string; + + constructor(public ngControl: NgControl) {} +} diff --git a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html new file mode 100644 index 0000000..6648dc4 --- /dev/null +++ b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html @@ -0,0 +1 @@ +{{ this.valueRender() }} diff --git a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.scss b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.spec.ts b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.spec.ts new file mode 100644 index 0000000..896934a --- /dev/null +++ b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CharacteristicValueComponent } from './characteristic-value.component'; + +describe('CharacteristicValueComponent', () => { + let component: CharacteristicValueComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ CharacteristicValueComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(CharacteristicValueComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts new file mode 100644 index 0000000..f540c72 --- /dev/null +++ b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts @@ -0,0 +1,18 @@ +import { Component, Input } from '@angular/core'; + +@Component({ + selector: 'app-characteristic-value', + templateUrl: './characteristic-value.component.html', + styleUrls: ['./characteristic-value.component.scss'] +}) +export class CharacteristicValueComponent { + @Input() value: string; + @Input() valueType: string; + + valueRender(): string { + switch (this.valueType) { + default: + return this.value; + } + } +} -- GitLab From ac14fb79f159ca6c285e54cd1e52e09e67087e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= Date: Tue, 16 Dec 2025 17:04:59 +0000 Subject: [PATCH 2/4] Improve LONGTEXT input --- .../characteristic-input.component.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html index 223305a..696bfe9 100644 --- a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html +++ b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html @@ -1,6 +1,15 @@ + + + {{ label }} + + + + + {{ label }} -- GitLab From 202aba46b81b1e9817d007b26d9ab7c58d6b4063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Capucho?= Date: Tue, 16 Dec 2025 17:04:59 +0000 Subject: [PATCH 3/4] Secret characteristics UI improvements --- .../characteristic-input.component.html | 11 +++++++++++ .../characteristic-input.component.ts | 2 ++ .../characteristic-value.component.html | 3 +++ .../characteristic-value.component.ts | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html index 696bfe9..b8bf81b 100644 --- a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html +++ b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html @@ -1,6 +1,17 @@ + + + {{ label }} + + + + + + {{ label }} diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts index 78dbf87..91cf4bd 100644 --- a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts +++ b/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts @@ -12,5 +12,7 @@ export class CharacteristicInputComponent { @Input() appearance: string; + exposeSecret: boolean = false; + constructor(public ngControl: NgControl) {} } diff --git a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html index 6648dc4..5657f6f 100644 --- a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html +++ b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html @@ -1 +1,4 @@ {{ this.valueRender() }} + diff --git a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts index f540c72..3a3d975 100644 --- a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts +++ b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts @@ -9,8 +9,12 @@ export class CharacteristicValueComponent { @Input() value: string; @Input() valueType: string; + exposeSecret: boolean = false; + valueRender(): string { switch (this.valueType) { + case "SECRET": + return this.exposeSecret ? this.value : "********"; default: return this.value; } -- GitLab From 828083f8e94744349b39f85bfb136272821c46b8 Mon Sep 17 00:00:00 2001 From: Kostis Trantzas Date: Fri, 17 Jul 2026 14:36:17 +0300 Subject: [PATCH 4/4] CSS fixes, and moving the common shared components under the same directory --- .../edit-resource-spec-characteristics.component.html | 4 ++-- .../edit-resource-spec/edit-resource-spec.component.html | 2 +- .../preview-resource/preview-resource.component.html | 2 +- .../edit-service-spec-characteristics.component.html | 4 ++-- .../edit-service-specs/edit-service-specs.component.html | 2 +- .../preview-service-order.component.html | 2 +- .../preview-service/preview-service.component.html | 2 +- src/app/shared.module.ts | 4 ++-- .../characteristic-input.component.html | 9 +++++++-- .../characteristic-input.component.scss | 0 .../characteristic-input.component.spec.ts | 0 .../characteristic-input.component.ts | 3 ++- .../characteristic-value.component.html | 6 ++++++ .../characteristic-value.component.scss | 0 .../characteristic-value.component.spec.ts | 0 .../characteristic-value.component.ts | 2 +- .../characteristic-value.component.html | 4 ---- 17 files changed, 27 insertions(+), 19 deletions(-) rename src/app/shared/components/{catalogManagement => characteristicManagement}/characteristic-input/characteristic-input.component.html (80%) rename src/app/shared/components/{catalogManagement => characteristicManagement}/characteristic-input/characteristic-input.component.scss (100%) rename src/app/shared/components/{catalogManagement => characteristicManagement}/characteristic-input/characteristic-input.component.spec.ts (100%) rename src/app/shared/components/{catalogManagement => characteristicManagement}/characteristic-input/characteristic-input.component.ts (90%) create mode 100644 src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.html rename src/app/shared/components/{inventoryManagement => characteristicManagement}/characteristic-value/characteristic-value.component.scss (100%) rename src/app/shared/components/{inventoryManagement => characteristicManagement}/characteristic-value/characteristic-value.component.spec.ts (100%) rename src/app/shared/components/{inventoryManagement => characteristicManagement}/characteristic-value/characteristic-value.component.ts (84%) delete mode 100644 src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html diff --git a/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec-characteristics/edit-resource-spec-characteristics.component.html b/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec-characteristics/edit-resource-spec-characteristics.component.html index d8320a0..9876908 100644 --- a/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec-characteristics/edit-resource-spec-characteristics.component.html +++ b/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec-characteristics/edit-resource-spec-characteristics.component.html @@ -116,7 +116,7 @@ [formGroupName]="i" class="row align-items-center justify-content-center characteristic-value-container" [@fadeIn] >
-
+
Alias @@ -200,7 +200,7 @@
Value - +
diff --git a/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec.component.html b/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec.component.html index d343c7c..cf3abd0 100644 --- a/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec.component.html +++ b/src/app/p_resources/admin/catalogManagement/edit-resource-spec/edit-resource-spec.component.html @@ -262,7 +262,7 @@ [value]="val.value.value" [valueType]="element.valueType"> ({{val.value.alias}}) + *ngIf="val.value.alias"> ({{val.value.alias}})
diff --git a/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html b/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html index fb0f291..9cac265 100644 --- a/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html +++ b/src/app/p_resources/admin/inventoryManagement/preview-resource/preview-resource.component.html @@ -226,7 +226,7 @@ - ({{ + ({{ specCharacteristic.value.alias }}) diff --git a/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-spec-characteristics/edit-service-spec-characteristics.component.html b/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-spec-characteristics/edit-service-spec-characteristics.component.html index bfeddb6..07e46df 100644 --- a/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-spec-characteristics/edit-service-spec-characteristics.component.html +++ b/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-spec-characteristics/edit-service-spec-characteristics.component.html @@ -118,7 +118,7 @@
-
+
Alias @@ -202,7 +202,7 @@
Value - +
diff --git a/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-specs.component.html b/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-specs.component.html index 6529240..bd8dc77 100644 --- a/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-specs.component.html +++ b/src/app/p_services/admin/catalogManagement/edit-service-specs/edit-service-specs.component.html @@ -307,7 +307,7 @@ - ({{val.value.alias}}) + ({{val.value.alias}})
diff --git a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html index b23460c..d50e1ad 100644 --- a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html +++ b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html @@ -394,7 +394,7 @@ - ({{specCharacteristic.value.alias}}) + ({{specCharacteristic.value.alias}}) diff --git a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html index c4402bc..99c7cc0 100644 --- a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html +++ b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html @@ -295,7 +295,7 @@ - ({{ + ({{ specCharacteristic.value.alias }}) diff --git a/src/app/shared.module.ts b/src/app/shared.module.ts index f530227..3c25ab5 100644 --- a/src/app/shared.module.ts +++ b/src/app/shared.module.ts @@ -26,8 +26,8 @@ import { DeleteOrganizationComponent } from './shared/components/partyManagement import { ListIndividualsComponent } from './shared/components/partyManagement/list-individuals/list-individuals.component'; import { EditIndividualsComponent } from './shared/components/partyManagement/edit-individuals/edit-individuals.component'; import { DeleteIndividualComponent } from './shared/components/partyManagement/delete-individual/delete-individual.component'; -import { CharacteristicInputComponent } from './shared/components/catalogManagement/characteristic-input/characteristic-input.component'; -import { CharacteristicValueComponent } from './shared/components/inventoryManagement/characteristic-value/characteristic-value.component'; +import { CharacteristicInputComponent } from './shared/components/characteristicManagement/characteristic-input/characteristic-input.component'; +import { CharacteristicValueComponent } from './shared/components/characteristicManagement/characteristic-value/characteristic-value.component'; import { jsonParsePipe } from './shared/pipes/jsonParsePipe'; diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html b/src/app/shared/components/characteristicManagement/characteristic-input/characteristic-input.component.html similarity index 80% rename from src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html rename to src/app/shared/components/characteristicManagement/characteristic-input/characteristic-input.component.html index b8bf81b..7fade00 100644 --- a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.html +++ b/src/app/shared/components/characteristicManagement/characteristic-input/characteristic-input.component.html @@ -16,8 +16,13 @@ {{ label }} - + diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.scss b/src/app/shared/components/characteristicManagement/characteristic-input/characteristic-input.component.scss similarity index 100% rename from src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.scss rename to src/app/shared/components/characteristicManagement/characteristic-input/characteristic-input.component.scss diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.spec.ts b/src/app/shared/components/characteristicManagement/characteristic-input/characteristic-input.component.spec.ts similarity index 100% rename from src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.spec.ts rename to src/app/shared/components/characteristicManagement/characteristic-input/characteristic-input.component.spec.ts diff --git a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts b/src/app/shared/components/characteristicManagement/characteristic-input/characteristic-input.component.ts similarity index 90% rename from src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts rename to src/app/shared/components/characteristicManagement/characteristic-input/characteristic-input.component.ts index 91cf4bd..5530d87 100644 --- a/src/app/shared/components/catalogManagement/characteristic-input/characteristic-input.component.ts +++ b/src/app/shared/components/characteristicManagement/characteristic-input/characteristic-input.component.ts @@ -14,5 +14,6 @@ export class CharacteristicInputComponent { exposeSecret: boolean = false; - constructor(public ngControl: NgControl) {} + constructor(public ngControl: NgControl) { + } } diff --git a/src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.html b/src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.html new file mode 100644 index 0000000..698ee18 --- /dev/null +++ b/src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.html @@ -0,0 +1,6 @@ + + {{ this.valueRender() }} + + diff --git a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.scss b/src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.scss similarity index 100% rename from src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.scss rename to src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.scss diff --git a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.spec.ts b/src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.spec.ts similarity index 100% rename from src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.spec.ts rename to src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.spec.ts diff --git a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts b/src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.ts similarity index 84% rename from src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts rename to src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.ts index 3a3d975..83fdd90 100644 --- a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.ts +++ b/src/app/shared/components/characteristicManagement/characteristic-value/characteristic-value.component.ts @@ -14,7 +14,7 @@ export class CharacteristicValueComponent { valueRender(): string { switch (this.valueType) { case "SECRET": - return this.exposeSecret ? this.value : "********"; + return this.exposeSecret ? this.value : "\u2217\u2217\u2217\u2217\u2217\u2217"; default: return this.value; } diff --git a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html b/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html deleted file mode 100644 index 5657f6f..0000000 --- a/src/app/shared/components/inventoryManagement/characteristic-value/characteristic-value.component.html +++ /dev/null @@ -1,4 +0,0 @@ -{{ this.valueRender() }} - -- GitLab