From f6538b89c2e7f189571b29ea4c5d60eb5256fc6b Mon Sep 17 00:00:00 2001 From: Bryan Soltis Date: Mon, 6 Nov 2023 13:03:50 -0600 Subject: [PATCH 01/16] 2023-11-06 - BryanSoltis - v3.1.2 Updates ### BUG FIXESS - Updated Configuration to properly close Working modal - Updated Global Export/Import to include ReadOnlyAPI key --- src/Pages/Configuration.razor | 6 ++---- src/Services/ImportExportService.cs | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Pages/Configuration.razor b/src/Pages/Configuration.razor index 3ccf5ca..47c724c 100644 --- a/src/Pages/Configuration.razor +++ b/src/Pages/Configuration.razor @@ -3974,10 +3974,8 @@ message.Type = MessageTypesEnum.ERROR; message.Message = "There was a problem with the request."; } - finally - { - workingmodal.Close(); - } + + workingmodal.Close(); } if (!generalerror) diff --git a/src/Services/ImportExportService.cs b/src/Services/ImportExportService.cs index 7770fe0..5a634d9 100644 --- a/src/Services/ImportExportService.cs +++ b/src/Services/ImportExportService.cs @@ -117,6 +117,7 @@ public static async Task ExportConfig(bool includeadmin = false configdata.SALTKey = config.SALTKey; configdata.AdminPassword = config.AdminPassword; configdata.APIKey = config.APIKey; + configdata.ReadOnlyAPIKey = config.ReadOnlyAPIKey; //IdentityHeaderName configdata.IdentityHeaderName = config.IdentityHeaderName; //AdminUsers @@ -183,6 +184,10 @@ public static async Task PostConfig(ConfigurationData configdat { config.APIKey = configdata.APIKey; } + if (GeneralHelper.IsNotNull(configdata.ReadOnlyAPIKey)) + { + config.ReadOnlyAPIKey = configdata.ReadOnlyAPIKey; + } if (GeneralHelper.IsNotNull(configdata.IdentityHeaderName)) { config.IdentityHeaderName = configdata.IdentityHeaderName; From 26f719b5c54de98e270b72a417f22b9c14fe5b72 Mon Sep 17 00:00:00 2001 From: Bryan Soltis Date: Tue, 7 Nov 2023 14:01:41 -0600 Subject: [PATCH 02/16] 2023-11-07 - BryanSoltis - v3.2.0 Updates ###FEATURES - Added ability to add custom locations - Added guidance to Configuration page for locations --- src/Pages/Configuration.razor | 65 ++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/src/Pages/Configuration.razor b/src/Pages/Configuration.razor index 47c724c..eb7ef57 100644 --- a/src/Pages/Configuration.razor +++ b/src/Pages/Configuration.razor @@ -898,6 +898,14 @@

The current Locations.

