feat: expand item types and improve API response handling

.cursor/rules/github-operation.mdc → .cursor/rules/mcp-operation.mdc

@@ -3,7 +3,7 @@ description: Any operations involving issues and pulls on GitHub
 globs: 
 alwaysApply: false
 ---
-**Repository Resolution Logic:**
+**Github Repository Resolution Logic:**
 
 - If owner and repo are explicitly provided, use them.
 - Otherwise, default to:
@@ -17,3 +17,7 @@ alwaysApply: false
 - The language chosen for raising an issue: Chinese- 
 - Be careful not to be too AI in your tone.
 - Pay attention to choosing the appropriate labels and types. And select the latest Milestone
+
+**Postgres db operation Logic:**
+
+- db name is `app`

.env.example

@@ -26,7 +26,7 @@ DOMAIN=localhost.nip.io
 # Used by the backend to generate links (e.g., in emails).
 # Example for local development: http://localhost:8000
 # Example for production: https://dashboard.yourdomain.com
-FRONTEND_HOST=http://localhost:8000
+FRONTEND_HOST=http://localhost:3000
 
 # -- Backend Settings --
 
@@ -220,5 +220,3 @@ OR_API_KEY="sk-or-api03-1234567890"
 # Google OAuth client ID and secret for authentication
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
-GOOGLE_OAUTH_REDIRECT_URI=http://localhost:8000/api/v1/login/google/callback
-FRONTEND_URL=http://localhost:3000

.github/workflows/generate-client.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: 8
+          version: 9.9.0
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -56,6 +56,10 @@ jobs:
       - name: Install Frontend Dependencies
         run: pnpm install
         working-directory: frontend
+
+      - name: Install Admin Dependencies
+        run: pnpm install
+        working-directory: admin
 
       # 安装所有后端依赖项
       - name: Install Backend Dependencies
@@ -94,7 +98,9 @@ jobs:
 
       # 6. Stage Generated Files
       - name: Stage Generated Client Files
-        run: git add frontend/src/client # Adjust path if needed
+        run: |
+          git add frontend/app/openapi-client
+          git add admin/src/client
 
       # 7. Handle Changes for Same-Repo Events (Push/PR from same repo)
       - name: Commit and Push Changes (Same Repo)
@@ -104,8 +110,8 @@ jobs:
           # Check if there are staged changes
           if ! git diff --staged --quiet; then
             echo "✅ Changes detected in generated client. Committing and pushing..."
-            # Pull before pushing to avoid conflicts if possible (optional)
-            # git pull --ff-only origin ${{ github.head_ref || github.ref_name }}
+            # Pull before pushing to avoid conflicts
+            git pull --rebase origin ${{ github.head_ref || github.ref_name }}
             git commit -m "ci: ✨ Autogenerate frontend client"
             git push origin HEAD:${{ github.head_ref || github.ref_name }}
           else

.github/workflows/playwright.yml

@@ -48,9 +48,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Install pnpm
-      uses: pnpm/action-setup@v2
+      uses: pnpm/action-setup@v3
       with:
