Merge pull request #134 from david-poindexter/no-vulnerabilities-ux

Add no vulnerabilities message and a loading message
DNNCommunity · Jun 18, 2023 · f295222 · f295222
2 parents bc2393a + b93724e
commit f295222
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 0 deletions.
diff --git 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
@@ -55,6 +55,14 @@ public class UIInfo
             /// <example>DNN Security Center</example>
             public string DnnSecurityCenter { get; set; }
 
+            /// <summary>Gets or sets the Loading localized text.</summary>
+            /// <example>Loading...</example>
+            public string Loading { get; set; }
+
+            /// <summary>Gets or sets the NoBulletins localized text.</summary>
+            /// <example>There are no known security vulnerabilities for the selected DNN Platform version.</example>
+            public string NoBulletins { get; set; }
+
 
         }
 

diff --git 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
@@ -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 {
             )}
           </select>
         </h3>
+        {this.securityBulletins === undefined &&
+          <div class="loading">{this.resx.uI.loading}</div>
+        }
+        {this.securityBulletins?.bulletins?.length === 0 &&
+          <div class="no-bulletins">{this.resx.uI.noBulletins}</div>
+        }
         {this.securityBulletins?.bulletins?.map((bulletin, index) => {
           return (
             <div class="bulletins">

diff --git 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
@@ -123,4 +123,10 @@
   <data name="DnnSecurityCenter.Text" xml:space="preserve">
     <value>DNN Security Center</value>
   </data>
+  <data name="Loading.Text" xml:space="preserve">
+    <value>Loading...</value>
+  </data>
+  <data name="NoBulletins.Text" xml:space="preserve">
+    <value>There are no known security vulnerabilities for the selected DNN Platform version.</value>
+  </data>
 </root>