@abtnode/ux 1.16.29-beta-44e63d18 → 1.16.29-beta-7e212076

package/lib/blocklet/overview.js

@@ -1,13 +1,15 @@
-import Button from '@arcblock/ux/lib/Button';
 import styled from '@emotion/styled';
 import React, { useState } from 'react';
-import ExpandLess from '@mui/icons-material/ExpandLess';
-import ExpandMore from '@mui/icons-material/ExpandMore';
+import { Box, Tooltip, Typography } from '@mui/material';
+import { Icon } from '@iconify/react';
+import QuestionMarkRoundedIcon from '@iconify-icons/material-symbols/question-mark-rounded';
+import KeyboardArrowDownRoundedIcon from '@iconify-icons/material-symbols/keyboard-arrow-down-rounded';
+import KeyboardArrowUpRoundedIcon from '@iconify-icons/material-symbols/keyboard-arrow-up-rounded';
+import Button from '@arcblock/ux/lib/Button';
 import InfoRow from '@arcblock/ux/lib/InfoRow';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tag from '@arcblock/ux/lib/Tag';
 import { getDisplayName, getWhoCanAccess } from '@blocklet/meta/lib/util';
-import Typography from '@mui/material/Typography';
 import { useBlockletContext } from '../contexts/blocklet';
 import { useNodeContext } from '../contexts/node';
 import DidAddress from '../did-address';
@@ -45,8 +47,20 @@ export default function BlockletOverview() {
       did: appDid,
       showQrcode: true
     })
-  } : null, appPid ? {
-    name: t('blocklet.appPid'),
+  } : null, appPid && appDid !== appPid ? {
+    name: /*#__PURE__*/_jsxs(Box, {
+      sx: {
+        display: 'flex',
+        alignItems: 'center',
+        gap: 1
+      },
+      children: [t('blocklet.appPid'), /*#__PURE__*/_jsx(Tooltip, {
+        title: t('blocklet.whyNeedAppPid'),
+        children: /*#__PURE__*/_jsx(Icon, {
+          icon: QuestionMarkRoundedIcon
+        })
+      })]
+    }),
     value: /*#__PURE__*/_jsx(DidAddress, {
       did: appPid,
       showQrcode: true
@@ -61,7 +75,11 @@ export default function BlockletOverview() {
         style: {
           marginLeft: '18px'
         },
-        endIcon: showAllDIDs ? /*#__PURE__*/_jsx(ExpandLess, {}) : /*#__PURE__*/_jsx(ExpandMore, {}),
+        endIcon: showAllDIDs ? /*#__PURE__*/_jsx(Icon, {
+          icon: KeyboardArrowUpRoundedIcon
+        }) : /*#__PURE__*/_jsx(Icon, {
+          icon: KeyboardArrowDownRoundedIcon
+        }),
         onClick: () => setShowAllDIDs(!showAllDIDs),
         children: showAllDIDs ? t('common.collapseAll') : t('blocklet.router.showAllDIDs')
       })]

package/lib/locales/ar.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'سيتم حذف بلوكليت من المخزن بعد الفصل. هل أنت متأكد من أنك تريد الفصل؟'
     },
     titleValidationError: 'يجب أن يكون طول العنوان على الأقل 3 أحرف',
-    descriptionValidationError: 'يجب أن تكون طول الوصف بين 3 و 160 حرفًا'
+    descriptionValidationError: 'يجب أن تكون طول الوصف بين 3 و 160 حرفًا',
+    whyNeedAppPid: 'إذا تم نقل تطبيقك، فإن DID الدائم هو DID الذي تم إنشاؤه عند تثبيت Blocklet هذا في الأصل.'
   },
   dashboard: {
     nodeDid: 'عقدة',

package/lib/locales/de.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'Das Blocklet wird nach dem Trennen aus dem Store entfernt. Möchten Sie wirklich trennen?'
     },
     titleValidationError: 'Die Länge des Titels muss mindestens 3 Zeichen betragen',
