re base code

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

1 files changed, 47 insertions, 66 deletions

diff --git a/catalog-ui/src/app/view-models/dashboard/dashboard-view.html b/catalog-ui/src/app/view-models/dashboard/dashboard-view.html
index bddcbcd46c..8279232b13 100644
--- a/catalog-ui/src/app/view-models/dashboard/dashboard-view.html
+++ b/catalog-ui/src/app/view-models/dashboard/dashboard-view.html
@@ -8,74 +8,53 @@
 
     <div class="w-sdc-main-container">
 
-        <perfect-scrollbar include-padding="true" class="w-sdc-main-right-container">
-
-            <div class='w-sdc-row-flex-items'>
-
-                <!-- ADD Component -->
-                <div ng-if="user.role === 'DESIGNER'" class="w-sdc-dashboard-card-new"
-                    data-ng-mouseleave="displayActions = false"
-                    data-ng-mouseover="displayActions = true"
-                    data-ng-init="displayActions = false">
-                    <div class="w-sdc-dashboard-card-new-content" data-tests-id="AddButtonsArea">
-                        <div class="w-sdc-dashboard-card-new-content-plus" data-ng-show="!displayActions"></div>
-                        <div class="sdc-dashboard-create-element-container" data-ng-show="displayActions">
-                            <button data-ng-if="roles[user.role].dashboard.showCreateNew" data-tests-id="createResourceButton" class="tlv-btn outline blue" data-ng-click="openCreateModal('RESOURCE')">Add VF</button>
-                            <button data-ng-if="roles[user.role].dashboard.showCreateNew" data-tests-id="createCRButton" class="tlv-btn outline blue" data-ng-click="createCR()">Add CR</button>
-                            <button data-ng-if="roles[user.role].dashboard.showCreateNew" data-tests-id="createPNFButton" class="tlv-btn outline blue" data-ng-click="createPNF()">Add PNF</button>
-                            <button data-ng-if="roles[user.role].dashboard.showCreateNew" data-tests-id="createServiceButton" class="tlv-btn outline blue" data-ng-click="openCreateModal('SERVICE')">Add Service</button>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Import Component -->
-                <div ng-if="user.role === 'DESIGNER'" class="w-sdc-dashboard-card-new"
-                    data-ng-mouseleave="displayActions = false"
-                    data-ng-mouseover="displayActions = true"
-                    data-ng-init="displayActions = false">
-                    <div class="w-sdc-dashboard-card-new-content" data-tests-id="importButtonsArea"  >
-                        <div class="w-sdc-dashboard-card-import-content-plus" data-ng-show="!displayActions"></div>
-                        <div class="sdc-dashboard-import-element-container" data-ng-show="displayActions">
-                            <div data-ng-if="roles[user.role].dashboard.showCreateNew" class="tlv-btn outline blue">Import VFC
-                                <file-opener on-file-upload="onImportVfc(file)" data-tests-id="importVFCbutton" extensions="{{sdcConfig.toscaFileExtension}}" data-ng-click="displayActions=false"></file-opener>
-                            </div>
-                            <div data-ng-if="roles[user.role].dashboard.showCreateNew" class="tlv-btn outline blue" data-ng-click="notificationIconCallback()">Import VSP</div>
-                            <div data-ng-if="roles[user.role].dashboard.showCreateNew" class="tlv-btn outline blue import-dcae">Import DCAE asset
-                                <file-opener on-file-upload="onImportVf(file)" data-tests-id="importVFbutton" extensions="{{sdcConfig.csarFileExtension}}" data-ng-click="displayActions=false"></file-opener>
+        <perfect-scrollbar id="dashboard-main-scroll" include-padding="true" class="w-sdc-main-right-container">
+
+            <div infinite-scroll-disabled='isAllItemDisplay' infinite-scroll="raiseNumberOfElementToDisplay()" infinite-scroll-container="'#dashboard-main-scroll'" infinite-scroll-distance="'0.2'" infinite-scroll-parent>
+
+                <div class='w-sdc-row-flex-items'>
+
+                    <!-- ADD Component -->
+                    <div ng-if="user.role === 'DESIGNER'" class="w-sdc-dashboard-card-new"
+                        data-ng-mouseleave="displayActions = false"
+                        data-ng-mouseover="displayActions = true"
+                        data-ng-init="displayActions = false">
+                        <div class="w-sdc-dashboard-card-new-content" data-tests-id="AddButtonsArea">
+                            <div class="w-sdc-dashboard-card-new-content-plus" data-ng-show="!displayActions"></div>
+                            <div class="sdc-dashboard-create-element-container" data-ng-show="displayActions">
+                                <button data-ng-if="roles[user.role].dashboard.showCreateNew" data-tests-id="createResourceButton" class="tlv-btn outline blue" data-ng-click="openCreateModal('RESOURCE')">Add VF</button>
+                                <button data-ng-if="roles[user.role].dashboard.showCreateNew" data-tests-id="createCRButton" class="tlv-btn outline blue" data-ng-click="createCR()">Add CR</button>
+                                <button data-ng-if="roles[user.role].dashboard.showCreateNew" data-tests-id="createPNFButton" class="tlv-btn outline blue" data-ng-click="createPNF()">Add PNF</button>
+                                <button data-ng-if="roles[user.role].dashboard.showCreateNew" data-tests-id="createServiceButton" class="tlv-btn outline blue" data-ng-click="openCreateModal('SERVICE')">Add Service</button>
                             </div>
                         </div>
                     </div>
-                </div>
 
