@gingkoo/pandora-metabase 1.0.124 → 1.0.126

package/lib/cjs/components/dialog/formula/utils.js

@@ -69,6 +69,22 @@ var getQuotes = exports.getQuotes = function getQuotes(fun, _args, formulaList)
         return vv === null || vv === void 0 ? void 0 : vv.quotes;
       } else if (vv !== null && vv !== void 0 && vv.fieldName) {
         return vv === null || vv === void 0 ? void 0 : vv.fieldName;
+      } else if ((vv === null || vv === void 0 ? void 0 : vv.type) === _types.AtomsTypeEnum.SELECT) {
+        var displayField = vv.displayField || 'value';
+        var getOptionText = function getOptionText(value) {
+          var _ref, _option$displayField;
+          var option = (vv.options || []).find(function (currentOption) {
+            return currentOption.value === value;
+          });
+          if (!option) return value || '';
+          return String((_ref = (_option$displayField = option[displayField]) !== null && _option$displayField !== void 0 ? _option$displayField : option.value) !== null && _ref !== void 0 ? _ref : '');
+        };
+        if (Array.isArray(vv.val)) {
+          return vv.val.map(function (currentValue) {
+            return getOptionText(currentValue);
+          }).join(', ');
+        }
+        return getOptionText(vv.val || '');
       } else {
         return vv.val;
       }

package/lib/cjs/components/dialog/formula-list/index.js

@@ -240,6 +240,23 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     nextList[index] = nextItem;
     setCaseList(nextList);
   };
+  function getSelectDisplayText(item) {
+    var displayField = item.displayField || 'value';
+    var getOptionText = function getOptionText(value) {
+      var _ref2, _option$displayField;
+      var option = (item.options || []).find(function (currentOption) {
+        return currentOption.value === value;
+      });
+      if (!option) return value || '';
+      return String((_ref2 = (_option$displayField = option[displayField]) !== null && _option$displayField !== void 0 ? _option$displayField : option.value) !== null && _ref2 !== void 0 ? _ref2 : '');
+    };
+    if (Array.isArray(item.val)) {
+      return item.val.map(function (currentValue) {
+        return getOptionText(String(currentValue));
+      }).join(', ');
+    }
+    return getOptionText(String(item.val || ''));
+  }
   function getItemDisplayText(v) {
     if (!v) return '';
     if (v.quotes) return v.quotes;
@@ -271,6 +288,9 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       }).join(' ');
       return "".concat(v.operator || 'and', " ( ").concat(listText, " )").replace(/\s+/g, ' ').trim();
     }
+    if (v.type === _types.AtomsTypeEnum.SELECT) {
+      return getSelectDisplayText(v);
+    }
     if (Array.isArray(v.val)) {
       return v.val.join(', ');
     }