-        version: 8
+        version: 9.9.0
     - uses: actions/setup-node@v4
       with:
         node-version: lts/*

.github/workflows/release.yml

@@ -57,5 +57,5 @@ jobs:
         run: |
           echo "## 🚀 Release Summary" >> $GITHUB_STEP_SUMMARY
           echo "Release draft created for version ${{ github.event.inputs.version }}." >> $GITHUB_STEP_SUMMARY
-          echo "Visit the [Releases section](https://github.com/vintasoftware/nextjs-fastapi-template/releases) to review and publish the release." >> $GITHUB_STEP_SUMMARY
+          echo "Visit the [Releases section](https://github.com/https://github.com/telepace/releases) to review and publish the release." >> $GITHUB_STEP_SUMMARY
           echo "Once the draft is published, another action will automatically be triggered to publish the packages." >> $GITHUB_STEP_SUMMARY

Makefile

@@ -81,7 +81,8 @@ lint: backend-lint frontend-lint admin-lint
 
 ## test: Run tests for all components
 .PHONY: test
-test: backend-test frontend-test website-test admin-test
+test: backend-test frontend-test website-test admin-test extension-test-unit
+	@echo "===========> All tests completed successfully"
 
 ## format: Format code in all components
 .PHONY: format
@@ -397,7 +398,7 @@ website-test: website-install
 
 ## extension-all: Run all extension related tasks without starting services
 .PHONY: extension-all
-extension-all: extension-build extension-package
+extension-all: extension-build extension-package extension-test
 	@echo "===========> Extension all checks completed successfully"
 
 ## extension: Start extension development
@@ -418,6 +419,23 @@ extension-package: check-pnpm
 	@echo "===========> Packaging browser extension for distribution"
 	@cd $(EXTENSION_DIR) && $(PNPM) run package
 
+## extension-test: Run all extension tests
+.PHONY: extension-test
+extension-test: extension-test-unit extension-test-e2e
+	@echo "===========> All extension tests completed"
+
+## extension-test-unit: Run extension unit tests with Jest
+.PHONY: extension-test-unit
+extension-test-unit: check-pnpm
+	@echo "===========> Running extension unit tests"
+	@cd $(EXTENSION_DIR) && $(PNPM) test
+
+## extension-test-e2e: Run extension E2E tests with Playwright
+.PHONY: extension-test-e2e
+extension-test-e2e: check-pnpm
+	@echo "===========> Running extension E2E tests"
+	@cd $(EXTENSION_DIR) && $(PNPM) exec playwright test
+
 # ==============================================================================
 # DOCKER TARGETS
 # ==============================================================================

README.md

@@ -418,7 +418,7 @@ This project provides optimized scripts and Makefile targets for common developm
 ### Frontend Development
 
 - `make frontend-install` - Install frontend dependencies
-- `make frontend-dev` - Run frontend development server
+- `make frontend` - Run frontend development server
 - `make frontend-build` - Build frontend for production
 - `make frontend-test` - Run frontend tests
 - `make frontend-lint` - Run linters on frontend code

admin/src/client/index.ts

@@ -4,5 +4,3 @@ export { CancelablePromise, CancelError } from "./core/CancelablePromise"
 export { OpenAPI, type OpenAPIConfig } from "./core/OpenAPI"
 export * from "./sdk.gen"
 export * from "./types.gen"
-export { isApiResponse, extractApiResponseError } from "./utils"
-export { type ItemPublic } from "./types"

admin/src/client/sdk.gen.ts

@@ -3,12 +3,13 @@
 import type { CancelablePromise } from './core/CancelablePromise';
 import { OpenAPI } from './core/OpenAPI';
 import { request as __request } from './core/request';
-import type { GoogleOauthGoogleCallbackApiData, GoogleOauthGoogleCallbackApiResponse, GoogleOauthGoogleLoginResponse, GoogleOauthGoogleCallbackData, GoogleOauthGoogleCallbackResponse, HealthGetHealthRootResponse, HealthGetHealthApiResponse, ItemsReadItemsData, ItemsReadItemsResponse, ItemsCreateItemData, ItemsCreateItemResponse, ItemsReadItemData, ItemsReadItemResponse, ItemsUpdateItemData, ItemsUpdateItemResponse, ItemsDeleteItemData, ItemsDeleteItemResponse, LoginLoginAccessTokenData, LoginLoginAccessTokenResponse, LoginTestTokenResponse, LoginLogoutResponse, LoginRecoverPasswordData, LoginRecoverPasswordResponse, LoginResetPasswordData, LoginResetPasswordResponse, LoginRecoverPasswordHtmlContentData, LoginRecoverPasswordHtmlContentResponse, PrivateCreateUserData, PrivateCreateUserResponse, UsersReadUsersData, UsersReadUsersResponse, UsersCreateUserData, UsersCreateUserResponse, UsersReadUserMeResponse, UsersDeleteUserMeResponse, UsersUpdateUserMeData, UsersUpdateUserMeResponse, UsersUpdatePasswordMeData, UsersUpdatePasswordMeResponse, UsersRegisterUserData, UsersRegisterUserResponse, UsersReadUserByIdData, UsersReadUserByIdResponse, UsersUpdateUserData, UsersUpdateUserResponse, UsersDeleteUserData, UsersDeleteUserResponse, UtilsTestEmailData, UtilsTestEmailResponse, UtilsHealthCheckResponse } from './types.gen';
+import type { GoogleOauthGoogleCallbackApiData, GoogleOauthGoogleCallbackApiResponse, GoogleOauthGoogleLoginResponse, GoogleOauthGoogleCallbackData, GoogleOauthGoogleCallbackResponse, HealthGetHealthApiResponse, ItemsReadItemsData, ItemsReadItemsResponse, ItemsCreateItemData, ItemsCreateItemResponse, ItemsReadItemData, ItemsReadItemResponse, ItemsUpdateItemData, ItemsUpdateItemResponse, ItemsDeleteItemData, ItemsDeleteItemResponse, LoginLoginAccessTokenData, LoginLoginAccessTokenResponse, LoginTestTokenResponse, LoginLogoutResponse, LoginRecoverPasswordData, LoginRecoverPasswordResponse, LoginResetPasswordData, LoginResetPasswordResponse, LoginRecoverPasswordHtmlContentData, LoginRecoverPasswordHtmlContentResponse, PrivateCreateUserData, PrivateCreateUserResponse, UsersReadUsersData, UsersReadUsersResponse, UsersCreateUserData, UsersCreateUserResponse, UsersReadUserMeResponse, UsersDeleteUserMeResponse, UsersUpdateUserMeData, UsersUpdateUserMeResponse, UsersUpdatePasswordMeData, UsersUpdatePasswordMeResponse, UsersRegisterUserData, UsersRegisterUserResponse, UsersReadUserByIdData, UsersReadUserByIdResponse, UsersUpdateUserData, UsersUpdateUserResponse, UsersDeleteUserData, UsersDeleteUserResponse, UtilsTestEmailData, UtilsTestEmailResponse, UtilsHealthCheckResponse } from './types.gen';
 
 export class GoogleOauthService {
     /**
      * Google Callback Api
      * Handle Google OAuth callback from frontend
+     * This is maintained for backward compatibility but not used in the new flow
      * @param data The data for the request.
      * @param data.requestBody
      * @returns unknown Successful Response
@@ -29,6 +30,7 @@ export class GoogleOauthService {
     /**
      * Google Login
      * Initiate Google OAuth2 authentication flow
+     * This endpoint redirects to Google's login page
      * @returns unknown Successful Response
      * @throws ApiError
      */
