From 6932f327d4c8327cf1e2b00dd013280627a9a3c7 Mon Sep 17 00:00:00 2001
From: srikant <srksriks123@gmail.com>
Date: Wed, 4 Dec 2024 12:31:46 +0530
Subject: [PATCH 1/5] #2256 Add ability to display text description next to
 heading label

Signed-off-by: srikant <srksriks123@gmail.com>
---
 .../components/title-editor/title-editor.jsx  | 40 +++++++++++++------
 .../components/title-editor/title-editor.scss | 12 ++++++
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
index 952a0b699c..96df21ac19 100644
--- a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
+++ b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
@@ -20,13 +20,16 @@ import { connect } from "react-redux";
 import Isvg from "react-inlinesvg";
 import { get } from "lodash";
 import classNames from "classnames";
-import { Help, Edit, Close } from "@carbon/react/icons";
+import { Edit, Close } from "@carbon/react/icons";
 import { TextInput, Button, Layer } from "@carbon/react";
 
 import { setTitle } from "./../../actions";
 import { MESSAGE_KEYS, CONDITION_MESSAGE_TYPE } from "./../../constants/constants";
 import * as PropertyUtils from "./../../util/property-utils";
 import ActionFactory from "../../actions/action-factory.js";
+import Tooltip from "../../../tooltip/tooltip.jsx";
+import Icon from "../../../icons/icon.jsx";
+import { CARBON_ICONS } from "./../../constants/constants";
 
 
 class TitleEditor extends Component {
@@ -66,6 +69,7 @@ class TitleEditor extends Component {
 				this.props.help.data,
 				this.props.controller.getAppData());
 		}
+		return { url: "https://www.google.com/", label: "Help" };
 	}
 	textInputOnFocus() {
 		this.setState({ focused: true });
@@ -136,19 +140,29 @@ class TitleEditor extends Component {
 				iconDescription={propertiesTitleEditButtonLabel}
 				hasIconOnly
 			/>);
-
+		const obj = {
+			"id": "link_for_number",
+			"data": {
+				"something": "option data"
+			},
+			"propertyId": {
+				"name": "number"
+			}
+		};
 		const helpButton = this.props.help
-			? (<Button
-				kind="ghost"
-				className="properties-title-editor-btn help"
-				data-id="help"
-				onClick={this.helpClickHandler}
-				tooltipPosition="bottom"
-				renderIcon={Help}
-				size="sm"
-				iconDescription={helpButtonLabel}
-				hasIconOnly
-			/>)
+			? (<span className="properties-heading-icon">
+				<Tooltip
+					className="properties-title-editor-btn help"
+					data-id="help"
+					tip={helpButtonLabel}
+					link={obj}
+					tooltipLinkHandler={this.helpClickHandler}
+					direction="bottom"
+					showToolTipOnClick
+				>
+					<Icon type={CARBON_ICONS.INFORMATION} className="properties-control-description-icon-info" />
+				</Tooltip>
+			</span>)
 			: null;
 
 		const closeButton = this.props.closeHandler
diff --git a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.scss b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.scss
index fae44bb2f2..956796e147 100644
--- a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.scss
+++ b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.scss
@@ -152,3 +152,15 @@
 	justify-content: center;
 	padding: 0;
 }
+
+.properties-heading-icon {
+	position: absolute;
+	margin-top: $spacing-03;
+}
+
+.properties-title-editor {
+	.tooltip-container {
+		height: $spacing-05;
+		cursor: pointer;
+	}
+}

From 54294aa2787d2f9ddada3c5106dc007f6230fb22 Mon Sep 17 00:00:00 2001
From: srikant <srksriks123@gmail.com>
Date: Fri, 6 Dec 2024 21:21:03 +0530
Subject: [PATCH 2/5] Include classname change

Signed-off-by: srikant <srksriks123@gmail.com>
---
 .../components/title-editor/title-editor.jsx                 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
index 96df21ac19..79a43a1ea3 100644
--- a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
+++ b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
@@ -69,7 +69,6 @@ class TitleEditor extends Component {
 				this.props.help.data,
 				this.props.controller.getAppData());
 		}