+ @if (admin) + { +

+ +

+ }
@@ -943,6 +951,10 @@ } + + } } @@ -955,37 +967,6 @@ @if (admin) { - @*
-
- New Location -
-
-

Add a new Location.

-
- - - - - - - - - - - - - -
Name - -
Short Name - -
- -
-
-
*@
Azure Naming Tool API documentation." }); From 1189fba64cc32db446fb5363811cdb53b4c2f196 Mon Sep 17 00:00:00 2001 From: Bryan Soltis Date: Wed, 15 Nov 2023 09:52:14 -0600 Subject: [PATCH 09/16] - Updated assembly version logic --- src/Helpers/ConfigurationHelper.cs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/Helpers/ConfigurationHelper.cs b/src/Helpers/ConfigurationHelper.cs index 67cd6cf..3a27d87 100644 --- a/src/Helpers/ConfigurationHelper.cs +++ b/src/Helpers/ConfigurationHelper.cs @@ -567,19 +567,27 @@ public static void ResetState(StateContainer state) public static string GetAssemblyVersion() { + string result = String.Empty; try { - string versiondata = String.Empty; - Version version = Assembly.GetExecutingAssembly().GetName().Version!; - versiondata = version.Major + "." + version.Minor + "." + version.Revision; - return versiondata; - + string data = (string)CacheHelper.GetCacheObject("assemblyversion")!; + if (String.IsNullOrEmpty(data)) + { + Version version = Assembly.GetExecutingAssembly().GetName().Version!; + result = version.Major + "." + version.Minor + "." + version.Revision; + CacheHelper.SetCacheObject("assemblyversion", result); + } + else + { + result = data; + } + return result; } catch (Exception ex) { AdminLogService.PostItem(new AdminLogMessage() { Title = "ERROR", Message = ex.Message }); - return null; } + return result; } public static async Task GetToolVersion() From cc7f510c6c77d7b6c085a80708ac73abcca511ad Mon Sep 17 00:00:00 2001 From: Bryan Soltis Date: Wed, 15 Nov 2023 13:26:30 -0600 Subject: [PATCH 10/16] 2023-11-15 - BryanSoltis - v3.2.0 Updates ###FEATURES - Added ability to add custom locations - Added guidance to Configuration page for locations - Added Generate Random Value functionality for custom components - Added Custom Component API functions for retrieving/deleting by parent component id ### BUG FIXES - Updated Configuration to properly close Working modal - Updated Global Export/Import to include ReadOnlyAPI key - Fixed #39 Updated Generate page to properly handle optional free text components --- src/Shared/Modals/AddModal.razor | 2 +- src/Shared/Modals/EditModal.razor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Shared/Modals/AddModal.razor b/src/Shared/Modals/AddModal.razor index ba21118..4c5dc61 100644 --- a/src/Shared/Modals/AddModal.razor +++ b/src/Shared/Modals/AddModal.razor @@ -66,7 +66,7 @@ Generate Alphanumeric Values
- If enabled, the tool will generate a rnadom alphanumeric value for the component. If disabled, only letters will be generated. + If enabled, the tool will generate a random alphanumeric value for the component. If disabled, only letters will be generated.
- If enabled, the tool will generate a rnadom alphanumeric value for the component. If disabled, only letters will be generated. + If enabled, the tool will generate a random alphanumeric value for the component. If disabled, only letters will be generated.
- Enter the desired custom component settings. + Enter the desired configuration.
diff --git a/src/Shared/Modals/EditModal.razor b/src/Shared/Modals/EditModal.razor index 9a324ad..5c0fda0 100644 --- a/src/Shared/Modals/EditModal.razor +++ b/src/Shared/Modals/EditModal.razor @@ -26,7 +26,7 @@
- This section allows you to modify the resource type validation settings. + This section allows you to modify the configuration.
From adcb9113bf3e54661b8f82509ada13fcbbde082c Mon Sep 17 00:00:00 2001 From: Sean McGrath Date: Thu, 16 Nov 2023 16:41:20 +1300 Subject: [PATCH 12/16] Remove Azure credentials from workflow Azure credentials are not required when using a publish profile --- ...loy-azure-naming-tool-to-azure-webapps-dotnet-core.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/deploy-azure-naming-tool-to-azure-webapps-dotnet-core.yml b/.github/workflows/deploy-azure-naming-tool-to-azure-webapps-dotnet-core.yml index 611c4bf..12dda2d 100644 --- a/.github/workflows/deploy-azure-naming-tool-to-azure-webapps-dotnet-core.yml +++ b/.github/workflows/deploy-azure-naming-tool-to-azure-webapps-dotnet-core.yml @@ -49,8 +49,7 @@ jobs: env: azure-webapp-name: ${{ secrets.AZURE_WEBAPP_NAME }} azure-webapp-publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }} - azure-credentials: ${{ secrets.AZURE_CREDENTIALS }} - if: (env.azure-webapp-name != null && env.azure-webapp-publish-profile != null && env.azure-credentials != null) + if: (env.azure-webapp-name != null && env.azure-webapp-publish-profile != null) run: echo 'isvalid=true' >> $GITHUB_OUTPUT build: @@ -104,11 +103,6 @@ jobs: uses: actions/download-artifact@v3 with: name: .net-app - - - name: Login to Azure - uses: azure/login@v1 - with: - creds: ${{ secrets.AZURE_CREDENTIALS }} - name: Deploy to Azure Web App id: deploy-to-webapp From 06dbb030da28442f453c02bdd3b82028e7fb03a2 Mon Sep 17 00:00:00 2001 From: Bryan Soltis Date: Thu, 16 Nov 2023 08:23:06 -0600 Subject: [PATCH 13/16] Update deploy-azure-naming-tool-to-azure-webapps-dotnet-core.yml --- ...loy-azure-naming-tool-to-azure-webapps-dotnet-core.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/deploy-azure-naming-tool-to-azure-webapps-dotnet-core.yml b/.github/workflows/deploy-azure-naming-tool-to-azure-webapps-dotnet-core.yml index 611c4bf..12dda2d 100644 --- a/.github/workflows/deploy-azure-naming-tool-to-azure-webapps-dotnet-core.yml +++ b/.github/workflows/deploy-azure-naming-tool-to-azure-webapps-dotnet-core.yml @@ -49,8 +49,7 @@ jobs: env: azure-webapp-name: ${{ secrets.AZURE_WEBAPP_NAME }} azure-webapp-publish-profile: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE }} - azure-credentials: ${{ secrets.AZURE_CREDENTIALS }} - if: (env.azure-webapp-name != null && env.azure-webapp-publish-profile != null && env.azure-credentials != null) + if: (env.azure-webapp-name != null && env.azure-webapp-publish-profile != null) run: echo 'isvalid=true' >> $GITHUB_OUTPUT build: @@ -104,11 +103,6 @@ jobs: uses: actions/download-artifact@v3 with: name: .net-app - - - name: Login to Azure - uses: azure/login@v1 - with: - creds: ${{ secrets.AZURE_CREDENTIALS }} - name: Deploy to Azure Web App id: deploy-to-webapp From 4884bb531f0cd396d3a3635f59d59612fd6f73fa Mon Sep 17 00:00:00 2001 From: Bryan Soltis Date: Thu, 16 Nov 2023 12:29:50 -0600 Subject: [PATCH 14/16] - Added new Azure locations - Updated location config file version --- src/configurationfileversions.json | 2 +- src/repository/resourcelocations.json | 580 ++++++++++++++------------ 2 files changed, 311 insertions(+), 271 deletions(-) diff --git a/src/configurationfileversions.json b/src/configurationfileversions.json index 44d8118..6e6a41c 100644 --- a/src/configurationfileversions.json +++ b/src/configurationfileversions.json @@ -1,4 +1,4 @@ { "resourcetypes": "1.0.1", - "resourcelocations": "1.0.0" + "resourcelocations": "2.0.0" } diff --git a/src/repository/resourcelocations.json b/src/repository/resourcelocations.json index ab5efb6..9bcef7e 100644 --- a/src/repository/resourcelocations.json +++ b/src/repository/resourcelocations.json @@ -1,272 +1,312 @@ [ - { - "id": 1, - "name": "Australia Central", - "shortName": "ac" - }, - { - "id": 2, - "name": "Australia Central 2", - "shortName": "ac2" - }, - { - "id": 3, - "name": "Australia East", - "shortName": "ae" - }, - { - "id": 4, - "name": "Australia Southeast", - "shortName": "as" - }, - { - "id": 5, - "name": "Brazil South", - "shortName": "bs2" - }, - { - "id": 6, - "name": "Brazil Southeast", - "shortName": "bs" - }, - { - "id": 7, - "name": "Canada Central", - "shortName": "cc" - }, - { - "id": 8, - "name": "Canada East", - "shortName": "ce" - }, - { - "id": 9, - "name": "Central India", - "shortName": "ci" - }, - { - "id": 10, - "name": "Central US", - "shortName": "cu" - }, - { - "id": 11, - "name": "China East", - "shortName": "ce" - }, - { - "id": 12, - "name": "China East 2", - "shortName": "ce2" - }, - { - "id": 13, - "name": "China North", - "shortName": "cn" - }, - { - "id": 14, - "name": "China North 2", - "shortName": "cn2" - }, - { - "id": 15, - "name": "East Asia", - "shortName": "ea" - }, - { - "id": 16, - "name": "East US", - "shortName": "eu" - }, - { - "id": 17, - "name": "East US 2", - "shortName": "eu2" - }, - { - "id": 18, - "name": "France Central", - "shortName": "fc" - }, - { - "id": 19, - "name": "France South", - "shortName": "fs" - }, - { - "id": 20, - "name": "Germany North", - "shortName": "gn" - }, - { - "id": 21, - "name": "Germany West Central", - "shortName": "gwc" - }, - { - "id": 22, - "name": "Japan East", - "shortName": "je" - }, - { - "id": 23, - "name": "Japan West", - "shortName": "jw" - }, - { - "id": 24, - "name": "Jio India West", - "shortName": "jiw" - }, - { - "id": 25, - "name": "Korea Central", - "shortName": "kc" - }, - { - "id": 26, - "name": "Korea South", - "shortName": "ks" - }, - { - "id": 27, - "name": "New Zealand North", - "shortName": "nzn" - }, - { - "id": 28, - "name": "North Central US", - "shortName": "ncu" - }, - { - "id": 29, - "name": "North Europe", - "shortName": "ne2" - }, - { - "id": 30, - "name": "Norway East", - "shortName": "ne" - }, - { - "id": 31, - "name": "Norway West", - "shortName": "nw" - }, - { - "id": 32, - "name": "South Africa North", - "shortName": "san" - }, - { - "id": 33, - "name": "South Africa West", - "shortName": "saw" - }, - { - "id": 34, - "name": "South Central US", - "shortName": "scu" - }, - { - "id": 35, - "name": "South India", - "shortName": "si" - }, - { - "id": 36, - "name": "Southeast Asia", - "shortName": "sa" - }, - { - "id": 37, - "name": "Switzerland North", - "shortName": "sn" - }, - { - "id": 38, - "name": "Switzerland West", - "shortName": "sw" - }, - { - "id": 39, - "name": "UAE Central", - "shortName": "uc" - }, - { - "id": 40, - "name": "UAE North", - "shortName": "un" - }, - { - "id": 41, - "name": "UK South", - "shortName": "us" - }, - { - "id": 42, - "name": "UK West", - "shortName": "uw" - }, - { - "id": 43, - "name": "USDoD Central", - "shortName": "uc" - }, - { - "id": 44, - "name": "USDoD East", - "shortName": "ue" - }, - { - "id": 45, - "name": "USGov Arizona", - "shortName": "ua" - }, - { - "id": 46, - "name": "USGov Iowa", - "shortName": "ui" - }, - { - "id": 47, - "name": "USGov Texas", - "shortName": "ut" - }, - { - "id": 48, - "name": "USGov Virginia", - "shortName": "uv" - }, - { - "id": 49, - "name": "West Central US", - "shortName": "wcu" - }, - { - "id": 50, - "name": "West Europe", - "shortName": "we" - }, - { - "id": 51, - "name": "West India", - "shortName": "wi" - }, - { - "id": 52, - "name": "West US", - "shortName": "wu" - }, - { - "id": 53, - "name": "West US 2", - "shortName": "wu2" - }, - { - "id": 54, - "name": "West US 3", - "shortName": "wu3" - } + { + "id": 1, + "name": "Australia Central", + "shortName": "ac" + }, + { + "id": 2, + "name": "Australia Central 2", + "shortName": "ac2" + }, + { + "id": 3, + "name": "Australia East", + "shortName": "ae" + }, + { + "id": 4, + "name": "Australia Southeast", + "shortName": "as" + }, + { + "id": 5, + "name": "Brazil South", + "shortName": "bs2" + }, + { + "id": 6, + "name": "Brazil Southeast", + "shortName": "bs" + }, + { + "id": 7, + "name": "Canada Central", + "shortName": "cc" + }, + { + "id": 8, + "name": "Canada East", + "shortName": "ce" + }, + { + "id": 9, + "name": "Central India", + "shortName": "ci" + }, + { + "id": 10, + "name": "Central US", + "shortName": "cu" + }, + { + "id": 11, + "name": "China East", + "shortName": "ce" + }, + { + "id": 12, + "name": "China East 2", + "shortName": "ce2" + }, + { + "id": 13, + "name": "China North", + "shortName": "cn" + }, + { + "id": 14, + "name": "China North 2", + "shortName": "cn2" + }, + { + "id": 15, + "name": "East Asia", + "shortName": "ea" + }, + { + "id": 16, + "name": "East US", + "shortName": "eu" + }, + { + "id": 17, + "name": "East US 2", + "shortName": "eu2" + }, + { + "id": 18, + "name": "France Central", + "shortName": "fc" + }, + { + "id": 19, + "name": "France South", + "shortName": "fs" + }, + { + "id": 20, + "name": "Germany North", + "shortName": "gn" + }, + { + "id": 21, + "name": "Germany West Central", + "shortName": "gwc" + }, + { + "id": 22, + "name": "Japan East", + "shortName": "je" + }, + { + "id": 23, + "name": "Japan West", + "shortName": "jw" + }, + { + "id": 24, + "name": "Jio India West", + "shortName": "jiw" + }, + { + "id": 25, + "name": "Korea Central", + "shortName": "kc" + }, + { + "id": 26, + "name": "Korea South", + "shortName": "ks" + }, + { + "id": 27, + "name": "New Zealand North", + "shortName": "nzn" + }, + { + "id": 28, + "name": "North Central US", + "shortName": "ncu" + }, + { + "id": 29, + "name": "North Europe", + "shortName": "ne2" + }, + { + "id": 30, + "name": "Norway East", + "shortName": "ne" + }, + { + "id": 31, + "name": "Norway West", + "shortName": "nw" + }, + { + "id": 32, + "name": "South Africa North", + "shortName": "san" + }, + { + "id": 33, + "name": "South Africa West", + "shortName": "saw" + }, + { + "id": 34, + "name": "South Central US", + "shortName": "scu" + }, + { + "id": 35, + "name": "South India", + "shortName": "si" + }, + { + "id": 36, + "name": "Southeast Asia", + "shortName": "sa" + }, + { + "id": 37, + "name": "Switzerland North", + "shortName": "sn" + }, + { + "id": 38, + "name": "Switzerland West", + "shortName": "sw" + }, + { + "id": 39, + "name": "UAE Central", + "shortName": "uc" + }, + { + "id": 40, + "name": "UAE North", + "shortName": "un" + }, + { + "id": 41, + "name": "UK South", + "shortName": "us" + }, + { + "id": 42, + "name": "UK West", + "shortName": "uw" + }, + { + "id": 43, + "name": "USDoD Central", + "shortName": "uc" + }, + { + "id": 44, + "name": "USDoD East", + "shortName": "ue" + }, + { + "id": 45, + "name": "USGov Arizona", + "shortName": "ua" + }, + { + "id": 46, + "name": "USGov Iowa", + "shortName": "ui" + }, + { + "id": 47, + "name": "USGov Texas", + "shortName": "ut" + }, + { + "id": 48, + "name": "USGov Virginia", + "shortName": "uv" + }, + { + "id": 49, + "name": "West Central US", + "shortName": "wcu" + }, + { + "id": 50, + "name": "West Europe", + "shortName": "we" + }, + { + "id": 51, + "name": "West India", + "shortName": "wi" + }, + { + "id": 52, + "name": "West US", + "shortName": "wu" + }, + { + "id": 53, + "name": "West US 2", + "shortName": "wu2" + }, + { + "id": 54, + "name": "West US 3", + "shortName": "wu3" + }, + { + "id": 55, + "name": "Sweden Central", + "shortName": "swc" + }, + { + "id": 56, + "name": "Sweden South", + "shortName": "sws" + }, + { + "id": 57, + "name": "Poland Central", + "shortName": "pol" + }, + { + "id": 58, + "name": "Italy North", + "shortName": "itn" + }, + { + "id": 59, + "name": "Qatar Central", + "shortName": "qac" + }, + { + "id": 60, + "name": "Isreal Central", + "shortName": "isc" + }, + { + "id": 61, + "name": "China North 3", + "shortName": "cn3" + }, + { + "id": 62, + "name": "Jio India Central", + "shortName": "jic" + } ] \ No newline at end of file From 4083ab41756a43a55db93787de74c44ebe312e59 Mon Sep 17 00:00:00 2001 From: Bryan Soltis Date: Thu, 16 Nov 2023 12:33:13 -0600 Subject: [PATCH 15/16] - Update configuration file formatting --- src/configurationfileversions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/configurationfileversions.json b/src/configurationfileversions.json index 6e6a41c..41feab0 100644 --- a/src/configurationfileversions.json +++ b/src/configurationfileversions.json @@ -1,4 +1,4 @@ { "resourcetypes": "1.0.1", "resourcelocations": "2.0.0" -} +} \ No newline at end of file From b15888c46b4ffd1f6f3a43d5e3b3e4cdb0575740 Mon Sep 17 00:00:00 2001 From: Bryan Soltis Date: Thu, 16 Nov 2023 16:14:47 -0600 Subject: [PATCH 16/16] 2023-11-16 - BryanSoltis - v3.2.0 Updates ### FEATURES - Added ability to add custom locations - Added guidance to Configuration page for locations - Added Generate Random Value functionality for custom components - Added Custom Component API functions for retrieving/deleting by parent component id - Added new Azure regions to Locations ### BUG FIXES - Updated Configuration to properly close Working modal - Updated Global Export/Import to include ReadOnlyAPI key - Fixed https://github.com/mspnp/AzureNamingTool/issues/29. Updated Azure regions - Fixed https://github.com/mspnp/AzureNamingTool/issues/39. Updated Generate page to properly handle optional free text components - Updated text on Add / Edit modals - Updated GitHub Action to remove Azure Credentials requirement (This is included in the App Service Publish Profile) ### CONTRIBUTORS - [wipash](https://github.com/wipash) --- src/Models/ResourceComponent.cs | 2 +- src/Pages/Generate.razor | 34 ++++++++++--------------------- src/Shared/Modals/AddModal.razor | 20 +++++++++--------- src/Shared/Modals/EditModal.razor | 22 ++++++++++---------- 4 files changed, 33 insertions(+), 45 deletions(-) diff --git a/src/Models/ResourceComponent.cs b/src/Models/ResourceComponent.cs index 2a8028a..08a7043 100644 --- a/src/Models/ResourceComponent.cs +++ b/src/Models/ResourceComponent.cs @@ -16,7 +16,7 @@ public class ResourceComponent public bool IsFreeText { get; set; } = false; public string MinLength { get; set; } = "1"; public string MaxLength { get; set; } = "10"; - public bool AllowRandom { get; set; } = false; + public bool EnforceRandom { get; set; } = false; public bool Alphanumeric { get; set; } = true; } } diff --git a/src/Pages/Generate.razor b/src/Pages/Generate.razor index 11945f3..f754ece 100644 --- a/src/Pages/Generate.razor +++ b/src/Pages/Generate.razor @@ -411,15 +411,7 @@ }
- - @if (resourceComponent.AllowRandom) - { -
- -
- } +
} @@ -528,7 +520,7 @@ private ResourceType? currentResourceType = null; private List multiselectedResourceTypes = new(); private string currentuser = String.Empty; - private Dictionary customcomponentvalues = new(); + //private Dictionary customcomponentvalues = new(); protected override async Task OnInitializedAsync() { @@ -563,16 +555,6 @@ categories = ResourceTypeService.GetTypeCategories(servicesData.ResourceTypes); resourceDelimiter = (ResourceDelimiter)servicesData.ResourceDelimiters![0]; componentsVisible = "collapse show"; - - // Create the custom coponents dictionary items - customcomponentvalues.Clear(); - if (GeneralHelper.IsNotNull(servicesData.ResourceComponents)) - { - foreach (ResourceComponent component in servicesData.ResourceComponents.Where(x => x.IsFreeText)) - { - customcomponentvalues.Add(GeneralHelper.NormalizeName(component.Name, true), String.Empty); - } - } } catch (Exception ex) { @@ -929,7 +911,14 @@ { if (component.IsCustom) { - selectedCustomComponents.Add(GeneralHelper.NormalizeName(component.Name, true), String.Empty); + if (component.EnforceRandom) + { + GenerateRandomValue(GeneralHelper.NormalizeName(component.Name, true), component.MaxLength, component.Alphanumeric); + } + else + { + selectedCustomComponents.Add(GeneralHelper.NormalizeName(component.Name, true), String.Empty); + } } } @@ -1198,8 +1187,7 @@ private void GenerateRandomValue(string customcomponentname, string maxlength, bool alphanumeric) { string value = GeneralHelper.GenerateRandomString(Convert.ToInt32(maxlength), alphanumeric); - customcomponentvalues[customcomponentname] = value; - OnComponentChanged("cc", value!, customcomponentname); + OnComponentChanged("cc", value, customcomponentname); } private void ResetForm(bool clearselection) diff --git a/src/Shared/Modals/AddModal.razor b/src/Shared/Modals/AddModal.razor index 12045b1..16be3d7 100644 --- a/src/Shared/Modals/AddModal.razor +++ b/src/Shared/Modals/AddModal.razor @@ -38,7 +38,7 @@
@if (itemComponentType == "freetext") @@ -46,20 +46,20 @@
- Allow Random Value Generation + Generate Random Value
- This setting allows the user to generate a random value for the component. + By default, Free Form allows any value. If enabled, this setting will generate a random value for the component.
-
- @if (itemAllowRandom) + @if (itemEnforceRandom) {
@@ -139,7 +139,7 @@ private string itemMinLength = "1"; private string itemMaxLength = "10"; private string itemComponentType = "standard"; - private bool itemAllowRandom = false; + private bool itemEnforceRandom = false; private bool itemAlphanumeric = true; private bool itemIsFreeText = false; private string currentuser = String.Empty; @@ -186,7 +186,7 @@ IsFreeText = itemIsFreeText, MinLength = itemMinLength, MaxLength = itemMaxLength, - AllowRandom = itemAllowRandom, + EnforceRandom = itemEnforceRandom, Alphanumeric = itemAlphanumeric }; serviceResponse = await ResourceComponentService.PostItem(resourceComponent); @@ -418,8 +418,8 @@ { switch (setting) { - case "allowrandom": - itemAllowRandom = (bool)e.Value; + case "enforcerandom": + itemEnforceRandom = (bool)e.Value; break; case "alphanumeric": itemAlphanumeric = (bool)e.Value; diff --git a/src/Shared/Modals/EditModal.razor b/src/Shared/Modals/EditModal.razor index 5c0fda0..af75bb9 100644 --- a/src/Shared/Modals/EditModal.razor +++ b/src/Shared/Modals/EditModal.razor @@ -71,7 +71,7 @@
@if (itemComponentType == "freetext") @@ -79,20 +79,20 @@
- Allow Random Value Generation + Generate Random Value
- This setting allows the user to generate a random value for the component. + By default, Free Form allows any value. If enabled, this setting to generate a random value for the component.
Enable
- @if (itemAllowRandom) + @if (itemEnforceRandom) {
@@ -376,7 +376,7 @@ private string itemComponentType = "standard"; private bool itemIsFreeText = false; private bool itemOriginalStandard = false; - private bool itemAllowRandom = false; + private bool itemEnforceRandom = false; private bool itemAlphanumeric = true; private List resourceComponents = new(); private string optional = String.Empty; @@ -409,7 +409,7 @@ itemComponentType = "freetext"; } itemOriginalStandard = !resourceComponent.IsFreeText; - itemAllowRandom = resourceComponent.AllowRandom; + itemEnforceRandom = resourceComponent.EnforceRandom; itemAlphanumeric = resourceComponent.Alphanumeric; break; case "ResourceEnvironment": @@ -506,7 +506,7 @@ { resourceComponent.IsFreeText = false; } - resourceComponent.AllowRandom = itemAllowRandom; + resourceComponent.EnforceRandom = itemEnforceRandom; resourceComponent.Alphanumeric = itemAlphanumeric; } else @@ -803,7 +803,7 @@ { if (GeneralHelper.IsNotNull(e.Value)) { - itemAllowRandom = bool.Parse(e.Value.ToString()!); + itemEnforceRandom = bool.Parse(e.Value.ToString()!); } } @@ -823,8 +823,8 @@ { switch (setting) { - case "allowrandom": - itemAllowRandom = (bool)e.Value; + case "enforcerandom": + itemEnforceRandom = (bool)e.Value; break; case "alphanumeric": itemAlphanumeric = (bool)e.Value;