@@ -42,6 +44,7 @@ export class GoogleOauthService {
     /**
      * Google Callback
      * Handle the callback from Google OAuth
+     * This endpoint is called by Google after the user has logged in
      * @param data The data for the request.
      * @param data.code
      * @param data.state
@@ -67,22 +70,8 @@ export class GoogleOauthService {
 }
 
 export class HealthService {
-    /**
-     * Get Health Root
-     * 兼容前端的根级别健康检查路由
-     * @returns unknown Successful Response
-     * @throws ApiError
-     */
-    public static getHealthRoot(): CancelablePromise<HealthGetHealthRootResponse> {
-        return __request(OpenAPI, {
-            method: 'GET',
-            url: '/health'
-        });
-    }
-
     /**
      * Get Health Api
-     * 兼容前端的API级别健康检查路由
      * @returns unknown Successful Response
      * @throws ApiError
      */

admin/src/client/types.gen.ts

@@ -142,8 +142,6 @@ export type GoogleOauthGoogleCallbackData = {
 
 export type GoogleOauthGoogleCallbackResponse = (unknown);
 
-export type HealthGetHealthRootResponse = (unknown);
-
 export type HealthGetHealthApiResponse = (unknown);
 
 export type ItemsReadItemsData = {

admin/src/client/types.ts

@@ -6,7 +6,33 @@
  * 项目的公共接口定义
  */
 export interface ItemPublic {
-  id: string;
-  title: string;
-  description?: string | null;
-} 
+  id: string
+  title: string
+  description?: string | null
+}
+
+/**
+ * 项目集合的公共接口定义
+ */
+export interface ItemsPublic {
+  data: Array<ItemPublic>
+  count: number
+}
+
+/**
+ * 从API响应中提取Item数据的类型
+ */
+export type ItemResponse = {
+  data: ItemPublic
+  meta?: Record<string, unknown> | null
+  error?: string | null
+}
+
+/**
+ * 从API响应中提取Items集合数据的类型
+ */
+export type ItemsResponse = {
+  data: ItemsPublic
+  meta?: Record<string, unknown> | null
+  error?: string | null
+}

admin/src/client/utils.ts

@@ -6,13 +6,13 @@
  * 检查一个值是否为API响应格式
  */
 export const isApiResponse = (value: unknown): boolean => {
-  if (!value || typeof value !== 'object') {
+  if (!value || typeof value !== "object") {
     return false
   }
-  
+
   const obj = value as Record<string, unknown>
   // 检查是否包含API响应格式的关键字段
-  return ('data' in obj || 'meta' in obj || 'error' in obj)
+  return "data" in obj || "meta" in obj || "error" in obj
 }
 
 /**
@@ -22,41 +22,41 @@ export const extractApiResponseError = (response: unknown): string | null => {
   if (!isApiResponse(response)) {
     return null
   }
-  
+
   const apiResponse = response as Record<string, unknown>
-  
+
   // 直接返回error字段
-  if (typeof apiResponse.error === 'string') {
+  if (typeof apiResponse.error === "string") {
     return apiResponse.error
   }
-  
+
   // 尝试从meta中提取详细错误信息
-  if (apiResponse.meta && typeof apiResponse.meta === 'object') {
+  if (apiResponse.meta && typeof apiResponse.meta === "object") {
     const meta = apiResponse.meta as Record<string, unknown>
-    
+
     // 检查meta中是否有details字段
     if (meta.details) {
       if (Array.isArray(meta.details) && meta.details.length > 0) {
         const firstDetail = meta.details[0]
-        if (typeof firstDetail === 'object' && firstDetail !== null) {
+        if (typeof firstDetail === "object" && firstDetail !== null) {
           // 尝试获取msg或message字段
           const detailObj = firstDetail as Record<string, unknown>
-          if (typeof detailObj.msg === 'string') {
+          if (typeof detailObj.msg === "string") {
             return detailObj.msg
           }
-          if (typeof detailObj.message === 'string') {
+          if (typeof detailObj.message === "string") {
             return detailObj.message
           }
         }
         // 如果是字符串，直接返回
-        if (typeof firstDetail === 'string') {
+        if (typeof firstDetail === "string") {
           return firstDetail
         }
-      } else if (typeof meta.details === 'string') {
+      } else if (typeof meta.details === "string") {
         return meta.details
       }
     }
   }
-  
+
   return null
-} 
+}

admin/src/routes/_layout/items.tsx

@@ -60,17 +60,15 @@ function ItemsTable() {
     })
 
   // 安全地处理API响应
-  const apiData = apiResponse?.data || ({} as any)
-
+  const responseData = apiResponse?.data || {} as any
+  
   // 使用类型断言处理响应数据
-  const items: ItemPublic[] = Array.isArray(apiData.data)
-    ? apiData.data
-    : Array.isArray(apiData)
-      ? apiData
-      : []
-
+  const items: ItemPublic[] = Array.isArray(responseData.data) 
+    ? responseData.data 
+    : []
+
   // 使用类型断言处理计数
-  const count = typeof apiData.count === "number" ? apiData.count : items.length
+  const count = typeof responseData.count === "number" ? responseData.count : items.length
 
   if (isLoading) {
     return <PendingItems />