-    descriptionValidationError: 'Die Beschreibungslänge muss zwischen 3 und 160 Zeichen liegen'
+    descriptionValidationError: 'Die Beschreibungslänge muss zwischen 3 und 160 Zeichen liegen',
+    whyNeedAppPid: 'Wenn Ihre Anwendung migriert wurde, ist die permanente DID die DID, die bei der ursprünglichen Installation dieses Blocklets generiert wurde.'
   },
   dashboard: {
     nodeDid: 'Knoten',

package/lib/locales/en.js

@@ -372,6 +372,7 @@ export default {
     noService: 'No Services',
     appId: 'App DID',
     appPid: 'Permanent DID',
+    whyNeedAppPid: 'If your application has been migrated, the permanent DID is the DID generated when this Blocklet was originally installed',
     alsoKnownAs: 'Also Known As',
     skSource: 'Owner Wallet',
     reloadSuccess: 'Blocklet was reloaded successfully',

package/lib/locales/es.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'Después de la desconexión, se eliminará el blocklet de la tienda. ¿Seguro que desea desconectar?'
     },
     titleValidationError: 'La longitud del título debe ser de al menos 3 caracteres',
-    descriptionValidationError: 'La longitud de la descripción debe estar entre 3 y 160 caracteres'
+    descriptionValidationError: 'La longitud de la descripción debe estar entre 3 y 160 caracteres',
+    whyNeedAppPid: 'Si se ha migrado su aplicación, el DID permanente es el DID generado cuando este Blocklet se instaló originalmente.'
   },
   dashboard: {
     nodeDid: 'Nodo',

package/lib/locales/fr.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'Le bloclet sera supprimé du store après sa déconnexion. Êtes-vous sûr de vouloir le déconnecter ?'
     },
     titleValidationError: "La longueur du titre doit être d'au moins 3 caractères",
-    descriptionValidationError: 'La longueur de la description doit être comprise entre 3 et 160 caractères'
+    descriptionValidationError: 'La longueur de la description doit être comprise entre 3 et 160 caractères',
+    whyNeedAppPid: "Si votre application a été migrée, le DID permanent est le DID généré lors de l'installation initiale de ce Blocklet."
   },
   dashboard: {
     nodeDid: 'Noeud',

package/lib/locales/hi.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'ब्लॉकलेट को डिस्कनेक्ट करने के बाद उसे स्टोर से हटा दिया जाएगा। क्या आप वाकई में उसे डिस्कनेक्ट करना चाहते हैं?'
     },
     titleValidationError: 'शीर्षक की लंबाई कम से कम 3 अक्षर होनी चाहिए',
-    descriptionValidationError: 'विवरण की लंबाई 3 और 160 वर्णों के बीच होनी चाहिए'
+    descriptionValidationError: 'विवरण की लंबाई 3 और 160 वर्णों के बीच होनी चाहिए',
+    whyNeedAppPid: 'अगर आपका एप्लीकेशन माइग्रेट कर दिया गया है, तो परमानेंट DID वही DID है जो उस समय जनरेट की गई थी जब पहली बार यह ब्लॉकलेट इंस्टॉल किया गया था।'
   },
   dashboard: {
     nodeDid: 'नोड',

package/lib/locales/id.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'Setelah terputus, blocklet akan dihapus dari toko. Apa Anda yakin untuk memutuskan?'
     },
     titleValidationError: 'Panjang judul harus setidaknya 3 karakter',
-    descriptionValidationError: 'Panjang deskripsi harus antara 3 dan 160 karakter.'
+    descriptionValidationError: 'Panjang deskripsi harus antara 3 dan 160 karakter.',
+    whyNeedAppPid: 'Jika aplikasi Anda telah dimigrasikan, DID permanen adalah DID yang dihasilkan saat Blocklet ini pertama kali dipasang'
   },
   dashboard: {
     nodeDid: 'Node',

package/lib/locales/ja.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'ブロックレットの接続を解除すると、ブロックレットはストアから削除されます。接続を解除してもよろしいですか？'
     },
     titleValidationError: 'タイトルの長さは最低3文字以上である必要があります',
-    descriptionValidationError: '説明の長さは3から160文字の間でなければなりません'
+    descriptionValidationError: '説明の長さは3から160文字の間でなければなりません',
+    whyNeedAppPid: 'アプリケーションが移行されている場合、永続的な DID はこの Blocklet が最初にインストールされたときに生成された DID です。'
   },
   dashboard: {
     nodeDid: 'ノード',

package/lib/locales/ko.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: '연결이 끊어지면 Blocklet이 스토어에서 제거됩니다. 연결을 끊으시겠습니까?'
     },
     titleValidationError: '제목 길이는 최소 3자 이상이어야 합니다',
