@modesto_ma/dsh-channels 0.5.0-beta.4 → 0.5.0-beta.6

package/src/client/panel/access-tab.tsx

@@ -1,18 +1,25 @@
 /**
- * 「访问授权」tab：准入与授权字段表单（管理员 user_id / 准入模式 /
- * 申请有效期）+ 白名单与待处理申请卡。表单保存走全局 draft，白名单
- * 增删是独立即时 mutation。
+ * 「访问授权」tab：待处理申请（有才显示，置顶）、准入字段（调试模式 /
+ * 管理员 / 申请有效期）与群、用户白名单。字段保存走全局 draft，白名单增删
+ * 与申请处理是独立即时 mutation。
+ *
+ * `access.loaded === false`（飞书未连接、插件 storage 域未打开）时白名单与
+ * 申请列表是「未知」而不是「空」，因此只渲染连接提示并禁用全部写操作。
  *
  * @module dsh-channels/client/panel/access-tab
  */
 
-import { PANEL_COPY, TAB_FIELD_GROUPS } from '../../settings/contract.ts'
-import { AccessCard } from './access-card.tsx'
-import { FieldsCard, SaveBar, TabHelp } from './shared.tsx'
+import { fillCopy, PANEL_COPY, TAB_FIELD_GROUPS } from '../../settings/contract.ts'
+import type { AccessWire } from '../../settings/contract.ts'
+import { Avatar } from '../avatar.tsx'
+import type { ProfileView } from './profiles.ts'
+import { FieldSections, NoticeBar, Row } from './shared.tsx'
 import type { FormView } from './shared.tsx'
