Merge branch 'main' into dependabot/nuget/src/System.IdentityModel.To…

…kens.Jwt-7.0.2
AlexHedley · Oct 14, 2023 · 0ef4c42 · 0ef4c42
2 parents 0eac325 + 30d534d
commit 0ef4c42
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -59,7 +59,7 @@ jobs:
 
     # ReportGenerator -reports:"src/Utility.Test/TestResults/**/coverage.cobertura.xml" -targetdir:coveragereport
     - name: ReportGenerator
-      uses: danielpalme/[email protected].25
+      uses: danielpalme/[email protected].26
       with:
         reports: 'src/Utility.Test/TestResults/**/coverage.cobertura.xml' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
         targetdir: 'coveragereport' # REQUIRED # The directory where the generated report should be saved.

diff --git a/src/Utility/Components/GuidGenerator/GuidGenerator.razor b/src/Utility/Components/GuidGenerator/GuidGenerator.razor
@@ -21,17 +21,17 @@
         </div>
     </div>
     <div class="row">
-        <div class="form-check">
+        <div class="form-check form-check-inline">
             <input class="form-check-input" type="checkbox" value="@removeDashes" id="chkRemoveDashesZero"
-                   @onchange="@(eventArgs => { removeDashes = (bool)eventArgs.Value; RemoveDashesFromZeroGuid(); })"/>
+                   @onchange="@(eventArgs => { removeDashes = (bool)eventArgs.Value; Update(); })"/>
             <label class="form-check-label" for="chkRemoveDashesZero">
                 Remove Dashes
             </label>
         </div>
         &nbsp;|&nbsp;
-        <div class="form-check">
+        <div class="form-check form-check-inline">
             <input class="form-check-input" type="checkbox" value="@addBraces" id="chkAddBracesZero"
-                   @onchange="@(eventArgs => { addBraces = (bool)eventArgs.Value; AddBracesToZeroGuid(); })"/>
+                   @onchange="@(eventArgs => { addBraces = (bool)eventArgs.Value; Update(); })"/>
             <label class="form-check-label" for="chkAddBracesZero">
                 Add Braces
             </label>
@@ -120,7 +120,6 @@
     void RemoveDashesFromZeroGuid()
     {
         zeroGuid = (removeDashes) ? defaultZeroGuid.ToString().Replace("-", "") : defaultZeroGuid.ToString();
-        //removeDashes = !removeDashes;
     }
 
     private bool addBraces = false;
@@ -129,6 +128,12 @@
         zeroGuid = (addBraces) ? $"{{{zeroGuid}}}" : zeroGuid.Replace("{", "").Replace("}", "");
     }
 
+    void Update()
+    {
+        RemoveDashesFromZeroGuid();
+        AddBracesToZeroGuid();
+    }
+
     #endregion Zero
 
     #region New
@@ -138,6 +143,7 @@
         var guid = Guid.NewGuid();
         newGuid = guid.ToString();
         newGuidHidden = guid;
+        RemoveDashesFromNewGuid();
     }
 
     private bool removeDashesNew = false;