From 8dc65f554336541c0cd605e0fe6587dd2ca6bdd0 Mon Sep 17 00:00:00 2001
From: imamSidero <imam.hussain@est.tech>
Date: Tue, 15 Nov 2022 10:18:16 +0000
Subject: Provide tosca function to map values

Providing the capability to add tosca function as the map values against it's key

Issue-ID: SDC-4264
Signed-off-by: Imam hussain <imam.hussain@est.tech>
Change-Id: Ieaa49f9ac18b848bfd3996e9c6e08f9b4a32b999
---
 .../dynamic-property.component.html                |  6 ++++--
 .../dynamic-property.component.less                |  7 ++++++-
 .../dynamic-property/dynamic-property.component.ts | 23 ++++++++++++++++++++++
 .../properties-table.component.html                |  2 +-
 .../properties-table/properties-table.component.ts |  5 +++++
 5 files changed, 39 insertions(+), 4 deletions(-)

(limited to 'catalog-ui/src/app/ng2/components')

diff --git a/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.html b/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.html
index 4553bcbd01..2431a70536 100644
--- a/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.html
+++ b/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.html
@@ -43,9 +43,10 @@
     <!-- RIGHT CELL OR FULL WIDTH CELL-->
     <ng-container *ngIf="propType == derivedPropertyTypes.SIMPLE || property.isDeclared || property.isToscaFunction() || (property.isChildOfListOrMap && propType == derivedPropertyTypes.MAP && property.schema.property.isSimpleType)">
         <div class="table-cell">
+            <checkbox class="inline-checkBox" *ngIf="(nestedLevel == 1 && property.isChildOfListOrMap && propType == derivedPropertyTypes.MAP && property.schema.property.isSimpleType)" [(checked)]="property.isSelected" [disabled]="property.isDisabled || readonly || property.mapKey == ''" (checkedChange)="toggleTosca.emit(property)" ></checkbox>
             <dynamic-element class="value-input"
                 pattern="validationUtils.getValidationPattern(property.type)"
-                [value]="property.isDeclared || property.isToscaFunction() ? property.value : property.valueObj"
+                [value]="(property.isDeclared || property.isToscaFunction()) ? property.value : property.valueObj"
                 [type]="property.isDeclared || property.isToscaFunction() ? 'string' : property.type"
                 [name]="property.name"
                 [path]="property.propertiesName"
@@ -65,7 +66,7 @@
         <div class="table-cell empty"></div>
     </ng-container>
     <!-- ICONS: add, delete, and expand -->
-    <ng-container *ngIf="!property.isDeclared && !property.isToscaFunction()">
+    <ng-container *ngIf="(!property.isDeclared && !property.isToscaFunction()) || (property.isToscaFunction() && property.isChildOfListOrMap && propType == derivedPropertyTypes.MAP && property.schema.property.isSimpleType)">
             <a *ngIf="(propType == derivedPropertyTypes.LIST) && (!property.isChildOfListOrMap || property.mapInlist)" class="property-icon add-item" (click)="createNewChildProperty();" [ngClass]="{'disabled':readonly || preventInsertItem(property)}" [attr.data-tests-id]="'add-to-list-' + propertyTestsId">Add value to list</a>
             <a *ngIf="(propType == derivedPropertyTypes.MAP) && (!property.isChildOfListOrMap || property.mapInlist)" class="property-icon add-item" (click)="createNewChildProperty();" [ngClass]="{'disabled':readonly || preventInsertItem(property)}" [attr.data-tests-id]="'add-to-list-' + propertyTestsId">Add value to map</a>
             <span *ngIf="property.isChildOfListOrMap" (click)="deleteItem.emit(property);" class="property-icon sprite-new delete-item-icon" [ngClass]="{'disabled':readonly}" [attr.data-tests-id]="'delete-from-list-' + propertyTestsId"></span>
@@ -93,6 +94,7 @@
             (clickOnPropertyRow)="onClickPropertyRow($event)"
             (checkProperty)="checkedChange($event)"
             (addChildPropsToParent)="addChildProps($event, prop.propertiesName)"
+            (toggleTosca)="toggleToscaFunction($event)"
             >
         </dynamic-property>
     </ng-container>
diff --git a/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.less b/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.less
index 1007292854..4d2cc89dfe 100644
--- a/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.less
+++ b/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.less
@@ -81,4 +81,9 @@
     outline: none;
     box-sizing: border-box;
 }
-
+.inline-checkBox {
+    float: left;
+    width: 7%;
+    margin-left: -5px;
+    margin-top: 4px;
+}
diff --git a/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.ts b/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.ts
index 6b018c160a..360cfac6a0 100644
--- a/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.ts
+++ b/catalog-ui/src/app/ng2/components/logic/properties-table/dynamic-property/dynamic-property.component.ts
@@ -27,6 +27,7 @@ import { trigger, state, style, transition, animate } from '@angular/animations'
 import {PropertiesUtils} from "../../../../pages/properties-assignment/services/properties.utils";
 import {IUiElementChangeEvent} from "../../../ui/form-components/ui-element-base.component";
 import {DynamicElementComponent} from "../../../ui/dynamic-element/dynamic-element.component";