+import { RequestList, Whitelist } from './whitelist.tsx'
 
 export interface AccessTabProps {
   form: FormView
+  profiles: ProfileView
   accessNotice: string | null
   accessError: string | null
   onAddGroup: (chatId: string, name: string) => Promise<boolean>
@@ -23,24 +30,86 @@ export interface AccessTabProps {
 }
 
 export function AccessTab(props: AccessTabProps): JSX.Element {
-  const { form, accessNotice, accessError, onAddGroup, onRemoveGroup, onAddUser, onRemoveUser, onResolveRequest } = props
+  const { form, profiles, accessNotice, accessError, onAddGroup, onRemoveGroup, onAddUser, onRemoveUser, onResolveRequest } = props
+  const { access } = form.panel
+  const working = form.busy === 'access'
+  const disabled = form.busy !== null || form.locked || !access.loaded
   return (
     <div className="dsh-channels-cfg__tabBody">
-      <TabHelp text={PANEL_COPY.accessTabHelp} />
-      <FieldsCard form={form} groups={TAB_FIELD_GROUPS.access} />
-      <SaveBar form={form} tab="access" />
-      <AccessCard
-        panel={form.panel}
-        busy={form.busy}
-        locked={form.locked}
-        notice={accessNotice}
-        error={accessError}
-        onAddGroup={onAddGroup}
-        onRemoveGroup={onRemoveGroup}
-        onAddUser={onAddUser}
-        onRemoveUser={onRemoveUser}
-        onResolveRequest={onResolveRequest}
+      {accessNotice === null ? null : <NoticeBar kind="ok" text={accessNotice} />}
+      {accessError === null ? null : <NoticeBar kind="error" text={accessError} />}
+      {access.loaded && access.mode === 'guarded' && !access.admin.configured
+        ? (
+            <NoticeBar
+              kind="error"
+              text={access.admin.ownerLookupError === undefined
+                ? PANEL_COPY.accessAdminMissingWarning
+                : `${PANEL_COPY.accessAdminMissingWarning}（${access.admin.ownerLookupError}）`}
+            />
+          )
+        : null}
+      {profiles.warning === undefined ? null : <p className="dsh-channels-cfg__secFoot">{fillCopy(PANEL_COPY.profilesWarning, { reason: profiles.warning })}</p>}
+      {access.loaded && access.requests.length > 0
+        ? <RequestList requests={access.requests} profiles={profiles} disabled={disabled} working={working} onResolve={onResolveRequest} />
+        : null}
+      <FieldSections
+        form={form}
+        groups={TAB_FIELD_GROUPS.access}
+        extra={{ access: <AdminRow admin={access.admin} profiles={profiles} /> }}
+      />
+      <Whitelist
+        title={PANEL_COPY.accessGroupsTitle}
+        entries={access.groups.map(group => ({
+          id: group.chatId,
+          name: profiles.chat(group.chatId)?.name ?? group.name,
+          avatarUrl: profiles.chat(group.chatId)?.avatarUrl,
+          source: group.source,
+        }))}
+        avatar="群"
+        empty={PANEL_COPY.accessGroupsEmpty}
+        loaded={access.loaded}
+        addLabel={PANEL_COPY.accessAddGroup}
+        idPlaceholder={PANEL_COPY.accessGroupChatIdPlaceholder}
+        namePlaceholder={PANEL_COPY.accessGroupNamePlaceholder}
+        disabled={disabled}
+        working={working}
+        onAdd={onAddGroup}
+        onRemove={onRemoveGroup}
+      />
+      <Whitelist
+        title={PANEL_COPY.accessUsersTitle}
+        entries={access.users.map(user => ({
+          id: user.userId,
+          name: profiles.user(user.userId)?.name ?? user.name,
+          avatarUrl: profiles.user(user.userId)?.avatarUrl,
+          source: user.source,
+        }))}
+        empty={PANEL_COPY.accessUsersEmpty}
+        loaded={access.loaded}
+        addLabel={PANEL_COPY.accessAddUser}
+        idPlaceholder={PANEL_COPY.accessUserIdPlaceholder}
+        namePlaceholder={PANEL_COPY.accessUserNamePlaceholder}
+        disabled={disabled}
+        working={working}
+        onAdd={onAddUser}
+        onRemove={onRemoveUser}
       />
     </div>
   )
 }
+
+/** The effective administrator with their Feishu name and avatar; nothing while there is none. */
+function AdminRow(props: { admin: AccessWire['admin']; profiles: ProfileView }): JSX.Element | null {
+  const { admin, profiles } = props
+  if (admin.userId === undefined) return null
+  const profile = profiles.user(admin.userId)
+  const name = profile?.name ?? admin.userId
+  const source = admin.source === 'owner' ? PANEL_COPY.accessAdminSourceOwner : PANEL_COPY.accessAdminSourceConfig
+  return (
+    <Row
+      leading={<Avatar text={name} url={profile?.avatarUrl} />}
+      label={name}
+      summary={<>{PANEL_COPY.accessAdminCurrent} · <span className="dsh-channels-cfg__mono">{admin.userId}</span> · {source}</>}
+    />
+  )
+}

package/src/client/panel/advanced-tab.tsx

@@ -1,80 +1,71 @@
 /**
- * 「高级」tab：流式刷新等低层字段 + 只读部署信息（overlayPath / version /
- * 部署级参数）+ 「清除 Web 覆盖」。清除覆盖是整体动作，不走 draft。
+ * 「高级」tab：日志分析接口（监听地址字段 + 访问令牌凭据行）、SDK 日志级别
+ * 与 Web 覆盖文件（「恢复 profile 配置」删除整个覆盖层，不走 draft）。
  *
  * @module dsh-channels/client/panel/advanced-tab
  */
 
-import { PANEL_COPY, TAB_FIELD_GROUPS } from '../../settings/contract.ts'
-import type { PanelWire } from '../../settings/contract.ts'
-import { FieldsCard, SaveBar, TabHelp } from './shared.tsx'
-import type { BusyAction, FormView } from './shared.tsx'
+import { fillCopy, PANEL_COPY, TAB_FIELD_GROUPS } from '../../settings/contract.ts'
+import { CredentialRow } from './credentials-card.tsx'
+import { FieldSections, Row, Section } from './shared.tsx'
+import type { AnalyzeTokenView, FormView } from './shared.tsx'
 
-export function AdvancedTab(props: { form: FormView; onClear: () => void }): JSX.Element {
-  const { form, onClear } = props
-  return (
-    <div className="dsh-channels-cfg__tabBody">
-      <TabHelp text={PANEL_COPY.advancedTabHelp} />
-      <FieldsCard form={form} groups={TAB_FIELD_GROUPS.advanced} />
-      <SaveBar form={form} tab="advanced" />
-      <AdvancedCard panel={form.panel} busy={form.busy} locked={form.locked} onClear={onClear} />
-    </div>
-  )
-}
-
-/** Read-only deployment facts; the only write action here drops the overlay file. */
-function AdvancedCard(props: {
-  panel: PanelWire
-  busy: BusyAction | null
-  locked: boolean
+export function AdvancedTab(props: {
+  form: FormView
+  analyzeToken: AnalyzeTokenView
   onClear: () => void
 }): JSX.Element {
-  const { panel, busy, locked, onClear } = props
-  const { readOnly } = panel.config
+  const { form, analyzeToken, onClear } = props
+  const { panel, busy, locked } = form
+  const tokenState = panel.config.credentials.analyzeToken
   const overridden = panel.config.overriddenKeys.length
   return (
-    <section className="dsh-channels-cfg__card">
-      <div className="dsh-channels-cfg__cardHead">
-        <span className="dsh-channels-cfg__cardTitle">{PANEL_COPY.advancedCard}</span>
-        <span className="dsh-channels-cfg__cardMeta">
-          {overridden === 0 ? PANEL_COPY.inherited : `${PANEL_COPY.overridden} ${overridden} 项`}
-        </span>
-      </div>
-      <span className="dsh-channels-cfg__help">{PANEL_COPY.advancedHelp}</span>
-      <div className="dsh-channels-cfg__labelRow">
-        <span className="dsh-channels-cfg__cardTitle">{PANEL_COPY.readOnlyCard}</span>
-      </div>
-      <div className="dsh-channels-cfg__readOnly">
-        {readOnly.map(field => (
-          <div className="dsh-channels-cfg__kv" key={field.key}>
-            <span className="dsh-channels-cfg__kvKey">{field.label}</span>
-            <span className="dsh-channels-cfg__kvValue">{field.value}</span>
-            {field.help === undefined ? null : <span className="dsh-channels-cfg__help">{field.help}</span>}
-          </div>
-        ))}
-        <div className="dsh-channels-cfg__kv">
-          <span className="dsh-channels-cfg__kvKey">{PANEL_COPY.overlayPath}</span>
-          <span className="dsh-channels-cfg__kvValue dsh-channels-cfg__mono">{panel.status.overlayPath}</span>
-          <span className="dsh-channels-cfg__help">{PANEL_COPY.overlayPathHelp}</span>
-        </div>
-        <div className="dsh-channels-cfg__kv">
-          <span className="dsh-channels-cfg__kvKey">{PANEL_COPY.version}</span>
-          <span className="dsh-channels-cfg__kvValue dsh-channels-cfg__mono">{panel.status.version}</span>
-        </div>
-      </div>
-      <div className="dsh-channels-cfg__actions">
-        <button
-          type="button"
-          className="dsh-channels-cfg__btn"
-          onClick={onClear}
-          disabled={overridden === 0 || busy !== null || locked}
-        >
-          {busy === 'clear' ? PANEL_COPY.clearing : PANEL_COPY.clear}
-        </button>
-        <span className="dsh-channels-cfg__help">
-          {overridden === 0 ? PANEL_COPY.noOverrides : `${PANEL_COPY.overridden} ${overridden} 项`}
-        </span>
-      </div>
-    </section>
+    <div className="dsh-channels-cfg__tabBody">
+      <FieldSections
+        form={form}
+        groups={TAB_FIELD_GROUPS.advanced}
+        extra={{
+          analyze: (
+            <CredentialRow
+              label={PANEL_COPY.analyzeTokenLabel}
+              summary={PANEL_COPY.analyzeTokenSummary}
+              state={tokenState}
+              value={analyzeToken.value}
+              secret
+              placeholder={PANEL_COPY.analyzeTokenPlaceholder}
+              issue={analyzeToken.issues.find(item => item.key === 'analyzeToken')}
+              busy={analyzeToken.busy}
+              disabled={analyzeToken.busy !== null || analyzeToken.locked || !tokenState.writable}
+              onChange={analyzeToken.onChange}
+              onSave={analyzeToken.onSave}
+              onClear={analyzeToken.onClear}
+            />
+          ),
+        }}
+      />
+      <Section title={PANEL_COPY.overlayTitle}>
+        <Row
+          label={PANEL_COPY.overlayPath}
+          summary={<span className="dsh-channels-cfg__mono">{panel.status.overlayPath}</span>}
+          details={(
+            <>
+              {PANEL_COPY.overlayPathHelp}
+              {' '}
+              {overridden === 0 ? PANEL_COPY.noOverrides : fillCopy(PANEL_COPY.overlayCount, { n: overridden })}
+            </>
+          )}
+          control={(
+            <button
+              type="button"
+              className="dsh-channels-cfg__btn dsh-channels-cfg__btn--danger"
+              onClick={onClear}
+              disabled={overridden === 0 || busy !== null || locked}
+            >
+              {busy === 'clear' ? PANEL_COPY.clearing : PANEL_COPY.clear}
+            </button>
+          )}
+        />
+      </Section>
+    </div>
   )
 }