[SDC-29] rebase continue work to align source

Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>

4 files changed, 60 insertions, 6 deletions

diff --git a/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal-view-model.ts b/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal-view-model.ts
new file mode 100644
index 0000000000..61a83c88f7
--- /dev/null
+++ b/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal-view-model.ts
@@ -0,0 +1,29 @@
+'use strict';
+
+export interface IConformanceLevelModalModelScope {
+    footerButtons:Array<any>;
+    modalInstance:ng.ui.bootstrap.IModalServiceInstance;
+}
+
+export class ConformanceLevelModalViewModel {
+
+    static '$inject' = ['$scope', '$uibModalInstance'];
+
+    constructor(private $scope:IConformanceLevelModalModelScope,
+                private $uibModalInstance:ng.ui.bootstrap.IModalServiceInstance) {
+
+        this.initScope();
+    }
+
+    private initScope = ():void => {
+
+        this.$scope.modalInstance = this.$uibModalInstance;
+
+        this.$scope.footerButtons = [
+            {'name': 'Continue', 'css': 'grey', 'callback': this.$uibModalInstance.close},
+            {'name': 'Reject', 'css': 'blue', 'callback': this.$uibModalInstance.dismiss}
+        ];
+
+    };
+
+}
diff --git a/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal-view.html b/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal-view.html
new file mode 100644
index 0000000000..3577e4d77b
--- /dev/null
+++ b/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal-view.html
@@ -0,0 +1,22 @@
+<sdc-modal modal="modalInstance"
+           type="classic"
+           class="w-sdc-modal modal-type-alert conformance-level-modal"
+           header="Warning"
+           buttons="footerButtons"
+           show-close-button="false">
+
+    <perfect-scrollbar include-padding="true">
+        <div class="w-sdc-modal-body-content" data-tests-id="message">
+            <p>
+                You are about to distribute a service with models and artifacts created with an <b>older version of the platform</b>.
+                For such service, new properties, metadata and requirements needed by ECOMP components will not be available.
+            </p><p>
+                It is highly recommended that you upgrade the service models and artifacts.
+            </p><p>
+                Click "Continue" if you need to distribute the current service version.<br />
+                Click "Reject" if you need to stop the distribution and manually upgrade the service.
+            </p>
+        </div>
+    </perfect-scrollbar>
+
+</sdc-modal>
diff --git a/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal.less b/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal.less
new file mode 100644
index 0000000000..7f195ade83
--- /dev/null
+++ b/catalog-ui/src/app/view-models/modals/conformance-level-modal/conformance-level-modal.less
@@ -0,0 +1,3 @@
+.conformance-level-modal{
+
+}
diff --git a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html
index 3657fad017..b078a4b1ef 100644
--- a/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html
+++ b/catalog-ui/src/app/view-models/modals/onboarding-modal/onboarding-modal-view.html
@@ -9,9 +9,9 @@
             <input type="text"
                    class="search-text"
                    placeholder="Search"
-                   data-ng-model="searchBind"
+                   data-ng-model="search.filterTerm"
                    data-tests-id="onboarding-search"
-                   ng-model-options="{ debounce: 500 }" />
+                   ng-model-options="{ debounce: 300 }" />
             <span class="w-sdc-search-icon magnification"></span>
         </div>
     </div>
@@ -38,16 +38,16 @@
                     <div infinite-scroll-disabled='allItemsDisplayed'  infinite-scroll="increaseNumItemsToDisplay()" infinite-scroll-container="'#onboarding-modal-scrollbar-container'">
 
                     <!-- Loop on components list -->
-                    <div data-ng-repeat-start="component in componentsList | filter: searchBind | orderBy:sortBy:reverse | limitTo:numberOfItemsToDisplay track by $index"
+                    <div data-ng-repeat-start="component in componentsList | filter: search | orderBy:sortBy:reverse | limitTo:numberOfItemsToDisplay track by $index"
                          class="flex-container data-row"
-                         data-ng-class="{'selected': component === selectedComponent}"
+                         data-ng-class="{'selected': component.packageId === selectedComponent.packageId}"
                          data-ng-click="doSelectComponent(component);"
                          data-tests-id="csar-row"
                          >
 
                         <!-- Name -->
                         <div class="table-col-general flex-item"  sdc-smart-tooltip>
-                            <span class="sprite table-arrow" data-ng-class="{'opened': component === selectedComponent}" data-tests-id="{{component.name}}"></span>
+                            <span class="sprite table-arrow" data-ng-class="{'opened': component.packageId === selectedComponent.packageId}" data-tests-id="{{component.name}}"></span>
                             {{component.name}}
                         </div>
 
@@ -71,7 +71,7 @@
 
                     </div>
 
-                    <div data-ng-repeat-end="" data-ng-if="component===selectedComponent" class="item-opened">
+                    <div data-ng-repeat-end="" data-ng-if="component.packageId === selectedComponent.packageId" class="item-opened">
 
                         <div class="item-opened-description">
                             <div class="item-opened-description-title">VSP Description:</div>