@@ -1330,7 +1350,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           value: v.val,
           triggerElement: function triggerElement() {
             return renderTokenContent((0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-              children: [!v.val && (0, _locale.__)('customColumn.selectOperator'), v.val, !v.fixed && renderDeleteIcon(v, index, groupType)]
+              children: [!v.val && (v.placeholder || (0, _locale.__)('customColumn.pleaseSelect')), getSelectDisplayText(v), !v.fixed && renderDeleteIcon(v, index, groupType)]
             }));
           },
           onChange: function onChange(val) {

package/lib/cjs/components/dialog/formula-list/utils.js

@@ -234,6 +234,8 @@ var getTemplateItem = exports.getTemplateItem = function getTemplateItem(type, i
       options: item.options || [],
       multiple: item.multiple || false,
       fixed: item.fixed || false,
+      placeholder: item.placeholder || '',
+      displayField: item.displayField || 'value',
       quotes: '',
       type: type
     };

package/lib/cjs/store/types.d.ts

@@ -146,6 +146,7 @@ export interface AtomsConstant {
     val: string;
     type: AtomsTypeEnum.CONSTANT;
 }
+export type SelectOptionDisplayField = 'label' | 'value';
 export interface AtomsOprator {
     val: string;
     type: AtomsTypeEnum.OPERATOR;
@@ -168,6 +169,8 @@ export interface AtomsSelect {
     val: string | string[] | null;
     multiple?: boolean;
     fixed?: boolean;
+    placeholder?: string;
+    displayField?: SelectOptionDisplayField;
     type: AtomsTypeEnum.SELECT;
 }
 export type AtomsItem = AtomsSubQuery | AtomsNotExists | AtomsExists | AtomsJoinDefault | AtomsExpression | AtomsCaseWhen | AtomsAndOr | AtomsFormula | AtomsField | AtomsInputString | AtomsInputStringList | AtomsInputNumberList | AtomsInputNumber | AtomsOprator | AtomsConstant | AtomsUnknown | AtomsCollection | AtomsSelect;
@@ -396,6 +399,15 @@ export interface FormulaTemplatesItem {
     args: {
         type: AtomsTypeEnum;
         check?: string | null;
+        options?: {
+            label: string;
+            value: string;
+        }[];
+        default?: string | string[];
+        multiple?: boolean;
+        fixed?: boolean;
+        placeholder?: string;
+        displayField?: SelectOptionDisplayField;
     }[];
     arity?: Arity;
     output?: string;

package/lib/cjs/utils.js

@@ -282,12 +282,39 @@ var _changeAlias = function changeAlias(items, val, type) {
         });
       }
       return v;
+    } else if (v.type === _types.AtomsTypeEnum.SUB_QUERY) {
+      if (type === AliasType.table) {
+        v.subQuery = changeTableAlias(v.subQuery || [], {
+          tableUuid: val.uuid,
+          alias: val.alias
+        });
+      }
+      if (type === AliasType.field) {
+        v.subQuery = changeFieldAlias(v.subQuery || [], {
+          fieldUuid: val.uuid,
+          fieldAlias: val.alias
+        });
+      }
+      return v;
     } else if (v.type === _types.AtomsTypeEnum.FORMULA) {
       v.args = _changeAlias(v.args, val, type);
       return v;
     } else if (v.type === _types.AtomsTypeEnum.COLLECTION) {
       v.list = _changeAlias(v.list, val, type);
       return v;
+    } else if (v.type === _types.AtomsTypeEnum.CASE_WHEN) {
+      v.caseValue = _changeAlias(v.caseValue || [], val, type);
+      v.branches = (v.branches || []).map(function (branch) {
+        return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, branch), {}, {
+          when: _changeAlias(branch.when || [], val, type),
+          then: _changeAlias(branch.then || [], val, type)
+        });
+      });
+      v.elseValue = _changeAlias(v.elseValue || [], val, type);
+      return v;
+    } else if (v.type === _types.AtomsTypeEnum.AND_OR) {
+      v.list = _changeAlias(v.list || [], val, type);
+      return v;
     } else {
       return v;
     }
