#996 Upgrade carbon 10.50.0 in common-canvas and 10.56.0 in test harn…

…ess (#997)
elyra-ai · Apr 22, 2022 · 8cc9926 · 8cc9926
1 parent 8616262
commit 8cc9926
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 71 deletions.
diff --git a/canvas_modules/common-canvas/__tests__/test_resources/paramDefs/checkbox_paramDef.json b/canvas_modules/common-canvas/__tests__/test_resources/paramDefs/checkbox_paramDef.json
@@ -16,7 +16,6 @@
     "checkbox_error": false,
     "checkbox_warning": false,
     "disable": true,
-    "checkbox_disabled": false,
     "hide": true,
     "checkbox_hidden": false
   },

diff --git a/canvas_modules/common-canvas/__tests__/test_resources/paramDefs/checkboxset_paramDef.json b/canvas_modules/common-canvas/__tests__/test_resources/paramDefs/checkboxset_paramDef.json
@@ -9,21 +9,9 @@
     ],
     "checkboxset_null": null,
     "error": false,
-    "checkbox_error": [
-      "apple"
-    ],
     "warning": false,
-    "checkbox_warning": [
-      "orange"
-    ],
     "disable": true,
-    "checkbox_disabled": [
-      "pear"
-    ],
     "hide": true,
