@gingkoo/pandora-metabase 1.0.31 → 1.0.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/lib/cjs/components/dialog/select-permission-table/index.js +2 -1
  2. package/lib/cjs/components/modules/join-data.js +20 -18
  3. package/lib/cjs/components/modules/permission-table.js +1 -1
  4. package/lib/cjs/utils.js +3 -3
  5. package/lib/es/components/dialog/select-permission-table/index.js +2 -1
  6. package/lib/es/components/modules/join-data.js +20 -18
  7. package/lib/es/components/modules/permission-table.js +1 -1
  8. package/lib/es/utils.js +3 -3
  9. package/package.json +1 -1
package/lib/cjs/components/dialog/select-permission-table/index.js CHANGED
@@ -42,11 +42,12 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
42
42
  width: '100%'
43
43
  },
44
44
  children: Array.isArray(datasource) && datasource.map(function (v) {
45
+ console.log('🚀 ~ SelectPermissionTable ~ v:', v);
45
46
  return (0, _jsxRuntime.jsx)("div", {
46
47
  className: (0, _classnames["default"])("Sqb-List-section"),
47
48
  children: (0, _jsxRuntime.jsx)("div", {
48
49
  className: (0, _classnames["default"])("Sqb-List-item mx-2", {
49
- active: value.name === v.name
50
+ active: value.alias + '' + value.id === v.alias + '' + v.id
50
51
  }),
51
52
  onClick: function onClick() {
52
53
  onChange(v);
package/lib/cjs/components/modules/join-data.js CHANGED
@@ -337,8 +337,9 @@ var JoinData = function JoinData(props) {
337
337
  data: data,
338
338
  value: newMeta[index][table_type],
339
339
  onChange: function onChange(data) {
340
+ console.log('🚀 ~ selectLeftTable ~ data:', data);
340
341
  // if (table_type === FlagLocation.TABLE_1) {
341
- if (newMeta[index][table_type].datasourceId !== data.datasourceId || newMeta[index][table_type].name !== data.name) {
342
+ if (newMeta[index][table_type].datasourceId !== data.datasourceId || newMeta[index][table_type].name !== data.name || newMeta[index][table_type].alias !== data.alias) {
342
343
  newMeta[index][table_type] = data;
343
344
  initExpressions();
344
345
  }
@@ -1133,7 +1134,7 @@ var JoinData = function JoinData(props) {
1133
1134
  if (meta.table1.name === _helper2.SummarizeAlias) {
1134
1135
  return PrevResult;
1135
1136
  } else {
1136
- return "".concat(meta.table1.datasourceName, ".").concat(meta.table1.name);
1137
+ return "".concat(meta.table1.datasourceName, ".").concat(meta.table1.alias || meta.table1.name);
1137
1138
  }
1138
1139
  } else {
1139
1140
  return '';
@@ -1144,7 +1145,7 @@ var JoinData = function JoinData(props) {
1144
1145
  if (!meta.table1.datasourceId || !meta.table1.id || meta.table1.datasourceId === _helper2.SummarizeAlias) {
1145
1146
  return false;
1146
1147
  }
1147
- return !(prevTables !== null && prevTables !== void 0 && (_prevTables$meta$tabl = prevTables[meta.table1.datasourceId]) !== null && _prevTables$meta$tabl !== void 0 && _prevTables$meta$tabl[meta.table1.id]);
1148
+ return !(prevTables !== null && prevTables !== void 0 && (_prevTables$meta$tabl = prevTables[meta.table1.datasourceId]) !== null && _prevTables$meta$tabl !== void 0 && _prevTables$meta$tabl[meta.table1.alias || meta.table1.id]);
1148
1149
  };
1149
1150
  var renderItem = function renderItem(items, type, i) {
1150
1151
  var _items$;
@@ -1492,23 +1493,24 @@ var JoinData = function JoinData(props) {
1492
1493
  if (v.type === _types.AtomsTypeEnum.COLLECTION) {
1493
1494
  return (0, _jsxRuntime.jsxs)("div", {
1494
1495
  className: (0, _classnames["default"])(" Sqb-collection-box"),
1495
- children: [(0, _jsxRuntime.jsx)("div", {
1496
- children: (0, _jsxRuntime.jsx)(_dialog.FormulaList
1496
+ children: [i == 0 && (0, _jsxRuntime.jsx)("span", {
1497
+ className: 'ml-2 mr-4 text-gray-500',
1498
+ children: "on"
1499
+ }), (0, _jsxRuntime.jsx)(_dialog.FormulaList
1500
+ // showPreview={false}
1501
+ // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
1502
+ , {
1497
1503
  // showPreview={false}
1498
1504
  // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
1499
- , {
1500
- // showPreview={false}
1501
- // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
1502
- value: v.list,
1503
- data: getTableColumns(),
1504
- // ref={ref}
1505
- onChange: function onChange(data, _quotes) {
1506
- var newMeta = store.metaList[groupIndex].list.slice();
1507
- newMeta[index].expressions[i].list = data;
1508
- newMeta[index].expressions[i].quotes = _quotes;
1509
- store.setMeta(newMeta, groupIndex);
1510
- }
1511
- })
1505
+ value: v.list,
1506
+ data: getTableColumns(),
1507
+ // ref={ref}
1508
+ onChange: function onChange(data, _quotes) {
1509
+ var newMeta = store.metaList[groupIndex].list.slice();
1510
+ newMeta[index].expressions[i].list = data;
1511
+ newMeta[index].expressions[i].quotes = _quotes;
1512
+ store.setMeta(newMeta, groupIndex);
1513
+ }
1512
1514
  }), (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
1513
1515
  title: (0, _locale.__)('SqlQueryBuilder.add'),
1514
1516
  children: (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
package/lib/cjs/components/modules/permission-table.js CHANGED
@@ -110,7 +110,7 @@ var PermissionTable = function PermissionTable(props) {
110
110
  if (!meta.table.datasourceId && !meta.table.id) {
111
111
  return false;
112
112
  }
113
- return !(prevTables !== null && prevTables !== void 0 && (_prevTables$meta$tabl = prevTables[meta.table.datasourceId]) !== null && _prevTables$meta$tabl !== void 0 && _prevTables$meta$tabl[meta.table.id]);
113
+ return !(prevTables !== null && prevTables !== void 0 && (_prevTables$meta$tabl = prevTables[meta.table.datasourceId]) !== null && _prevTables$meta$tabl !== void 0 && _prevTables$meta$tabl[meta.table.alias || meta.table.id]);
114
114
  };
115
115
  return (0, _jsxRuntime.jsx)(_Wrapper["default"], {
116
116
  className: "Sqb-item",
package/lib/cjs/utils.js CHANGED
@@ -31,12 +31,12 @@ var getMetaTabels = exports.getMetaTabels = function getMetaTabels(data) {
31
31
  data.map(function (v) {
32
32
  if (v.type === _enum.TypeEnum.data) {
33
33
  var _v$table, _v$table2;
34
- obj[(_v$table = v.table) === null || _v$table === void 0 ? void 0 : _v$table.datasourceId] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[(_v$table2 = v.table) === null || _v$table2 === void 0 ? void 0 : _v$table2.datasourceId]), {}, (0, _defineProperty2["default"])({}, v.table.id, v.columns));
34
+ obj[(_v$table = v.table) === null || _v$table === void 0 ? void 0 : _v$table.datasourceId] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[(_v$table2 = v.table) === null || _v$table2 === void 0 ? void 0 : _v$table2.datasourceId]), {}, (0, _defineProperty2["default"])({}, v.table.alias || v.table.id, v.columns));
35
35
  }
36
36
  if (v.type === _enum.TypeEnum.joinData) {
37
37
  var _v$table3, _v$table4, _v$table5, _v$table6;
38
- obj[((_v$table3 = v.table1) === null || _v$table3 === void 0 ? void 0 : _v$table3.datasourceId) || 'source'] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[(_v$table4 = v.table1) === null || _v$table4 === void 0 ? void 0 : _v$table4.datasourceId]), {}, (0, _defineProperty2["default"])({}, v.table1.id, v.columns));
39
- obj[((_v$table5 = v.table2) === null || _v$table5 === void 0 ? void 0 : _v$table5.datasourceId) || 'source'] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[(_v$table6 = v.table2) === null || _v$table6 === void 0 ? void 0 : _v$table6.datasourceId]), {}, (0, _defineProperty2["default"])({}, v.table2.id, v.columns));
38
+ obj[((_v$table3 = v.table1) === null || _v$table3 === void 0 ? void 0 : _v$table3.datasourceId) || 'source'] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[(_v$table4 = v.table1) === null || _v$table4 === void 0 ? void 0 : _v$table4.datasourceId]), {}, (0, _defineProperty2["default"])({}, v.table1.alias || v.table1.id, v.columns));
39
+ obj[((_v$table5 = v.table2) === null || _v$table5 === void 0 ? void 0 : _v$table5.datasourceId) || 'source'] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[(_v$table6 = v.table2) === null || _v$table6 === void 0 ? void 0 : _v$table6.datasourceId]), {}, (0, _defineProperty2["default"])({}, v.table2.alias || v.table2.id, v.columns));
40
40
  }
41
41
  });
42
42
  return obj;
package/lib/es/components/dialog/select-permission-table/index.js CHANGED
@@ -34,11 +34,12 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
34
34
  width: '100%'
35
35
  },
36
36
  children: Array.isArray(datasource) && datasource.map(function (v) {
37
+ console.log('🚀 ~ SelectPermissionTable ~ v:', v);
37
38
  return _jsx("div", {
38
39
  className: cx("Sqb-List-section"),
39
40
  children: _jsx("div", {
40
41
  className: cx("Sqb-List-item mx-2", {
41
- active: value.name === v.name
42
+ active: value.alias + '' + value.id === v.alias + '' + v.id
42
43
  }),
43
44
  onClick: function onClick() {
44
45
  onChange(v);
package/lib/es/components/modules/join-data.js CHANGED
@@ -331,8 +331,9 @@ var JoinData = function JoinData(props) {
331
331
  data: data,
332
332
  value: newMeta[index][table_type],
333
333
  onChange: function onChange(data) {
334
+ console.log('🚀 ~ selectLeftTable ~ data:', data);
334
335
  // if (table_type === FlagLocation.TABLE_1) {
335
- if (newMeta[index][table_type].datasourceId !== data.datasourceId || newMeta[index][table_type].name !== data.name) {
336
+ if (newMeta[index][table_type].datasourceId !== data.datasourceId || newMeta[index][table_type].name !== data.name || newMeta[index][table_type].alias !== data.alias) {
336
337
  newMeta[index][table_type] = data;
337
338
  initExpressions();
338
339
  }
@@ -1127,7 +1128,7 @@ var JoinData = function JoinData(props) {
1127
1128
  if (meta.table1.name === SummarizeAlias) {
1128
1129
  return PrevResult;
1129
1130
  } else {
1130
- return "".concat(meta.table1.datasourceName, ".").concat(meta.table1.name);
1131
+ return "".concat(meta.table1.datasourceName, ".").concat(meta.table1.alias || meta.table1.name);
1131
1132
  }
1132
1133
  } else {
1133
1134
  return '';
@@ -1138,7 +1139,7 @@ var JoinData = function JoinData(props) {
1138
1139
  if (!meta.table1.datasourceId || !meta.table1.id || meta.table1.datasourceId === SummarizeAlias) {
1139
1140
  return false;
1140
1141
  }
1141
- return !(prevTables !== null && prevTables !== void 0 && (_prevTables$meta$tabl = prevTables[meta.table1.datasourceId]) !== null && _prevTables$meta$tabl !== void 0 && _prevTables$meta$tabl[meta.table1.id]);
1142
+ return !(prevTables !== null && prevTables !== void 0 && (_prevTables$meta$tabl = prevTables[meta.table1.datasourceId]) !== null && _prevTables$meta$tabl !== void 0 && _prevTables$meta$tabl[meta.table1.alias || meta.table1.id]);
1142
1143
  };
1143
1144
  var renderItem = function renderItem(items, type, i) {
1144
1145
  var _items$;
@@ -1486,23 +1487,24 @@ var JoinData = function JoinData(props) {
1486
1487
  if (v.type === AtomsTypeEnum.COLLECTION) {
1487
1488
  return _jsxs("div", {
1488
1489
  className: cx(" Sqb-collection-box"),
1489
- children: [_jsx("div", {
1490
- children: _jsx(FormulaList
1490
+ children: [i == 0 && _jsx("span", {
1491
+ className: 'ml-2 mr-4 text-gray-500',
1492
+ children: "on"
1493
+ }), _jsx(FormulaList
1494
+ // showPreview={false}
1495
+ // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
1496
+ , {
1491
1497
  // showPreview={false}
1492
1498
  // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
1493
- , {
1494
- // showPreview={false}
1495
- // check={formulaList?.[fun.name]?.args?.[i]?.check || ''}
1496
- value: v.list,
1497
- data: getTableColumns(),
1498
- // ref={ref}
1499
- onChange: function onChange(data, _quotes) {
1500
- var newMeta = store.metaList[groupIndex].list.slice();
1501
- newMeta[index].expressions[i].list = data;
1502
- newMeta[index].expressions[i].quotes = _quotes;
1503
- store.setMeta(newMeta, groupIndex);
1504
- }
1505
- })
1499
+ value: v.list,
1500
+ data: getTableColumns(),
1501
+ // ref={ref}
1502
+ onChange: function onChange(data, _quotes) {
1503
+ var newMeta = store.metaList[groupIndex].list.slice();
1504
+ newMeta[index].expressions[i].list = data;
1505
+ newMeta[index].expressions[i].quotes = _quotes;
1506
+ store.setMeta(newMeta, groupIndex);
1507
+ }
1506
1508
  }), _jsx(Tooltip, {
1507
1509
  title: __('SqlQueryBuilder.add'),
1508
1510
  children: _jsx(Dropdown, {
package/lib/es/components/modules/permission-table.js CHANGED
@@ -104,7 +104,7 @@ var PermissionTable = function PermissionTable(props) {
104
104
  if (!meta.table.datasourceId && !meta.table.id) {
105
105
  return false;
106
106
  }
107
- return !(prevTables !== null && prevTables !== void 0 && (_prevTables$meta$tabl = prevTables[meta.table.datasourceId]) !== null && _prevTables$meta$tabl !== void 0 && _prevTables$meta$tabl[meta.table.id]);
107
+ return !(prevTables !== null && prevTables !== void 0 && (_prevTables$meta$tabl = prevTables[meta.table.datasourceId]) !== null && _prevTables$meta$tabl !== void 0 && _prevTables$meta$tabl[meta.table.alias || meta.table.id]);
108
108
  };
109
109
  return _jsx(Wrapper, {
110
110
  className: "Sqb-item",
package/lib/es/utils.js CHANGED
@@ -20,12 +20,12 @@ export var getMetaTabels = function getMetaTabels(data) {
20
20
  data.map(function (v) {
21
21
  if (v.type === TypeEnum.data) {
22
22
  var _v$table, _v$table2;
23
- obj[(_v$table = v.table) === null || _v$table === void 0 ? void 0 : _v$table.datasourceId] = _objectSpread(_objectSpread({}, obj[(_v$table2 = v.table) === null || _v$table2 === void 0 ? void 0 : _v$table2.datasourceId]), {}, _defineProperty({}, v.table.id, v.columns));
23
+ obj[(_v$table = v.table) === null || _v$table === void 0 ? void 0 : _v$table.datasourceId] = _objectSpread(_objectSpread({}, obj[(_v$table2 = v.table) === null || _v$table2 === void 0 ? void 0 : _v$table2.datasourceId]), {}, _defineProperty({}, v.table.alias || v.table.id, v.columns));
24
24
  }
25
25
  if (v.type === TypeEnum.joinData) {
26
26
  var _v$table3, _v$table4, _v$table5, _v$table6;
27
- obj[((_v$table3 = v.table1) === null || _v$table3 === void 0 ? void 0 : _v$table3.datasourceId) || 'source'] = _objectSpread(_objectSpread({}, obj[(_v$table4 = v.table1) === null || _v$table4 === void 0 ? void 0 : _v$table4.datasourceId]), {}, _defineProperty({}, v.table1.id, v.columns));
28
- obj[((_v$table5 = v.table2) === null || _v$table5 === void 0 ? void 0 : _v$table5.datasourceId) || 'source'] = _objectSpread(_objectSpread({}, obj[(_v$table6 = v.table2) === null || _v$table6 === void 0 ? void 0 : _v$table6.datasourceId]), {}, _defineProperty({}, v.table2.id, v.columns));
27
+ obj[((_v$table3 = v.table1) === null || _v$table3 === void 0 ? void 0 : _v$table3.datasourceId) || 'source'] = _objectSpread(_objectSpread({}, obj[(_v$table4 = v.table1) === null || _v$table4 === void 0 ? void 0 : _v$table4.datasourceId]), {}, _defineProperty({}, v.table1.alias || v.table1.id, v.columns));
28
+ obj[((_v$table5 = v.table2) === null || _v$table5 === void 0 ? void 0 : _v$table5.datasourceId) || 'source'] = _objectSpread(_objectSpread({}, obj[(_v$table6 = v.table2) === null || _v$table6 === void 0 ? void 0 : _v$table6.datasourceId]), {}, _defineProperty({}, v.table2.alias || v.table2.id, v.columns));
29
29
  }
30
30
  });
31
31
  return obj;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gingkoo/pandora-metabase",
3
- "version": "1.0.31",
3
+ "version": "1.0.32",
4
4
  "description": "",
5
5
  "main": "lib/es/index.js",
6
6
  "module": "lib/es/index.js",