Fix build issue 6

Signed-off-by: CTomlyn <[email protected]>
elyra-ai · Jun 29, 2023 · dce0df2 · dce0df2
1 parent f2ca9cd
commit dce0df2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/canvas_modules/common-canvas/src/color-picker/color-picker.jsx b/canvas_modules/common-canvas/src/color-picker/color-picker.jsx
@@ -35,22 +35,20 @@ class ColorPicker extends React.Component {
 	render() {
 		this.logger.log("render");
 		return (
-			<div>
-				<div className="color-picker" onClick={this.onClick}>
-					<div tabIndex="0" data-color={"col-white-0"} className="color-picker-item white-0" />
-					<div tabIndex="0" data-color={"col-yellow-20"} className="color-picker-item yellow-20" />
-					<div tabIndex="0" data-color={"col-gray-20"} className="color-picker-item gray-20" />
-					<div tabIndex="0" data-color={"col-green-20"} className="color-picker-item green-20" />
-					<div tabIndex="0" data-color={"col-teal-20"} className="color-picker-item teal-20" />
-					<div tabIndex="0" data-color={"col-cyan-20"} className="color-picker-item cyan-20" />
-
-					<div tabIndex="0" data-color={"col-red-50"} className="color-picker-item red-50" />
-					<div tabIndex="0" data-color={"col-orange-40"} className="color-picker-item orange-40" />
-					<div tabIndex="0" data-color={"col-gray-50"} className="color-picker-item gray-50" />
-					<div tabIndex="0" data-color={"col-green-50"} className="color-picker-item green-50" />
-					<div tabIndex="0" data-color={"col-teal-50"} className="color-picker-item teal-50" />
-					<div tabIndex="0" data-color={"col-cyan-50"} className="color-picker-item cyan-50" />
-				</div>
+			<div className="color-picker" onClick={this.onClick}>
+				<div tabIndex="0" data-color={"col-white-0"} className="color-picker-item white-0" />
+				<div tabIndex="0" data-color={"col-yellow-20"} className="color-picker-item yellow-20" />
+				<div tabIndex="0" data-color={"col-gray-20"} className="color-picker-item gray-20" />
+				<div tabIndex="0" data-color={"col-green-20"} className="color-picker-item green-20" />
+				<div tabIndex="0" data-color={"col-teal-20"} className="color-picker-item teal-20" />
+				<div tabIndex="0" data-color={"col-cyan-20"} className="color-picker-item cyan-20" />
+
+				<div tabIndex="0" data-color={"col-red-50"} className="color-picker-item red-50" />
+				<div tabIndex="0" data-color={"col-orange-40"} className="color-picker-item orange-40" />
+				<div tabIndex="0" data-color={"col-gray-50"} className="color-picker-item gray-50" />
+				<div tabIndex="0" data-color={"col-green-50"} className="color-picker-item green-50" />
+				<div tabIndex="0" data-color={"col-teal-50"} className="color-picker-item teal-50" />
+				<div tabIndex="0" data-color={"col-cyan-50"} className="color-picker-item cyan-50" />
 			</div>
 		);
 	}

diff --git a/canvas_modules/common-canvas/src/common-canvas/cc-context-toolbar.jsx b/canvas_modules/common-canvas/src/common-canvas/cc-context-toolbar.jsx
@@ -19,7 +19,7 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import Toolbar from "../toolbar/toolbar.jsx";
 import Logger from "../logging/canvas-logger.js";
-import ColorPicker from "../color-picker";
+import ColorPicker from "../color-picker/color-picker.jsx";
 
 const CM_TOOLBAR_GAP = 4;
 const CM_ICON_SIZE = 32;

diff --git a/canvas_modules/common-canvas/src/context-menu/common-context-menu.jsx b/canvas_modules/common-canvas/src/context-menu/common-context-menu.jsx
@@ -19,7 +19,7 @@ import React from "react";
 import PropTypes from "prop-types";
 import { MenuItem, SubMenu } from "react-contextmenu";
 import { ChevronRight16 } from "@carbon/icons-react";
-import ColorPicker from "../color-picker";
+import ColorPicker from "../color-picker/color-picker.jsx";
 
 // context-menu sizing
 const CONTEXT_MENU_WIDTH = 160; // see context-menu.css .react-context-menu margin

diff --git a/canvas_modules/harness/src/client/App.js b/canvas_modules/harness/src/client/App.js
@@ -38,7 +38,7 @@ import ToolbarBundles from "@elyra/canvas/locales/toolbar/locales";
 
 import { CommonCanvas, CanvasController, CommonProperties } from "common-canvas"; // eslint-disable-line import/no-unresolved
 import CommonCanvasPackage from "@elyra/canvas/package.json";
-import ColorPicker from "../../../common-canvas/src/color-picker";
+import ColorPicker from "../../../common-canvas/src/color-picker/color-picker.jsx";
 
 import FlowsCanvas from "./components/custom-canvases/flows/flows-canvas";
 import TablesCanvas from "./components/custom-canvases/tables/tables-canvas";