re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 47 insertions, 17 deletions

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 36976c610e..28b033a64b 100644
--- 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
@@ -1,5 +1,14 @@
 <div include-padding="true" class="sdc-workspace-general-step">
-
+    <div class="w-sdc-main-container-body-content-action-buttons">
+        <div data-ng-if="unsavedFile && !isCreateMode() && !isViewMode()" class="unsaved-file-warning">
+             <span class="sprite-new sdc-warning"></span> Click save to update to the new VSP
+        </div>
+        <button class="tlv-btn blue" data-ng-if="isDesigner()" data-ng-show="isGeneralView()" data-ng-class="{'disabled' : !isValidForm  || isDisableMode() || isViewMode() || isCreateMode()}"  
+            data-ng-click="save()" data-tests-id="create/save" tooltips tooltip-content="Save">Save</button>
+        <span data-ng-if="isDesigner()" data-ng-class="{'disabled' :isDisableMode() || isViewMode() || isCreateMode()}"  ng-click="revert()" class="sprite-new revert-btn" data-tests-id="revert"
+              data-ng-show="isGeneralView()" tooltips tooltip-content="Revert"></span>
+
+    </div>
     <form novalidate class="w-sdc-form" name="editForm" validation-on-load form-to-validate="editForm">
 
         <div class="w-sdc-form-section-container">
@@ -9,10 +18,13 @@
                 <div class="w-sdc-form-column">
                     <div class="upper-general-fields">
                         <div class="selected-icon-container" data-ng-class="{'show-only-on-over':'defaulticon'!=component.icon && !isViewMode()}">
-                            <div class="selected-icon-inner-container">
+                            <div class="selected-icon-inner-container ">
                                 <div class="sprite-new update-component-icon" data-ng-click="updateIcon()" data-ng-if="!isViewMode() && possibleToUpdateIcon()"></div>
                                 <div class="i-sdc-form-item-suggested-icon large selected-icon {{component.iconSprite}} {{component.icon}}"
-                                     data-ng-class="{ 'disable': isViewMode() || !possibleToUpdateIcon() }"
+                                     data-ng-class="{
+                                     'disable': isViewMode() || !possibleToUpdateIcon(),
+                                     'archive-component active-component-static': component.archived
+                                     }"
                                      ng-model="component.icon"
                                      tooltips tooltip-content='{{component.icon | translate}}'
                                 >
@@ -27,7 +39,7 @@
                                        data-ng-class="{'view-mode': isViewMode()}"
                                        name="componentName"
                                        data-ng-init="isCreateMode() && validateName(true)"
-	                               data-ng-maxlength="50"
+                                       data-ng-maxlength="50"
                                        data-ng-model="component.name"
                                        type="text"
                                        data-required
@@ -53,7 +65,7 @@
 
                             <!--------------------- CATEGORIES -------------------->
                             <div class="i-sdc-form-item"
-                     data-ng-class="{'error': validateField(editForm.category)}">
+                                 data-ng-class="{'error': validateField(editForm.category)}">
                                 <loader data-display="!categories && !initCategoreis()" relative="true"></loader>
                                 <label class="i-sdc-form-label required">Category</label>
                                 <select class="i-sdc-form-select"
@@ -132,14 +144,17 @@
                 <div class="w-sdc-form-column">
                     <!--------------------- IMPORT TOSCA FILE USING BROWSE (ALSO VFC) -------------------->
                     <div class="i-sdc-form-item" ng-if="isShowFileBrowse">
+                       
+                        <!-- //                                     element-disabled="{{!isCreateMode()&&!(isEditMode()&&component.resourceType=='VF')&&component.vspArchived}} || {{isViewMode()}}" -->
+
                         <label class="i-sdc-form-label" data-ng-class="{'required':isCreateMode()}">{{browseFileLabel}}</label>
                         <file-upload id="fileUploadElement"
                                      class="i-sdc-form-input"
                                      element-name="fileElement"
-                                     element-disabled="{{!isCreateMode()&&!(isEditMode()&&component.resourceType=='VF')}} || {{isViewMode()}}"
+                                     element-disabled="{{(!isCreateMode()&&!(isEditMode()&&component.resourceType=='VF'))|| isViewMode() || component.vspArchived}}"
                                      form-element="editForm"
                                      file-model="component.importedFile"
-                                     on-file-changed-in-directive="uploadFileChangedInGeneralTab"
+                                     on-file-changed-in-directive="onImportFileChange"
                                      extensions="{{importedFileExtension}}"
                                      default-text="'Browse to select file'"
                                      data-ng-class="{'error':!(isEditMode()&&component.resourceType=='VF') && (!editForm.fileElement.$valid || !component.importedFile.filename)}"></file-upload>