-    "checkbox_hidden": [
-      "pear"
-    ],
     "disable_and_hide": false,
     "checkboxset_disable_and_hide": [
       "pear"

diff --git a/canvas_modules/common-canvas/__tests__/test_resources/paramDefs/panelNested_paramDef.json b/canvas_modules/common-canvas/__tests__/test_resources/paramDefs/panelNested_paramDef.json
@@ -3,7 +3,6 @@
     "title": "Nested Panels"
   },
   "current_parameters": {
-    "number": 11,
     "field1_panel": "age",
     "field2_panel": "BP",
     "selectcolumn": "",
@@ -45,11 +44,6 @@
     "text_field": ""
   },
   "parameters": [
-    {
-      "id": "number",
-      "type": "double",
-      "required": true
-    },
     {
       "id": "field1_panel",
       "type": "string",
@@ -195,15 +189,6 @@
       "default": "Panels"
     },
     "parameter_info": [
-      {
-        "parameter_ref": "number",
-        "label": {
-          "default": "number"
-        },
-        "description": {
-          "default": "A control between a panelSelector control.  Also used to display dynamic text in panel text."
-        }
-      },
       {
         "parameter_ref": "field1_panel",
         "label": {

diff --git a/canvas_modules/common-canvas/package.json b/canvas_modules/common-canvas/package.json
@@ -51,8 +51,8 @@
     "@babel/plugin-transform-runtime": "7.11.5",
     "@babel/preset-env": "7.11.5",
     "@babel/preset-react": "7.10.4",
-    "@carbon/icons-react": "10.43.0",
-    "@carbon/themes": "10.47.0",
+    "@carbon/icons-react": "10.44.0",
+    "@carbon/themes": "10.48.0",
     "@rollup/plugin-babel": "5.3.0",
     "@rollup/plugin-commonjs": "21.0.1",
     "@rollup/plugin-json": "4.1.0",
@@ -62,8 +62,8 @@
     "babel-jest": "26.3.0",
     "babel-plugin-lodash": "3.3.4",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
-    "carbon-components": "10.48.0",
-    "carbon-components-react": "7.48.0",
+    "carbon-components": "10.50.0",
+    "carbon-components-react": "7.50.0",
     "carbon-icons": "7.0.7",
     "chai": "4.2.0",
     "chai-enzyme": "1.0.0-beta.1",
@@ -101,9 +101,9 @@
     "stylelint": "13.13.1"
   },
   "peerDependencies": {
-    "@carbon/icons-react": "^10.43.0",
-    "carbon-components": "^10.48.0",
-    "carbon-components-react": "^7.48.0",
+    "@carbon/icons-react": "^10.44.0",
+    "carbon-components": "^10.50.0",
+    "carbon-components-react": "^7.50.0",
     "carbon-icons": "^7.0.7",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",

diff --git a/canvas_modules/common-canvas/src/common-properties/controls/multiselect/multiselect.jsx b/canvas_modules/common-canvas/src/common-properties/controls/multiselect/multiselect.jsx
@@ -72,7 +72,7 @@ class MultiSelectControl extends React.Component {
 		const selectedOptions = [];
 		if (values) {
 			values.forEach((value) => selectedOptions.push(options.find(function(option) {
-				return option.value === value;
+				return option.id === value;
 			})));
 		}
 		return selectedOptions;
@@ -82,7 +82,7 @@ class MultiSelectControl extends React.Component {
 		const options = [];
 		for (let j = 0; j < this.props.controlOpts.values.length; j++) {
 			options.push({
-				value: this.props.controlOpts.values[j],
+				id: this.props.controlOpts.values[j],
 				label: this.props.controlOpts.valueLabels[j]
 			});
 		}
@@ -110,7 +110,7 @@ class MultiSelectControl extends React.Component {
 	handleOnChange(evt) {
 		const controlValues = [];
 		for (let i = 0; i < evt.selectedItems.length; i++) {
-			controlValues.push(evt.selectedItems[i].value);
+			controlValues.push(evt.selectedItems[i].id);
 		}
 		this.props.controller.updatePropertyValue(this.props.propertyId, controlValues);
 	}
@@ -163,7 +163,7 @@ class MultiSelectControl extends React.Component {
 				disabled={this.props.state === STATES.DISABLED}
 				translateWithId={(id) => listBoxMenuIconTranslationIds[id]}
 				items={multiSelectDropdown.options}
-				initialSelectedItems={multiSelectDropdown.selectedOptions}
+				selectedItems={multiSelectDropdown.selectedOptions}
 				onChange={this.handleOnChange}
 				label={label}
 				titleText={this.props.tableControl ? null : this.props.controlItem}

diff --git a/canvas_modules/harness/package.json b/canvas_modules/harness/package.json
@@ -33,16 +33,16 @@
     "@babel/polyfill": "7.11.5",
     "@babel/preset-env": "7.11.5",
     "@babel/preset-react": "7.10.4",
-    "@carbon/icons-react": "10.43.0",
-    "@carbon/themes": "10.47.0",
+    "@carbon/icons-react": "10.49.0",
+    "@carbon/themes": "10.54.0",
     "@elyra/canvas": "file:../common-canvas",
     "@hot-loader/react-dom": "17.0.0-rc.2",
     "@ibm/plex": "5.1.3",
     "autoprefixer": "10.3.1",
     "babel-loader": "8.1.0",
     "babel-plugin-lodash": "3.3.4",
-    "carbon-components": "10.48.0",
-    "carbon-components-react": "7.48.0",
+    "carbon-components": "10.56.0",
+    "carbon-components-react": "7.56.0",
     "carbon-icons": "7.0.7",
     "codemirror": "5.58.2",
     "css-loader": "4.3.0",

diff --git a/canvas_modules/harness/test_resources/parameterDefs/checkbox_paramDef.json b/canvas_modules/harness/test_resources/parameterDefs/checkbox_paramDef.json
@@ -16,7 +16,6 @@
     "checkbox_error": false,
     "checkbox_warning": false,
     "disable": true,
-    "checkbox_disabled": false,
     "hide": true,
     "checkbox_hidden": false
   },

diff --git a/canvas_modules/harness/test_resources/parameterDefs/checkboxset_paramDef.json b/canvas_modules/harness/test_resources/parameterDefs/checkboxset_paramDef.json
@@ -9,21 +9,9 @@
     ],
     "checkboxset_null": null,
     "error": false,
-    "checkbox_error": [
-      "apple"
-    ],
     "warning": false,
-    "checkbox_warning": [
-      "orange"
-    ],
     "disable": true,
-    "checkbox_disabled": [
-      "pear"
-    ],
     "hide": true,
-    "checkbox_hidden": [
-      "pear"
-    ],
     "disable_and_hide": false,
     "checkboxset_disable_and_hide": [
       "pear"

diff --git a/canvas_modules/harness/test_resources/parameterDefs/panelNested_paramDef.json b/canvas_modules/harness/test_resources/parameterDefs/panelNested_paramDef.json
@@ -3,7 +3,6 @@
     "title": "Nested Panels"
   },
   "current_parameters": {
-    "number": 11,
     "field1_panel": "age",
     "field2_panel": "BP",
     "selectcolumn": "",
@@ -45,11 +44,6 @@
     "text_field": ""
   },
   "parameters": [
-    {
-      "id": "number",
-      "type": "double",
-      "required": true
-    },
     {
       "id": "field1_panel",
       "type": "string",
@@ -195,15 +189,6 @@
       "default": "Panels"
     },
     "parameter_info": [
-      {
-        "parameter_ref": "number",
-        "label": {
-          "default": "number"
-        },
-        "description": {
-          "default": "A control between a panelSelector control.  Also used to display dynamic text in panel text."
-        }
-      },
       {
         "parameter_ref": "field1_panel",
         "label": {