-                <!-- Tile new -->
-                <div class="sdc-tile sdc-tile-fix-width" data-ng-repeat="component in components | filter:{resourceType:('!'+vfcmtType)} | entityFilter:checkboxesFilter | filter:search">
-                 
-                    <div class='sdc-tile-header' data-ng-class="{'purple': component.isResource(), 'blue': !component.isResource()}">
-                        <div data-ng-if="component.isResource()" data-tests-id="asset-type">{{component.getComponentSubType()}}</div>
-                        <div data-ng-if="component.isService()">S</div>
-                    </div>
-
-                    <div class='sdc-tile-content' data-tests-id="dashboard-Elements" data-ng-click="goToComponent(component)">
-                        <div class='sdc-tile-content-icon'>
-                            <div class="{{component.iconSprite}} {{component.icon}}"
-                                data-ng-class="{'sprite-resource-icons': component.isResource(), 'sprite-services-icons': component.isService()}"
-                                data-tests-id="{{component.name}}"></div>
-                        </div>
-
-                        <div class='sdc-tile-content-info'>
-                            <div class="sdc-tile-info-line title" data-tests-id="{{component.name | resourceName}}" sdc-smart-tooltip>{{component.name | resourceName}}</div>
-                            <div class="sdc-tile-info-line subtitle" data-tests-id="{{component.name}}Version">V {{component.version}}</div>
+                    <!-- Import Component -->
+                    <div ng-if="user.role === 'DESIGNER'" class="w-sdc-dashboard-card-new"
+                        data-ng-mouseleave="displayActions = false"
+                        data-ng-mouseover="displayActions = true"
+                        data-ng-init="displayActions = false">
+                        <div class="w-sdc-dashboard-card-new-content" data-tests-id="importButtonsArea"  >
+                            <div class="w-sdc-dashboard-card-import-content-plus" data-ng-show="!displayActions"></div>
+                            <div class="sdc-dashboard-import-element-container" data-ng-show="displayActions">
+                                <div data-ng-if="roles[user.role].dashboard.showCreateNew" class="tlv-btn outline blue">Import VFC
+                                    <file-opener on-file-upload="onImportVfc(file)" data-tests-id="importVFCbutton" extensions="{{sdcConfig.toscaFileExtension}}" data-ng-click="displayActions=false"></file-opener>
+                                </div>
+                                <div data-ng-if="roles[user.role].dashboard.showCreateNew" class="tlv-btn outline blue" data-ng-click="notificationIconCallback()">Import VSP</div>
+                                <div data-ng-if="roles[user.role].dashboard.showCreateNew" class="tlv-btn outline blue import-dcae">Import DCAE asset
+                                    <file-opener on-file-upload="onImportVf(file)" data-tests-id="importVFbutton" extensions="{{sdcConfig.csarFileExtension}}" data-ng-click="displayActions=false"></file-opener>
+                                </div>
+                            </div>
                         </div>
                     </div>
 
-                    <div class='sdc-tile-footer'>
-                        <div class="sdc-tile-footer-content">
-                            <div class='sdc-tile-footer-text'>{{component.getStatus(sdcMenu)}}</div>
-                        </div>
-                    </div>
+                    <!-- Tile new -->
+                    <ng2-ui-tile data-ng-repeat="component in components | filter:{resourceType:('!'+vfcmtType)} | entityFilter:filterParams.checkboxes | filter:filterParams.searchTerm | limitTo:numberOfItemToDisplay"
+                        [component]="component" (on-tile-click)="goToComponent(component)"></ng2-ui-tile>
+                    <!-- Tile new -->
 
                 </div>
-                <!-- Tile new -->
 
             </div>
 
@@ -88,24 +67,26 @@
                  >
                 <span data-ng-if="folder.isGroup()">{{folder.text}}</span>
 
-                <sdc-checkbox data-ng-if="!folder.isGroup() && !folder.dist"
+                <ng1-checkbox data-ng-if="!folder.isGroup() && !folder.dist"
                               elem-id="checkbox-{{folder.text | lowercase | clearWhiteSpaces}}"
-                              sdc-checklist-model="checkboxesFilter.selectedStatuses"
+                              sdc-checklist-model="filterParams.checkboxes.selectedStatuses"
                               sdc-checklist-value="folder.state"
-                              text="{{folder.text}}"></sdc-checkbox>
+                              sdc-checklist-change="changeFilterParams()"
+                              text="{{folder.text}}"></ng1-checkbox>
 
-                <sdc-checkbox data-ng-if="!folder.isGroup() && folder.dist"
+                <ng1-checkbox data-ng-if="!folder.isGroup() && folder.dist"
                               elem-id="checkbox-{{folder.text | lowercase | clearWhiteSpaces}}"
-                              sdc-checklist-model="checkboxesFilter.distributed"
+                              sdc-checklist-model="filterParams.checkboxes.distributed"
                               sdc-checklist-value="folder.dist"
-                              text="{{folder.text}}"></sdc-checkbox>
+                              sdc-checklist-change="changeFilterParams()"
+                              text="{{folder.text}}"></ng1-checkbox>
                 <span class="i-sdc-left-sidebar-item-state-count">{{entitiesCount(folder)}}</span>
             </div>
         </div>
 
     </div>
 
-    <top-nav [top-lvl-selected-index]="0" [version]="version" [search-term]="search.filterTerm" (search-term-change)="search.filterTerm=$event" [notification-icon-callback]="notificationIconCallback"></top-nav>
+    <top-nav [top-lvl-selected-index]="0" [version]="version" [search-term]="filterParams.searchTerm" (search-term-change)="updateSearchTerm($event);changeFilterParams()" [notification-icon-callback]="notificationIconCallback"></top-nav>
 
 </div>
 <div data-ui-view=""></div>