-		return { url: "https://www.google.com/", label: "Help" };
 	}
 	textInputOnFocus() {
 		this.setState({ focused: true });
@@ -156,11 +155,11 @@ class TitleEditor extends Component {
 					data-id="help"
 					tip={helpButtonLabel}
 					link={obj}
-					tooltipLinkHandler={this.helpClickHandler}
+					tooltipLinkHandler={this.props.controller.getHandlers().tooltipLinkHandler}
 					direction="bottom"
 					showToolTipOnClick
 				>
-					<Icon type={CARBON_ICONS.INFORMATION} className="properties-control-description-icon-info" />
+					<Icon type={CARBON_ICONS.INFORMATION} className="properties-title-editor-btn help" />
 				</Tooltip>
 			</span>)
 			: null;

From a0c3e387390b14282546527fe12bff3bab799726 Mon Sep 17 00:00:00 2001
From: srikant <srksriks123@gmail.com>
Date: Fri, 6 Dec 2024 21:47:58 +0530
Subject: [PATCH 3/5] Include changes in paramDef

Signed-off-by: srikant <srksriks123@gmail.com>
---
 .../components/title-editor/title-editor.jsx       | 13 ++-----------
 .../parameterDefs/readonly_paramDef.json           | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
index 79a43a1ea3..3b99ee87af 100644
--- a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
+++ b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
@@ -139,22 +139,13 @@ class TitleEditor extends Component {
 				iconDescription={propertiesTitleEditButtonLabel}
 				hasIconOnly
 			/>);
-		const obj = {
-			"id": "link_for_number",
-			"data": {
-				"something": "option data"
-			},
-			"propertyId": {
-				"name": "number"
-			}
-		};
 		const helpButton = this.props.help
 			? (<span className="properties-heading-icon">
 				<Tooltip
 					className="properties-title-editor-btn help"
 					data-id="help"
-					tip={helpButtonLabel}
-					link={obj}
+					tip={this.props.help?.data?.description?.label}
+					link={this.props.help?.data?.description?.link ? this.props.help?.data?.description?.link : null}
 					tooltipLinkHandler={this.props.controller.getHandlers().tooltipLinkHandler}
 					direction="bottom"
 					showToolTipOnClick
diff --git a/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json b/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json
index ab6abeb21c..5b786c446c 100644
--- a/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json
+++ b/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json
@@ -426,7 +426,19 @@
     ],
     "help": {
       "data": {
-        "url": "randomUrl"
+        "url": "randomUrl",
+        "description": {
+          "label": "Readonly Description",
+          "link": {
+            "id": "link_for_heading",
+            "data": {
+              "something": "option data"
+            },
+            "propertyId": {
+              "name": "number"
+            }
+          }
+        }
       }
     }
   },

From d97e731c2c0318569fcba4714715d16075a2607b Mon Sep 17 00:00:00 2001
From: srikant <srksriks123@gmail.com>
Date: Tue, 10 Dec 2024 15:57:49 +0530
Subject: [PATCH 4/5] Include description in Form

Signed-off-by: srikant <srksriks123@gmail.com>
---
 .../components/title-editor/title-editor.jsx    |  3 ++-
 .../src/common-properties/form/Form.js          |  5 ++++-
 .../properties-main/properties-main.jsx         |  1 +
 .../parameterDefs/readonly_paramDef.json        | 17 ++++-------------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
