Add support of tooltip for operators

ukrbublik · May 23, 2024 · 7688936 · 7688936
1 parent 0d5e94a
commit 7688936
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 - 6.6.0
   - Add JsonLogic Export for SwitchCase (PR #1013)
+  - Add support of `tooltip` for operator config (PR #1011) (issue #261)
 - 6.5.2
   - Updated dependencies. `@babel/runtime` is now dep for core package (PR #1051) (issue #964)
 - 6.5.1

diff --git a/CONFIG.adoc b/CONFIG.adoc
@@ -519,6 +519,7 @@ where `AND` and `OR` - available conjuctions (logical operators). You can add `N
 |===
 |key |required |default |meaning
 |label |+ | |Label to be displayed in operators select component
+|tooltip | | |Optional tooltip to be displayed in operators list by hovering on item
 |reversedOp |+ | |Opposite operator
 |isNotOp | |false |Eg. true for operator "!=", false for operator "=="
 |cardinality | |1 |Number of right operands (1 for binary, 2 for `between`)

diff --git a/packages/antd/modules/widgets/core/FieldSelect.jsx b/packages/antd/modules/widgets/core/FieldSelect.jsx
@@ -30,9 +30,9 @@ const FieldSelect = (props) => {
   const dropdownPlacement = config.settings.dropdownPlacement;
   const dropdownAlign = dropdownPlacement ? BUILT_IN_PLACEMENTS[dropdownPlacement] : undefined;
   const width = isFieldSelected && !showSearch || !selectWidth ? null : selectWidth + SELECT_WIDTH_OFFSET_RIGHT;
-  let tooltipText = selectedAltLabel || selectedFullLabel || selectedLabel;
+  let tooltipText = selectedAltLabel || selectedFullLabel;
   if (tooltipText == selectedLabel)
-    tooltipText = selectedKey;
+    tooltipText = null;
 
   const onChange = (key) => {
     setField(key);

diff --git a/packages/mui/modules/widgets/core/MuiFieldSelect.jsx b/packages/mui/modules/widgets/core/MuiFieldSelect.jsx
@@ -80,9 +80,9 @@ export default ({
   }, [readonly, placeholder, items]);
 
   const hasValue = selectedKey != null;
-  let tooltipText = selectedAltLabel || selectedFullLabel || selectedLabel;
+  let tooltipText = selectedAltLabel || selectedFullLabel;
   if (tooltipText == selectedLabel)
-    tooltipText = selectedKey;
+    tooltipText = null;
   let res = (
     <Select
       error={!!errorText}

diff --git a/packages/ui/modules/components/rule/Field.jsx b/packages/ui/modules/components/rule/Field.jsx
@@ -57,7 +57,7 @@ export default class Field extends Component {
     let selectedFullLabel = partsLabels ? partsLabels.join(fieldSeparatorDisplay) : null;
     if (selectedFullLabel == selectedLabel || parentField)
       selectedFullLabel = null;
-    const selectedAltLabel = selectedOpts.label2;
+    const selectedAltLabel = selectedOpts.label2 || selectedOpts.tooltip;
 
     const parentFieldPath = getFieldParts(parentField, config);
     const parentFieldConfig = parentField ? getFieldConfig(config, parentField) : null;

diff --git a/packages/ui/modules/components/rule/Operator.jsx b/packages/ui/modules/components/rule/Operator.jsx
@@ -65,10 +65,12 @@ export default class Operator extends Component {
     const selectedKeys = selectedKey ? [selectedKey] : null;
     const selectedPath = selectedKeys;
     const selectedLabel = selectedOpts.label;
+    // tip: label2 is not documented for operators
+    const selectedAltLabel = selectedOpts.label2 || selectedOpts.tooltip;
 
     return {
       placeholder, items,
-      selectedKey, selectedKeys, selectedPath, selectedLabel, selectedOpts, fieldConfig
+      selectedKey, selectedKeys, selectedPath, selectedLabel, selectedAltLabel, selectedOpts, fieldConfig
     };
   }
 
@@ -79,10 +81,14 @@ export default class Operator extends Component {
     return keys(fields).sort((a, b) => (ops.indexOf(a) - ops.indexOf(b))).map(fieldKey => {
       const field = fields[fieldKey];
       const label = field.label;
+      const altLabel = field.label2;
+      const tooltip = field.tooltip;
       return {
         key: fieldKey,
         path: fieldKey,
         label,
+        altLabel,
+        tooltip,
       };
     });
   }

diff --git a/packages/ui/modules/components/rule/ValueField.jsx b/packages/ui/modules/components/rule/ValueField.jsx
@@ -83,7 +83,7 @@ export default class ValueField extends Component {
     let selectedFullLabel = partsLabels ? partsLabels.join(fieldSeparatorDisplay) : null;
     if (selectedFullLabel == selectedLabel || parentField)
       selectedFullLabel = null;
-    const selectedAltLabel = selectedOpts.label2;
+    const selectedAltLabel = selectedOpts.label2 || selectedOpts.tooltip;
 
     return {
       placeholder,