@abtnode/ux 1.16.26-beta-351de484 → 1.16.26-beta-63f52a83

package/es/blocklet/app-avatar.js

@@ -1,7 +1,5 @@
 import PropTypes from 'prop-types';
 import Avatar from '@mui/material/Avatar';
-import DiDAvatar from '@arcblock/did-connect/lib/Avatar';
-import { BLOCKLET_CONFIGURABLE_KEY } from '@blocklet/constant';
 import useAppLogo from '../hooks/use-app-logo';
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function BlockletAppAvatar({
@@ -18,22 +16,6 @@ export default function BlockletAppAvatar({
   const {
     variant
   } = rest;
-  let imgEle = /*#__PURE__*/_jsx("img", {
-    src: logoUrl,
-    alt: "",
-    style: {
-      width: size
-    }
-  });
-  if (!blocklet.meta.logo) {
-    const exist = (blocklet.configs || []).find(x => x.key === BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_LOGO_SQUARE)?.value;
-    if (!exist) {
-      imgEle = /*#__PURE__*/_jsx(DiDAvatar, {
-        did: blocklet.meta.did || '',
-        responsive: true
-      });
-    }
-  }
   return /*#__PURE__*/_jsx(Avatar, {
     variant: variant || 'square',
     style: Object.assign({
@@ -43,7 +25,13 @@ export default function BlockletAppAvatar({
       borderRadius: 10
     }, style),
     ...rest,
-    children: imgEle
+    children: /*#__PURE__*/_jsx("img", {
+      src: logoUrl,
+      alt: "",
+      style: {
+        width: size
+      }
+    })
   });
 }
 BlockletAppAvatar.propTypes = {

package/es/blocklet/authentication/index.js

@@ -41,9 +41,7 @@ function OAuth() {
     }),
     value: 'more'
   }];
-
-  // tabs[0].value
-  const [currentTab, setCurrentTab] = useState('oauth');
+  const [currentTab, setCurrentTab] = useState(tabs[0].value);
   const contents = useCreation(() => ({
     oauth: /*#__PURE__*/_jsx(OAuthLogin, {}),
     federated: /*#__PURE__*/_jsx(FederatedLogin, {}),

package/es/blocklet/authentication/oauth/apple.js

@@ -8,6 +8,14 @@ import { useNodeContext } from '../../../contexts/node';
 import { useBlockletContext } from '../../../contexts/blocklet';
 import SwitchControl from '../../component/switch-control';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const defaultValue = {
+  enabled: false,
+  teamId: '',
+  serviceId: '',
+  keyId: '',
+  authKey: '',
+  bundleId: ''
+};
 function OAuthApple() {
   const {
     api
@@ -20,11 +28,7 @@ function OAuthApple() {
   } = useLocaleContext();
   const did = blocklet?.meta?.did;
   const authData = Object.assign({
-    enabled: false,
-    teamId: '',
-    serviceId: '',
-    keyId: '',
-    authKey: ''
+    ...defaultValue
   }, blocklet?.settings?.oauth?.apple || {});
   const {
     handleSubmit,
@@ -33,7 +37,7 @@ function OAuthApple() {
     watch,
     reset
   } = useForm({
-    defaultValues: pick(authData, ['enabled', 'teamId', 'serviceId', 'keyId', 'authKey'])
+    defaultValues: pick(authData, Object.keys(defaultValue))
   });
   const enabled = watch('enabled');
   const onSubmit = useMemoizedFn(async data => {
@@ -49,11 +53,7 @@ function OAuthApple() {
         }
       });
       const defaultValues = Object.assign({
-        enabled: false,
-        teamId: '',
-        serviceId: '',
-        keyId: '',
-        authKey: ''
+        ...defaultValue
       }, blockletChanged?.settings?.oauth?.apple || {});
       // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
       reset(defaultValues);
@@ -64,25 +64,31 @@ function OAuthApple() {
   });
   const validateTeamId = useMemoizedFn(val => {
     if (!val?.trim()) {
-      return t('oauth.apple.teamIdDescribe');
+      return t('oauth.apple.teamIdDescription');
     }
     return true;
   });
   const validateServiceId = useMemoizedFn(val => {
     if (!val?.trim()) {
-      return t('oauth.apple.serviceIdDescribe');
+      return t('oauth.apple.serviceIdDescription');
     }
     return true;
   });
   const validateKeyId = useMemoizedFn(val => {
     if (!val?.trim()) {
-      return t('oauth.apple.keyIdDescribe');
+      return t('oauth.apple.keyIdDescription');
     }
     return true;
   });
   const validateAuthKey = useMemoizedFn(val => {
     if (!val?.trim()) {
-      return t('oauth.apple.authKeyDescribe');
+      return t('oauth.apple.authKeyDescription');
+    }
+    return true;
+  });
+  const validateBundleId = useMemoizedFn(val => {
+    if (!val?.trim()) {
+      return t('oauth.apple.bundleIdDescription');
     }
     return true;
   });
@@ -128,6 +134,24 @@ function OAuthApple() {
             disabled: !enabled
           })
         })
+      }), /*#__PURE__*/_jsx(Controller, {
+        name: "bundleId",
+        control: control,
+        rules: {
+          validate: enabled ? validateBundleId : noop
+        },
+        render: ({
+          field
+        }) => /*#__PURE__*/_jsx(FormControl, {
+          fullWidth: true,
+          children: /*#__PURE__*/_jsx(TextField, {
+            ...field,
+            error: !!formState.errors[field.name],
+            label: t('oauth.apple.bundleId'),
+            helperText: formState.errors[field.name]?.message || '　',
+            disabled: !enabled
+          })
+        })
       }), /*#__PURE__*/_jsx(Controller, {
         name: "serviceId",
         control: control,

package/es/blocklet/authentication/oauth/auth0.js

@@ -8,6 +8,12 @@ import { useNodeContext } from '../../../contexts/node';
 import { useBlockletContext } from '../../../contexts/blocklet';
 import SwitchControl from '../../component/switch-control';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const defaultValue = {
+  enabled: false,
+  domain: '',
+  clientId: '',
+  clientSecret: ''
+};
 function OAuthAuth0() {
   const {
     api
@@ -20,10 +26,7 @@ function OAuthAuth0() {
   } = useLocaleContext();
   const did = blocklet?.meta?.did;
   const auth0 = Object.assign({
-    enabled: false,
-    domain: '',
-    clientId: '',
-    clientSecret: ''
+    ...defaultValue
   }, blocklet?.settings?.oauth?.auth0 || {});
   const {
     handleSubmit,
@@ -32,7 +35,7 @@ function OAuthAuth0() {
     watch,
     reset
   } = useForm({
-    defaultValues: pick(auth0, ['domain', 'clientId', 'clientSecret', 'enabled'])
+    defaultValues: pick(auth0, Object.keys(defaultValue))
   });
   const enabled = watch('enabled');
   const onSubmit = useMemoizedFn(async data => {
@@ -48,10 +51,7 @@ function OAuthAuth0() {
         }
       });
       const defaultValues = Object.assign({
-        enabled: false,
-        domain: '',
-        clientId: '',
-        clientSecret: ''
+        ...defaultValue
       }, blockletChanged?.settings?.oauth?.auth0 || {});
       // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
       reset(defaultValues);
@@ -62,13 +62,19 @@ function OAuthAuth0() {
   });
   const validateDomain = useMemoizedFn(val => {
     if (!val?.trim()) {
-      return t('oauth.auth0.domainDescribe');
+      return t('oauth.auth0.domainDescription');
     }
     return true;
   });
   const validateClientId = useMemoizedFn(val => {
     if (!val?.trim()) {
-      return t('oauth.auth0.clientIdDescribe');
+      return t('oauth.auth0.clientIdDescription');
+    }
+    return true;
+  });
+  const validateClientSecret = useMemoizedFn(val => {
+    if (!val?.trim()) {
+      return t('oauth.auth0.clientSecretDescription');
     }
     return true;
   });
@@ -136,7 +142,7 @@ function OAuthAuth0() {
         name: "clientSecret",
         control: control,
         rules: {
-          validate: noop
+          validate: enabled ? validateClientSecret : noop
         },
         render: ({
           field

package/es/blocklet/authentication/oauth/github.js

@@ -8,6 +8,11 @@ import { useNodeContext } from '../../../contexts/node';
 import { useBlockletContext } from '../../../contexts/blocklet';
 import SwitchControl from '../../component/switch-control';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const defaultValue = {
+  enabled: false,
+  clientId: '',
+  clientSecret: ''
+};
 function OAuthGithub() {
   const {
     api
@@ -21,9 +26,7 @@ function OAuthGithub() {
   // TODO: @zhanghan 将来需要换成 permanent did
   const did = blocklet?.meta?.did;
   const github = Object.assign({
-    enabled: false,
-    clientId: '',
-    clientSecret: ''
+    ...defaultValue
   }, blocklet?.settings?.oauth?.github || {});
   const {
     handleSubmit,
@@ -32,7 +35,7 @@ function OAuthGithub() {
     watch,
     reset
   } = useForm({
-    defaultValues: pick(github, ['clientSecret', 'clientId', 'enabled'])
+    defaultValues: pick(github, Object.keys(defaultValue))
   });
   const enabled = watch('enabled');
   const onSubmit = useMemoizedFn(async data => {
@@ -48,9 +51,7 @@ function OAuthGithub() {
         }
       });
       const defaultValues = Object.assign({
-        enabled: false,
-        clientId: '',
-        clientSecret: ''
+        ...defaultValue
       }, blockletChanged?.settings?.oauth?.github || {});
       // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
       reset(defaultValues);
@@ -61,13 +62,13 @@ function OAuthGithub() {
   });
   const validateClientId = useMemoizedFn(val => {
     if (!val?.trim()) {
-      return t('oauth.github.clientIdDescribe');
+      return t('oauth.github.clientIdDescription');
     }
     return true;
   });
   const validateClientSecret = useMemoizedFn(val => {
     if (!val?.trim()) {
-      return t('oauth.github.clientSecretDescribe');
+      return t('oauth.github.clientSecretDescription');
     }
     return true;
   });

package/es/blocklet/authentication/oauth/google.js

@@ -8,6 +8,11 @@ import { useNodeContext } from '../../../contexts/node';
 import { useBlockletContext } from '../../../contexts/blocklet';
 import SwitchControl from '../../component/switch-control';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const defaultValue = {
+  enabled: false,
+  clientId: '',
+  clientSecret: ''
+};
 function OAuthGoogle() {
   const {
     api
@@ -20,9 +25,7 @@ function OAuthGoogle() {
   } = useLocaleContext();
   const did = blocklet?.meta?.did;
   const authData = Object.assign({
-    enabled: false,
-    clientId: '',
-    clientSecret: ''
+    ...defaultValue
   }, blocklet?.settings?.oauth?.google || {});
   const {
     handleSubmit,
@@ -31,7 +34,7 @@ function OAuthGoogle() {
     watch,
     reset
   } = useForm({
-    defaultValues: pick(authData, ['clientSecret', 'clientId', 'enabled'])
+    defaultValues: pick(authData, Object.keys(defaultValue))
   });
   const enabled = watch('enabled');
   const onSubmit = useMemoizedFn(async data => {
@@ -47,9 +50,7 @@ function OAuthGoogle() {
         }
       });
       const defaultValues = Object.assign({
-        enabled: false,
-        clientId: '',
-        clientSecret: ''
+        ...defaultValue
       }, blockletChanged?.settings?.oauth?.google || {});
       // 将当前表单的默认值重置为新的数据，这样能够修正页面的 isDirty 数据
       reset(defaultValues);
@@ -60,13 +61,13 @@ function OAuthGoogle() {
   });
   const validateClientId = useMemoizedFn(val => {
     if (!val?.trim()) {
-      return t('oauth.google.clientIdDescribe');
+      return t('oauth.google.clientIdDescription');
     }
     return true;
   });
   const validateClientSecret = useMemoizedFn(val => {
     if (!val?.trim()) {
-      return t('oauth.google.clientSecretDescribe');
+      return t('oauth.google.clientSecretDescription');
     }
     return true;
   });