@elinpf/dsh-ops-access-ui 0.1.7 → 0.2.1

package/lib/client.js

@@ -29,7 +29,6 @@ __export(client_exports, {
   apiFetchResult: () => apiFetchResult,
   apply: () => apply,
   defaultTtlChoice: () => defaultTtlChoice,
-  delegatedAccessCount: () => delegatedAccessCount,
   deleteEntry: () => deleteEntry,
   fetchAdminList: () => fetchAdminList,
   fetchKinds: () => fetchKinds,
@@ -40,7 +39,7 @@ __export(client_exports, {
   inject: () => inject,
   liveGrantFor: () => liveGrantFor,
   name: () => name,
-  pendingAccessCount: () => pendingAccessCount,
+  pendingRequestCount: () => pendingRequestCount,
   postPanelDecide: () => postPanelDecide,
   postPanelDeny: () => postPanelDeny,
   postPanelExtend: () => postPanelExtend,
@@ -109,6 +108,32 @@ async function fetchEntry(kind, name2, tier) {
     return null;
   }
 }
+async function fetchAdminRequests(signal) {
+  try {
+    const res = await fetch("/ops-access/admin/requests", { signal });
+    if (!res.ok) return null;
+    const data = await res.json();
+    return Array.isArray(data) ? data : null;
+  } catch {
+    return null;
+  }
+}
+async function fetchRequestDetail(id) {
+  try {
+    const res = await fetch("/ops-access/admin/requests/detail?id=" + encodeURIComponent(id));
+    if (!res.ok) return null;
+    return await res.json();
+  } catch {
+    return null;
+  }
+}
+function decideRegistrationRequest(id, approved) {
+  return apiFetchResult("/ops-access/admin/requests/decide", {
+    method: "POST",
+    headers: { "content-type": "application/json" },
+    body: JSON.stringify({ id, approved })
+  }, "decideRegistrationRequest");
+}
 async function fetchPanelGrants(sessionId, signal) {
   try {
     const res = await fetch("/ops-access/grants?session=" + encodeURIComponent(sessionId), { signal });
@@ -177,24 +202,19 @@ function postPanelDecide(id, approved, ttlMinutes) {
     body: JSON.stringify(approved ? { id, approved, ttlMinutes } : { id, approved })
   }, "postPanelDecide");
 }
-function pendingAccessCount(session) {
-  if (session === null || session === void 0 || !Array.isArray(session.runningCalls)) return 0;
-  return session.runningCalls.filter((c) => c.name === "request_access").length;
-}
-function delegatedAccessCount(requests, sessionId) {
+function pendingRequestCount(requests) {
   if (!Array.isArray(requests)) return 0;
-  return requests.filter((r) => r.parentSession === sessionId).length;
+  return requests.length;
 }
 function AccessBadge(props) {
-  const own = pendingAccessCount(props.session);
-  const [delegated, setDelegated] = (0, import_react.useState)(0);
   const sid = props.sessionId;
+  const [count, setCount] = (0, import_react.useState)(0);
   (0, import_react.useEffect)(() => {
     if (sid === void 0) return;
     let alive = true;
     const poll = async () => {
       const data = await fetchPanelRequests(sid);
-      if (alive && data !== null) setDelegated(delegatedAccessCount(data.requests, sid));
+      if (alive && data !== null) setCount(pendingRequestCount(data.requests));
     };
     void poll();
     const timer = setInterval(() => {
@@ -205,13 +225,12 @@ function AccessBadge(props) {
       clearInterval(timer);
     };
   }, [sid]);
-  const count = own + delegated;
   if (count === 0 || sid === void 0) return null;
   return (0, import_react.createElement)(
     "button",
     {
       className: "ops-access-badge",
-      title: delegated > 0 ? "\u6709\u5F85\u5BA1\u6279\u7684\u63D0\u6743\u7533\u8BF7\uFF08\u542B\u59D4\u6D3E\u5B50\u4F1A\u8BDD\uFF09\u2014 \u70B9\u51FB\u6253\u5F00\u6388\u6743\u9762\u677F" : "\u6709\u5F85\u5BA1\u6279\u7684\u63D0\u6743\u7533\u8BF7 \u2014 \u70B9\u51FB\u6253\u5F00\u6388\u6743\u9762\u677F",
+      title: "\u6709\u5F85\u5BA1\u6279\u7684\u63D0\u6743\u7533\u8BF7 \u2014 \u70B9\u51FB\u6253\u5F00\u6388\u6743\u9762\u677F",
       onClick: () => props.openPanel(sid)
     },
     (0, import_react.createElement)("span", { className: "ops-access-badge-dot" }),
@@ -701,7 +720,7 @@ function TierBadge({ status }) {
   }, (0, import_react.createElement)(CrossIcon));
 }
 function AdminListView(props) {
-  const { entries, loading, onRefresh, onAdd, onEdit, onDelete } = props;
+  const { entries, loading, requests, onReview, onRefresh, onAdd, onEdit, onDelete } = props;
   const kindOrder = [];
   const byKind = {};
   for (const e of entries) {
@@ -734,6 +753,46 @@ function AdminListView(props) {
         }, (0, import_react.createElement)(PlusIcon), "\u65B0\u589E")
       )
     ),
+    requests && requests.length > 0 && (0, import_react.createElement)(
+      "div",
+      { className: "ops-access-admin-card" },
+      (0, import_react.createElement)(
+        "div",
+        { className: "ops-access-admin-card-header" },
+        (0, import_react.createElement)("span", { className: "ops-access-admin-card-title" }, "\u5F85\u5BA1\u6279\u6CE8\u518C\u7533\u8BF7"),
+        (0, import_react.createElement)("span", { className: "ops-access-admin-card-count" }, String(requests.length) + " \u6761")
+      ),
+      ...requests.map(
+        (request) => (0, import_react.createElement)(
+          "div",
+          { key: request.id, className: "ops-access-admin-card-row" },
+          (0, import_react.createElement)(
+            "div",
+            { className: "ops-access-admin-card-row-main" },
+            (0, import_react.createElement)(
+              "div",
+              { className: "ops-access-admin-card-row-name" },
+              request.kind + "/" + request.name,
+              (0, import_react.createElement)("span", { className: "ops-access-admin-card-row-id" }, request.tier)
+            ),
+            (0, import_react.createElement)(
+              "div",
+              { className: "ops-access-admin-card-row-desc" },
+              (request.reason ? request.reason + " \xB7 " : "") + new Date(request.createdAt).toLocaleString()
+            )
+          ),
+          (0, import_react.createElement)(
+            "div",
+            { className: "ops-access-admin-row-actions" },
+            (0, import_react.createElement)("button", {
+              type: "button",
+              className: "ops-access-admin-btn ops-access-admin-btn-primary",
+              onClick: () => onReview?.(request)
+            }, "\u5BA1\u67E5")
+          )
+        )
+      )
+    ),
     entries.length === 0 ? (0, import_react.createElement)(
       "div",
       { className: "ops-access-admin-empty" },
@@ -1145,6 +1204,88 @@ function AdminFormView(props) {
     )
   );
 }
+function RequestReviewView(props) {
+  const { detail, deciding, error, onDecide, onCancel } = props;
+  const [confirming, setConfirming] = (0, import_react.useState)(null);
+  const fieldEntries = Object.entries(detail.fields);
+  return (0, import_react.createElement)(
+    "div",
+    { className: "ops-access-admin-root" },
+    (0, import_react.createElement)(
+      "div",
+      { className: "ops-access-admin-header" },
+      (0, import_react.createElement)(
+        "span",
+        { className: "ops-access-admin-title" },
+        "\u5BA1\u6279\u6CE8\u518C\u7533\u8BF7: " + detail.kind + "/" + detail.name + " (" + detail.tier + ")"
+      )
+    ),
+    (0, import_react.createElement)(
+      "div",
+      { className: "ops-access-admin-card-row-desc" },
+      (detail.reason ? "\u7406\u7531: " + detail.reason + " \xB7 " : "") + "\u63D0\u4EA4\u4E8E " + new Date(detail.createdAt).toLocaleString()
+    ),
+    ...fieldEntries.map(([fieldName, value]) => {
+      const text = typeof value === "string" ? value : JSON.stringify(value);
+      return (0, import_react.createElement)(
+        "div",
+        { key: fieldName, style: { margin: "8px 0" } },
+        (0, import_react.createElement)("div", { className: "ops-access-admin-card-row-name" }, fieldName),
+        text.includes("\n") || text.length > 80 ? (0, import_react.createElement)("textarea", {
+          readOnly: true,
+          rows: Math.min(text.split("\n").length + 1, 12),
+          style: { width: "100%", fontFamily: "monospace" },
+          value: text
+        }) : (0, import_react.createElement)("div", { style: { fontFamily: "monospace" } }, text)
+      );
+    }),
+    fieldEntries.length === 0 && (0, import_react.createElement)("div", { className: "ops-access-admin-empty" }, "(\u65E0\u5B57\u6BB5)"),
+    error && (0, import_react.createElement)("div", { className: "ops-access-admin-card-row-desc" }, error),
+    confirming ? (0, import_react.createElement)(
+      "div",
+      { className: "ops-access-admin-confirm" },
+      (0, import_react.createElement)(
+        "div",
+        null,
+        confirming === "approve" ? "\u786E\u8BA4\u6279\u51C6\uFF1F\u8BE5 " + detail.tier + " tier \u5C06\u7ACB\u5373\u5199\u5165\u51ED\u8BC1\u5E93\u5E76\u751F\u6548\u3002" : "\u786E\u8BA4\u62D2\u7EDD\uFF1F\u8BE5\u7533\u8BF7\u5C06\u88AB\u6807\u8BB0\u4E3A\u5DF2\u62D2\u7EDD,\u4E0D\u4F1A\u5199\u5165\u4EFB\u4F55\u5185\u5BB9\u3002"
+      ),
+      (0, import_react.createElement)(
+        "div",
+        { className: "ops-access-admin-actions" },
+        (0, import_react.createElement)("button", {
+          type: "button",
+          className: "ops-access-admin-btn " + (confirming === "approve" ? "ops-access-admin-btn-primary" : "ops-access-admin-btn-danger"),
+          disabled: deciding,
+          onClick: () => onDecide(confirming === "approve")
+        }, deciding ? "\u63D0\u4EA4\u4E2D\u2026" : confirming === "approve" ? "\u786E\u8BA4\u6279\u51C6" : "\u786E\u8BA4\u62D2\u7EDD"),
+        (0, import_react.createElement)("button", {
+          type: "button",
+          className: "ops-access-admin-btn",
+          disabled: deciding,
+          onClick: () => setConfirming(null)
+        }, "\u53D6\u6D88")
+      )
+    ) : (0, import_react.createElement)(
+      "div",
+      { className: "ops-access-admin-actions", style: { marginTop: "12px" } },
+      (0, import_react.createElement)("button", {
+        type: "button",
+        className: "ops-access-admin-btn ops-access-admin-btn-primary",
+        onClick: () => setConfirming("approve")
+      }, "\u6279\u51C6\u5199\u5165"),
+      (0, import_react.createElement)("button", {
+        type: "button",
+        className: "ops-access-admin-btn ops-access-admin-btn-danger",
+        onClick: () => setConfirming("reject")
+      }, "\u62D2\u7EDD"),
+      (0, import_react.createElement)("button", {
+        type: "button",
+        className: "ops-access-admin-btn",
+        onClick: onCancel
+      }, "\u8FD4\u56DE")
+    )
+  );
+}
 function AdminSection(_props) {
   const [view, setView] = (0, import_react.useState)("list");
   const [entries, setEntries] = (0, import_react.useState)([]);
@@ -1153,10 +1294,15 @@ function AdminSection(_props) {
   const [editEntry, setEditEntry] = (0, import_react.useState)(null);
   const [deleteTarget, setDeleteTarget] = (0, import_react.useState)(null);
   const [deleting, setDeleting] = (0, import_react.useState)(false);
+  const [requests, setRequests] = (0, import_react.useState)(null);
+  const [reviewDetail, setReviewDetail] = (0, import_react.useState)(null);
+  const [reviewError, setReviewError] = (0, import_react.useState)(null);
+  const [deciding, setDeciding] = (0, import_react.useState)(false);
   const refreshList = (0, import_react.useCallback)(async () => {
     setListLoading(true);
-    const result = await fetchAdminList();
-    setEntries(result);
+    const [list, pending] = await Promise.all([fetchAdminList(), fetchAdminRequests()]);
+    setEntries(list);
+    setRequests(pending);
     setListLoading(false);
   }, []);
   (0, import_react.useEffect)(() => {
@@ -1190,6 +1336,29 @@ function AdminSection(_props) {
     setDeleteTarget(null);
     refreshList();
   }, [deleteTarget, refreshList]);
+  const handleReview = (0, import_react.useCallback)(async (request) => {
+    setReviewError(null);
+    const detail = await fetchRequestDetail(request.id);
+    if (!detail) {
+      setReviewError("\u52A0\u8F7D\u7533\u8BF7\u8BE6\u60C5\u5931\u8D25 \u2014 \u7533\u8BF7\u53EF\u80FD\u5DF2\u88AB\u5904\u7406");
+      refreshList();
+      return;
+    }
+    setReviewDetail(detail);
+  }, [refreshList]);
+  const handleDecide = (0, import_react.useCallback)(async (approved) => {
+    if (!reviewDetail) return;
+    setDeciding(true);
+    setReviewError(null);
+    const result = await decideRegistrationRequest(reviewDetail.id, approved);
+    setDeciding(false);
+    if (!result.ok) {
+      setReviewError(result.error ?? "\u64CD\u4F5C\u5931\u8D25");
+      return;
+    }
+    setReviewDetail(null);
+    refreshList();
+  }, [reviewDetail, refreshList]);
   if (deleteTarget) {
     return (0, import_react.createElement)(
       "div",
@@ -1217,6 +1386,15 @@ function AdminSection(_props) {
       )
     );
   }
+  if (reviewDetail) {
+    return (0, import_react.createElement)(RequestReviewView, {
+      detail: reviewDetail,
+      deciding,
+      error: reviewError,
+      onDecide: handleDecide,
+      onCancel: () => setReviewDetail(null)
+    });
+  }
   if (view === "form") {
     return (0, import_react.createElement)(AdminFormView, {
       error: formError,
@@ -1229,6 +1407,8 @@ function AdminSection(_props) {
   return (0, import_react.createElement)(AdminListView, {
     entries,
     loading: listLoading,
+    requests,
+    onReview: handleReview,
     onRefresh: refreshList,
     onAdd: handleAdd,
     onEdit: handleEdit,
@@ -1722,10 +1902,14 @@ function apply(ctx) {
         () => slots.inject(
           "conversation.input.dock",
           () => slots.register(
-            { name: "conversation.input.dock", id: "ops-access-badge", order: 30 },
+            {
+              name: "conversation.input.dock",
+              id: "ops-access-badge",
+              order: 30,
+              inject: (sessionId) => ({ sessionId })
+            },
             (props) => AccessBadge({
               sessionId: props.sessionId,
-              session: props.session,
               openPanel: (sid) => opsPanels.open(sid, "access")
             })
           )

package/lib/types.d.ts

@@ -110,4 +110,25 @@ export interface PanelDenied {
 export interface OverviewGrant extends PanelGrant {
     session: string;
 }
+/** One pending registration request as reported by GET /ops-access/admin/requests. */
+export interface RegistrationRequestMeta {
+    id: string;
+    kind: string;
+    name: string;
+    tier: 'ro' | 'rw';
+    envelope: {
+        name?: string;
+        description?: string;
+        environment?: string;
+    };
+    reason?: string;
+    status: 'pending' | 'approved' | 'rejected';
+    createdAt: string;
+    /** Field names → value sizes; field VALUES never ride the list. */
+    fields: Record<string, number>;
+}
+/** The full request incl. field values — GET /ops-access/admin/requests/detail. */
+export interface RegistrationRequestDetail extends Omit<RegistrationRequestMeta, 'fields'> {
+    fields: Record<string, unknown>;
+}
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elinpf/dsh-ops-access-ui",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "Browser half carrier for @-mentioning ops-access profiles: the host row exists only for client-bundle discovery; candidates come from GET /ops-access/list served by @elinpf/dsh-ops-access, and mention expansion (agent/pre-step) lives there too.",
   "type": "module",
   "main": "lib/index.js",
@@ -24,10 +24,7 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "lib/index.js",
-    "lib/client.js",
-    "lib/invariant.js",
-    "lib/types.js",
+    "lib/**/*.js",
     "lib/**/*.d.ts",
     "cordis.patch.yml"
   ],