@gingkoo/pandora-metabase 1.0.129 → 1.0.130

package/lib/cjs/components/dialog/select-table/index.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -34,6 +35,7 @@ var SelectTable = function SelectTable(_ref) {
     _ref$tableFlat = _ref.tableFlat,
     tableFlat = _ref$tableFlat === void 0 ? false : _ref$tableFlat;
   var store = (0, _useProvider.useStore)();
+  var flatTableRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     loading = _useState2[0],
@@ -41,11 +43,15 @@ var SelectTable = function SelectTable(_ref) {
   var _useState3 = (0, _react.useState)(data.slice()),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
     datasource = _useState4[0];
-  var _useState5 = (0, _react.useState)(sourceTable.slice()),
+  var _useState5 = (0, _react.useState)(function () {
+      return sortSelectedDatasourceFirst(sourceTable.slice(), value.datasourceId);
+    }),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
     originDatasourceTable = _useState6[0],
     setOriginDatasourceTable = _useState6[1];
-  var _useState7 = (0, _react.useState)(sourceTable.slice()),
+  var _useState7 = (0, _react.useState)(function () {
+      return sortSelectedDatasourceFirst(sourceTable.slice(), value.datasourceId);
+    }),
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
     datasourceTable = _useState8[0],
     setDatasourceTable = _useState8[1];
@@ -76,7 +82,11 @@ var SelectTable = function SelectTable(_ref) {
       if (!value.datasourceType && _datasourceType) {
         emitDatasourceTypeChange(nextVal);
       }
-      loadTables(value.datasourceId, _datasourceType);
+      loadTables(value.datasourceId, _datasourceType).then(function (tables) {
+        if (tableFlat) {
+          updateFlatDatasourceTables(value.datasourceId, _datasourceType, tables);
+        }
+      });
     }
   }, []);
   function getDefaultDatasourceType(datasource) {
@@ -88,6 +98,47 @@ var SelectTable = function SelectTable(_ref) {
       return v.datasourceId === datasourceId;
     });
   }
+  function getFlatDatasourceType(datasourceItem) {
+    if (val.datasourceId === datasourceItem.datasourceId && val.datasourceType) {
+      return val.datasourceType;
+    }
+    return datasourceItem.datasourceType || getDefaultDatasourceType(datasourceItem);
+  }
+  function sortSelectedDatasourceFirst(tables, datasourceId) {
+    var selectedDatasourceId = datasourceId || value.datasourceId;
+    if (!tableFlat || !selectedDatasourceId) return tables.slice();
+    var selectedIndex = tables.findIndex(function (item) {
+      return item.datasourceId === selectedDatasourceId;
+    });
+    if (selectedIndex <= 0) return tables.slice();
+    var nextTables = tables.slice();
+    var _nextTables$splice = nextTables.splice(selectedIndex, 1),
+      _nextTables$splice2 = (0, _slicedToArray2["default"])(_nextTables$splice, 1),
+      selectedTable = _nextTables$splice2[0];
+    return [selectedTable].concat((0, _toConsumableArray2["default"])(nextTables));
+  }
+  function updateFlatDatasourceTables(datasourceId, datasourceType, tables) {
+    var tablesData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : originDatasourceTable;
+    var scrollToTop = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+    var nextOriginDatasourceTable = sortSelectedDatasourceFirst(tablesData, datasourceId).map(function (v) {
+      if (v.datasourceId !== datasourceId) return v;
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+        datasourceType: datasourceType,
+        children: tables
+      });
+    });
+    setOriginDatasourceTable(nextOriginDatasourceTable);
+    setDatasourceTable(filterDatasourceTables(nextOriginDatasourceTable, tableFilterValue));
+    if (scrollToTop) {
+      requestAnimationFrame(function () {
+        var _flatTableRef$current;
+        var scrollContainer = (_flatTableRef$current = flatTableRef.current) === null || _flatTableRef$current === void 0 ? void 0 : _flatTableRef$current.parentElement;
+        if (scrollContainer) {
+          scrollContainer.scrollTop = 0;
+        }
+      });
+    }
+  }
   function filterDatasourceTables(tables, keyword) {
     var searchVal = keyword.toLocaleLowerCase();
     if (!searchVal) return tables.slice();
@@ -157,7 +208,6 @@ var SelectTable = function SelectTable(_ref) {
       datasourceType: datasourceType
     });
     setVal(nextVal);
