ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into alanwest/opentelemetry-dotnet

Browse Source
This commit is contained in:
Alan West 2021-03-26 13:32:02 -07:00
commit 6216b89118
No known key found for this signature in database
GPG Key ID: 10C64B6E349D00BC
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Web/WebSPA/Client/modules/catalog/catalog.component.ts
View File

@ -59,6 +59,7 @@ export class CatalogComponent implements OnInit {
this.brandSelected = this.brandSelected && this.brandSelected.toString() != "null" ? this.brandSelected : null; this.brandSelected = this.brandSelected && this.brandSelected.toString() != "null" ? this.brandSelected : null;
this.typeSelected = this.typeSelected && this.typeSelected.toString() != "null" ? this.typeSelected : 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); this.getCatalog(this.paginationInfo.itemsPage, this.paginationInfo.actualPage, this.brandSelected, this.typeSelected);
} }
@ -95,7 +96,7 @@ export class CatalogComponent implements OnInit {
itemsPage : catalog.pageSize, itemsPage : catalog.pageSize,
totalItems : catalog.count, totalItems : catalog.count,
totalPages: Math.ceil(catalog.count / catalog.pageSize), totalPages: Math.ceil(catalog.count / catalog.pageSize),
items: catalog.pageSize items: catalog.data.length
}; };
}); });
} }

2
src/Web/WebSPA/Client/modules/shared/components/pager/pager.ts
View File

@ -25,8 +25,6 @@ export class Pager implements OnInit, OnChanges {
ngOnChanges() { ngOnChanges() {
if (this.model) { 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.previousDisabled = (this.model.actualPage == 0);
this.buttonStates.nextDisabled = (this.model.actualPage + 1 >= this.model.totalPages); this.buttonStates.nextDisabled = (this.model.actualPage + 1 >= this.model.totalPages);
} }

14
src/Web/WebSPA/package-lock.json generated
View File

@ -8474,12 +8474,12 @@
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
}, },
"is-svg": { "is-svg": {
"version": "3.0.0", "version": "4.2.2",
"resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz", "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-4.2.2.tgz",
"integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==", "integrity": "sha512-JlA7Mc7mfWjdxxTkJ094oUK9amGD7gQaj5xA/NCY0vlVvZ1stmj4VX+bRuwOMN93IHRZ2ctpPH/0FO6DqvQ5Rw==",
"dev": true, "dev": true,
"requires": { "requires": {
"html-comment-regex": "^1.1.0" "html-comment-regex": "^1.1.2"
} }
}, },
"is-symbol": { "is-symbol": {
@ -14771,9 +14771,9 @@
} }
}, },
"ssri": { "ssri": {
"version": "8.0.0", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
"integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"minipass": "^3.1.1" "minipass": "^3.1.1"

4
src/Web/WebSPA/package.json
View File

@ -56,7 +56,9 @@
"tslib": "^2.0.0", "tslib": "^2.0.0",
"typedoc": "^0.19.2", "typedoc": "^0.19.2",
"webpack-dev-server": "3.1.14", "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": { "devDependencies": {
"@angular-devkit/build-angular": "~0.1002.0", "@angular-devkit/build-angular": "~0.1002.0",