index 3b99ee87af..f746c659a8 100644
--- a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
+++ b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
@@ -144,7 +144,7 @@ class TitleEditor extends Component {
 				<Tooltip
 					className="properties-title-editor-btn help"
 					data-id="help"
-					tip={this.props.help?.data?.description?.label}
+					tip={this.props.description?.default}
 					link={this.props.help?.data?.description?.link ? this.props.help?.data?.description?.link : null}
 					tooltipLinkHandler={this.props.controller.getHandlers().tooltipLinkHandler}
 					direction="bottom"
@@ -245,6 +245,7 @@ TitleEditor.propTypes = {
 	showHeading: PropTypes.bool,
 	rightFlyoutTabsView: PropTypes.bool,
 	titleInfo: PropTypes.object,
+	description: PropTypes.object,
 	title: PropTypes.string, // set by redux
 	setTitle: PropTypes.func // set by redux
 };
diff --git a/canvas_modules/common-canvas/src/common-properties/form/Form.js b/canvas_modules/common-canvas/src/common-properties/form/Form.js
index 8ca232296b..4db7d27a3f 100644
--- a/canvas_modules/common-canvas/src/common-properties/form/Form.js
+++ b/canvas_modules/common-canvas/src/common-properties/form/Form.js
@@ -21,14 +21,16 @@ import { UIItem } from "./UIItem";
 import { L10nProvider } from "../util/L10nProvider";
 import { translateMessages } from "./Conditions";
 import { Size } from "../constants/form-constants";
+import { ResourceDef } from "../util/L10nProvider";
 import { CONTAINER_TYPE } from "../constants/constants";
 
 export default class Form {
-	constructor(componentId, label, labelEditable, help, editorSize, pixelWidth, uiItems, buttons, data, conditions, resources, icon, heading, title, titleUiItems) {
+	constructor(componentId, label, labelEditable, help, description, editorSize, pixelWidth, uiItems, buttons, data, conditions, resources, icon, heading, title, titleUiItems) {
 		this.componentId = componentId;
 		this.label = label;
 		this.labelEditable = labelEditable;
 		this.help = help;
+		this.description = ResourceDef.make(description);
 		this.editorSize = editorSize;
 		this.pixelWidth = pixelWidth;
 		this.uiItems = uiItems;
@@ -81,6 +83,7 @@ export default class Form {
 				propDef.label,
 				propDef.labelEditable,
 				propDef.help,
+				propDef.description,
 				propDef.editorSizeHint(editorSizeDefault),
 				propDef.pixelWidth,
 				[UIItem.makePrimaryTabs(tabs)],
diff --git a/canvas_modules/common-canvas/src/common-properties/properties-main/properties-main.jsx b/canvas_modules/common-canvas/src/common-properties/properties-main/properties-main.jsx
index e16128334d..95603a944d 100644
--- a/canvas_modules/common-canvas/src/common-properties/properties-main/properties-main.jsx
+++ b/canvas_modules/common-canvas/src/common-properties/properties-main/properties-main.jsx
@@ -486,6 +486,7 @@ class PropertiesMain extends React.Component {
 				propertiesTitle = (<TitleEditor
 					labelEditable={formData.labelEditable}
 					help={formData.help}
+					description={formData.description}
 					controller={this.propertiesController}
 					helpClickHandler={this.props.callbacks.helpClickHandler}
 					closeHandler={applyOnBlurEnabled ? this.applyPropertiesEditing.bind(this, true) : null}
diff --git a/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json b/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json
index 5b786c446c..2414616ef5 100644
--- a/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json
+++ b/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json
@@ -424,21 +424,12 @@
         ]
       }
     ],
+    "description": {
+      "default": "Readonly Description"
+    },
     "help": {
       "data": {
-        "url": "randomUrl",
-        "description": {
-          "label": "Readonly Description",
-          "link": {
-            "id": "link_for_heading",
-            "data": {
-              "something": "option data"
-            },
-            "propertyId": {
-              "name": "number"
-            }
-          }
-        }
+        "url": "randomUrl"
       }
     }
   },

From 06f9714895f99c4e71292dbce1c3ed3f50bb94db Mon Sep 17 00:00:00 2001
From: srikant <srksriks123@gmail.com>
Date: Wed, 18 Dec 2024 10:23:58 +0530
Subject: [PATCH 5/5] Include description object

Signed-off-by: srikant <srksriks123@gmail.com>
---
 .../components/title-editor/title-editor.jsx              | 2 +-
 .../test_resources/parameterDefs/readonly_paramDef.json   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
index f746c659a8..5fd70eaf94 100644
--- a/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
+++ b/canvas_modules/common-canvas/src/common-properties/components/title-editor/title-editor.jsx
@@ -145,7 +145,7 @@ class TitleEditor extends Component {
 					className="properties-title-editor-btn help"
 					data-id="help"
 					tip={this.props.description?.default}
-					link={this.props.help?.data?.description?.link ? this.props.help?.data?.description?.link : null}
+					link={this.props.description?.link ? this.props.description?.link : null}
 					tooltipLinkHandler={this.props.controller.getHandlers().tooltipLinkHandler}
 					direction="bottom"
 					showToolTipOnClick
diff --git a/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json b/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json
index 2414616ef5..5d4aeaa04f 100644
--- a/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json
+++ b/canvas_modules/harness/test_resources/parameterDefs/readonly_paramDef.json
@@ -425,7 +425,13 @@
       }
     ],
     "description": {
-      "default": "Readonly Description"
+      "default": "Readonly description",
+      "link": {
+        "id": "link_for_action-buttons-panel",
+        "data": {
+          "something": "option data"
+        }
+      }
     },
     "help": {
       "data": {