+import {SubPropertyToscaFunction} from "app/models/sub-property-tosca-function";
 
 @Component({
     selector: 'dynamic-property',
@@ -57,6 +58,7 @@ export class DynamicPropertyComponent {
     @Output('propertyChanged') emitter: EventEmitter<void> = new EventEmitter<void>();
     @Output() expandChild: EventEmitter<string> = new EventEmitter<string>();
     @Output() checkProperty: EventEmitter<string> = new EventEmitter<string>();
+    @Output() toggleTosca: EventEmitter<DerivedFEProperty> = new EventEmitter<DerivedFEProperty>();
     @Output() deleteItem: EventEmitter<string> = new EventEmitter<string>();
     @Output() clickOnPropertyRow: EventEmitter<PropertyFEModel | DerivedFEProperty> = new EventEmitter<PropertyFEModel | DerivedFEProperty>();
     @Output() mapKeyChanged: EventEmitter<string> = new EventEmitter<string>();
@@ -131,6 +133,10 @@ export class DynamicPropertyComponent {
         this.checkProperty.emit(propName);
     }
 
+    toggleToscaFunction = (prop: DerivedFEProperty) => {
+        this.toggleTosca.emit(prop);
+    }
+
     getHasChildren = (property:DerivedFEProperty): boolean => {// enter to this function only from base property (PropertyFEModel) and check for child property if it has children
         return _.filter((<PropertyFEModel>this.property).flattenedChildren,(prop:DerivedFEProperty)=>{
             return _.startsWith(prop.propertiesName + '#', property.propertiesName);
@@ -222,6 +228,15 @@ export class DynamicPropertyComponent {
                     delete itemParent.valueObjValidation[oldKey];
                     itemParent.valueObjIsValid = itemParent.calculateValueObjIsValid();
                 }
+                if (this.property.subPropertyToscaFunctions !== null) {
+                    let tempSubToscaFunction: SubPropertyToscaFunction[] = [];
+                    this.property.subPropertyToscaFunctions.forEach((item : SubPropertyToscaFunction, index) => {
+                        if(item.subPropertyPath[0] != oldKey){
+                            tempSubToscaFunction.push(item);
+                        }
+                    });
+                    this.property.subPropertyToscaFunctions = tempSubToscaFunction;
+                }
                 this.property.childPropMapKeyUpdated(item, null);  // remove map key
             } else {
                 const itemIndex: number = this.property.flattenedChildren.filter(prop => prop.parentName == item.parentName).map(prop => prop.propertiesName).indexOf(item.propertiesName);
@@ -241,7 +256,15 @@ export class DynamicPropertyComponent {
 
     updateChildKeyInParent(childProp: DerivedFEProperty, newMapKey: string) {
         if (this.property instanceof PropertyFEModel) {
+            let oldKey = childProp.getActualMapKey();
             this.property.childPropMapKeyUpdated(childProp, newMapKey);
+            if (this.property.subPropertyToscaFunctions != null) {
+                this.property.subPropertyToscaFunctions.forEach((item : SubPropertyToscaFunction) => {
+                    if(item.subPropertyPath[0] === oldKey){
+                        item.subPropertyPath = [newMapKey];
+                    }
+                });
+            }
             this.emitter.emit();
         }
     }
diff --git a/catalog-ui/src/app/ng2/components/logic/properties-table/properties-table.component.html b/catalog-ui/src/app/ng2/components/logic/properties-table/properties-table.component.html
index 2d8fa7705d..6e4edddeb4 100644
--- a/catalog-ui/src/app/ng2/components/logic/properties-table/properties-table.component.html
+++ b/catalog-ui/src/app/ng2/components/logic/properties-table/properties-table.component.html
@@ -89,7 +89,7 @@
                         (expandChild)="property.updateExpandedChildPropertyId($event)"
                         (clickOnPropertyRow)="onClickPropertyInnerRow($event, instanceId)"
                         (checkProperty)="propertyChecked(property, $event)"
-
+                        (toggleTosca)="toggleToscaFunction($event)"
                         >
                         
                     </dynamic-property>
diff --git a/catalog-ui/src/app/ng2/components/logic/properties-table/properties-table.component.ts b/catalog-ui/src/app/ng2/components/logic/properties-table/properties-table.component.ts
index f78728695c..a0b401386b 100644
--- a/catalog-ui/src/app/ng2/components/logic/properties-table/properties-table.component.ts
+++ b/catalog-ui/src/app/ng2/components/logic/properties-table/properties-table.component.ts
@@ -47,6 +47,7 @@ export class PropertiesTableComponent implements OnChanges {
     @Output() selectPropertyRow: EventEmitter<PropertyRowSelectedEvent> = new EventEmitter<PropertyRowSelectedEvent>();
     @Output() updateCheckedPropertyCount: EventEmitter<boolean> = new EventEmitter<boolean>(); // only for hasDeclareOption
     @Output() updateCheckedChildPropertyCount: EventEmitter<boolean> = new EventEmitter<boolean>();//only for hasDeclareListOption
+    @Output() togggleToscaBtn: EventEmitter<boolean> = new EventEmitter<boolean>();
     @Output() deleteProperty: EventEmitter<PropertyFEModel> = new EventEmitter<PropertyFEModel>();
     private selectedPropertyToDelete: PropertyFEModel;
 
@@ -108,6 +109,10 @@ export class PropertiesTableComponent implements OnChanges {
         }
     }
 
+    toggleToscaFunction = (prop: DerivedFEProperty) => {
+        this.togggleToscaBtn.emit(prop.isSelected);
+    };
+
     onDeleteProperty = () => {
         this.deleteProperty.emit(this.selectedPropertyToDelete);
         this.modalService.closeCurrentModal();
-- 
cgit 1.2.3-korg