-    descriptionValidationError: '설명 길이는 3에서 160자 사이여야 합니다'
+    descriptionValidationError: '설명 길이는 3에서 160자 사이여야 합니다',
+    whyNeedAppPid: '애플리케이션이 마이그레이션된 경우 영구 DID는 이 Blocklet이 처음 설치되었을 때 생성된 DID입니다.'
   },
   dashboard: {
     nodeDid: '노드',

package/lib/locales/pt.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'Após desconectado, o Blocklet será removido da loja. Você tem certeza que deseja desconectar?'
     },
     titleValidationError: 'O comprimento do título deve ter pelo menos 3 caracteres',
-    descriptionValidationError: 'O comprimento da descrição deve estar entre 3 e 160 caracteres.'
+    descriptionValidationError: 'O comprimento da descrição deve estar entre 3 e 160 caracteres.',
+    whyNeedAppPid: 'Se o seu aplicativo foi migrado, o DID permanente é o DID gerado quando este Blocklet foi instalado originalmente'
   },
   dashboard: {
     nodeDid: 'Nó',

package/lib/locales/ru.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'Блоклет будет удален из магазина после отключения. Уверены, что хотите отключить?'
     },
     titleValidationError: 'Длина заголовка должна быть не менее 3 символов',
-    descriptionValidationError: 'Длина описания должна быть от 3 до 160 символов'
+    descriptionValidationError: 'Длина описания должна быть от 3 до 160 символов',
+    whyNeedAppPid: 'Если ваше приложение перенесено, постоянный DID — это DID, созданный при первоначальной установке этого Blocklet.'
   },
   dashboard: {
     nodeDid: 'Узел',

package/lib/locales/th.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'เมื่อยกเลิกการเชื่อมต่อแล้ว Blocklet จะถูกลบออกจากร้าน คุณแน่ใจไหมว่าต้องการยกเลิกการเชื่อมต่อหรือไม่'
     },
     titleValidationError: 'ความยาวของชื่อต้องมีอย่างน้อย 3 ตัวอักษร',
-    descriptionValidationError: 'ความยาวคำอธิบายต้องอยู่ระหว่าง 3 ถึง 160 ตัวอักษร.'
+    descriptionValidationError: 'ความยาวคำอธิบายต้องอยู่ระหว่าง 3 ถึง 160 ตัวอักษร.',
+    whyNeedAppPid: 'หากแอปพลิเคชันของคุณได้รับการโยกย้ายมา DID ถาวรคือ DID ที่สร้างขึ้นเมื่อติดตั้ง Blocklet นี้เริ่มแรก'
   },
   dashboard: {
     nodeDid: 'โหนด',

package/lib/locales/vi.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: 'Sau khi ngắt kết nối, Blocklet sẽ bị xóa khỏi cửa hàng. Bạn có chắc chắn muốn ngắt kết nối không?'
     },
     titleValidationError: 'Độ dài tiêu đề phải ít nhất 3 ký tự',
