@abtnode/ux 1.8.40 → 1.8.42

package/lib/blocklet/component/navigation/navigation-dialog.js

@@ -147,23 +147,28 @@ const NavigationDialog = /*#__PURE__*/(0, _react.forwardRef)(function Navigation
   const selectedOption = (0, _react.useMemo)(() => {
     const parentData = rawNavigations.find(item => {
       if (watchComponent) {
-        return item.component === watchComponent;
+        const findComponent = components.find(x => x.name === watchComponent);
+        return findComponent.did === item.id;
       }
       return item.id === watchParent;
     });
     return parentData;
-  }, [rawNavigations, watchComponent, watchParent]);
+  }, [components, rawNavigations, watchComponent, watchParent]);
   const linkPrefix = (0, _react.useMemo)(() => {
     if (selectedOption !== null && selectedOption !== void 0 && selectedOption.component) {
       const findComponent = components.find(item => item.name === selectedOption.component);
       const {
         link
       } = findComponent || {};
-      const stringLink = (0, _isObject.default)(link) ? link[locale] : link;
-      return (0, _index.withoutTrailingSlash)((0, _urlJoin.default)(stringLink, selectedOption.link || '/'));
+      const stringLink = (0, _isObject.default)(link) ? link[state.locale] : link;
+      if (watchComponent) {
+        return (0, _index.withoutTrailingSlash)(stringLink);
+      }
+      const selectedLink = (0, _isObject.default)(selectedOption.link) ? selectedOption.link[state.locale] : selectedOption.link;
+      return (0, _index.withoutTrailingSlash)((0, _urlJoin.default)(stringLink, selectedLink || '/'));
     }
     return null;
-  }, [components, locale, selectedOption]);
+  }, [components, state.locale, selectedOption, watchComponent]);
   const autocompleteOptions = (0, _react.useMemo)(() => {
     const {
       component

package/lib/blocklet/component/navigation/navigation-preview.js

@@ -46,6 +46,7 @@ function NavigationPreview(_ref) {
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dashboard.default, {
           meta: blockletInfo,
+          invalidPathFallback: () => {},
           headerProps: {
             style: {
               display: 'none'

package/lib/blocklet/config-navigation.js

@@ -8,10 +8,11 @@ var _react = require("react");
 var _material = require("@mui/material");
 var _lab = require("@mui/lab");
 var _react2 = require("@iconify/react");
-var _Session = require("@arcblock/did-connect/lib/Session");
 var _notistack = require("notistack");
 var _ahooks = require("ahooks");
 var _Dialog = require("@arcblock/ux/lib/Dialog");
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _Session = require("@arcblock/did-connect/lib/Session");
 var _sortableTree = _interopRequireDefault(require("./component/sortable-tree"));
 var _navigationDialog = _interopRequireDefault(require("./component/navigation/navigation-dialog"));
 var _navigationActions = _interopRequireDefault(require("./component/navigation/navigation-actions"));
@@ -19,6 +20,7 @@ var _useNavigation = _interopRequireDefault(require("../hooks/use-navigation"));
 var _blocklet = require("../contexts/blocklet");
 var _navigationPreview = _interopRequireDefault(require("./component/navigation/navigation-preview"));
 var _team = require("../contexts/team");
+var _util = require("../util");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -32,11 +34,29 @@ const mockSession = {
   switchProfile: () => {},
   switchPassport: () => {}
 };
+const navigationTypeMap = {
+  header: 'Header',
+  footer: 'Footer',
+  bottom: 'Footer Link',
+  social: 'Footer Social',
+  dashboard: 'Dashboard',
+  sessionManager: 'SessionManager'
+};
 function ConfigNavigation() {
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
   const [showTree, setShowTree] = (0, _react.useState)(false);
   const {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
+  const refNavigationDialog = (0, _react.useRef)(null);
+  const {
+    roles
+  } = (0, _team.useTeamContext)();
+  const {
+    enqueueSnackbar
+  } = (0, _notistack.useSnackbar)();
   const pageState = (0, _ahooks.useReactive)({
     saveLoading: false,
     resetLoading: false,
@@ -49,21 +69,6 @@ function ConfigNavigation() {
       setShowTree(false);
     };
   }, []);
-  const navigationTypeMap = {
-    header: 'Header',
-    footer: 'Footer',
-    bottom: 'Footer Link',
-    social: 'Footer Social',
-    dashboard: 'Dashboard',
-    sessionManager: 'SessionManager'
-  };
-  const refNavigationDialog = (0, _react.useRef)(null);
-  const {
-    roles
-  } = (0, _team.useTeamContext)();
-  const {
-    enqueueSnackbar
-  } = (0, _notistack.useSnackbar)();
   const {
     state: navigationState,
     navigation,
@@ -112,10 +117,22 @@ function ConfigNavigation() {
       enqueueSnackbar('保存成功', {
         variant: 'success'
       });
+    } catch (e) {
+      enqueueSnackbar( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+          variant: "subtitle2",
+          children: t('navigation.actionFailed')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+          variant: "body1",
+          children: (0, _util.formatError)(e) || e.error
+        })]
+      }), {
+        variant: 'error'
+      });
     } finally {
       pageState.saveLoading = false;
     }
-  }, [enqueueSnackbar, navigationState.rawNavigation, pageState, saveNavigationList]);
+  }, [enqueueSnackbar, navigationState.rawNavigation, pageState, saveNavigationList, t]);
   const handleResetNavigation = (0, _react.useCallback)(async () => {
     try {
       pageState.resetLoading = true;
@@ -123,10 +140,22 @@ function ConfigNavigation() {
       enqueueSnackbar('重置成功', {
         variant: 'success'
       });
+    } catch (e) {
+      enqueueSnackbar( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+          variant: "subtitle2",
+          children: t('navigation.actionFailed')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+          variant: "body1",
+          children: (0, _util.formatError)(e) || e.error
+        })]
+      }), {
+        variant: 'error'
+      });
     } finally {
       pageState.resetLoading = false;
     }
