From a0201e3f585dc52f717e33c46ede35a4eccac736 Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 19 Jun 2023 21:24:19 +0100 Subject: [PATCH 1/6] fix: upgrade @microsoft/signalr from 6.0.11 to 6.0.16 (#4964) [skip ci] Snyk has created this PR to upgrade @microsoft/signalr from 6.0.11 to 6.0.16. See this package in npm: See this project in Snyk: https://app.snyk.io/org/ombi-shared/project/7a4dc3b5-498d-41a0-82fb-9781f30ae243?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- src/Ombi/ClientApp/package.json | 2 +- src/Ombi/ClientApp/yarn.lock | 77 +++++---------------------------- 2 files changed, 12 insertions(+), 67 deletions(-) diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index 50dff54bb..10aba96f0 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -27,7 +27,7 @@ "@angularclass/hmr": "^3.0.0", "@auth0/angular-jwt": "^5.0.2", "@fortawesome/fontawesome-free": "^6.0.0", - "@microsoft/signalr": "^6.0.7", + "@microsoft/signalr": "^6.0.16", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", "@ngxs/devtools-plugin": "3.7.3", diff --git a/src/Ombi/ClientApp/yarn.lock b/src/Ombi/ClientApp/yarn.lock index 8fc0a3a7e..d8ebedb65 100644 --- a/src/Ombi/ClientApp/yarn.lock +++ b/src/Ombi/ClientApp/yarn.lock @@ -337,24 +337,6 @@ __metadata: languageName: node linkType: hard -"@angular/localize@npm:^15.0.4": - version: 15.2.4 - resolution: "@angular/localize@npm:15.2.4" - dependencies: - "@babel/core": 7.19.3 - glob: 8.1.0 - yargs: ^17.2.1 - peerDependencies: - "@angular/compiler": 15.2.4 - "@angular/compiler-cli": 15.2.4 - bin: - localize-extract: tools/bundles/src/extract/cli.js - localize-migrate: tools/bundles/src/migrate/cli.js - localize-translate: tools/bundles/src/translate/cli.js - checksum: 999976488ea1aacfd61f738bbb4933dff7e6b144bf066e3ede2ebd1bf267e70c8fffaeb8ef8666fe0c823827f35fc597dfb222014237c87cba92c06e753d0db5 - languageName: node - linkType: hard - "@angular/material@npm:^14.2.7": version: 14.2.7 resolution: "@angular/material@npm:14.2.7" @@ -2449,16 +2431,16 @@ __metadata: languageName: node linkType: hard -"@microsoft/signalr@npm:^6.0.7": - version: 6.0.11 - resolution: "@microsoft/signalr@npm:6.0.11" +"@microsoft/signalr@npm:^6.0.16": + version: 6.0.18 + resolution: "@microsoft/signalr@npm:6.0.18" dependencies: abort-controller: ^3.0.0 eventsource: ^1.0.7 fetch-cookie: ^0.11.0 node-fetch: ^2.6.7 ws: ^7.4.5 - checksum: fa095a1671f8795a70831198f1557e7d150e44849267a8edc044791f2481b3c31cb40024e971cc382015071889c0cd14fda36e7df8aef85a86f0a5b3a9a111b1 + checksum: 8cf0f9e2541ce03678e9f2613185956044b8278dd97f791b3769250aa2a162a8ebe6f9312129e711901a69daa32a3ceb989620cb624207c8b15be00b82722d79 languageName: node linkType: hard @@ -4516,17 +4498,6 @@ __metadata: languageName: node linkType: hard -"angular-router-loader@npm:^0.8.5": - version: 0.8.5 - resolution: "angular-router-loader@npm:0.8.5" - dependencies: - loader-utils: ^1.0.2 - peerDependencies: - webpack: ">=2.4.0" - checksum: 72248f918da0937f650865127a69abd1ed520931442492bd1710f0c2f0363512ed44cda6cbcf25e6faca8ebe170b0092e92dc89c6d676ef1c739c6ddac86224c - languageName: node - linkType: hard - "angularx-qrcode@npm:^15.0.0": version: 15.0.0 resolution: "angularx-qrcode@npm:15.0.0" @@ -8982,7 +8953,7 @@ cors@latest: "fsevents@patch:fsevents@^1.2.7#~builtin": version: 1.2.13 - resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin::version=1.2.13&hash=d11327" + resolution: "fsevents@patch:fsevents@npm%3A1.2.13#~builtin::version=1.2.13&hash=18f3a7" dependencies: bindings: ^1.5.0 nan: ^2.12.1 @@ -8992,7 +8963,7 @@ cors@latest: "fsevents@patch:fsevents@~2.3.2#~builtin": version: 2.3.2 - resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=df0bf1" + resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=18f3a7" dependencies: node-gyp: latest conditions: os=darwin @@ -9228,19 +9199,6 @@ cors@latest: languageName: node linkType: hard -"glob@npm:8.1.0": - version: 8.1.0 - resolution: "glob@npm:8.1.0" - dependencies: - fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^5.0.1 - once: ^1.3.0 - checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47 - languageName: node - linkType: hard - "glob@npm:^7.0.3, glob@npm:^7.0.6, glob@npm:^7.1.1, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": version: 7.2.3 resolution: "glob@npm:7.2.3" @@ -11243,17 +11201,6 @@ cors@latest: languageName: node linkType: hard -"loader-utils@npm:^1.0.2": - version: 1.4.0 - resolution: "loader-utils@npm:1.4.0" - dependencies: - big.js: ^5.2.2 - emojis-list: ^3.0.0 - json5: ^1.0.1 - checksum: d150b15e7a42ac47d935c8b484b79e44ff6ab4c75df7cc4cb9093350cf014ec0b17bdb60c5d6f91a37b8b218bd63b973e263c65944f58ca2573e402b9a27e717 - languageName: node - linkType: hard - "loader-utils@npm:^1.2.3": version: 1.4.2 resolution: "loader-utils@npm:1.4.2" @@ -12799,7 +12746,6 @@ cors@latest: "@angular/compiler-cli": ^15.0.4 "@angular/core": ^15.0.4 "@angular/forms": ^15.0.4 - "@angular/localize": ^15.0.4 "@angular/material": ^14.2.7 "@angular/platform-browser": ^15.0.4 "@angular/platform-browser-dynamic": ^15.0.4 @@ -12810,7 +12756,7 @@ cors@latest: "@babel/core": ^7.18.9 "@compodoc/compodoc": ^1.1.19 "@fortawesome/fontawesome-free": ^6.0.0 - "@microsoft/signalr": ^6.0.7 + "@microsoft/signalr": ^6.0.16 "@ngx-translate/core": ^14.0.0 "@ngx-translate/http-loader": ^7.0.0 "@ngxs/devtools-plugin": 3.7.3 @@ -12818,7 +12764,6 @@ cors@latest: "@storybook/angular": ^6.5.9 "@types/jquery": ^3.5.14 "@yellowspot/ng-truncate": ^2.0.0 - angular-router-loader: ^0.8.5 angularx-qrcode: ^15.0.0 bootstrap: ^4.2.1 chromatic: ^6.7.1 @@ -14754,14 +14699,14 @@ proxy-middleware@latest: "resolve@patch:resolve@1.1.7#~builtin": version: 1.1.7 - resolution: "resolve@patch:resolve@npm%3A1.1.7#~builtin::version=1.1.7&hash=3bafbf" + resolution: "resolve@patch:resolve@npm%3A1.1.7#~builtin::version=1.1.7&hash=07638b" checksum: e9dbca78600ae56835c43a09f1276876c883e4b4bbd43e2683fa140671519d2bdebeb1c1576ca87c8c508ae2987b3ec481645ac5d3054b0f23254cfc1ce49942 languageName: node linkType: hard "resolve@patch:resolve@1.22.1#~builtin, resolve@patch:resolve@^1.1.5#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.3.2#~builtin": version: 1.22.1 - resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=c3c19d" + resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b" dependencies: is-core-module: ^2.9.0 path-parse: ^1.0.7 @@ -16794,7 +16739,7 @@ proxy-middleware@latest: "typescript@patch:typescript@^4.0.3#~builtin": version: 4.7.4 - resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin::version=4.7.4&hash=65a307" + resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin::version=4.7.4&hash=701156" bin: tsc: bin/tsc tsserver: bin/tsserver @@ -16804,7 +16749,7 @@ proxy-middleware@latest: "typescript@patch:typescript@~4.8.4#~builtin": version: 4.8.4 - resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin::version=4.8.4&hash=0102e9" + resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin::version=4.8.4&hash=701156" bin: tsc: bin/tsc tsserver: bin/tsserver From 23a4fede69898a25b342aed78a8cda553c1fd18d Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 19 Jun 2023 21:26:36 +0100 Subject: [PATCH 2/6] fix: upgrade primeng from 15.0.0-rc.1 to 15.4.1 (#4962) [skip ci] Snyk has created this PR to upgrade primeng from 15.0.0-rc.1 to 15.4.1. See this package in npm: See this project in Snyk: https://app.snyk.io/org/ombi-shared/project/7a4dc3b5-498d-41a0-82fb-9781f30ae243?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- src/Ombi/ClientApp/package.json | 2 +- src/Ombi/ClientApp/yarn.lock | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index 10aba96f0..4398ee293 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -47,7 +47,7 @@ "ngx-order-pipe": "^2.2.0", "popper.js": "^1.14.3", "primeicons": "^6.0.1", - "primeng": "^15.0.0-rc.1", + "primeng": "^15.4.1", "rxjs": "^7.5.4", "ts-md5": "^1.2.7", "tslint-angular": "^1.1.2", diff --git a/src/Ombi/ClientApp/yarn.lock b/src/Ombi/ClientApp/yarn.lock index d8ebedb65..d857f0c32 100644 --- a/src/Ombi/ClientApp/yarn.lock +++ b/src/Ombi/ClientApp/yarn.lock @@ -12778,7 +12778,7 @@ cors@latest: ngx-order-pipe: ^2.2.0 popper.js: ^1.14.3 primeicons: ^6.0.1 - primeng: ^15.0.0-rc.1 + primeng: ^15.4.1 protractor: ~5.4.0 rxjs: ^7.5.4 ts-md5: ^1.2.7 @@ -13831,19 +13831,18 @@ cors@latest: languageName: node linkType: hard -"primeng@npm:^15.0.0-rc.1": - version: 15.0.0-rc.1 - resolution: "primeng@npm:15.0.0-rc.1" +"primeng@npm:^15.4.1": + version: 15.4.1 + resolution: "primeng@npm:15.4.1" dependencies: tslib: ^2.3.0 peerDependencies: - "@angular/common": ^15.0.0 - "@angular/core": ^15.0.0 - "@angular/forms": ^15.0.0 - primeicons: ^6.0.1 + "@angular/common": ^15.2.1 + "@angular/core": ^15.2.1 + "@angular/forms": ^15.2.1 rxjs: ^6.0.0 || ^7.5.0 - zone.js: ^0.10.2 || ^0.11.0 || ^0.12.0 - checksum: 1c2223b707e799385c609c6c073b04807896147eba4fdd428cc229f6627ba806be581f7de05f23c8835826d48c17d080c40a1793ac91ba4db8ca8f2e5d8dde9b + zone.js: ^0.10.2 || ^0.11.0 || ^0.12.0 || ^0.13.0 + checksum: d40d6d8bec33ef68994c1b549e61cddbcb0d87f1b8aa70085444cbab83c95a33b79b438fd7b3aa9ec7b27b27dfe4d6a61e477d97f0a300ec3c3409b930a17610 languageName: node linkType: hard From 8584ad46053c51f5da40b24f3efd1b9e5a031ddd Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 20 Jun 2023 08:28:46 +0100 Subject: [PATCH 3/6] fix: src/Ombi.Notifications/Ombi.Notifications.csproj to reduce vulnerabilities (#4969) [skip ci] The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-DOTNET-SYSTEMSECURITYCRYPTOGRAPHYPKCS-5708426 Co-authored-by: snyk-bot --- src/Ombi.Notifications/Ombi.Notifications.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ombi.Notifications/Ombi.Notifications.csproj b/src/Ombi.Notifications/Ombi.Notifications.csproj index d061707fe..0f074463d 100644 --- a/src/Ombi.Notifications/Ombi.Notifications.csproj +++ b/src/Ombi.Notifications/Ombi.Notifications.csproj @@ -12,7 +12,7 @@ - + From 84454e53c00c808e8a393c7750bdc418a7593e91 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 20 Jun 2023 08:29:04 +0100 Subject: [PATCH 4/6] fix: upgrade @fortawesome/fontawesome-free from 6.1.2 to 6.4.0 (#4965) [skip ci] Snyk has created this PR to upgrade @fortawesome/fontawesome-free from 6.1.2 to 6.4.0. See this package in npm: See this project in Snyk: https://app.snyk.io/org/ombi-shared/project/7a4dc3b5-498d-41a0-82fb-9781f30ae243?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- src/Ombi/ClientApp/package.json | 2 +- src/Ombi/ClientApp/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index 4398ee293..55b013fd0 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -26,7 +26,7 @@ "@angular/router": "^15.0.4", "@angularclass/hmr": "^3.0.0", "@auth0/angular-jwt": "^5.0.2", - "@fortawesome/fontawesome-free": "^6.0.0", + "@fortawesome/fontawesome-free": "^6.4.0", "@microsoft/signalr": "^6.0.16", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", diff --git a/src/Ombi/ClientApp/yarn.lock b/src/Ombi/ClientApp/yarn.lock index d857f0c32..367c5f5f1 100644 --- a/src/Ombi/ClientApp/yarn.lock +++ b/src/Ombi/ClientApp/yarn.lock @@ -2294,10 +2294,10 @@ __metadata: languageName: node linkType: hard -"@fortawesome/fontawesome-free@npm:^6.0.0": - version: 6.1.2 - resolution: "@fortawesome/fontawesome-free@npm:6.1.2" - checksum: 0d3c9d60ffbb9c1fa4041051eff6542adc1fc29653501399d0235c077a2195a35f286d979da42fe021f73649032f9eeae2c9a0511eaacda2896559155d40a0fc +"@fortawesome/fontawesome-free@npm:^6.4.0": + version: 6.4.0 + resolution: "@fortawesome/fontawesome-free@npm:6.4.0" + checksum: 0197cd7df96de375862fea561d69427deebb918cadc26074cc8d490180d536e7e58853d138ca74d081b46b2cbdec2783d01cdaccb8bd723d6ef6b4cc8455b84b languageName: node linkType: hard @@ -12755,7 +12755,7 @@ cors@latest: "@auth0/angular-jwt": ^5.0.2 "@babel/core": ^7.18.9 "@compodoc/compodoc": ^1.1.19 - "@fortawesome/fontawesome-free": ^6.0.0 + "@fortawesome/fontawesome-free": ^6.4.0 "@microsoft/signalr": ^6.0.16 "@ngx-translate/core": ^14.0.0 "@ngx-translate/http-loader": ^7.0.0 From 6025c5ed757438d3a5d79bd36fd789ef0297ce70 Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 20 Jun 2023 08:29:23 +0100 Subject: [PATCH 5/6] fix: upgrade multiple dependencies with Snyk (#4963) [skip ci] Snyk has created this PR to upgrade: - @angular/animations from 15.2.4 to 15.2.9. See this package in npm: - @angular/common from 15.2.4 to 15.2.9. See this package in npm: - @angular/compiler from 15.2.4 to 15.2.9. See this package in npm: - @angular/core from 15.2.4 to 15.2.9. See this package in npm: - @angular/forms from 15.2.4 to 15.2.9. See this package in npm: - @angular/platform-browser from 15.2.4 to 15.2.9. See this package in npm: - @angular/platform-browser-dynamic from 15.2.4 to 15.2.9. See this package in npm: - @angular/platform-server from 15.2.4 to 15.2.9. See this package in npm: - @angular/router from 15.2.4 to 15.2.9. See this package in npm: See this project in Snyk: https://app.snyk.io/org/ombi-shared/project/7a4dc3b5-498d-41a0-82fb-9781f30ae243?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot --- src/Ombi/ClientApp/package.json | 18 ++--- src/Ombi/ClientApp/yarn.lock | 132 ++++++++++++++++---------------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/Ombi/ClientApp/package.json b/src/Ombi/ClientApp/package.json index 55b013fd0..6e396452a 100644 --- a/src/Ombi/ClientApp/package.json +++ b/src/Ombi/ClientApp/package.json @@ -13,17 +13,17 @@ }, "private": true, "dependencies": { - "@angular/animations": "^15.0.4", + "@angular/animations": "^15.2.9", "@angular/cdk": "^14.2.7", - "@angular/common": "^15.0.4", - "@angular/compiler": "^15.0.4", - "@angular/core": "^15.0.4", - "@angular/forms": "^15.0.4", + "@angular/common": "^15.2.9", + "@angular/compiler": "^15.2.9", + "@angular/core": "^15.2.9", + "@angular/forms": "^15.2.9", "@angular/material": "^14.2.7", - "@angular/platform-browser": "^15.0.4", - "@angular/platform-browser-dynamic": "^15.0.4", - "@angular/platform-server": "^15.0.4", - "@angular/router": "^15.0.4", + "@angular/platform-browser": "^15.2.9", + "@angular/platform-browser-dynamic": "^15.2.9", + "@angular/platform-server": "^15.2.9", + "@angular/router": "^15.2.9", "@angularclass/hmr": "^3.0.0", "@auth0/angular-jwt": "^5.0.2", "@fortawesome/fontawesome-free": "^6.4.0", diff --git a/src/Ombi/ClientApp/yarn.lock b/src/Ombi/ClientApp/yarn.lock index 367c5f5f1..c7aae5ad0 100644 --- a/src/Ombi/ClientApp/yarn.lock +++ b/src/Ombi/ClientApp/yarn.lock @@ -204,14 +204,14 @@ __metadata: languageName: node linkType: hard -"@angular/animations@npm:^15.0.4": - version: 15.2.4 - resolution: "@angular/animations@npm:15.2.4" +"@angular/animations@npm:^15.2.9": + version: 15.2.9 + resolution: "@angular/animations@npm:15.2.9" dependencies: tslib: ^2.3.0 peerDependencies: - "@angular/core": 15.2.4 - checksum: 8fe91a126cac08f1bda95fe7d78bf789e61255211e545dfdd0378eb9f52e0a4a3c4683f1fc925fceed2bfaf9146ce872a7df11f73e92b184fc042565a41609b3 + "@angular/core": 15.2.9 + checksum: a8d6aa16f6f263e272aff3313b04e704c7cf1fde5bf1565d160f23b1752db097bbbe4bb3d79bf181147411508dc9578a2567ffc1c53a7ab49f4bf408153a2de8 languageName: node linkType: hard @@ -260,15 +260,15 @@ __metadata: languageName: node linkType: hard -"@angular/common@npm:^15.0.4": - version: 15.2.4 - resolution: "@angular/common@npm:15.2.4" +"@angular/common@npm:^15.2.9": + version: 15.2.9 + resolution: "@angular/common@npm:15.2.9" dependencies: tslib: ^2.3.0 peerDependencies: - "@angular/core": 15.2.4 + "@angular/core": 15.2.9 rxjs: ^6.5.3 || ^7.4.0 - checksum: 089436758dc98d7a653bcf0301d090f588ee931d142033c06de5da569db2fd5e924ee84e8baac4fd8bdebdbd1d20b8af1611cc2b2a9bc4f7c7e7c2e9606f1934 + checksum: 1f8d740f2b0bc9915441bca27692f0ff6b3362cf9c8790c6130dfc7f3a30f4cdf311bc27fd05bd22b753104b0a47bc2e5bbccb0161943645f695d12c5db6364e languageName: node linkType: hard @@ -297,41 +297,41 @@ __metadata: languageName: node linkType: hard -"@angular/compiler@npm:^15.0.4": - version: 15.2.4 - resolution: "@angular/compiler@npm:15.2.4" +"@angular/compiler@npm:^15.2.9": + version: 15.2.9 + resolution: "@angular/compiler@npm:15.2.9" dependencies: tslib: ^2.3.0 peerDependencies: - "@angular/core": 15.2.4 + "@angular/core": 15.2.9 peerDependenciesMeta: "@angular/core": optional: true - checksum: f47676eb0160be35b5f44e625a3bea43e51fc84c3aa05a9bbebd1fcd357fa73331dc4de32af2dbec7e1f254fb0e65ed9e149e8e7cf61eb81464453c666ff78d1 + checksum: 6515427505abdf32401559573d22b0f14bb83e076886d868c700a5e87e6edb2314ef667de9a979dfc28ed0f01be8731cdee30cfefef8807a615be54364f24c1a languageName: node linkType: hard -"@angular/core@npm:^15.0.4": - version: 15.2.4 - resolution: "@angular/core@npm:15.2.4" +"@angular/core@npm:^15.2.9": + version: 15.2.9 + resolution: "@angular/core@npm:15.2.9" dependencies: tslib: ^2.3.0 peerDependencies: rxjs: ^6.5.3 || ^7.4.0 zone.js: ~0.11.4 || ~0.12.0 || ~0.13.0 - checksum: ab7ad7b6b55fe24ff1f390ea09c04d52301146075488fc4ee4700d77e9f24ad8b3a03f3ca48b6f4306f6b2106e22b541b23bfb5df3fca94606b94fd95b20df7b + checksum: 47410db4f0b103da657b1cff16000f6fbb87b3a7fd208d6180d548baf93fce39ae1f1a8f2d8bb279fbc190645becf268589d489edc309ffcdcca7737b1e88d07 languageName: node linkType: hard -"@angular/forms@npm:^15.0.4": - version: 15.2.4 - resolution: "@angular/forms@npm:15.2.4" +"@angular/forms@npm:^15.2.9": + version: 15.2.9 + resolution: "@angular/forms@npm:15.2.9" dependencies: tslib: ^2.3.0 peerDependencies: - "@angular/common": 15.2.4 - "@angular/core": 15.2.4 - "@angular/platform-browser": 15.2.4 + "@angular/common": 15.2.9 + "@angular/core": 15.2.9 + "@angular/platform-browser": 15.2.9 rxjs: ^6.5.3 || ^7.4.0 checksum: cc23288506d62f2e1e86e22ab795176b46d63aa0f821515b9549bb10b583975e45b67667d14d1eb52c24a645ad81e7e8693855d5d7f521c27ab4ef0ee871791b languageName: node @@ -354,65 +354,65 @@ __metadata: languageName: node linkType: hard -"@angular/platform-browser-dynamic@npm:^15.0.4": - version: 15.2.4 - resolution: "@angular/platform-browser-dynamic@npm:15.2.4" +"@angular/platform-browser-dynamic@npm:^15.2.9": + version: 15.2.9 + resolution: "@angular/platform-browser-dynamic@npm:15.2.9" dependencies: tslib: ^2.3.0 peerDependencies: - "@angular/common": 15.2.4 - "@angular/compiler": 15.2.4 - "@angular/core": 15.2.4 - "@angular/platform-browser": 15.2.4 - checksum: e48fe83b1d9723ee26a1b4343d7dfd1537027e01f559382b819174f4f25e700ff46c0390fc35dbc4550fa374d37a6d449f7a9504c55d0d7b8e7f90e2785c2048 + "@angular/common": 15.2.9 + "@angular/compiler": 15.2.9 + "@angular/core": 15.2.9 + "@angular/platform-browser": 15.2.9 + checksum: 4692b22c95f8f7135b6d9183487dda8f35ec44869586c2d23ef8798f6cb0a568161c9e52b2f6f3c86042a03bbbd9c8815492c4738da9fb61bb709cf604b3b797 languageName: node linkType: hard -"@angular/platform-browser@npm:^15.0.4": - version: 15.2.4 - resolution: "@angular/platform-browser@npm:15.2.4" +"@angular/platform-browser@npm:^15.2.9": + version: 15.2.9 + resolution: "@angular/platform-browser@npm:15.2.9" dependencies: tslib: ^2.3.0 peerDependencies: - "@angular/animations": 15.2.4 - "@angular/common": 15.2.4 - "@angular/core": 15.2.4 + "@angular/animations": 15.2.9 + "@angular/common": 15.2.9 + "@angular/core": 15.2.9 peerDependenciesMeta: "@angular/animations": optional: true - checksum: 67a52b676362614840df1056a579daf9f3763bacec9c2e4fff64109070624b3d2daa3bd2bb8fad776a79e65239f90c9227aa97de3a1b22e8ac397b84038c02e9 + checksum: 8887716b7765939dbf131ddefa063d6af85af23f09986214799f2c4785cc8a50db2c501111d6fc16ba8ba8684e60f2caf3d27b97f95b3ee0ef5e469442a43f13 languageName: node linkType: hard -"@angular/platform-server@npm:^15.0.4": - version: 15.2.4 - resolution: "@angular/platform-server@npm:15.2.4" +"@angular/platform-server@npm:^15.2.9": + version: 15.2.9 + resolution: "@angular/platform-server@npm:15.2.9" dependencies: domino: ^2.1.2 tslib: ^2.3.0 xhr2: ^0.2.0 peerDependencies: - "@angular/animations": 15.2.4 - "@angular/common": 15.2.4 - "@angular/compiler": 15.2.4 - "@angular/core": 15.2.4 - "@angular/platform-browser": 15.2.4 - "@angular/platform-browser-dynamic": 15.2.4 - checksum: e6f3d0b6222356c4af9201e8d8747e4657f1977beb223d39ab7ef60634937d49d89c0826db11ed3d8b46b92bf8dda38dffc1bb001195266ed1618edc8f378d96 + "@angular/animations": 15.2.9 + "@angular/common": 15.2.9 + "@angular/compiler": 15.2.9 + "@angular/core": 15.2.9 + "@angular/platform-browser": 15.2.9 + "@angular/platform-browser-dynamic": 15.2.9 + checksum: 4c1f246eb59105a92184e221b3a9fd335712fd31e1d0bf2240732eafda268a88bb18fc1387536dda8edec5fac2ce4270f26e8acfddfb33740ae62616801c1c63 languageName: node linkType: hard -"@angular/router@npm:^15.0.4": - version: 15.2.4 - resolution: "@angular/router@npm:15.2.4" +"@angular/router@npm:^15.2.9": + version: 15.2.9 + resolution: "@angular/router@npm:15.2.9" dependencies: tslib: ^2.3.0 peerDependencies: - "@angular/common": 15.2.4 - "@angular/core": 15.2.4 - "@angular/platform-browser": 15.2.4 + "@angular/common": 15.2.9 + "@angular/core": 15.2.9 + "@angular/platform-browser": 15.2.9 rxjs: ^6.5.3 || ^7.4.0 - checksum: ef98f2f22e78379fdaf6dd6f4732c161aa6e596d236e8f7e8e893ab488342f28e3f76127b2b24076697800073dccaea29a6c6c376082cd2354be859f3faa273d + checksum: c85b1473299f73c9c6819b1a01a385dbe5ca24884627af9ab173d483d4bc26ad1ef09f8abb4a56abd5325f7459b438d720a95eb108dcfa3e9134a6200e235eb7 languageName: node linkType: hard @@ -12738,19 +12738,19 @@ cors@latest: resolution: "ombi@workspace:." dependencies: "@angular-devkit/build-angular": ^15.0.2 - "@angular/animations": ^15.0.4 + "@angular/animations": ^15.2.9 "@angular/cdk": ^14.2.7 "@angular/cli": ^15.0.2 - "@angular/common": ^15.0.4 - "@angular/compiler": ^15.0.4 + "@angular/common": ^15.2.9 + "@angular/compiler": ^15.2.9 "@angular/compiler-cli": ^15.0.4 - "@angular/core": ^15.0.4 - "@angular/forms": ^15.0.4 + "@angular/core": ^15.2.9 + "@angular/forms": ^15.2.9 "@angular/material": ^14.2.7 - "@angular/platform-browser": ^15.0.4 - "@angular/platform-browser-dynamic": ^15.0.4 - "@angular/platform-server": ^15.0.4 - "@angular/router": ^15.0.4 + "@angular/platform-browser": ^15.2.9 + "@angular/platform-browser-dynamic": ^15.2.9 + "@angular/platform-server": ^15.2.9 + "@angular/router": ^15.2.9 "@angularclass/hmr": ^3.0.0 "@auth0/angular-jwt": ^5.0.2 "@babel/core": ^7.18.9 From 5f6095080208de44ee481ceef08fc594b7771ebc Mon Sep 17 00:00:00 2001 From: Jamie Date: Tue, 20 Jun 2023 09:38:04 +0100 Subject: [PATCH 6/6] small improvements to fix flaky tests (#4970) [skip ci] --- .../user-preference/user-preference.component.ts | 7 ++++--- tests/cypress/tests/details/tv/tvdetails-buttons.spec.ts | 3 +++ .../tests/discover/discover-recently-requested.spec.ts | 2 +- .../user-preferences/user-preferences-profile.spec.ts | 1 - 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts index 74a803161..03f78f241 100644 --- a/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts +++ b/src/Ombi/ClientApp/src/app/user-preferences/components/user-preference/user-preference.component.ts @@ -49,7 +49,6 @@ export class UserPreferenceComponent implements OnInit { if (user.name) { this.username = user.name; } - this.selectedLang = this.translate.currentLang; const accessToken = await this.identityService.getAccessToken().toPromise(); @@ -86,8 +85,10 @@ export class UserPreferenceComponent implements OnInit { } public languageSelected() { - this.identityService.updateLanguage(this.selectedLang).subscribe(x => this.notification.success(this.translate.instant("UserPreferences.Updated"))); - this.translate.use(this.selectedLang); + this.identityService.updateLanguage(this.selectedLang).subscribe(_ => { + this.notification.success(this.translate.instant("UserPreferences.Updated")) + this.translate.use(this.selectedLang); + }); } public countrySelected() { diff --git a/tests/cypress/tests/details/tv/tvdetails-buttons.spec.ts b/tests/cypress/tests/details/tv/tvdetails-buttons.spec.ts index ad56572ae..d8502ddb9 100644 --- a/tests/cypress/tests/details/tv/tvdetails-buttons.spec.ts +++ b/tests/cypress/tests/details/tv/tvdetails-buttons.spec.ts @@ -73,6 +73,9 @@ describe("TV Details Buttons", () => { cy.visit("/details/tv/1399"); cy.wait('@issuesEnabled'); + cy.waitUntil(() => { + return Page.reportIssueButton.should("be.visible"); + }); Page.reportIssueButton.should('be.visible'); }); diff --git a/tests/cypress/tests/discover/discover-recently-requested.spec.ts b/tests/cypress/tests/discover/discover-recently-requested.spec.ts index b8bceb088..0fe3332d0 100644 --- a/tests/cypress/tests/discover/discover-recently-requested.spec.ts +++ b/tests/cypress/tests/discover/discover-recently-requested.spec.ts @@ -199,7 +199,7 @@ describe("Discover Recently Requested Tests", () => { }); }); - it.only("Approve Requested Tv Show", () => { + it("Approve Requested Tv Show", () => { cy.requestAllTv(71712); diff --git a/tests/cypress/tests/user-preferences/user-preferences-profile.spec.ts b/tests/cypress/tests/user-preferences/user-preferences-profile.spec.ts index a53af7cfa..f4c621ce9 100644 --- a/tests/cypress/tests/user-preferences/user-preferences-profile.spec.ts +++ b/tests/cypress/tests/user-preferences/user-preferences-profile.spec.ts @@ -18,7 +18,6 @@ langs.forEach((l) => { Page.profile.languageSelectBox.click(); Page.profile.languageSelectBoxOption(l.code).click(); - Page.navbar.discover.contains(l.discover); cy.wait('@langSave').then((intercept) => {