-    emitDatasourceTypeChange(nextVal);
     loadTables(nextVal.datasourceId, datasourceType, true);
   }
   function handleFlatDatasourceTypeChange(_x2, _x3) {
@@ -165,7 +215,7 @@ var SelectTable = function SelectTable(_ref) {
   }
   function _handleFlatDatasourceTypeChange() {
     _handleFlatDatasourceTypeChange = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee2(datasourceItem, datasourceType) {
-      var nextVal, tables, updateDatasourceTable, nextOriginDatasourceTable;
+      var nextVal, tables;
       return _regenerator["default"].wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -174,24 +224,12 @@ var SelectTable = function SelectTable(_ref) {
                 datasourceType: datasourceType
               });
               setVal(nextVal);
-              emitDatasourceTypeChange(nextVal);
             }
             _context2.next = 1;
             return loadTables(datasourceItem.datasourceId, datasourceType, true);
           case 1:
             tables = _context2.sent;
-            updateDatasourceTable = function updateDatasourceTable(tablesData) {
-              return tablesData.map(function (v) {
-                if (v.datasourceId !== datasourceItem.datasourceId) return v;
-                return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
-                  datasourceType: datasourceType,
-                  children: tables
-                });
-              });
-            };
-            nextOriginDatasourceTable = updateDatasourceTable(originDatasourceTable);
-            setOriginDatasourceTable(nextOriginDatasourceTable);
-            setDatasourceTable(filterDatasourceTables(nextOriginDatasourceTable, tableFilterValue));
+            updateFlatDatasourceTables(datasourceItem.datasourceId, datasourceType, tables, undefined, true);
           case 2:
           case "end":
             return _context2.stop();
