Support default value for category specific metadata

Issue-ID: SDC-3513
Signed-off-by: davsad <david.sadlier@est.tech>
Change-Id: I4697b66c6d59c1464cf81f9c68fe76b6ca24472c

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java
index 84b23fe..754420d 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/CategoriesImportManager.java
@@ -255,6 +255,7 @@ public class CategoriesImportManager {
             metadataKeyDef.setMandatory(mandatory);
             List<String> validValues = (List<String>) metadataKeyInfo.get(MetadataKeyEnum.VALID_VALUES.getName());
             metadataKeyDef.setValidValues(validValues);
+            metadataKeyDef.setDefaultValue((String) metadataKeyInfo.get(MetadataKeyEnum.DEFAULT.getName()));
             metadataKeyDefs.add(metadataKeyDef);
         }
         return metadataKeyDefs;

diff --git a/catalog-ui/src/app/models/category.ts b/catalog-ui/src/app/models/category.ts
index 64588d0..2c1bc21 100644 (file)
--- a/catalog-ui/src/app/models/category.ts
+++ b/catalog-ui/src/app/models/category.ts
@@ -50,6 +50,7 @@ export interface IGroup extends ICategoryBase {
 
 export interface IMetadataKey {
        name:string;
-       mandatory:boolean
+       mandatory:boolean;
        validValues: string[];
+       defaultValue: string;
 }

diff --git a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts
index 54caa42..1065404 100644 (file)
--- a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts
+++ b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view-model.ts
@@ -634,14 +634,14 @@ export class GeneralViewModel {
             if (this.$scope.component.categories[0].metadataKeys) {
                 for (let metadataKey of this.$scope.component.categories[0].metadataKeys) {
                     if (!this.$scope.component.categorySpecificMetadata[metadataKey.name]) {
-                        this.$scope.component.categorySpecificMetadata[metadataKey.name] = "";
+                        this.$scope.component.categorySpecificMetadata[metadataKey.name] = metadataKey.defaultValue ? metadataKey.defaultValue : "";
                    }
                 }
             }
             if (this.$scope.component.categories[0].subcategories && this.$scope.component.categories[0].subcategories[0].metadataKeys) {
                 for (let metadataKey of this.$scope.component.categories[0].subcategories[0].metadataKeys) {
                     if (!this.$scope.component.categorySpecificMetadata[metadataKey.name]) {
-                        this.$scope.component.categorySpecificMetadata[metadataKey.name] = "";
+                        this.$scope.component.categorySpecificMetadata[metadataKey.name] = metadataKey.defaultValue ? metadataKey.defaultValue : "";
                    }
                 }
             }
@@ -678,9 +678,17 @@ export class GeneralViewModel {
             return this.getMetadataKey(this.$scope.component.categories, key) != null;
         }
 
-       this.$scope.isCategoryServiceMetadataKey = (key: string): boolean => {
+        this.$scope.isCategoryServiceMetadataKey = (key: string): boolean => {
             return this.isServiceMetadataKey(key);
         }
+
+        this.$scope.isMetadataKeyForComponentCategoryService = (key: string, attribute: string): boolean => {
+            let metadatakey = this.getMetadataKey(this.$scope.component.categories, key);
+            if (metadatakey && (!this.$scope.component[attribute] || !metadatakey.validValues.find(v => v === this.$scope.component[attribute]))) {
+                this.$scope.component[attribute] = metadatakey.defaultValue;
+            }
+            return metadatakey != null;
+         }
     }
 
     private setUnsavedChanges = (hasChanges: boolean): void => {

diff --git a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view.html b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view.html
index cb661f7..40300c8 100644 (file)
--- a/catalog-ui/src/app/view-models/workspace/tabs/general/general-view.html
+++ b/catalog-ui/src/app/view-models/workspace/tabs/general/general-view.html
@@ -375,12 +375,12 @@
 
                     <!--------------------- NAMING POLICY  -------------------->
                     <div ng-if="component.isService()" class="i-sdc-form-item" data-ng-class="{'error': validateField(editForm.namingPolicy)}">
-                        <div ng-if="component.selectedCategory && isMetadataKeyForComponentCategory('Naming Policy')">
+                        <div ng-if="component.selectedCategory && isMetadataKeyForComponentCategoryService('Naming Policy', 'namingPolicy')">
                                <div ng-if="isMetadataKeyMandatory('Naming Policy')">
                                 <label class="i-sdc-form-label required">Naming Policy</label>
                                </div>
                                <div ng-if="!isMetadataKeyMandatory('Naming Policy')">
-                                <label class="i-sdc-form-label" translate="GENERAL_TAB_LABEL_NAMING_POLICY"></label>
+                                <label class="i-sdc-form-label">Naming Policy</label>
                                </div>
                                <select class="i-sdc-form-input" type="text"
                                       ng-required="isMetadataKeyMandatory('Naming Policy')"
@@ -420,7 +420,7 @@
                     <div ng-if="component.isService()"
                          class="i-sdc-form-item"
                          data-ng-class="{'error': validateField(editForm.serviceFunctionType)}">
-                        <div ng-if="component.selectedCategory && isMetadataKeyForComponentCategory('Service Type')">
+                        <div ng-if="component.selectedCategory && isMetadataKeyForComponentCategoryService('Service Type', 'serviceType')">
                                <div ng-if="isMetadataKeyMandatory('Service Type')">
                                 <label class="i-sdc-form-label required" translate="GENERAL_TAB_LABEL_SERVICE_TYPE"></label>
                             </div>
@@ -462,7 +462,7 @@
                     <div ng-if="component.isService()"
                          class="i-sdc-form-item"
                          data-ng-class="{'error': validateField(editForm.serviceRole)}">
-                        <div ng-if="component.selectedCategory && isMetadataKeyForComponentCategory('Service Role')">
+                        <div ng-if="component.selectedCategory && isMetadataKeyForComponentCategoryService('Service Role', 'serviceRole')">
                                <div ng-if="isMetadataKeyMandatory('Service Role')">
                                 <label class="i-sdc-form-label required" translate="GENERAL_TAB_LABEL_SERVICE_ROLE"></label>
                                </div>
@@ -502,10 +502,15 @@
                     <div ng-if="component.isService()"
                          class="i-sdc-form-item"
                          data-ng-class="{'error': validateField(editForm.serviceFunction)}">
-                        <label class="i-sdc-form-label required" translate="GENERAL_TAB_LABEL_SERVICE_FUNCTION"></label>
-                        <div ng-if="component.selectedCategory && isMetadataKeyForComponentCategory('Service Function')">
+                        <div ng-if="component.selectedCategory && isMetadataKeyForComponentCategoryService('Service Function', 'serviceFunction')">
+                            <div ng-if="isMetadataKeyMandatory('Service Function')">
+                                <label class="i-sdc-form-label required" translate="GENERAL_TAB_LABEL_SERVICE_FUNCTION"></label>
+                            </div>
+                            <div ng-if="!isMetadataKeyMandatory('Service Function')">
+                                <label class="i-sdc-form-label" translate="GENERAL_TAB_LABEL_SERVICE_FUNCTION"></label>
+                            </div>
                                <select class="i-sdc-form-input" type="text"
-                                      data-required
+                                      ng-required="isMetadataKeyMandatory('Service Function')"
                                       data-ng-class="{'view-mode': isViewMode()}"
                                       data-ng-model="component.serviceFunction"
                                       data-ng-model-options="{ debounce: 500 }"
@@ -517,13 +522,14 @@
                                </select>
                         </div>
                         <div ng-if="!component.selectedCategory || !isMetadataKeyForComponentCategory('Service Function')">
+                              <label class="i-sdc-form-label" translate="GENERAL_TAB_LABEL_SERVICE_FUNCTION"></label>
                               <input class="i-sdc-form-input" type="text"
                                       data-ng-class="{'view-mode': isViewMode()}"
                                       data-ng-model="component.serviceFunction"
                                       name="serviceFunction"
                                       data-tests-id="serviceFunction"
-                                      data-ng-maxlength="256"
-                                      data-ng-pattern="validation.ServiceTypeAndRoleValidationPattern"
+                                      data-ng-maxlength="256"
+                                      data-ng-pattern="validation.ServiceTypeAndRoleValidationPattern"
                                />
                         </div>
                         <div class="input-error" data-ng-show="validateField(editForm.serviceFunction)">

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/category/MetadataKeyDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/category/MetadataKeyDataDefinition.java
index 4d8a197..3278ec6 100644 (file)
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/category/MetadataKeyDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/category/MetadataKeyDataDefinition.java
@@ -35,10 +35,12 @@ public class MetadataKeyDataDefinition extends ToscaDataDefinition {
     private String name;
     private List<String> validValues;
     private boolean mandatory;
+    private String defaultValue;
     
     public MetadataKeyDataDefinition(MetadataKeyDataDefinition metadataKeyDataDefinition) {
         this.name = metadataKeyDataDefinition.name;
         this.validValues = metadataKeyDataDefinition.validValues;
         this.mandatory = metadataKeyDataDefinition.mandatory;
+        this.defaultValue = metadataKeyDataDefinition.defaultValue;
     }
 }

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/MetadataKeyEnum.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/MetadataKeyEnum.java
index 138c60b..aab37d1 100644 (file)
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/MetadataKeyEnum.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/MetadataKeyEnum.java
@@ -27,7 +27,8 @@ public enum MetadataKeyEnum {
     METADATA_KEYS("metadataKeys"),
     NAME("name"),
     MANDATORY("mandatory"),
-    VALID_VALUES("validValues");
+    VALID_VALUES("validValues"),
+    DEFAULT("default");
 
     private final String name;