Merge remote-tracking branch 'origin/2.0.0'

Cumulocity-IoT · Feb 11, 2022 · b81aefa · b81aefa
2 parents cae1b77 + 2a2c0ea
commit b81aefa
Show file tree

Hide file tree

Showing 15 changed files with 13,946 additions and 10,878 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cumulocity-asset-viewer-widget",
-  "version": "1.0.5",
+  "version": "2.0.0",
   "description": "The Asset Viewer Widget help you to display asset/device data in Tile/List view, along with navigation to template dashboards(App Builder only).",
   "author": "Darpankumar Lalani - Software AG, Global Presales",
   "license": "Apache 2.0",
@@ -19,45 +19,44 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~8.2.0",
-    "@angular/common": "~8.2.0",
-    "@angular/compiler": "~8.2.0",
-    "@angular/core": "~8.2.0",
-    "@angular/forms": "~8.2.0",
-    "@angular/material": "^8.2.3",
-    "@angular/platform-browser": "~8.2.0",
-    "@angular/platform-browser-dynamic": "~8.2.0",
-    "@angular/router": "~8.2.0",
-    "@c8y/ng1-modules": "1009.0.4",
-    "@c8y/ngx-components": "1009.0.4",
-    "@c8y/style": "1009.0.4",
-    "ngx-bootstrap": "5.5.0",
-    "@ng-select/ng-select": "^3.7.3"
+    "@angular/animations": "~11.1.2",
+    "@angular/common": "~11.1.2",
+    "@angular/compiler": "~11.1.2",
+    "@angular/core": "~11.1.2",
+    "@angular/forms": "~11.1.2",
+    "@angular/material": "^11.2.13",
+    "@angular/platform-browser": "~11.1.2",
+    "@angular/platform-browser-dynamic": "~11.1.2",
+    "@angular/router": "~11.1.2",
+    "@c8y/ng1-modules": "1011.0.12",
+    "@c8y/ngx-components": "1011.0.12",
+    "@c8y/style": "1011.0.12",
+    "ngx-bootstrap": "6.2.0",
+    "@ng-select/ng-select": "^6.1.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.802.2",
-    "@angular-devkit/build-ng-packagr": "~0.802.2",
-    "@angular/cli": "~8.2.2",
-    "@angular/cdk": "^8.2.3",
-    "@angular/compiler-cli": "~8.2.0",
-    "@angular/language-service": "~8.2.0",
-    "@types/node": "~8.9.4",
-    "@types/jasmine": "~3.3.8",
+    "@angular-devkit/build-angular": "~0.1101.2",
+    "@angular-devkit/build-ng-packagr": "~0.803.28",
+    "@angular/cli": "~11.1.2",
+    "@angular/cdk": "^11.2.13",
+    "@angular/compiler-cli": "~11.1.2",
+    "@angular/language-service": "~11.1.2",
+    "@types/node": "~12.11.1",
+    "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "^5.0.0",
-    "jasmine-core": "~3.4.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.1.0",
-    "karma-chrome-launcher": "~2.2.0",
+    "codelyzer": "^6.0.0",
+    "jasmine-core": "~3.6.0",
+    "jasmine-spec-reporter": "~5.0.0",
+    "karma": "~5.2.0",
+    "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~2.0.1",
-    "karma-jasmine-html-reporter": "^1.4.0",
-    "ng-packagr": "^9.1.0",
-    "protractor": "~5.4.0",
-    "ts-node": "~7.0.0",
-    "tsickle": "^0.36.0",
-    "tslint": "~5.15.0",
-    "typescript": "~3.5.3",
+    "karma-jasmine": "~4.0.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
+    "ng-packagr": "^11.0.0",
+    "protractor": "~7.0.0",
+    "ts-node": "~8.3.0",
+    "tslint": "~6.1.0",
+    "typescript": "~4.1.2",
     "css-loader": "^3.5.3",
     "del": "^5.1.0",
     "delay": "^4.3.0",
@@ -71,9 +70,8 @@
     "webpack-cli": "^3.3.11",
     "webpack-external-import": "^2.2.3",
     "gulp-inject-string": "^1.1.2",