@@ -232,8 +270,19 @@ var SelectTable = function SelectTable(_ref) {
     });
   }
   (0, _react.useEffect)(function () {
-    setOriginDatasourceTable(sourceTable.slice());
-    setDatasourceTable(filterDatasourceTables(sourceTable.slice(), tableFilterValue));
+    var nextSourceTable = sourceTable.slice();
+    if (tableFlat && val.datasourceId) {
+      var _store$getDataset;
+      var _datasourceType2 = val.datasourceType;
+      var cachedTables = _datasourceType2 ? (_store$getDataset = store.getDataset) === null || _store$getDataset === void 0 ? void 0 : _store$getDataset.call(store, val.datasourceId, _datasourceType2) : [];
+      if (_datasourceType2 && cachedTables !== null && cachedTables !== void 0 && cachedTables.length) {
+        updateFlatDatasourceTables(val.datasourceId, _datasourceType2, cachedTables, nextSourceTable);
+        return;
+      }
+    }
+    var sortedSourceTable = sortSelectedDatasourceFirst(nextSourceTable, val.datasourceId);
+    setOriginDatasourceTable(sortedSourceTable);
+    setDatasourceTable(filterDatasourceTables(sortedSourceTable, tableFilterValue));
   }, [sourceTable]);
   (0, _react.useEffect)(function () {
     didUpdate === null || didUpdate === void 0 || didUpdate();
@@ -265,6 +314,7 @@ var SelectTable = function SelectTable(_ref) {
   if (tableFlat) {
     return (0, _jsxRuntime.jsx)("div", {
       className: (0, _classnames["default"])("Sqb-SelectTable--box pb-2"),
+      ref: flatTableRef,
       children: (0, _jsxRuntime.jsx)("div", {
         style: {
           minWidth: 300
@@ -290,7 +340,7 @@ var SelectTable = function SelectTable(_ref) {
             })
           }), datasourceTable.map(function (table) {
             var _table$children;
-            var datasourceType = table.datasourceType || getDefaultDatasourceType(table);
+            var datasourceType = getFlatDatasourceType(table);
             return (0, _jsxRuntime.jsxs)(_react["default"].Fragment, {
               children: [(0, _jsxRuntime.jsxs)("div", {
                 className: (0, _classnames["default"])("Sqb-List-title mx-4 pb-2 pt-2"),
@@ -314,7 +364,7 @@ var SelectTable = function SelectTable(_ref) {
                   className: (0, _classnames["default"])("Sqb-List-section"),
                   children: (0, _jsxRuntime.jsx)("div", {
                     className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                      active: val.datasourceId === table.datasourceId && val.name === v.name && (val.datasourceType || datasourceType) === datasourceType
+                      active: val.datasourceId === table.datasourceId && val.id === v.id && (val.datasourceType || datasourceType) === datasourceType
                     }),
                     onClick: function onClick() {
                       onChange((0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _val), v), {}, {
@@ -433,7 +483,7 @@ var SelectTable = function SelectTable(_ref) {
               className: (0, _classnames["default"])("Sqb-List-section"),
               children: (0, _jsxRuntime.jsx)("div", {
                 className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                  active: val.datasourceId === value.datasourceId && val.name === v.name && (val.datasourceType || datasourceType) === datasourceType
+                  active: val.datasourceId === value.datasourceId && val.id === v.id && (val.datasourceType || datasourceType) === datasourceType
                 }),
                 onClick: function onClick() {
                   onChange((0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, val), v), {}, {

package/lib/cjs/components/modules/join-data.js

@@ -93,11 +93,11 @@ var JoinData = function JoinData(props) {
   var tableIsDel = function () {
     var _ref = (0, _asyncToGenerator2["default"])(_regenerator["default"].mark(function _callee() {
       var _meta$table, _meta$table2;
-      var tableName, tables, names;
+      var tableId, tables, ids;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            tableName = (_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.name;
+            tableId = (_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.id;
             if ((_meta$table2 = meta.table2) !== null && _meta$table2 !== void 0 && _meta$table2.datasourceId) {
               _context.next = 1;
               break;
@@ -109,10 +109,10 @@ var JoinData = function JoinData(props) {
             return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table2.datasourceId, meta.table2.datasourceType);
           case 2:
             tables = _context.sent;
-            names = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
-              return v.name;
+            ids = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
+              return v.id;
             })) || [];
-            if (!names.includes(tableName)) {
+            if (!ids.includes(tableId)) {
               setIsDel(true);
             } else {
               setIsDel(false);

package/lib/es/components/dialog/select-table/index.js

@@ -1,10 +1,11 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import './index.less';
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import cloneDeep from 'lodash/cloneDeep';
 import cx from 'classnames';
 import { uuidv4 } from '../../../utils/helper';
@@ -26,6 +27,7 @@ var SelectTable = function SelectTable(_ref) {
     _ref$tableFlat = _ref.tableFlat,
     tableFlat = _ref$tableFlat === void 0 ? false : _ref$tableFlat;
   var store = useStore();
+  var flatTableRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -33,11 +35,15 @@ var SelectTable = function SelectTable(_ref) {
   var _useState3 = useState(data.slice()),
     _useState4 = _slicedToArray(_useState3, 1),
     datasource = _useState4[0];
-  var _useState5 = useState(sourceTable.slice()),
+  var _useState5 = useState(function () {
+      return sortSelectedDatasourceFirst(sourceTable.slice(), value.datasourceId);
+    }),
     _useState6 = _slicedToArray(_useState5, 2),
     originDatasourceTable = _useState6[0],
     setOriginDatasourceTable = _useState6[1];
-  var _useState7 = useState(sourceTable.slice()),
+  var _useState7 = useState(function () {
+      return sortSelectedDatasourceFirst(sourceTable.slice(), value.datasourceId);
+    }),
     _useState8 = _slicedToArray(_useState7, 2),
     datasourceTable = _useState8[0],
     setDatasourceTable = _useState8[1];
@@ -68,7 +74,11 @@ var SelectTable = function SelectTable(_ref) {
       if (!value.datasourceType && _datasourceType) {
         emitDatasourceTypeChange(nextVal);
       }
-      loadTables(value.datasourceId, _datasourceType);
+      loadTables(value.datasourceId, _datasourceType).then(function (tables) {
+        if (tableFlat) {
+          updateFlatDatasourceTables(value.datasourceId, _datasourceType, tables);
+        }
+      });
     }
   }, []);
   function getDefaultDatasourceType(datasource) {
@@ -80,6 +90,47 @@ var SelectTable = function SelectTable(_ref) {
       return v.datasourceId === datasourceId;
     });
   }
+  function getFlatDatasourceType(datasourceItem) {
+    if (val.datasourceId === datasourceItem.datasourceId && val.datasourceType) {
+      return val.datasourceType;
+    }
+    return datasourceItem.datasourceType || getDefaultDatasourceType(datasourceItem);
+  }
+  function sortSelectedDatasourceFirst(tables, datasourceId) {
+    var selectedDatasourceId = datasourceId || value.datasourceId;
+    if (!tableFlat || !selectedDatasourceId) return tables.slice();
+    var selectedIndex = tables.findIndex(function (item) {
+      return item.datasourceId === selectedDatasourceId;
+    });
+    if (selectedIndex <= 0) return tables.slice();
+    var nextTables = tables.slice();
+    var _nextTables$splice = nextTables.splice(selectedIndex, 1),
+      _nextTables$splice2 = _slicedToArray(_nextTables$splice, 1),
+      selectedTable = _nextTables$splice2[0];
+    return [selectedTable].concat(_toConsumableArray(nextTables));
+  }
+  function updateFlatDatasourceTables(datasourceId, datasourceType, tables) {
+    var tablesData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : originDatasourceTable;
+    var scrollToTop = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+    var nextOriginDatasourceTable = sortSelectedDatasourceFirst(tablesData, datasourceId).map(function (v) {
+      if (v.datasourceId !== datasourceId) return v;
+      return _objectSpread(_objectSpread({}, v), {}, {
+        datasourceType: datasourceType,
+        children: tables
+      });
+    });
+    setOriginDatasourceTable(nextOriginDatasourceTable);
+    setDatasourceTable(filterDatasourceTables(nextOriginDatasourceTable, tableFilterValue));
+    if (scrollToTop) {
+      requestAnimationFrame(function () {
+        var _flatTableRef$current;
+        var scrollContainer = (_flatTableRef$current = flatTableRef.current) === null || _flatTableRef$current === void 0 ? void 0 : _flatTableRef$current.parentElement;
+        if (scrollContainer) {
+          scrollContainer.scrollTop = 0;
+        }
+      });
+    }
+  }
   function filterDatasourceTables(tables, keyword) {
     var searchVal = keyword.toLocaleLowerCase();
     if (!searchVal) return tables.slice();
@@ -149,7 +200,6 @@ var SelectTable = function SelectTable(_ref) {
       datasourceType: datasourceType
     });
     setVal(nextVal);
-    emitDatasourceTypeChange(nextVal);
     loadTables(nextVal.datasourceId, datasourceType, true);
   }
   function handleFlatDatasourceTypeChange(_x2, _x3) {
@@ -157,7 +207,7 @@ var SelectTable = function SelectTable(_ref) {
   }
   function _handleFlatDatasourceTypeChange() {
     _handleFlatDatasourceTypeChange = _asyncToGenerator(_regeneratorRuntime.mark(function _callee2(datasourceItem, datasourceType) {
-      var nextVal, tables, updateDatasourceTable, nextOriginDatasourceTable;
+      var nextVal, tables;
       return _regeneratorRuntime.wrap(function (_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -166,24 +216,12 @@ var SelectTable = function SelectTable(_ref) {
                 datasourceType: datasourceType
               });
               setVal(nextVal);
-              emitDatasourceTypeChange(nextVal);
             }
             _context2.next = 1;
             return loadTables(datasourceItem.datasourceId, datasourceType, true);
           case 1:
             tables = _context2.sent;
-            updateDatasourceTable = function updateDatasourceTable(tablesData) {
-              return tablesData.map(function (v) {
-                if (v.datasourceId !== datasourceItem.datasourceId) return v;
-                return _objectSpread(_objectSpread({}, v), {}, {
-                  datasourceType: datasourceType,
-                  children: tables
-                });
-              });
-            };
-            nextOriginDatasourceTable = updateDatasourceTable(originDatasourceTable);
-            setOriginDatasourceTable(nextOriginDatasourceTable);
-            setDatasourceTable(filterDatasourceTables(nextOriginDatasourceTable, tableFilterValue));
+            updateFlatDatasourceTables(datasourceItem.datasourceId, datasourceType, tables, undefined, true);
           case 2:
           case "end":
             return _context2.stop();
@@ -224,8 +262,19 @@ var SelectTable = function SelectTable(_ref) {
     });
   }
   useEffect(function () {
-    setOriginDatasourceTable(sourceTable.slice());
-    setDatasourceTable(filterDatasourceTables(sourceTable.slice(), tableFilterValue));
+    var nextSourceTable = sourceTable.slice();
+    if (tableFlat && val.datasourceId) {
+      var _store$getDataset;
+      var _datasourceType2 = val.datasourceType;
+      var cachedTables = _datasourceType2 ? (_store$getDataset = store.getDataset) === null || _store$getDataset === void 0 ? void 0 : _store$getDataset.call(store, val.datasourceId, _datasourceType2) : [];
+      if (_datasourceType2 && cachedTables !== null && cachedTables !== void 0 && cachedTables.length) {
+        updateFlatDatasourceTables(val.datasourceId, _datasourceType2, cachedTables, nextSourceTable);
+        return;
+      }
+    }
+    var sortedSourceTable = sortSelectedDatasourceFirst(nextSourceTable, val.datasourceId);
+    setOriginDatasourceTable(sortedSourceTable);
+    setDatasourceTable(filterDatasourceTables(sortedSourceTable, tableFilterValue));
   }, [sourceTable]);
   useEffect(function () {
     didUpdate === null || didUpdate === void 0 || didUpdate();
@@ -257,6 +306,7 @@ var SelectTable = function SelectTable(_ref) {
   if (tableFlat) {
     return _jsx("div", {
       className: cx("Sqb-SelectTable--box pb-2"),
+      ref: flatTableRef,
       children: _jsx("div", {
         style: {
           minWidth: 300
@@ -282,7 +332,7 @@ var SelectTable = function SelectTable(_ref) {
             })
           }), datasourceTable.map(function (table) {
             var _table$children;
-            var datasourceType = table.datasourceType || getDefaultDatasourceType(table);
+            var datasourceType = getFlatDatasourceType(table);
             return _jsxs(React.Fragment, {
               children: [_jsxs("div", {
                 className: cx("Sqb-List-title mx-4 pb-2 pt-2"),
@@ -306,7 +356,7 @@ var SelectTable = function SelectTable(_ref) {
                   className: cx("Sqb-List-section"),
                   children: _jsx("div", {
                     className: cx("Sqb-List-item mx-2", {
-                      active: val.datasourceId === table.datasourceId && val.name === v.name && (val.datasourceType || datasourceType) === datasourceType
+                      active: val.datasourceId === table.datasourceId && val.id === v.id && (val.datasourceType || datasourceType) === datasourceType
                     }),
                     onClick: function onClick() {
                       onChange(_objectSpread(_objectSpread(_objectSpread({}, _val), v), {}, {
@@ -425,7 +475,7 @@ var SelectTable = function SelectTable(_ref) {
               className: cx("Sqb-List-section"),
               children: _jsx("div", {
                 className: cx("Sqb-List-item mx-2", {
-                  active: val.datasourceId === value.datasourceId && val.name === v.name && (val.datasourceType || datasourceType) === datasourceType
+                  active: val.datasourceId === value.datasourceId && val.id === v.id && (val.datasourceType || datasourceType) === datasourceType
                 }),
                 onClick: function onClick() {
                   onChange(_objectSpread(_objectSpread(_objectSpread({}, val), v), {}, {

package/lib/es/components/modules/join-data.js

@@ -88,11 +88,11 @@ var JoinData = function JoinData(props) {
   var tableIsDel = function () {
     var _ref = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
       var _meta$table, _meta$table2;
-      var tableName, tables, names;
+      var tableId, tables, ids;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            tableName = (_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.name;
+            tableId = (_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.id;
             if ((_meta$table2 = meta.table2) !== null && _meta$table2 !== void 0 && _meta$table2.datasourceId) {
               _context.next = 1;
               break;
@@ -104,10 +104,10 @@ var JoinData = function JoinData(props) {
             return store === null || store === void 0 ? void 0 : store.fetchDataset(meta.table2.datasourceId, meta.table2.datasourceType);
           case 2:
             tables = _context.sent;
-            names = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
-              return v.name;
+            ids = (tables === null || tables === void 0 ? void 0 : tables.map(function (v) {
+              return v.id;
             })) || [];
-            if (!names.includes(tableName)) {
+            if (!ids.includes(tableId)) {
               setIsDel(true);
             } else {
               setIsDel(false);

package/package.json

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