@@ -353,27 +380,27 @@ var changeTableAlias = exports.changeTableAlias = function changeTableAlias(list
     }
     if (v.type === _enum.TypeEnum.summarize) {
       v.group.map(function (group) {
-        if (group.tableUuid === tableUuid) {
+        var groupAtoms = group.atoms;
+        if (groupAtoms && groupAtoms.length > 0) {
+          group.atoms = _changeAlias(groupAtoms, {
+            uuid: tableUuid,
+            alias: alias
+          }, AliasType.table);
+          group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
+        } else if (group.tableUuid === tableUuid) {
           group.alias = alias;
-          var groupAtoms = group.atoms;
-          if (groupAtoms && groupAtoms.length > 0) {
-            group.atoms = _changeAlias(groupAtoms, {
-              uuid: tableUuid,
-              alias: alias
-            }, AliasType.table);
-          }
           group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
         }
       });
       v.by.map(function (by) {
-        if (by.tableUuid === tableUuid) {
+        if (by.atoms && by.atoms.length > 0) {
+          by.atoms = _changeAlias(by.atoms, {
+            uuid: tableUuid,
+            alias: alias
+          }, AliasType.table);
+          by.sql = (0, _helper.summarizeByToSql)(by);
+        } else if (by.tableUuid === tableUuid) {
           by.alias = alias;
-          if (by.atoms && by.atoms.length > 0) {
-            by.atoms = _changeAlias(by.atoms, {
-              uuid: tableUuid,
-              alias: alias
-            }, AliasType.table);
-          }
           by.sql = (0, _helper.summarizeByToSql)(by);
         }
       });
@@ -417,27 +444,27 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
     if (v.type === _enum.TypeEnum.rowLimit) {}
     if (v.type === _enum.TypeEnum.summarize) {
       v.group.map(function (group) {
-        if (group.fieldUuid === uuid) {
+        var groupAtoms = group.atoms;
+        if (groupAtoms && groupAtoms.length > 0) {
+          group.atoms = _changeAlias(groupAtoms, {
+            uuid: uuid,
+            alias: alias
+          }, AliasType.field);
+          group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
+        } else if (group.fieldUuid === uuid) {
           group.fieldAlias = alias;
-          var groupAtoms = group.atoms;
-          if (groupAtoms && groupAtoms.length > 0) {
-            group.atoms = _changeAlias(groupAtoms, {
-              uuid: uuid,
-              alias: alias
-            }, AliasType.field);
-          }
           group.sql = (0, _helper.summarizeToSql)(v.group, group).sql;
         }
       });
       v.by.map(function (by) {
-        if (by.fieldUuid === uuid) {
+        if (by.atoms && by.atoms.length > 0) {
+          by.atoms = _changeAlias(by.atoms, {
+            uuid: uuid,
+            alias: alias
+          }, AliasType.field);
+          by.sql = (0, _helper.summarizeByToSql)(by);
+        } else if (by.fieldUuid === uuid) {
           by.fieldAlias = alias;
-          if (by.atoms && by.atoms.length > 0) {
-            by.atoms = _changeAlias(by.atoms, {
-              uuid: uuid,
-              alias: alias
-            }, AliasType.field);
-          }
           by.sql = (0, _helper.summarizeByToSql)(by);
         }
       });

package/lib/es/components/dialog/formula/utils.js

@@ -61,6 +61,22 @@ export var getQuotes = function getQuotes(fun, _args, formulaList) {
         return vv === null || vv === void 0 ? void 0 : vv.quotes;
       } else if (vv !== null && vv !== void 0 && vv.fieldName) {
         return vv === null || vv === void 0 ? void 0 : vv.fieldName;
+      } else if ((vv === null || vv === void 0 ? void 0 : vv.type) === AtomsTypeEnum.SELECT) {
+        var displayField = vv.displayField || 'value';
+        var getOptionText = function getOptionText(value) {
+          var _ref, _option$displayField;
+          var option = (vv.options || []).find(function (currentOption) {
+            return currentOption.value === value;
+          });
+          if (!option) return value || '';
+          return String((_ref = (_option$displayField = option[displayField]) !== null && _option$displayField !== void 0 ? _option$displayField : option.value) !== null && _ref !== void 0 ? _ref : '');
+        };
+        if (Array.isArray(vv.val)) {
+          return vv.val.map(function (currentValue) {
+            return getOptionText(currentValue);
+          }).join(', ');
+        }
+        return getOptionText(vv.val || '');
       } else {
         return vv.val;
       }

package/lib/es/components/dialog/formula-list/index.js

@@ -231,6 +231,23 @@ var FormulaList = forwardRef(function (props, ref) {
     nextList[index] = nextItem;
     setCaseList(nextList);
   };
+  function getSelectDisplayText(item) {
+    var displayField = item.displayField || 'value';
+    var getOptionText = function getOptionText(value) {
+      var _ref2, _option$displayField;
+      var option = (item.options || []).find(function (currentOption) {
+        return currentOption.value === value;
+      });
+      if (!option) return value || '';
+      return String((_ref2 = (_option$displayField = option[displayField]) !== null && _option$displayField !== void 0 ? _option$displayField : option.value) !== null && _ref2 !== void 0 ? _ref2 : '');
+    };
+    if (Array.isArray(item.val)) {
+      return item.val.map(function (currentValue) {
+        return getOptionText(String(currentValue));
+      }).join(', ');
+    }
+    return getOptionText(String(item.val || ''));
+  }
   function getItemDisplayText(v) {
     if (!v) return '';
     if (v.quotes) return v.quotes;
@@ -262,6 +279,9 @@ var FormulaList = forwardRef(function (props, ref) {
       }).join(' ');
       return "".concat(v.operator || 'and', " ( ").concat(listText, " )").replace(/\s+/g, ' ').trim();
     }
+    if (v.type === AtomsTypeEnum.SELECT) {
+      return getSelectDisplayText(v);
+    }
     if (Array.isArray(v.val)) {
       return v.val.join(', ');
     }
@@ -1321,7 +1341,7 @@ var FormulaList = forwardRef(function (props, ref) {
           value: v.val,
           triggerElement: function triggerElement() {
             return renderTokenContent(_jsxs(_Fragment, {
-              children: [!v.val && __('customColumn.selectOperator'), v.val, !v.fixed && renderDeleteIcon(v, index, groupType)]
+              children: [!v.val && (v.placeholder || __('customColumn.pleaseSelect')), getSelectDisplayText(v), !v.fixed && renderDeleteIcon(v, index, groupType)]
             }));
           },
           onChange: function onChange(val) {

package/lib/es/components/dialog/formula-list/utils.js

@@ -226,6 +226,8 @@ export var getTemplateItem = function getTemplateItem(type, item) {
       options: item.options || [],
       multiple: item.multiple || false,
       fixed: item.fixed || false,
+      placeholder: item.placeholder || '',
+      displayField: item.displayField || 'value',
       quotes: '',
       type: type
     };

package/lib/es/store/types.d.ts

@@ -146,6 +146,7 @@ export interface AtomsConstant {
     val: string;
     type: AtomsTypeEnum.CONSTANT;
 }
+export type SelectOptionDisplayField = 'label' | 'value';
 export interface AtomsOprator {
     val: string;
     type: AtomsTypeEnum.OPERATOR;
@@ -168,6 +169,8 @@ export interface AtomsSelect {
     val: string | string[] | null;
     multiple?: boolean;
     fixed?: boolean;
+    placeholder?: string;
+    displayField?: SelectOptionDisplayField;
     type: AtomsTypeEnum.SELECT;
 }
 export type AtomsItem = AtomsSubQuery | AtomsNotExists | AtomsExists | AtomsJoinDefault | AtomsExpression | AtomsCaseWhen | AtomsAndOr | AtomsFormula | AtomsField | AtomsInputString | AtomsInputStringList | AtomsInputNumberList | AtomsInputNumber | AtomsOprator | AtomsConstant | AtomsUnknown | AtomsCollection | AtomsSelect;
@@ -396,6 +399,15 @@ export interface FormulaTemplatesItem {
     args: {
         type: AtomsTypeEnum;
         check?: string | null;
+        options?: {
+            label: string;
+            value: string;
+        }[];
+        default?: string | string[];
+        multiple?: boolean;
+        fixed?: boolean;
+        placeholder?: string;
+        displayField?: SelectOptionDisplayField;
     }[];
     arity?: Arity;
     output?: string;

package/lib/es/utils.js

@@ -269,12 +269,39 @@ var _changeAlias = function changeAlias(items, val, type) {
         });
       }
       return v;
+    } else if (v.type === AtomsTypeEnum.SUB_QUERY) {
+      if (type === AliasType.table) {
+        v.subQuery = changeTableAlias(v.subQuery || [], {
+          tableUuid: val.uuid,
+          alias: val.alias
+        });
+      }
+      if (type === AliasType.field) {
+        v.subQuery = changeFieldAlias(v.subQuery || [], {
+          fieldUuid: val.uuid,
+          fieldAlias: val.alias
+        });
+      }
+      return v;
     } else if (v.type === AtomsTypeEnum.FORMULA) {
       v.args = _changeAlias(v.args, val, type);
       return v;
     } else if (v.type === AtomsTypeEnum.COLLECTION) {
       v.list = _changeAlias(v.list, val, type);
       return v;
+    } else if (v.type === AtomsTypeEnum.CASE_WHEN) {
+      v.caseValue = _changeAlias(v.caseValue || [], val, type);
+      v.branches = (v.branches || []).map(function (branch) {
+        return _objectSpread(_objectSpread({}, branch), {}, {
+          when: _changeAlias(branch.when || [], val, type),
+          then: _changeAlias(branch.then || [], val, type)
+        });
+      });
+      v.elseValue = _changeAlias(v.elseValue || [], val, type);
+      return v;
+    } else if (v.type === AtomsTypeEnum.AND_OR) {
+      v.list = _changeAlias(v.list || [], val, type);
+      return v;
     } else {
       return v;
     }
@@ -340,27 +367,27 @@ export var changeTableAlias = function changeTableAlias(list, curObj) {
     }
     if (v.type === TypeEnum.summarize) {
       v.group.map(function (group) {
-        if (group.tableUuid === tableUuid) {
+        var groupAtoms = group.atoms;
+        if (groupAtoms && groupAtoms.length > 0) {
+          group.atoms = _changeAlias(groupAtoms, {
+            uuid: tableUuid,
+            alias: alias
+          }, AliasType.table);
+          group.sql = summarizeToSql(v.group, group).sql;
+        } else if (group.tableUuid === tableUuid) {
           group.alias = alias;
-          var groupAtoms = group.atoms;
-          if (groupAtoms && groupAtoms.length > 0) {
-            group.atoms = _changeAlias(groupAtoms, {
-              uuid: tableUuid,
-              alias: alias
-            }, AliasType.table);
-          }
           group.sql = summarizeToSql(v.group, group).sql;
         }
       });
       v.by.map(function (by) {
-        if (by.tableUuid === tableUuid) {
+        if (by.atoms && by.atoms.length > 0) {
+          by.atoms = _changeAlias(by.atoms, {
+            uuid: tableUuid,
+            alias: alias
+          }, AliasType.table);
+          by.sql = summarizeByToSql(by);
+        } else if (by.tableUuid === tableUuid) {
           by.alias = alias;
-          if (by.atoms && by.atoms.length > 0) {
-            by.atoms = _changeAlias(by.atoms, {
-              uuid: tableUuid,
-              alias: alias
-            }, AliasType.table);
-          }
           by.sql = summarizeByToSql(by);
         }
       });
@@ -404,27 +431,27 @@ export var changeFieldAlias = function changeFieldAlias(list, curObj) {
     if (v.type === TypeEnum.rowLimit) {}
     if (v.type === TypeEnum.summarize) {
       v.group.map(function (group) {
-        if (group.fieldUuid === uuid) {
+        var groupAtoms = group.atoms;
+        if (groupAtoms && groupAtoms.length > 0) {
+          group.atoms = _changeAlias(groupAtoms, {
+            uuid: uuid,
+            alias: alias
+          }, AliasType.field);
+          group.sql = summarizeToSql(v.group, group).sql;
+        } else if (group.fieldUuid === uuid) {
           group.fieldAlias = alias;
-          var groupAtoms = group.atoms;
-          if (groupAtoms && groupAtoms.length > 0) {
-            group.atoms = _changeAlias(groupAtoms, {
-              uuid: uuid,
-              alias: alias
-            }, AliasType.field);
-          }
           group.sql = summarizeToSql(v.group, group).sql;
         }
       });
       v.by.map(function (by) {
-        if (by.fieldUuid === uuid) {
+        if (by.atoms && by.atoms.length > 0) {
+          by.atoms = _changeAlias(by.atoms, {
+            uuid: uuid,
+            alias: alias
+          }, AliasType.field);
+          by.sql = summarizeByToSql(by);
+        } else if (by.fieldUuid === uuid) {
           by.fieldAlias = alias;
-          if (by.atoms && by.atoms.length > 0) {
-            by.atoms = _changeAlias(by.atoms, {
-              uuid: uuid,
-              alias: alias
-            }, AliasType.field);
-          }
           by.sql = summarizeByToSql(by);
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.124",
+  "version": "1.0.126",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",