-    "rxjs": "~6.4.0",
-    "tslib": "^1.10.0",
-    "zone.js": "~0.9.1"
-
+    "rxjs": "~6.6.3",
+    "tslib": "^2.0.0",
+    "zone.js": "~0.11.3"
   }
 }
diff --git a/projects/gp-asset-viewer/package.json b/projects/gp-asset-viewer/package.json
@@ -5,7 +5,7 @@
   "author": "Darpankumar Lalani - Software AG, Global Presales",
   "license": "Apache 2.0",
   "peerDependencies": {
-    "@angular/common": "^8.2.0",
-    "@angular/core": "^8.2.0"
+    "@angular/common": "^11.1.2",
+    "@angular/core": "^11.1.2"
   }
 }
diff --git a/.../gp-asset-viewer/src/lib/gp-asset-overview-config/gp-asset-overview-config.component.html b/.../gp-asset-viewer/src/lib/gp-asset-overview-config/gp-asset-overview-config.component.html
@@ -205,7 +205,7 @@
    <div class="row">
     <div class="col-sm-6 form-horizontal">
        <div class="col-sm-12 form-group">
-                <label for="pageSize" class=" col-sm-6 control-label">Default Page Size:</label>
+                <label for="pageSize" class=" col-sm-6 control-label">Page Size:</label>
                 <div class="col-sm-6 ">
                     <select  [(ngModel)]="config.pageSize" name="pageSize" id="pageSize">
                         <option *ngFor="let pageSize of pageSizeList"

diff --git a/projects/gp-asset-viewer/src/lib/gp-asset-viewer.component.html b/projects/gp-asset-viewer/src/lib/gp-asset-viewer.component.html
@@ -1,8 +1,8 @@
 <div class="gp-device-list header-container">
     <div class="header-item" style="display: flex;">
       <div class="btn-group" role="group">
-        <button type="button" class="btn btn-default" (click) = "viewMode = '1';"><i class="fa fa-file header-mode"></i></button>
-        <button type="button" class="btn btn-default"(click) = "viewMode = '2';"><i class="fa fa-list header-mode"></i></button>
+        <button type="button" class="btn btn-default" (click) = "viewMode = '1';"><i class="dlt-c8y-icon-files header-mode"></i></button>
+        <button type="button" class="btn btn-default"(click) = "viewMode = '2';"><i class="dlt-c8y-icon-list header-mode"></i></button>
       </div>
 
        <div class="btn-group device-list-switch-toggle ">
@@ -45,10 +45,9 @@
 
     </div>
   </div>
-  <mat-paginator [style.visibility]="totalRecord === -1? 'hidden': 'visible'" class="device-list-pagination-view" [length]="totalRecord"
-  [pageSizeOptions]="[5,10,20,50,100]" [pageSize]="pageSize" (page)="getPageEvent($event)"></mat-paginator>
+  <pagination  [style.visibility]="totalRecord === -1? 'hidden': 'visible'" class="m-t-8 m-r-8 p-b-8 pull-right" previousText=" " nextText=" "  [maxSize]="10" [totalItems]="totalRecord" [itemsPerPage]="pageSize" [(ngModel)]="currentPage" (pageChanged)="getPageEvent($event)"></pagination>
   <div style="text-align: center;"><c8y-loading *ngIf="isBusy"></c8y-loading></div>
-  <div *ngIf="!isBusy && totalRecord > 0 ; else noRecordFound"> 
+  <div *ngIf="!isBusy && totalRecord > 0 ; else noRecordFound" class="col-sm-12 col-xs-12"> 
     <div class="card-wrapper" *ngIf="viewMode !== '2' && !isBusy">
         <div class="book " *ngFor="let ndevice of filterData" [ngClass]="{'cover': ndevice.isBookOpen === true}">
           <div class="back"></div>
@@ -150,7 +149,7 @@
         </div>
   </div>
   <div *ngIf="viewMode === '2' && !isBusy">
-    <table  mat-table [dataSource]="dataSource" matSort class="device-list-table">
+    <table  mat-table  [dataSource]="dataSource" matSort class="device-list-table">
 
       <ng-container matColumnDef="id">
         <th mat-header-cell *matHeaderCellDef mat-sort-header> ID </th>