starting to add first js

ignatandrei · May 9, 2020 · b272942 · b272942
1 parent 1f64385
commit b272942
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/src/NetCore2Blockly/NetCore2Blockly/ExtensionMethods/CLIExtension.cs b/src/NetCore2Blockly/NetCore2Blockly/ExtensionMethods/CLIExtension.cs
@@ -59,6 +59,16 @@ public static IApplicationBuilder UseBlockly(this IApplicationBuilder app)
             MapJS(app, "/blocklyAPIFunctions", b => b.BlocklyAPIFunctions);
             MapJS(app, "/BlocklyToolBoxFunctionDefinitions", b => b.BlocklyToolBoxFunctionDefinition);
             MapJS(app, "/BlocklySwaggers", b => b.SwaggersDictionaryJS);
+            var blocklyFilesHostedService =
+                app.
+                    ApplicationServices
+                    .GetService<GenerateBlocklyFilesHostedService>();
+
+            foreach (var item in blocklyFilesHostedService.KeySwaggers())
+            {
+                MapJS(app, "/BlocklyDefinitions" + item, b => b.SwaggerBlocklyTypesDefinition(item));
+            }
+
             return app;
         }
 

diff --git a/src/NetCore2Blockly/NetCore2Blockly/GenerateBlocklyFilesHostedService.cs b/src/NetCore2Blockly/NetCore2Blockly/GenerateBlocklyFilesHostedService.cs
@@ -18,7 +18,14 @@ public class GenerateBlocklyFilesHostedService : IHostedService
 
         #region swaggers
         private Dictionary<string, string> swaggers;
-
+        public string[] KeySwaggers()
+        {
+            return swaggers.Select(it => it.Key).ToArray();
+        }
+        public string SwaggerBlocklyTypesDefinition(string key)
+        {
+            return "";
+        }
         public string SwaggersDictionaryJS
         {
             get

diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html
@@ -174,7 +174,7 @@ <h1>
 
     </script>
     <xml id="toolbox" style="display: none">
-        <category name="LocalSite" expanded="true">
+        <category name="LocalSite" expanded="false">
             <category id="LocalSiteFunctions" name="LocalSiteFunctions" expanded="true">
             </category>
             <category custom="LocalSiteValues" name="LocalSiteValues">
@@ -971,11 +971,15 @@ <h1>
         };
         //swagger
 
-        window.alert(JSON.stringify(dictSwagger));
+        //window.alert(JSON.stringify(dictSwagger));
         var toolbox = document.getElementById('toolbox');
         var xmlString = '';
         for (var i = 0; i < dictSwagger.length; i++) {
-            xmlString = `<category name="${dictSwagger[i].key}"></category>`;
+            var nameSwagger = dictSwagger[i].key;
+            xmlString += `<category name="${nameSwagger}" expanded="true">`;
+            xmlString += `<category name="${nameSwagger} Functions" expanded="true"></category>`;
+            xmlString += `<category name="${nameSwagger} Values"></category>`;
+            xmlString += "</category>";
         }
 
         var html = toolbox.innerHTML.replace('<category name="OtherSwagggers"></category>', xmlString);