From 68f5afd09c9aec61f59332482411a8e94e563385 Mon Sep 17 00:00:00 2001 From: n-stefan <38526229+n-stefan@users.noreply.github.com> Date: Mon, 15 Mar 2021 08:52:46 +0200 Subject: [PATCH 1/3] Fix WebSPA pager display (#1629) --- src/Web/WebSPA/Client/modules/catalog/catalog.component.ts | 2 +- src/Web/WebSPA/Client/modules/shared/components/pager/pager.ts | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts index 18b30d4b7..c4538b393 100644 --- a/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts +++ b/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts @@ -95,7 +95,7 @@ export class CatalogComponent implements OnInit { itemsPage : catalog.pageSize, totalItems : catalog.count, totalPages: Math.ceil(catalog.count / catalog.pageSize), - items: catalog.pageSize + items: catalog.data.length }; }); } diff --git a/src/Web/WebSPA/Client/modules/shared/components/pager/pager.ts b/src/Web/WebSPA/Client/modules/shared/components/pager/pager.ts index 9be34463a..eecc6f995 100644 --- a/src/Web/WebSPA/Client/modules/shared/components/pager/pager.ts +++ b/src/Web/WebSPA/Client/modules/shared/components/pager/pager.ts @@ -25,8 +25,6 @@ export class Pager implements OnInit, OnChanges { ngOnChanges() { if (this.model) { - this.model.items = (this.model.itemsPage > this.model.totalItems) ? this.model.totalItems : this.model.itemsPage; - this.buttonStates.previousDisabled = (this.model.actualPage == 0); this.buttonStates.nextDisabled = (this.model.actualPage + 1 >= this.model.totalPages); } From 8b4ab00c9196a31a96337189e7772dc2936984ca Mon Sep 17 00:00:00 2001 From: Sreenivasulu Kalluru <69580789+Sreenivas-Kalluru@users.noreply.github.com> Date: Wed, 24 Mar 2021 11:00:27 +0530 Subject: [PATCH 2/3] updated package version for ssri and is-svg (#1636) --- src/Web/WebSPA/package-lock.json | 14 +++++++------- src/Web/WebSPA/package.json | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Web/WebSPA/package-lock.json b/src/Web/WebSPA/package-lock.json index e0b8a607c..ce1fcf057 100644 --- a/src/Web/WebSPA/package-lock.json +++ b/src/Web/WebSPA/package-lock.json @@ -8474,12 +8474,12 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "is-svg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz", - "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.2.2.tgz", + "integrity": "sha512-JlA7Mc7mfWjdxxTkJ094oUK9amGD7gQaj5xA/NCY0vlVvZ1stmj4VX+bRuwOMN93IHRZ2ctpPH/0FO6DqvQ5Rw==", "dev": true, "requires": { - "html-comment-regex": "^1.1.0" + "html-comment-regex": "^1.1.2" } }, "is-symbol": { @@ -14771,9 +14771,9 @@ } }, "ssri": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz", - "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", + "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", "dev": true, "requires": { "minipass": "^3.1.1" diff --git a/src/Web/WebSPA/package.json b/src/Web/WebSPA/package.json index d1f140331..43358a1e3 100644 --- a/src/Web/WebSPA/package.json +++ b/src/Web/WebSPA/package.json @@ -56,7 +56,9 @@ "tslib": "^2.0.0", "typedoc": "^0.19.2", "webpack-dev-server": "3.1.14", - "zone.js": "~0.10.2" + "zone.js": "~0.10.2", + "ssri": ">=8.0.1", + "is-svg": ">=4.2.2" }, "devDependencies": { "@angular-devkit/build-angular": "~0.1002.0", From 5974647b529de0d6727ce6b1ed778a4dd4bd5a50 Mon Sep 17 00:00:00 2001 From: n-stefan <38526229+n-stefan@users.noreply.github.com> Date: Thu, 25 Mar 2021 10:51:53 +0200 Subject: [PATCH 3/3] Fix WebSPA catalog filter (#1637) --- src/Web/WebSPA/Client/modules/catalog/catalog.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts b/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts index c4538b393..942f117d5 100644 --- a/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts +++ b/src/Web/WebSPA/Client/modules/catalog/catalog.component.ts @@ -59,6 +59,7 @@ export class CatalogComponent implements OnInit { this.brandSelected = this.brandSelected && this.brandSelected.toString() != "null" ? this.brandSelected : null; this.typeSelected = this.typeSelected && this.typeSelected.toString() != "null" ? this.typeSelected : null; + this.paginationInfo.actualPage = 0; this.getCatalog(this.paginationInfo.itemsPage, this.paginationInfo.actualPage, this.brandSelected, this.typeSelected); }