Set 'EnumControl' property values to 'null' in properties JSON (#2432)

Co-authored-by: Martha Cryan <martha.cryan@ibm.com>
elyra-ai · Feb 7, 2022 · 58540f7 · 58540f7
1 parent 6b9b5ed
commit 58540f7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/elyra/templates/components/canvas_properties_template.jinja2 b/elyra/templates/components/canvas_properties_template.jinja2
@@ -9,7 +9,9 @@
         "activeControl": "{{ property.default_control_type }}",
         "{{ property.default_control_type }}":
     {% endif %}
-    {% if property.data_type|lower == "bool" or property.data_type|lower == "boolean" %}
+    {% if property.default_control_type == "EnumControl" %}
+        null
+    {% elif property.data_type|lower == "bool" or property.data_type|lower == "boolean" %}
         {{ property.value|lower }}
     {% elif property.data_type|lower == "int" or property.data_type|lower == "integer" or
             property.data_type|lower == "number" or property.data_type|lower == "float" %}

diff --git a/elyra/templates/components/generic_properties_template.jinja2 b/elyra/templates/components/generic_properties_template.jinja2
@@ -2,7 +2,7 @@
     "current_parameters": {
       "label": "",
       "elyra_filename": "",
-      "elyra_runtime_image": "",
+      "elyra_runtime_image": null,
       "elyra_cpu": null,
       "elyra_gpu": null,
       "elyra_memory": null,
@@ -251,4 +251,3 @@
     },
     "resources": {}
   }
-
diff --git a/elyra/tests/pipeline/resources/properties.json b/elyra/tests/pipeline/resources/properties.json
@@ -2,7 +2,7 @@
   "current_parameters": {
     "label": "",
     "elyra_filename": "",
-    "elyra_runtime_image": "",
+    "elyra_runtime_image": null,
     "elyra_cpu": null,
     "elyra_gpu": null,
     "elyra_memory": null,

diff --git a/packages/pipeline-editor/package.json b/packages/pipeline-editor/package.json
@@ -37,8 +37,8 @@
   },
   "dependencies": {
     "@elyra/metadata-common": "3.6.0-dev",
-    "@elyra/pipeline-editor": "~1.5.1",
-    "@elyra/pipeline-services": "~1.5.1",
+    "@elyra/pipeline-editor": "~1.6.0-rc.0",
+    "@elyra/pipeline-services": "~1.6.0-rc.0",
     "@elyra/services": "3.6.0-dev",
     "@elyra/ui-components": "3.6.0-dev",
     "@jupyterlab/application": "^3.0.0",

diff --git a/tests/snapshots/pipeline-editor-tests/matches-simple-pipeline-snapshot.1.snap b/tests/snapshots/pipeline-editor-tests/matches-simple-pipeline-snapshot.1.snap
@@ -28,7 +28,6 @@ Object {
               "filename": "helloworld.ipynb",
               "include_subdirectories": false,
               "outputs": Array [],
-              "runtime_image": "",
             },
             "label": "",
             "ui_data": Object {

diff --git a/yarn.lock b/yarn.lock
@@ -1393,13 +1393,13 @@
     seedrandom "3.0.5"
     uuid "8.3.0"
 
-"@elyra/pipeline-editor@~1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@elyra/pipeline-editor/-/pipeline-editor-1.5.1.tgz#860d912ab8c88bb45969f494c37d7e8954856176"
-  integrity sha512-TemYiuNiyJnEKbN03W3qzxRk3+PoQGYzn1GOjTvO+rM0KJ+aY2JQ1mvSyo2y9yFRbQZNkgTdCnSffMn9mhZMEQ==
+"@elyra/pipeline-editor@~1.6.0-rc.0":
+  version "1.6.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@elyra/pipeline-editor/-/pipeline-editor-1.6.0-rc.0.tgz#e703404fd7c30855ee9e2423af4bee9ab0f1ddec"
+  integrity sha512-UIv9cA8QSqc3emUE+8G+nTtcLnNNIlW2V5Gedpg0ZVNWM3JSwxiVCy4Hyp83kBIPsxHH1WFRr44eEZ/4dUUJIw==
   dependencies:
     "@elyra/canvas" "11.0.0"
-    "@elyra/pipeline-services" "^1.5.1"
+    "@elyra/pipeline-services" "^1.6.0-rc.0"
     downshift "^6.1.2"
     immer "^9.0.7"
     nanoid "^3.1.20"
@@ -1414,10 +1414,10 @@
   resolved "https://registry.yarnpkg.com/@elyra/pipeline-schemas/-/pipeline-schemas-3.0.42.tgz#d1e681022cd033234a8e0fe4febb0e58d8a7683e"
   integrity sha512-DF34KqUocckJWTJBUqS0diKgqgqAbCWljx3O5v1ZKHYoiz5UvSz5/67U/5oaJXIlPqwbmL47rWvIA/u6M7DCZw==
 
-"@elyra/pipeline-services@^1.5.1", "@elyra/pipeline-services@~1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@elyra/pipeline-services/-/pipeline-services-1.5.1.tgz#888384adee29c5f75158ebaf863a88da40a48962"
-  integrity sha512-yo8ffzyf42GJgMzTJsKJ/tvabUWgiRhLCMh8flcDUddITidPfvCTM4oDh3HpVIPSVwagzb6IdnJ+hqzHyZZPGQ==
+"@elyra/pipeline-services@^1.6.0-rc.0", "@elyra/pipeline-services@~1.6.0-rc.0":
+  version "1.6.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@elyra/pipeline-services/-/pipeline-services-1.6.0-rc.0.tgz#f2805272ef6ea962526a55b495d284dc7d1ff617"
+  integrity sha512-8c6ChPmvwanUxH33Uif0bbf0SeP3ni45qcLskklg/g/jG11EYi1z1WeNP8Qs4ODeB8DuqMxfgYXR76SLA+St5g==
   dependencies:
     immer "^9.0.7"
     jsonc-parser "^3.0.0"