@@ -147,16 +162,16 @@
 
                     <!--------------------- IMPORT TOSCA FILE USING ONBOARDING -------------------->
                     <div class="i-sdc-form-item" ng-if="isShowOnboardingSelectionBrowse">
-                        <label class="i-sdc-form-label required">Select VSP</label>
-                        <div class="i-sdc-form-file-upload i-sdc-form-input">
-                            <span class="i-sdc-form-file-name" data-tests-id="filename">{{(fileModel && fileModel.filename) || importedToscaBrowseFileText}}</span>
-                            <div class="i-sdc-form-file-upload-x-btn" ng-click="cancel()" data-ng-show="fileModel.filename && fileModel.filename!=='' && elementDisabled!=='true'"></div>
-                            <input type="button" name="fileElement"/>
-                            <div class="file-upload-browse-btn" data-ng-click="openOnBoardingModal()" data-tests-id="browseButton">Browse</div>
-                        </div>
+                            <label class="i-sdc-form-label required">Select VSP</label>
+                            <div class="i-sdc-form-file-upload i-sdc-form-input">
+                                <span class="i-sdc-form-file-name"  data-ng-disabled="component.vspArchived"  data-tests-id="filename">{{(fileModel && fileModel.filename) || importedToscaBrowseFileText }}</span>
+                                <div class="i-sdc-form-file-upload-x-btn" ng-click="cancel()" data-ng-show="fileModel.filename && fileModel.filename!=='' && elementDisabled!=='true'"></div>
+                                <input type="button" data-ng-disabled="component.vspArchived" name="fileElement" />
+                                <div class="file-upload-browse-btn" data-ng-click="openOnBoardingModal()" data-ng-disabled="!component.vspArchived" data-tests-id="browseButton">Browse</div>
+                            </div>
                     </div>
 
-                    <div class="input-error-file-upload" data-ng-show="component.importedFile && (!editForm.fileElement.$valid || !component.importedFile.filename)">
+                    <div class="input-error-file-upload"   data-ng-disabled="!component.archived"  data-ng-show="component.importedFile && (!editForm.fileElement.$valid || !component.importedFile.filename)">
                         <!-- editForm.fileElement.$error.required <== Can not use this, because the browse is done from outside for the first time -->
                         <span ng-show="!(isEditMode()&&component.resourceType=='VF')&&!component.importedFile.filename" translate="NEW_SERVICE_RESOURCE_ERROR_TOSCA_FILE_REQUIRED"></span><!-- Required -->
                         <span ng-show="editForm.fileElement.$error.maxsize" translate="VALIDATION_ERROR_MAX_FILE_SIZE"></span>
@@ -283,7 +298,7 @@
                 </div>
                 <!--------------------- Resource Model Number -------------------->
 
-                    <!--------------------- ECOMPGENERATEDNAMING -------------------->
+                <!--------------------- ECOMPGENERATEDNAMING -------------------->
 
                     <div class="i-sdc-form-item"
                          data-ng-class="{'error': validateField(editForm.ecompGeneratedNaming)}"
@@ -307,7 +322,7 @@
 
                     <!--------------------- NAMING POLICY  -------------------->
                     <div ng-if="component.isService()" class="i-sdc-form-item" data-ng-class="{'error': validateField(editForm.namingPolicy)}">
-                        <label class="i-sdc-form-label">Naming policy</label>
+                        <label class="i-sdc-form-label">Naming Policy</label>
                         <input class="i-sdc-form-input"
                                name="namingPolicy"
                                data-ng-class="{'view-mode': isViewMode() || !component.ecompGeneratedNaming}"
@@ -389,6 +404,21 @@
                     </div>
                     <!--------------------- ENVIRONMENT CONTEXT ------------------>
 
+                    <!--------------------- Instantiation Type -------------------->
+                    <div class="i-sdc-form-item" data-ng-if="component.isService() && instantiationTypes">
+                        <label class="i-sdc-form-label">Instantiation Type</label>
+                        <select class="i-sdc-form-select"
+                                name="instantiationType"
+                                data-ng-class="{'view-mode': isViewMode()}"
+                                data-ng-disabled="component.isCsarComponent()"
+                                data-ng-model="component.instantiationType"
+                                data-tests-id="selectInstantiationType">
+                        <option ng-repeat="type in instantiationTypes">{{type}}</option>
+
+                        </select>
+                    </div>
+
+                    <!--------------------- Instantiation Type -------------------->
 
                     <div class="meta-data" data-ng-if="component.creationDate">
                         <div>