-    descriptionValidationError: 'Chiều dài mô tả phải từ 3 đến 160 ký tự.'
+    descriptionValidationError: 'Chiều dài mô tả phải từ 3 đến 160 ký tự.',
+    whyNeedAppPid: 'Nếu ứng dụng của bạn đã được di chuyển, DID vĩnh viễn là DID được tạo khi Blocklet này được cài đặt ban đầu'
   },
   dashboard: {
     nodeDid: 'Nút',

package/lib/locales/zh-tw.js

@@ -739,7 +739,8 @@ export default {
       disconnectStoreTip: '斷開連線後，blocklet 將從商店中移除。您確定要斷開連線嗎？'
     },
     titleValidationError: '標題長度必須至少為3到40個字符',
-    descriptionValidationError: '描述長度必須介於3到160個字符之間'
+    descriptionValidationError: '描述長度必須介於3到160個字符之間',
+    whyNeedAppPid: '如果已遷移您的應用程式，永久 DID 是最初安裝此 Blocklet 時產生的 DID。'
   },
   dashboard: {
     nodeDid: '節點',

package/lib/locales/zh.js

@@ -370,6 +370,7 @@ export default {
     noService: '暂无服务',
     appId: '应用 DID',
     appPid: '永久性 DID',
+    whyNeedAppPid: '如果你的应用曾经迁移过，永久性 DID 是最初安装这个 Blocklet 时产生的 DID',
     alsoKnownAs: '曾用 DID',
     skSource: '安装钱包',
     reloadSuccess: '应用重启成功',

package/lib/team/members/invite-member.js

@@ -33,7 +33,7 @@ export default function InviteMember({
     inviteInfo: null,
     role: '',
     remark: '',
-    sourceAppPid: apps.length > 0 ? apps[0].appId : null
+    sourceAppPid: apps.length > 0 ? apps[0].appPid : null
   });
   const onCreate = async () => {
     if (!currentState.role) {
@@ -44,6 +44,10 @@ export default function InviteMember({
     currentState.error = null;
     currentState.loading = true;
     try {
+      let sourceAppPid = currentState.sourceAppPid ?? null;
+      if (sourceAppPid === teamDid) {
+        sourceAppPid = null;
+      }
       const {
         inviteInfo
       } = await api.createMemberInvitation({
@@ -51,7 +55,7 @@ export default function InviteMember({
           teamDid,
           role: currentState.role,
           remark: trimRemark,
-          sourceAppPid: currentState.sourceAppPid ?? null
+          sourceAppPid
         }
       });
       currentState.inviteInfo = inviteInfo;
@@ -85,7 +89,7 @@ export default function InviteMember({
           label: t('common.passport'),
           disabled: currentState.loading,
           children: apps.map(r => /*#__PURE__*/_jsx(MenuItem, {
-            value: r.appId,
+            value: r.appPid,
             children: /*#__PURE__*/_jsxs(Box, {
               sx: {
                 display: 'flex',
@@ -100,16 +104,16 @@ export default function InviteMember({
                   gap: 1
                 },
                 children: [/*#__PURE__*/_jsx(Avatar, {
-                  did: r.appId,
+                  did: r.appPid,
                   size: 28
                 }), r.appName]
               }), /*#__PURE__*/_jsx(DID, {
-                did: r.appId,
+                did: r.appPid,
                 compact: true,
                 responsive: false
               })]
             })
-          }, r.appId))
+          }, r.appPid))
         })]
       }) : null, /*#__PURE__*/_jsxs(FormControl, {
         fullWidth: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.29-beta-44e63d18",
+  "version": "1.16.29-beta-7e212076",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -25,9 +25,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.29-beta-44e63d18",
-    "@abtnode/constant": "1.16.29-beta-44e63d18",
-    "@abtnode/util": "1.16.29-beta-44e63d18",
+    "@abtnode/auth": "1.16.29-beta-7e212076",
+    "@abtnode/constant": "1.16.29-beta-7e212076",
+    "@abtnode/util": "1.16.29-beta-7e212076",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.124",
     "@arcblock/did-connect": "^2.10.3",
@@ -37,11 +37,11 @@
     "@arcblock/react-hooks": "^2.10.3",
     "@arcblock/terminal": "^2.10.3",
     "@arcblock/ux": "^2.10.3",
-    "@blocklet/constant": "1.16.29-beta-44e63d18",
-    "@blocklet/js-sdk": "1.16.29-beta-44e63d18",
+    "@blocklet/constant": "1.16.29-beta-7e212076",
+    "@blocklet/js-sdk": "1.16.29-beta-7e212076",
     "@blocklet/launcher-layout": "2.3.24",
     "@blocklet/list": "^0.13.4",
-    "@blocklet/meta": "1.16.29-beta-44e63d18",
+    "@blocklet/meta": "1.16.29-beta-7e212076",
     "@blocklet/ui-react": "^2.10.3",
     "@blocklet/uploader": "0.1.18",
     "@emotion/react": "^11.10.4",
@@ -108,5 +108,5 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "0a389ad71f5a189041c4896b029f05f73c8ce8d6"
+  "gitHead": "20c632cfb07f1e4fda4ab9b67ba0aad3b0149d3b"
 }