Merge branch 'main' of https://github.com/SECTL/SecScore

src/components/AutoScore/ActionEditor.tsx

@@ -2,12 +2,22 @@ import React, { useEffect, useMemo } from "react"
 import { Button, Card, InputNumber, Select, Space } from "antd"
 import { DeleteOutlined, PlusOutlined } from "@ant-design/icons"
 import { useTranslation } from "react-i18next"
-import type { ActionDraft, ActionEvent, AutoScoreTagOption } from "./AutoScoreUtils"
-import { createDefaultActionDraft } from "./AutoScoreUtils"
+import type {
+  ActionDraft,
+  ActionEvent,
+  AutoScoreRewardOption,
+  AutoScoreTagOption,
+} from "./AutoScoreUtils"
+import {
+  createDefaultActionDraft,
+  parseRewardActionValue,
+  stringifyRewardActionValue,
+} from "./AutoScoreUtils"
 
 interface ActionEditorProps {
   value: ActionDraft[]
   tagOptions: AutoScoreTagOption[]
+  rewardOptions: AutoScoreRewardOption[]
   canEdit: boolean
   onChange: (nextDrafts: ActionDraft[]) => void
 }
@@ -15,6 +25,7 @@ interface ActionEditorProps {
 export const ActionEditor: React.FC<ActionEditorProps> = ({
   value,
   tagOptions,
+  rewardOptions,
   canEdit,
   onChange,
 }) => {
@@ -33,6 +44,7 @@ export const ActionEditor: React.FC<ActionEditorProps> = ({
       { value: "add_score", label: t("autoScore.actionAddScore") },
       { value: "add_tag", label: t("autoScore.actionAddTag") },
       { value: "settle_score", label: t("autoScore.actionSettleScore") },
+      { value: "reward_exchange", label: t("rewardExchange.title") },
     ],
     [t]
   )
@@ -58,6 +70,31 @@ export const ActionEditor: React.FC<ActionEditorProps> = ({
     return Array.from(optionMap.values())
   }, [safeValue, tagOptions])
 
+  const mergedRewardOptions = useMemo(() => {
+    const optionMap = new Map(rewardOptions.map((option) => [option.value, option]))
+
+    for (const action of safeValue) {
+      if (action.event !== "reward_exchange") continue
+      const rewardValue = parseRewardActionValue(action.value)
+      if (!rewardValue) continue
+
+      const optionValue = String(rewardValue.rewardId)
+      if (!optionMap.has(optionValue)) {
+        optionMap.set(optionValue, {
+          label: rewardValue.rewardName || optionValue,
+          value: optionValue,
+        })
+      }
+    }
+
+    return Array.from(optionMap.values())
+  }, [rewardOptions, safeValue])
+
+  const buildRewardDraftValue = (rewardId: string): string => {
+    const rewardOption = mergedRewardOptions.find((option) => option.value === rewardId)
+    return stringifyRewardActionValue(Number(rewardId), rewardOption?.label) || ""
+  }
+
   const updateAction = (id: string, patch: Partial<Omit<ActionDraft, "id">>) => {
     onChange(safeValue.map((item) => (item.id === id ? { ...item, ...patch } : item)))
   }
@@ -87,7 +124,14 @@ export const ActionEditor: React.FC<ActionEditorProps> = ({
               onChange={(event: ActionEvent) =>
                 updateAction(action.id, {
                   event,
-                  value: event === "add_score" ? "1" : event === "add_tag" ? [] : "",
+                  value:
+                    event === "add_score"
+                      ? "1"
+                      : event === "add_tag"
+                        ? []
+                        : event === "reward_exchange" && mergedRewardOptions.length > 0
+                          ? buildRewardDraftValue(mergedRewardOptions[0].value)
+                          : "",
                 })
               }
             />
@@ -115,6 +159,22 @@ export const ActionEditor: React.FC<ActionEditorProps> = ({
                 options={mergedTagOptions}
                 onChange={(nextValue) => updateAction(action.id, { value: nextValue })}
               />
+            ) : action.event === "reward_exchange" ? (
+              <Select
+                showSearch
+                style={{ minWidth: 260 }}
+                placeholder={t("rewardExchange.rewards")}
+                value={(() => {
+                  const rewardValue = parseRewardActionValue(action.value)
+                  return rewardValue ? String(rewardValue.rewardId) : undefined
+                })()}
+                disabled={!canEdit}
+                optionFilterProp="label"
+                options={mergedRewardOptions}
+                onChange={(nextValue: string) =>
+                  updateAction(action.id, { value: buildRewardDraftValue(nextValue) })
+                }
+              />
             ) : (
               <div style={{ minWidth: 260, color: "var(--ss-text-secondary)" }}>
                 {t("autoScore.actionSettleScoreHint")}

src/components/AutoScore/AutoScoreUtils.ts

@@ -40,6 +40,7 @@ export interface AutoScoreExecutionBatch {
   affectedStudentNames: string[]
   createdEventIds: number[]
   addedStudentTagIds: number[]
+  rewardRedemptionIds?: number[]
   scoreDeltaTotal: number
   settled: boolean
   rolledBack: boolean
@@ -58,20 +59,35 @@ export interface AutoScoreRule {
   lastExecuted?: string | null
 }
 
-export type ActionEvent = "add_score" | "add_tag" | "settle_score"
+export type ActionEvent = "add_score" | "add_tag" | "settle_score" | "reward_exchange"
 
 export interface AutoScoreTagOption {
   label: string
   value: string
 }
 
+export interface AutoScoreRewardOption {
+  label: string
+  value: string
+}
+
+export interface ParsedRewardActionValue {
+  rewardId: number
+  rewardName?: string
+}
+
 export interface ActionDraft {
   id: string
   event: ActionEvent
   value: string | string[]
 }
 
-export type ActionDraftError = "action_required" | "score_required" | "tag_required" | null
+export type ActionDraftError =
+  | "action_required"
+  | "score_required"
+  | "tag_required"
+  | "reward_required"
+  | null
 
 const TRIGGER_FIELD_INTERVAL = "interval_minutes"
 const TRIGGER_FIELD_TAG = "student_tag"
@@ -108,6 +124,11 @@ const toStringValue = (value: unknown): string => {
   return String(value)
 }
 
+const normalizeOptionalString = (value: unknown): string | null => {
+  const normalized = toStringValue(value).trim()
+  return normalized || null
+}
+
 const normalizeTagValues = (values: unknown[]): string[] => {
   const normalized = values.map((value) => toStringValue(value).trim()).filter(Boolean)
 
@@ -143,6 +164,66 @@ const stringifyTagValues = (values: string[]): string | null => {
   return JSON.stringify(normalized)
 }
 
+export const parseRewardActionValue = (value: unknown): ParsedRewardActionValue | null => {
+  if (value === null || value === undefined) return null
+
+  if (typeof value === "number" && Number.isInteger(value) && value > 0) {
+    return { rewardId: value }
+  }
+
+  const rawValue = Array.isArray(value) ? value.find((item) => toStringValue(item).trim()) : value
+  const text = toStringValue(rawValue).trim()
+  if (!text) return null
+
+  if (text.startsWith("{")) {
+    try {
+      const parsed = JSON.parse(text) as {
+        rewardId?: unknown
+        reward_id?: unknown
+        rewardName?: unknown
+        reward_name?: unknown
+      }
+      const rewardId = toFiniteNumber(parsed.rewardId ?? parsed.reward_id)
+      if (rewardId === null || !Number.isInteger(rewardId) || rewardId <= 0) {
+        return null
+      }
+
+      const rewardName =
+        normalizeOptionalString(parsed.rewardName ?? parsed.reward_name) ?? undefined
+      return rewardName ? { rewardId, rewardName } : { rewardId }
+    } catch {
+      void 0
+    }
+  }
+
+  const rewardId = toFiniteNumber(text)
+  if (rewardId === null || !Number.isInteger(rewardId) || rewardId <= 0) {
+    return null
+  }
+
+  return { rewardId }
+}
+
+export const stringifyRewardActionValue = (
+  rewardId: unknown,
+  rewardName?: unknown
+): string | null => {
+  const parsedRewardId = toFiniteNumber(rewardId)
+  if (parsedRewardId === null || !Number.isInteger(parsedRewardId) || parsedRewardId <= 0) {
+    return null
+  }
+
+  const payload: ParsedRewardActionValue = {
+    rewardId: parsedRewardId,
+  }
+  const normalizedRewardName = normalizeOptionalString(rewardName)
+  if (normalizedRewardName) {
+    payload.rewardName = normalizedRewardName
+  }
+
+  return JSON.stringify(payload)
+}
+
 const ruleFromTrigger = (trigger: AutoScoreTrigger): JsonRule | null => {
   if (trigger.event === "interval_time_passed") {
     const intervalValue = parseIntervalTriggerValue(trigger.value)
@@ -520,7 +601,10 @@ export const createDefaultActionDraft = (): ActionDraft => ({
 })
 
 const isActionEvent = (value: unknown): value is ActionEvent =>
-  value === "add_score" || value === "add_tag" || value === "settle_score"
+  value === "add_score" ||
+  value === "add_tag" ||
+  value === "settle_score" ||
+  value === "reward_exchange"
 
 export const normalizeActionDrafts = (drafts: ActionDraft[] | null | undefined): ActionDraft[] => {
   if (!Array.isArray(drafts) || drafts.length === 0) {
@@ -537,6 +621,15 @@ export const normalizeActionDrafts = (drafts: ActionDraft[] | null | undefined):
         value:
           draft.event === "add_tag"
             ? parseTagValues(draft.value)
+            : draft.event === "reward_exchange"
+              ? (() => {
+                  const parsedValue = parseRewardActionValue(
+                    Array.isArray(draft.value) ? draft.value[0] : draft.value
+                  )
+                  return parsedValue
+                    ? stringifyRewardActionValue(parsedValue.rewardId, parsedValue.rewardName) || ""
+                    : ""
+                })()
             : draft.event === "settle_score"
               ? ""
               : toStringValue(Array.isArray(draft.value) ? draft.value[0] : draft.value),
@@ -553,7 +646,8 @@ export const actionsToDrafts = (actions: AutoScoreAction[]): ActionDraft[] => {
       if (
         action.event !== "add_score" &&
         action.event !== "add_tag" &&
-        action.event !== "settle_score"
+        action.event !== "settle_score" &&
+        action.event !== "reward_exchange"
       ) {
         return null
       }
@@ -563,6 +657,13 @@ export const actionsToDrafts = (actions: AutoScoreAction[]): ActionDraft[] => {
         value:
           action.event === "add_tag"
             ? parseTagValues(action.value)
+            : action.event === "reward_exchange"
+              ? (() => {
+                  const parsedValue = parseRewardActionValue(action.value)
+                  return parsedValue
+                    ? stringifyRewardActionValue(parsedValue.rewardId, parsedValue.rewardName) || ""
+                    : ""
+                })()
             : action.event === "settle_score"
               ? ""
               : toStringValue(action.value),
@@ -597,6 +698,18 @@ export const actionDraftsToPayload = (
       continue
     }
 
+    if (draft.event === "reward_exchange") {
+      const parsedValue = parseRewardActionValue(draft.value)
+      const serializedValue = parsedValue
+        ? stringifyRewardActionValue(parsedValue.rewardId, parsedValue.rewardName)
+        : null
+      if (!serializedValue) {
+        return { actions: [], error: "reward_required" }
+      }
+      actions.push({ event: draft.event, value: serializedValue })
+      continue
+    }
+
     const serializedTagValue = stringifyTagValues(parseTagValues(draft.value))
     if (!serializedTagValue) {
       return { actions: [], error: "tag_required" }

src/components/AutoScore/TriggerRuleBuilder.tsx

@@ -1,5 +1,5 @@
 import React, { useMemo } from "react"
-import { Alert, Card } from "antd"
+import { Card } from "antd"
 import {
   Builder,
   Query,
@@ -46,12 +46,6 @@ export const TriggerRuleBuilder: React.FC<TriggerRuleBuilderProps> = ({
       style={{ marginBottom: "24px", backgroundColor: "var(--ss-card-bg)" }}
       title={t("autoScore.whenTriggered")}
     >
-      <Alert
-        type="info"
-        showIcon
-        style={{ marginBottom: "16px" }}
-        title={t("autoScore.triggerScheduleHint")}
-      />
       <div
         className="query-builder-container"
         style={{

src/components/AutoScoreManager.tsx

@@ -36,11 +36,13 @@ import {
   normalizeTriggerTree,
   queryTreeToJson,
   normalizeActionDrafts,
+  parseRewardActionValue,
   queryTreeToTriggers,
   triggerTreeJsonToQueryTree,
   type ActionDraft,
   type AutoScoreExecutionBatch,
   type AutoScoreExecutionConfig,
+  type AutoScoreRewardOption,
   type AutoScoreRule,
   type AutoScoreTagOption,
 } from "./AutoScore/AutoScoreUtils"
@@ -55,6 +57,12 @@ interface TagItem {
   name: string
 }
 
+interface RewardItem {
+  id: number
+  name: string
+  cost_points: number
+}
+
 interface RuleFormValues {
   name?: string
   studentNames?: string[]
@@ -152,6 +160,7 @@ function AutoScoreManager({ canEdit }: AutoScoreManagerProps): React.JSX.Element
   const [form] = Form.useForm<RuleFormValues>()
   const [messageApi, contextHolder] = message.useMessage()
   const [tags, setTags] = useState<TagItem[]>([])
+  const [rewards, setRewards] = useState<RewardItem[]>([])
 
   const tagOptions = useMemo<AutoScoreTagOption[]>(
     () =>
@@ -161,6 +170,18 @@ function AutoScoreManager({ canEdit }: AutoScoreManagerProps): React.JSX.Element
       })),
     [tags]
   )
+  const rewardOptions = useMemo<AutoScoreRewardOption[]>(
+    () =>
+      rewards.map((reward) => ({
+        label: reward.name,
+        value: String(reward.id),
+      })),
+    [rewards]
+  )
+  const rewardLabelById = useMemo(
+    () => new Map(rewards.map((reward) => [reward.id, reward.name] as const)),
+    [rewards]
+  )
 
   const triggerConfig = useMemo(
     () => createTriggerQueryConfig(t, tagOptions),
@@ -288,6 +309,20 @@ function AutoScoreManager({ canEdit }: AutoScoreManagerProps): React.JSX.Element
     }
   }
 
+  const fetchRewards = async () => {
+    const api = (window as any).api
+    if (!api || !canEdit) return
+
+    try {
+      const res = await api.rewardSettingQuery()
+      if (res.success && Array.isArray(res.data)) {
+        setRewards(res.data)
+      }
+    } catch {
+      void 0
+    }
+  }
+
   const fetchRules = async () => {
     const api = (window as any).api
     if (!api || !canEdit) return
@@ -323,6 +358,7 @@ function AutoScoreManager({ canEdit }: AutoScoreManagerProps): React.JSX.Element
   useEffect(() => {
     if (!canEdit) return
     fetchTags().catch(() => void 0)
+    fetchRewards().catch(() => void 0)
     fetchStudents().catch(() => void 0)
     fetchRules().catch(() => void 0)
     fetchBatches().catch(() => void 0)
@@ -445,6 +481,10 @@ function AutoScoreManager({ canEdit }: AutoScoreManagerProps): React.JSX.Element
       messageApi.warning(t("autoScore.tagNamePlaceholder"))
       return
     }
+    if (actionPayload.error === "reward_required") {
+      messageApi.warning(t("autoScore.rewardRequired"))
+      return
+    }
     if (actionPayload.actions.length === 0) {
       messageApi.warning(t("autoScore.actionRequired"))
       return
@@ -623,6 +663,15 @@ function AutoScoreManager({ canEdit }: AutoScoreManagerProps): React.JSX.Element
     if (action.event === "settle_score") {
       return `${t("autoScore.actionSettleScore")}: ${t("autoScore.actionSettleScoreHint")}`
     }
+    if (action.event === "reward_exchange") {
+      const rewardValue = parseRewardActionValue(action.value)
+      const rewardLabel = rewardValue
+        ? rewardLabelById.get(rewardValue.rewardId) ||
+          rewardValue.rewardName ||
+          `#${rewardValue.rewardId}`
+        : String(action.value || "").trim() || "-"
+      return `${t("rewardExchange.title")}: ${rewardLabel}`
+    }
     return `${action.event}: ${String(action.value || "").trim() || "-"}`
   }
 
@@ -905,6 +954,7 @@ function AutoScoreManager({ canEdit }: AutoScoreManagerProps): React.JSX.Element
       <ActionEditor
         value={actionDrafts}
         tagOptions={tagOptions}
+        rewardOptions={rewardOptions}
         canEdit={canEdit}
         onChange={(nextDrafts) => setActionDrafts(normalizeActionDrafts(nextDrafts))}
       />

src/components/ContentArea.tsx

@@ -206,7 +206,7 @@ export function ContentArea({
 
     try {
       const api = (window as any).api
-      if (!api?.oauthLoadLoginState) {
+      if (!api?.oauthLoadLoginState || !api?.oauthGetStorageUsage) {
         setStorageUsage(null)
         setStorageUsageError("当前环境不支持云用量查询")
         return
@@ -229,37 +229,24 @@ export function ContentArea({
         return
       }
 
-      const params = new URLSearchParams({
-        client_id: platformId,
-        user_id: oauthState.user_id,
-      })
-
-      const response = await fetch(
-        `https://appwrite.sectl.top/api/cloud/storage/usage?${params.toString()}`,
-        {
-          headers: {
-            Authorization: `Bearer ${oauthState.access_token}`,
-          },
-        }
+      const usageRes = await api.oauthGetStorageUsage(
+        oauthState.access_token,
+        platformId,
+        oauthState.user_id
       )
-
-      const responseText = await response.text()
-      let payload: any = {}
-      try {
-        payload = responseText ? JSON.parse(responseText) : {}
-      } catch {
-        payload = {}
-      }
-
-      if (!response.ok) {
-        throw new Error(payload?.error_description || payload?.message || "获取云空间用量失败")
+      if (!usageRes?.success || !usageRes.data) {
+        throw new Error(usageRes?.message || "获取云空间用量失败")
       }
 
       setStorageUsage({
-        used_storage_formatted: String(payload?.used_storage_formatted || "0 B"),
-        total_storage_formatted: String(payload?.total_storage_formatted || "0 B"),
-        percentage: Number.isFinite(payload?.percentage) ? Number(payload.percentage) : 0,
-        file_count: Number.isFinite(payload?.file_count) ? Number(payload.file_count) : 0,
+        used_storage_formatted: String(usageRes.data.used_storage_formatted || "0 B"),
+        total_storage_formatted: String(usageRes.data.total_storage_formatted || "0 B"),
+        percentage: Number.isFinite(usageRes.data.percentage)
+          ? Number(usageRes.data.percentage)
+          : 0,
+        file_count: Number.isFinite(usageRes.data.file_count)
+          ? Number(usageRes.data.file_count)
+          : 0,
       })
     } catch (error: any) {
       setStorageUsage(null)
@@ -627,10 +614,12 @@ export function ContentArea({
       </div>
 
       <Content
+        className="ss-content-scroll-container"
         style={{
           flex: 1,
           overflowY: isBoardPage ? "hidden" : "auto",
           overflowX: "hidden",
+          background: "var(--ss-bg-color)",
           paddingBottom: bottomInset ? `${bottomInset}px` : 0,
         }}
       >
@@ -697,3 +686,4 @@ export function ContentArea({
     </Layout>
   )
 }
+

src/components/Home.tsx

@@ -613,6 +613,12 @@ export const Home: React.FC<HomeProps> = ({
     }
   }
 
+  const getScrollViewport = useCallback(() => {
+    const container = scrollContainerRef.current
+    if (!container) return null
+    return container.closest(".ss-content-scroll-container") as HTMLElement | null
+  }, [])
+
   const openOperation = (student: student, sourceEl?: HTMLElement | null) => {
     if (!canEdit) {
       messageApi.error(t("common.readOnly"))
@@ -2423,9 +2429,11 @@ export const Home: React.FC<HomeProps> = ({
       return
     }
 
+    const scrollViewport = getScrollViewport()
     const refreshActiveByScroll = () => {
       let currentKey = groupedStudents[0]?.key || null
-      const anchorY = 140
+      const viewportTop = scrollViewport?.getBoundingClientRect().top ?? 0
+      const anchorY = viewportTop + 96
 
       groupedStudents.forEach((group) => {
         const el = groupRefs.current[group.key]
@@ -2446,13 +2454,13 @@ export const Home: React.FC<HomeProps> = ({
     }
 
     refreshActiveByScroll()
-    window.addEventListener("scroll", refreshActiveByScroll, { passive: true })
+    scrollViewport?.addEventListener("scroll", refreshActiveByScroll, { passive: true })
     window.addEventListener("resize", refreshActiveByScroll)
     return () => {
-      window.removeEventListener("scroll", refreshActiveByScroll)
+      scrollViewport?.removeEventListener("scroll", refreshActiveByScroll)
       window.removeEventListener("resize", refreshActiveByScroll)
     }
-  }, [groupedStudents, quickNavLayout.itemSize, quickNavLayout.paddingY])
+  }, [getScrollViewport, groupedStudents, quickNavLayout.itemSize, quickNavLayout.paddingY])
 
   const shouldShowQuickNav =
     groupedStudents.length > 1 &&