more configuration via runtimestring

ignatandrei · ignatandrei · commit 35585e1a8a46 · 2020-07-01T22:37:56.000+03:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,7 +10,7 @@ variables:
   solution: '**/*.sln'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
-  deployNuget: '0'
+  deployNuget: '1'
 
 steps:
 - task: NuGetToolInstaller@1
diff --git a/src/NetCore2Blockly/NetCore2Blockly/BlocklyUIOptions.cs b/src/NetCore2Blockly/NetCore2Blockly/BlocklyUIOptions.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using Microsoft.Extensions.Configuration;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -46,6 +47,6 @@ public BlocklyUIOptions()
         /// <value>
         /// The run time blocks.
         /// </value>
-        public Func<string> RunTimeString { get; set; }
+        public Func<IServiceProvider, string> RunTimeString { get; set; }
     }
 }
diff --git a/src/NetCore2Blockly/NetCore2Blockly/ExtensionMethods/CLIExtension.cs b/src/NetCore2Blockly/NetCore2Blockly/ExtensionMethods/CLIExtension.cs
@@ -267,7 +267,7 @@ public static void UseBlocklyUI(this IApplicationBuilder appBuilder, BlocklyUIOp
         {
             var manifestEmbeddedProvider =
 new ManifestEmbeddedFileProvider(Assembly.GetExecutingAssembly());
-
+            var service = appBuilder.ApplicationServices;
             mapFile("blocklyFiles", manifestEmbeddedProvider, appBuilder);
 
             #region map options
@@ -283,7 +283,7 @@ public static void UseBlocklyUI(this IApplicationBuilder appBuilder, BlocklyUIOp
                     data= options.CustomBlocks?.Replace("`", @"\`");
                     str += $"{Environment.NewLine}var customBlocks = `{data}`;";
 
-                    str += $"{Environment.NewLine}{options.RunTimeString?.Invoke()};";
+                    str += $"{Environment.NewLine}{options.RunTimeString?.Invoke(service)};";
                     var result = Encoding.UTF8.GetBytes(str);
                     var m = new Memory<byte>(result);
                     await cnt.Response.BodyWriter.WriteAsync(m);
diff --git a/src/NetCore2Blockly/NetCore2Blockly/NetCore2Blockly.xml b/src/NetCore2Blockly/NetCore2Blockly/NetCore2Blockly.xml
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/Startup.cs b/src/NetCore2Blockly/TestBlocklyHtml/Startup.cs
@@ -221,7 +221,13 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 StartBlocks = StartBlocksForUI,
                 HeaderName = "Demo test for .NET Core WebAPI To Blockly ( demo site with Blockly +  swaggers + odata loaded + graphql)",
                 CustomBlocks = CustomBlocksForUI,
-                RunTimeString = () => $"console.log('this is from runtime blocks {DateTime.Now.Ticks}');"
+                RunTimeString = c =>
+                {
+                    var str=$"console.log('this is from runtime blocks {DateTime.Now.Ticks}');";
+                    var val = c.GetRequiredService<IConfiguration>().GetSection("myCustomValue").Value;
+                    str += val;
+                    return str;
+                }
             }); 
 
             app.UseBlocklyLocalStorage();
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/appsettings.json b/src/NetCore2Blockly/TestBlocklyHtml/appsettings.json
@@ -7,6 +7,7 @@
     }
   },
   "AllowedHosts": "*",
+  "myCustomValue": "console.log('this is from the appsettings at runtime - can be modified');",
   "NetCoreBlockly": {
     "OtherLinks": {
       "Swaggers": [

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System;`
	`1`	`+using Microsoft.Extensions.Configuration;`
	`2`	`+using System;`
`2`	`3`	`using System.Collections.Generic;`
`3`	`4`	`using System.Text;`
`4`	`5`
`@@ -46,6 +47,6 @@ public BlocklyUIOptions()`
`46`	`47`	`/// <value>`
`47`	`48`	`/// The run time blocks.`
`48`	`49`	`/// </value>`
`49`		`- public Func<string> RunTimeString { get; set; }`
	`50`	`+ public Func<IServiceProvider, string> RunTimeString { get; set; }`
`50`	`51`	`}`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`}`
`8`	`8`	`},`
`9`	`9`	`"AllowedHosts": "*",`
	`10`	`+ "myCustomValue": "console.log('this is from the appsettings at runtime - can be modified');",`
`10`	`11`	`"NetCoreBlockly": {`
`11`	`12`	`"OtherLinks": {`
`12`	`13`	`"Swaggers": [`