Merge branch 'main' into PropertyListener_prevValue_fix

elyra-ai · Dec 3, 2024 · ae5ed98 · ae5ed98
2 parents bd56b16 + c42b453
commit ae5ed98
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/canvas_modules/harness/src/client/components/sidepanel/canvas/sidepanel-canvas.jsx b/canvas_modules/harness/src/client/components/sidepanel/canvas/sidepanel-canvas.jsx
@@ -161,7 +161,7 @@ export default class SidePanelForms extends React.Component {
 			var filename = evt.target.files[0].name;
 			var fileExt = filename.substring(filename.lastIndexOf(".") + 1);
 			if (fileExt === "json") {
-				this.setState({ canvasDiagram: evt.target.files[0] });
+				this.setState({ canvasDiagram: evt.target.files[0] }, () => this.submitCanvas());
 				this.props.log("Canvas diagram JSON file selected", filename);
 			}
 		}
@@ -174,7 +174,7 @@ export default class SidePanelForms extends React.Component {
 			var filename = evt.target.files[0].name;
 			var fileExt = filename.substring(filename.lastIndexOf(".") + 1);
 			if (fileExt === "json") {
-				this.setState({ canvasDiagram2: evt.target.files[0] });
+				this.setState({ canvasDiagram2: evt.target.files[0] }, () => this.submitCanvas2());
 				this.props.log("Canvas diagram JSON file selected", filename);
 			}
 		}
@@ -187,7 +187,7 @@ export default class SidePanelForms extends React.Component {
 			var filename = evt.target.files[0].name;
 			var fileExt = filename.substring(filename.lastIndexOf(".") + 1);
 			if (fileExt === "json") {
-				this.setState({ canvasPalette: evt.target.files[0] });
+				this.setState({ canvasPalette: evt.target.files[0] }, () => this.submitPalette());
 				this.props.log("Canvas palette JSON file selected", filename);
 			}
 		}
@@ -200,7 +200,7 @@ export default class SidePanelForms extends React.Component {
 			var filename = evt.target.files[0].name;
 			var fileExt = filename.substring(filename.lastIndexOf(".") + 1);
 			if (fileExt === "json") {
-				this.setState({ canvasPalette2: evt.target.files[0] });
+				this.setState({ canvasPalette2: evt.target.files[0] }, () => this.submitPalette2());
 				this.props.log("Canvas palette JSON file selected", filename);
 			}
 		}
@@ -407,6 +407,7 @@ export default class SidePanelForms extends React.Component {
 					accept={[".json"]}
 					onChange={this.onCanvasFileSelect}
 					iconDescription="Delete file"
+					filenameStatus={this.isReadyToSubmitCanvasData ? "complete" : "uploading"}
 				/>
 				{space}
 				<div className="harness-sidepanel-file-upload-submit">
@@ -429,6 +430,7 @@ export default class SidePanelForms extends React.Component {
 					accept={[".json"]}
 					onChange={this.onCanvasPaletteSelect}
 					iconDescription="Delete file"
+					filenameStatus={this.isReadyToSubmitPaletteData ? "complete" : "uploading"}
 				/>
 				{space}
 				<div className="harness-sidepanel-file-upload-submit">
@@ -479,6 +481,7 @@ export default class SidePanelForms extends React.Component {
 					accept={[".json"]}
 					onChange={this.onCanvasFileSelect2}
 					iconDescription="Delete file"
+					filenameStatus={this.isReadyToSubmitCanvasData2 ? "complete" : "uploading"}
 				/>
 				{space}
 				<div className="harness-sidepanel-file-upload-submit">
@@ -502,6 +505,7 @@ export default class SidePanelForms extends React.Component {
 					accept={[".json"]}
 					onChange={this.onCanvasPaletteSelect2}
 					iconDescription="Delete file"
+					filenameStatus={this.isReadyToSubmitPaletteData2 ? "complete" : "uploading"}
 				/>
 				{space}
 				<div className="harness-sidepanel-file-upload-submit">

diff --git a/canvas_modules/harness/src/client/components/sidepanel/properties/sidepanel-properties.jsx b/canvas_modules/harness/src/client/components/sidepanel/properties/sidepanel-properties.jsx
@@ -140,7 +140,7 @@ export default class SidePanelProperties extends React.Component {
 			if (fileExt === "json") {
 				this.setState({
 					commonProperties: evt.target.files[0],
-				});
+				}, () => this.submitProperties());
 				this.props.log("Common Properties JSON file selected", filename);
 			}
 		}
@@ -260,6 +260,7 @@ export default class SidePanelProperties extends React.Component {
 					accept={[".json"]}
 					onChange={this.onPropertiesSelect}
 					iconDescription="Delete file"
+					filenameStatus={this.isReadyToSubmitProperties ? "complete" : "uploading"}
 				/>
 				{space}
 			</div>);