Switch back to the new schema

ICRAR · Oct 28, 2022 · 068fa91 · 068fa91
1 parent 7019fdc
commit 068fa91
Showing 1 changed file with 49 additions and 66 deletions.
diff --git a/daliuge-translator/dlg/dropmake/lg.graph.schema b/daliuge-translator/dlg/dropmake/lg.graph.schema
@@ -5,9 +5,6 @@
         "modelData": {
             "type": "object",
             "properties": {
-                "fileType": {
-                    "type": "string"
-                },
                 "repoService": {
                     "type": "string"
                 },
@@ -23,10 +20,7 @@
                 "filePath": {
                     "type": "string"
                 },
-                "sha": {
-                    "type": "string"
-                },
-                "gitUrl": {
+                "fileType": {
                     "type": "string"
                 },
                 "eagleVersion": {
@@ -49,23 +43,38 @@
                 },
                 "numLGNodes": {
                     "type": "integer"
+                },
+                "commitHash": {
+                    "type": "string"
+                },
+                "downloadUrl": {
+                    "type": "string"
+                },
+                "repositoryUrl": {
+                    "type": "string"
+                },
+                "signature": {
+                    "type": "string"
                 }
             },
             "required": [
                 "filePath",
                 "fileType",
-                "gitUrl",
                 "readonly",
                 "repo",
                 "repoBranch",
                 "repoService",
-                "sha",
                 "eagleVersion",
                 "eagleCommitHash",
                 "schemaVersion",
                 "lastModifiedName",
                 "lastModifiedEmail",
-                "lastModifiedDatetime"
+                "lastModifiedDatetime",
+                "numLGNodes",
+                "commitHash",
+                "downloadUrl",
+                "repositoryUrl",
+                "signature"
             ]
         },
         "nodeDataArray": {
@@ -82,6 +91,12 @@
                     "color": {
                         "type": "string"
                     },
+                    "commitHash": {
+                        "type": "string"
+                    },
+                    "dataHash": {
+                        "type": "string"
+                    },
                     "drawOrderHint": {
                         "type": "integer"
                     },
@@ -109,22 +124,12 @@
                     "collapsed": {
                         "type": "boolean"
                     },
-                    "streaming": {
-                        "type": "boolean"
-                    },
                     "subject": {
                         "type": "null"
                     },
                     "expanded": {
                         "type": "boolean"
                     },
-                    "precious": {
-                        "type": "boolean",
-                        "deprecated": true
-                    },
-                    "persist": {
-                        "type": "boolean"
-                    },
                     "inputApplicationName": {
                         "type": "string"
                     },
@@ -261,6 +266,12 @@
                             ]
                         }
                     },
+                    "paletteDownloadUrl": {
+                        "type": "string"
+                    },
+                    "repositoryUrl": {
+                        "type": "string"
+                    },
                     "fields": {
                         "type": "array",
                         "items": {
@@ -296,58 +307,20 @@
                                 "positional": {
                                     "type": "boolean",
                                     "default": false
-                                }
-                            },
-                            "required": [
-                                "description",
-                                "name",
-                                "text",
-                                "value"
-                            ]
-                        }
-                    },
-                    "applicationArgs": {
-                        "type": "array",
-                        "items": {
-                            "type": "object",
-                            "properties": {
-                                "text": {
-                                    "type": "string"
                                 },
-                                "name": {
-                                    "type": "string"
-                                },
-                                "value": {
-                                    "type": ["string","boolean","number", "null"]
-                                },
-                                "defaultValue": {
-                                    "type": ["string","boolean","number", "null"]
-                                },
-                                "description": {
-                                    "type": "string"
-                                },
-                                "readonly": {
+                                "keyAttribute": {
                                     "type": "boolean"
-                                },
-                                "type": {
-                                    "type": "string"
-                                },
-                                "precious": {
-                                    "type": "boolean"
-                                },
-                                "options": {
-                                    "type": "array"
-                                },
-                                "positional": {
-                                    "type": "boolean",
-                                    "default": false
                                 }
                             },
                             "required": [
                                 "description",
                                 "name",
                                 "text",
-                                "value"
+                                "value",
+                                "type",
+                                "precious",
+                                "options",
+                                "positional"
                             ]
                         }
                     },
@@ -359,11 +332,12 @@
                     "category",
                     "collapsed",
                     "color",
+                    "commitHash",
+                    "dataHash",
                     "description",
                     "drawOrderHint",
                     "expanded",
                     "fields",
-                    "applicationArgs",
                     "height",
                     "inputAppFields",
                     "inputApplicationName",
@@ -377,7 +351,8 @@
                     "outputApplicationType",
                     "outputLocalPorts",
                     "outputPorts",
-                    "streaming",
+                    "paletteDownloadUrl",
+                    "repositoryUrl",
                     "subject",
                     "text",
                     "width",
@@ -391,6 +366,12 @@
             "items": {
                 "type": "object",
                 "properties": {
+                    "closesLoop": {
+                        "type": "boolean"
+                    },
+                    "dataType": {
+                        "type": "string"
+                    },
                     "from": {
                         "type": "integer"
                     },
@@ -408,6 +389,8 @@
                     }
                 },
                 "required": [
+                    "closesLoop",
+                    "dataType",
                     "from",
                     "fromPort",
                     "to",