-  }, [enqueueSnackbar, pageState, resetNavigation]);
+  }, [enqueueSnackbar, pageState, resetNavigation, t]);
   const sessionCtxValue = (0, _react.useMemo)(() => {
     return {
       session: _objectSpread(_objectSpread({}, mockSession), {}, {

package/lib/hooks/use-navigation.js

@@ -91,17 +91,6 @@ function isSameNavigation(a, b) {
   }
   return a.id === b.id;
 }
-function hackBuiltinLink(treeList) {
-  const copyData = (0, _cloneDeep.default)(treeList);
-  (0, _parseNavigationFromBlocklet.deepWalk)(copyData, item => {
-    if (item.from === 'tmpl') {
-      item.link = '/';
-    }
-  }, {
-    key: 'items'
-  });
-  return copyData;
-}
 function useNavigation() {
   const {
     blocklet,
@@ -137,17 +126,8 @@ function useNavigation() {
   }, [state.rawNavigation]);
   const treeNavigation = (0, _react.useMemo)(() => {
     const rawData = (0, _parseNavigationFromBlocklet.filterNavigation)(state.rawNavigation, components);
-    const navigationWithLink = hackBuiltinLink((0, _parseNavigationFromBlocklet.joinLink)(rawData, components));
-    let hasSessionManager = false;
-    return navigationWithLink.filter(item => {
-      if ((0, _parseNavigationFromBlocklet.isMatchSection)(item.section, 'sessionManager')) {
-        if (hasSessionManager) {
-          return false;
-        }
-        hasSessionManager = true;
-      }
-      return true;
-    });
+    const navigationWithLink = (0, _parseNavigationFromBlocklet.joinLink)(rawData, components);
+    return (0, _parseNavigationFromBlocklet.cleanOrphanNavigation)(navigationWithLink);
   }, [components, state.rawNavigation]);
   function getNavigationFullLink(navigationItem) {
     if (!navigationItem.id) return '';

package/lib/locales/en.js

@@ -1114,6 +1114,7 @@ module.exports = {
   },
   navigation: {
     navigation: 'Navigation',
+    actionFailed: 'Action Failed',
     form: {
       title: 'Title',
       titlePlaceholder: 'Please input navigation title',

package/lib/locales/zh.js

@@ -1119,6 +1119,7 @@ module.exports = {
   },
   navigation: {
     navigation: '导航',
+    actionFailed: '操作失败',
     form: {
       title: '标题',
       titlePlaceholder: '请输入导航标题',

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.40",
+  "version": "1.8.42",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.40",
-    "@abtnode/constant": "1.8.40",
-    "@abtnode/util": "1.8.40",
+    "@abtnode/auth": "1.8.42",
+    "@abtnode/constant": "1.8.42",
+    "@abtnode/util": "1.8.42",
     "@arcblock/did-connect": "^2.4.55",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/icons": "^2.4.55",
     "@arcblock/terminal": "^2.4.55",
     "@arcblock/ux": "^2.4.55",
-    "@blocklet/constant": "1.8.40",
+    "@blocklet/constant": "1.8.42",
     "@blocklet/launcher-layout": "^1.9.15",
     "@blocklet/list": "^0.10.38",
-    "@blocklet/meta": "1.8.40",
+    "@blocklet/meta": "1.8.42",
     "@blocklet/ui-react": "^2.4.55",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -84,5 +84,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "336dbe0ad2cf512a322358899e56aab3668b1715"
+  "gitHead": "04771ed44e11deb3f214b637be6e3b78ca2b9245"
 }