Merge pull request #438 from serverlessworkflow/fix-dashboard-functio…

…n-validation Fixed the `custom function` validation when using the JSON editor of the Dashboard
serverlessworkflow · Oct 23, 2024 · c6b75bb · c6b75bb
2 parents 0648ecb + 8c8e2e6
commit c6b75bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/dashboard/Synapse.Dashboard/Components/MonacoEditor/MonacoEditorHelper.cs b/src/dashboard/Synapse.Dashboard/Components/MonacoEditor/MonacoEditorHelper.cs
@@ -42,7 +42,6 @@ public Func<StandaloneCodeEditor, StandaloneEditorConstructionOptions> GetStanda
             {
                 Other = "true",
                 Strings = "true",
-                Comments = "fasle"
             }
         };
     }

diff --git a/src/dashboard/Synapse.Dashboard/Pages/Functions/Create/Store.cs b/src/dashboard/Synapse.Dashboard/Pages/Functions/Create/Store.cs
@@ -528,7 +528,7 @@ protected async Task SetValidationSchema(string? version = null)
         this._processingVersion = true;
         try
         {
-            var schema = $"https://raw.githubusercontent.com/serverlessworkflow/specification/{version}/schema/workflow.yaml#/$defs/task";
+            var schema = $"https://raw.githubusercontent.com/serverlessworkflow/serverlessworkflow.github.io/main/static/schemas/{version}/workflow.yaml#/$defs/task";
             var type = $"create_{typeof(CustomFunction).Name.ToLower()}_{version}_schema";
             await this.MonacoInterop.AddValidationSchemaAsync(schema, $"https://synapse.io/schemas/{type}.json", $"{type}*").ConfigureAwait(false);
             this._textModelUri = this.MonacoEditorHelper.GetResourceUri(type);

diff --git a/src/dashboard/Synapse.Dashboard/Services/SpecificationSchemaManager.cs b/src/dashboard/Synapse.Dashboard/Services/SpecificationSchemaManager.cs
@@ -45,7 +45,7 @@ public async Task<string> GetLatestVersion()
     {
         if (!string.IsNullOrEmpty(this._latestVersion)) return this._latestVersion;
         var tags = await this.HttpClient.GetFromJsonAsync<IEnumerable<GitHubTag>>("https://api.github.com/repos/serverlessworkflow/specification/tags");
-        this._latestVersion = tags?.FirstOrDefault()?.Name;
+        this._latestVersion = tags?.FirstOrDefault()?.Name?.Substring(1);
         return this._latestVersion ?? string.Empty;
     }
 
@@ -57,7 +57,7 @@ public async Task<string> GetLatestVersion()
     public async Task<string> GetSchema(string version)
     {
         if (_knownSchemas.TryGetValue(version, out string? value)) return value;
-        var address = $"https://raw.githubusercontent.com/serverlessworkflow/specification/{version}/schema/workflow.yaml";
+        var address = $"https://raw.githubusercontent.com/serverlessworkflow/serverlessworkflow.github.io/main/static/schemas/{version}/workflow.yaml";
         var yamlSchema = await this.HttpClient.GetStringAsync(address);
         this._knownSchemas.Add(version, this.YamlSerializer.ConvertToJson(yamlSchema));
         return this._knownSchemas[version];

diff --git a/src/dashboard/Synapse.Dashboard/wwwroot/js/monaco-editor-interop-extension.js b/src/dashboard/Synapse.Dashboard/wwwroot/js/monaco-editor-interop-extension.js
@@ -9,10 +9,12 @@ import { LineCounter, parseDocument } from "https://esm.sh/yaml";
  * @returns
  */
 export function addValidationSchema(schema, schemaUri, schemaType) {
+    let isUrl = false;
     try {
         schema = JSON.parse(schema);
     }
     catch {
+        isUrl = true;
         schema = { $ref: schema };
     }
     // JSON
@@ -24,7 +26,11 @@ export function addValidationSchema(schema, schemaUri, schemaType) {
             schemas: [
                 ...monaco.languages.json.jsonDefaults.diagnosticsOptions.schemas,
                 {
-                    schema,
+                    schema: isUrl ?
+                        {
+                            $ref: schema.$ref.replace('.yaml', '.json')
+                        } :
+                        schema,
                     uri: schemaUri,
                     fileMatch: [schemaType]
                 }