From e43ba160ba0c589df81634b33071ce1c652186ce Mon Sep 17 00:00:00 2001 From: David Date: Sun, 18 Jun 2023 14:20:34 -0400 Subject: [PATCH 1/9] Add latest versions of DNN to dropdown --- module.web/src/data/dnn-versions.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module.web/src/data/dnn-versions.ts b/module.web/src/data/dnn-versions.ts index d1de86b..e938a70 100644 --- a/module.web/src/data/dnn-versions.ts +++ b/module.web/src/data/dnn-versions.ts @@ -1,5 +1,7 @@ const dnnVersions: string[] = [ 'All Versions', + '09.11.02', + '09.11.01', '09.11.00', '09.10.01', '09.10.00', From 865cd2dbf8b63d2384f7ba12af46f6d751c48bc3 Mon Sep 17 00:00:00 2001 From: David Date: Sun, 18 Jun 2023 14:21:56 -0400 Subject: [PATCH 2/9] Make necessary change to global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 3f0705f..1939ac6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { "version": "6.0.400", - "rollForward": "latestMinor" + "rollForward": "latestMajor" } } \ No newline at end of file From bc2393a3f2601bc1a3e1a6706615d94fdc2b881c Mon Sep 17 00:00:00 2001 From: DNNCommunity Date: Sun, 18 Jun 2023 18:32:27 +0000 Subject: [PATCH 3/9] Commit latest generated files From b93724e68425b8f44e19bc58bfa409c439c589ff Mon Sep 17 00:00:00 2001 From: David Date: Sun, 18 Jun 2023 15:30:22 -0400 Subject: [PATCH 4/9] Add no vulnerabilities message and a loading message --- Services/LocalizationService.cs | 2 ++ ViewModels/LocalizationViewModel.cs | 8 ++++++++ docs/rest/rest.json | 10 ++++++++++ .../dnn-security-center/dnn-security-center.tsx | 7 +++++++ module.web/src/services/services.ts | 12 ++++++++++++ resources/App_LocalResources/UI.resx | 6 ++++++ 6 files changed, 45 insertions(+) diff --git a/Services/LocalizationService.cs b/Services/LocalizationService.cs index 2141c7b..37a271f 100644 --- a/Services/LocalizationService.cs +++ b/Services/LocalizationService.cs @@ -88,6 +88,8 @@ private LocalizationViewModel HydrateViewModel() { DnnPlatformVersion = this.GetString("DnnPlatformVersion", "UI.resx"), DnnSecurityCenter = this.GetString("DnnSecurityCenter", "UI.resx"), + Loading = this.GetString("Loading", "UI.resx"), + NoBulletins = this.GetString("NoBulletins", "UI.resx"), }; viewModel.UI = ui; diff --git a/ViewModels/LocalizationViewModel.cs b/ViewModels/LocalizationViewModel.cs index e7297d5..fe7725c 100644 --- a/ViewModels/LocalizationViewModel.cs +++ b/ViewModels/LocalizationViewModel.cs @@ -55,6 +55,14 @@ public class UIInfo /// DNN Security Center public string DnnSecurityCenter { get; set; } + /// Gets or sets the Loading localized text. + /// Loading... + public string Loading { get; set; } + + /// Gets or sets the NoBulletins localized text. + /// There are no known security vulnerabilities for the selected DNN Platform version. + public string NoBulletins { get; set; } + } diff --git a/docs/rest/rest.json b/docs/rest/rest.json index f4e90e2..6098c68 100644 --- a/docs/rest/rest.json +++ b/docs/rest/rest.json @@ -111,6 +111,16 @@ "type": "string", "description": "Gets or sets the DnnSecurityCenter localized text.", "example": "DNN Security Center" + }, + "Loading": { + "type": "string", + "description": "Gets or sets the Loading localized text.", + "example": "Loading..." + }, + "NoBulletins": { + "type": "string", + "description": "Gets or sets the NoBulletins localized text.", + "example": "There are no known security vulnerabilities for the selected DNN Platform version." } } }, diff --git a/module.web/src/components/dnn-security-center/dnn-security-center.tsx b/module.web/src/components/dnn-security-center/dnn-security-center.tsx index 0d5d76e..2144f77 100644 --- a/module.web/src/components/dnn-security-center/dnn-security-center.tsx +++ b/module.web/src/components/dnn-security-center/dnn-security-center.tsx @@ -58,6 +58,7 @@ export class DnnSecurityCenter { } private handleSelect(event): void { + this.securityBulletins = undefined; this.selectValue = event.target.value; if (this.selectValue === 'All Versions') { window.location.reload(); @@ -98,6 +99,12 @@ export class DnnSecurityCenter { )} + {this.securityBulletins === undefined && +
{this.resx.uI.loading}
+ } + {this.securityBulletins?.bulletins?.length === 0 && +
{this.resx.uI.noBulletins}
+ } {this.securityBulletins?.bulletins?.map((bulletin, index) => { return (
diff --git a/module.web/src/services/services.ts b/module.web/src/services/services.ts index 0c781a1..9aa5001 100644 --- a/module.web/src/services/services.ts +++ b/module.web/src/services/services.ts @@ -248,6 +248,10 @@ export class UIInfo implements IUIInfo { dnnPlatformVersion?: string | undefined; /** Gets or sets the DnnSecurityCenter localized text. */ dnnSecurityCenter?: string | undefined; + /** Gets or sets the Loading localized text. */ + loading?: string | undefined; + /** Gets or sets the NoBulletins localized text. */ + noBulletins?: string | undefined; constructor(data?: IUIInfo) { if (data) { @@ -262,6 +266,8 @@ export class UIInfo implements IUIInfo { if (_data) { this.dnnPlatformVersion = _data["DnnPlatformVersion"]; this.dnnSecurityCenter = _data["DnnSecurityCenter"]; + this.loading = _data["Loading"]; + this.noBulletins = _data["NoBulletins"]; } } @@ -276,6 +282,8 @@ export class UIInfo implements IUIInfo { data = typeof data === 'object' ? data : {}; data["DnnPlatformVersion"] = this.dnnPlatformVersion; data["DnnSecurityCenter"] = this.dnnSecurityCenter; + data["Loading"] = this.loading; + data["NoBulletins"] = this.noBulletins; return data; } } @@ -286,6 +294,10 @@ export interface IUIInfo { dnnPlatformVersion?: string | undefined; /** Gets or sets the DnnSecurityCenter localized text. */ dnnSecurityCenter?: string | undefined; + /** Gets or sets the Loading localized text. */ + loading?: string | undefined; + /** Gets or sets the NoBulletins localized text. */ + noBulletins?: string | undefined; } /** A viewmodel that represents DNN Security Bulletins. */ diff --git a/resources/App_LocalResources/UI.resx b/resources/App_LocalResources/UI.resx index 24e1155..ea9673c 100644 --- a/resources/App_LocalResources/UI.resx +++ b/resources/App_LocalResources/UI.resx @@ -123,4 +123,10 @@ DNN Security Center + + Loading... + + + There are no known security vulnerabilities for the selected DNN Platform version. + \ No newline at end of file From e9f8887cb1be9efa941fdfdb045bd9c16d3908b1 Mon Sep 17 00:00:00 2001 From: DNNCommunity Date: Sun, 18 Jun 2023 19:50:13 +0000 Subject: [PATCH 5/9] Commit latest generated files From 8cd6f08a76f57b94945c82ce54e1ccbbaa35b7cb Mon Sep 17 00:00:00 2001 From: David Date: Sun, 18 Jun 2023 16:33:37 -0400 Subject: [PATCH 6/9] Update backend and some frontend dependencies --- Module.csproj | 16 +++++++++------- UnitTests/UnitTests.csproj | 10 +++++----- manifest.dnn | 4 ++-- module.web/package-lock.json | 28 ++++++++++++++-------------- module.web/package.json | 6 +++--- 5 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Module.csproj b/Module.csproj index c053e63..fb73099 100644 --- a/Module.csproj +++ b/Module.csproj @@ -92,19 +92,19 @@ - 9.10.2 + 9.11.1 - 9.10.2 + 9.11.1 - 9.10.2 + 9.11.1 - 9.10.2 + 9.11.1 - 5.2.7 + 5.2.9 6.0.0 @@ -115,7 +115,7 @@ 10.0.3 - 13.17.0 + 13.19.0 1.1.118 @@ -125,7 +125,9 @@ - + + Designer +