@goplusvn/core 0.1.71 → 0.1.72

package/templates/starter-app/src/app/api/users/route.ts

@@ -1,10 +1,10 @@
 import { NextResponse } from "next/server"
+import { getUsersList } from "@/server/services/user-service"
 import bcrypt from "bcryptjs"
 
 import { apiHandler } from "@/lib/api-handler"
 import { serverError } from "@/lib/errors/server-error"
 import { db } from "@/lib/prisma"
-import { getUsersList } from "@/server/services/user-service"
 
 /**
  * /api/users — danh sách + tạo người dùng.
@@ -27,10 +27,12 @@ export const GET = apiHandler(
       })
       return NextResponse.json(result)
     } catch (error) {
-      return serverError(error, req, { message: "Lỗi tải danh sách người dùng" })
+      return serverError(error, req, {
+        message: "Lỗi tải danh sách người dùng",
+      })
     }
   },
-  { resource: "user", action: "view" },
+  { resource: "user", action: "view" }
 )
 
 export const POST = apiHandler(
@@ -52,20 +54,20 @@ export const POST = apiHandler(
       if (!name) {
         return NextResponse.json(
           { error: "Tên là bắt buộc", field: "name" },
-          { status: 400 },
+          { status: 400 }
         )
       }
       // Template dùng email làm định danh đăng nhập (User.email là unique).
       if (!email) {
         return NextResponse.json(
           { error: "Email là bắt buộc", field: "email" },
-          { status: 400 },
+          { status: 400 }
         )
       }
       if (password && password.length < 6) {
         return NextResponse.json(
           { error: "Mật khẩu phải có ít nhất 6 ký tự", field: "password" },
-          { status: 400 },
+          { status: 400 }
         )
       }
 
@@ -73,7 +75,7 @@ export const POST = apiHandler(
       if (existing) {
         return NextResponse.json(
           { error: "Email đã tồn tại", field: "email" },
-          { status: 400 },
+          { status: 400 }
         )
       }
 
@@ -129,11 +131,11 @@ export const POST = apiHandler(
 
       return NextResponse.json(
         { id: created.id, name: created.name, email: created.email },
-        { status: 201 },
+        { status: 201 }
       )
     } catch (error) {
       return serverError(error, req, { message: "Lỗi tạo người dùng" })
     }
   },
-  { resource: "user", action: "create" },
+  { resource: "user", action: "create" }
 )

package/templates/starter-app/src/app/globals.css

@@ -8,7 +8,6 @@
 /* Tailwind v4 must scan core's component classes (this app's own src is
    auto-scanned). */
 @source "../../node_modules/@goerp/core/src/**/*.tsx";
-@source "../../node_modules/@goplusvn/core/src/**/*.tsx";
 
 /* App brand overrides. Core's default brand is indigo. Re-skin either here
    statically, or at runtime via `branding.primaryColor` on <TenantProvider>. */

package/templates/starter-app/src/components/layout/main-layout-wrapper.tsx

@@ -1,8 +1,9 @@
-'use client'
+"use client"
 
-import type { NavigationType } from '@goerp/core/types'
-import { NotificationBell } from '@goerp/core/notification/ui'
-import { MainLayout } from '@goerp/core/ui'
+import { NotificationBell } from "@goerp/core/notification/ui"
+import { MainLayout } from "@goerp/core/ui"
+
+import type { NavigationType } from "@goerp/core/types"
 
 export function MainLayoutWrapper({
   children,

package/templates/starter-app/src/configs/entities/department.config.ts

@@ -1,7 +1,7 @@
-import { departmentsConfig } from "@goerp/core/configs/entities"
-
 import type { EntityConfig } from "@goerp/core/types"
 
+import { departmentsConfig } from "@goerp/core/configs/entities"
+
 const CRUD_ENDPOINT = "/api/crud/departments"
 
 /**
@@ -18,7 +18,10 @@ export const departmentConfig: EntityConfig = {
   // generic endpoint (core's default points at /api/departments).
   fields: departmentsConfig.fields.map((field) =>
     field.dataSource?.type === "api"
-      ? { ...field, dataSource: { ...field.dataSource, endpoint: CRUD_ENDPOINT } }
-      : field,
+      ? {
+          ...field,
+          dataSource: { ...field.dataSource, endpoint: CRUD_ENDPOINT },
+        }
+      : field
   ),
 }

package/templates/starter-app/src/configs/entities/index.ts

@@ -5,7 +5,7 @@ import { jobTitlesConfig } from "./job-titles.config"
 import { systemAlertsConfig } from "./system-alerts.config"
 
 // Đăng ký entity → cấu hình. Khóa = số nhiều, khớp URL /crud/<key> + apiEndpoint.
-// Thêm entity mới: import config rồi thêm 1 dòng ở đây (kèm MODEL_MAP ở src/lib/crud).
+// Thêm entity mới: import config rồi thêm 1 dòng ở đây (khai `modelName` trong config).
 export const entityConfigs: Record<string, EntityConfig> = {
   departments: departmentConfig,
   "job-titles": jobTitlesConfig,

package/templates/starter-app/src/configs/entities/job-titles.config.ts

@@ -11,6 +11,8 @@ export const jobTitlesConfig: EntityConfig = {
   icon: Briefcase,
   description: "Quản lý danh sách chức danh trong tổ chức",
   apiEndpoint: "/api/crud/job-titles",
+  // Tên model Prisma — engine core đọc từ đây, không cần MODEL_MAP ở lib/crud.
+  modelName: "jobTitle",
   idField: "id",
   displayField: "name",
 

package/templates/starter-app/src/configs/entities/system-alerts.config.ts

@@ -14,6 +14,8 @@ export const systemAlertsConfig: EntityConfig = {
   icon: Bell,
   description: "Quản lý các thông báo và cảnh báo hệ thống",
   apiEndpoint: "/api/crud/system-alerts",
+  // Tên model Prisma — engine core đọc từ đây, không cần MODEL_MAP ở lib/crud.
+  modelName: "systemAlert",
   idField: "id",
   displayField: "title",
 

package/templates/starter-app/src/configs/entities/users.config.ts

@@ -20,13 +20,26 @@ export const usersConfig: EntityConfig = {
   iconName: "Users",
   description: "Quản lý tài khoản đăng nhập, vai trò và chi nhánh",
   apiEndpoint: "/api/users",
+  modelName: "user",
   idField: "id",
   displayField: "name",
 
   fields: [
-    { name: "id", label: "ID", type: "text", hideInForm: true, hideInTable: true },
+    {
+      name: "id",
+      label: "ID",
+      type: "text",
+      hideInForm: true,
+      hideInTable: true,
+    },
     { name: "name", label: "Họ tên", type: "text", required: true },
-    { name: "email", label: "Email", type: "email", required: true, width: 200 },
+    {
+      name: "email",
+      label: "Email",
+      type: "email",
+      required: true,
+      width: 200,
+    },
     {
       name: "roleNames",
       label: "Vai trò",

package/templates/starter-app/src/configs/i18n.ts

@@ -1,12 +1,12 @@
 export const i18n = {
-  defaultLocale: 'vi',
-  locales: ['vi', 'en'] as const,
+  defaultLocale: "vi",
+  locales: ["vi", "en"] as const,
   localeDirection: {
-    vi: 'ltr',
-    en: 'ltr',
+    vi: "ltr",
+    en: "ltr",
   } as const,
   localeNames: {
-    vi: 'vietnamese',
-    en: 'english',
+    vi: "vietnamese",
+    en: "english",
   } as const,
 } as const

package/templates/starter-app/src/configs/permissions/menu-tree.ts

@@ -33,5 +33,5 @@ export const MENU_TREE: MenuTreeSection[] = navigations
 
 /** resource → href của trang chính (ActionCatalogPage dùng để link chéo). */
 export const RESOURCE_PAGES: Record<string, string> = Object.fromEntries(
-  MENU_TREE.flatMap((s) => s.items.map((i) => [i.resource, i.href ?? ""])),
+  MENU_TREE.flatMap((s) => s.items.map((i) => [i.resource, i.href ?? ""]))
 )

package/templates/starter-app/src/data/dictionary.ts

@@ -67,7 +67,8 @@ export const dictionary: DictionaryType = {
       deleted: "{{entity}} đã được xóa thành công",
       bulkDeleted: "{{count}} {{entities}} đã được xóa thành công",
       deleteConfirm: "Bạn có chắc chắn muốn xóa {{entity}} này không?",
-      bulkDeleteConfirm: "Bạn có chắc chắn muốn xóa {{count}} {{entities}} không?",
+      bulkDeleteConfirm:
+        "Bạn có chắc chắn muốn xóa {{count}} {{entities}} không?",
       deleteFailed: "Không thể xóa {{entity}}",
       saveFailed: "Không thể lưu {{entity}}",
       loadFailed: "Không thể tải dữ liệu. Vui lòng thử lại.",

package/templates/starter-app/src/data/navigations.ts

@@ -37,14 +37,24 @@ export const navigations: NavigationType[] = [
     title: "Hệ thống",
     iconName: "ShieldCheck",
     items: [
-      { title: "Người dùng", iconName: "Users", href: "/users", resource: "user" },
+      {
+        title: "Người dùng",
+        iconName: "Users",
+        href: "/users",
+        resource: "user",
+      },
       {
         title: "Phiên đăng nhập",
         iconName: "KeyRound",
         href: "/security/sessions",
         resource: "user",
       },
-      { title: "Vai trò", iconName: "ShieldCheck", href: "/roles", resource: "role" },
+      {
+        title: "Vai trò",
+        iconName: "ShieldCheck",
+        href: "/roles",
+        resource: "role",
+      },
       {
         title: "Tài nguyên",
         iconName: "Boxes",

package/templates/starter-app/src/lib/action-guard.ts

@@ -14,13 +14,12 @@ import { getSession } from "@/lib/auth"
  */
 export async function requirePermission(
   resource: string,
-  action = "view",
+  action = "view"
 ): Promise<Session> {
   const session = await getSession()
   if (!session?.user) throw new Error("Unauthorized")
-  const s = session as Parameters<typeof checkPermission>[0]
-  if (!checkPermission(s, resource, action)) {
+  if (!checkPermission(session, resource, action)) {
     throw new Error(`Forbidden: ${resource}:${action}`)
   }
-  return session as Session
+  return session
 }

package/templates/starter-app/src/lib/api-handler.ts

@@ -15,13 +15,11 @@
 import { NextResponse } from "next/server"
 import { withAuditContext } from "@goerp/core/audit"
 import { checkPermission as coreCheckPermission } from "@goerp/core/auth"
-import {
-  createApiHandler,
-  type ApiHandlerMiddleware,
-} from "@goerp/core/auth/api-handler"
+import { createApiHandler } from "@goerp/core/auth/api-handler"
 
-import type { NextRequest } from "next/server"
 import type { Session } from "@/types/session"
+import type { ApiHandlerMiddleware } from "@goerp/core/auth/api-handler"
+import type { NextRequest } from "next/server"
 
 import { getRegistryResource } from "@/configs/permissions"
 import { getSession } from "@/lib/auth"
@@ -40,7 +38,7 @@ interface HandlerContext<TParams = Record<string, string>> {
 
 type Handler<TParams = Record<string, string>> = (
   req: NextRequest,
-  ctx: HandlerContext<TParams>,
+  ctx: HandlerContext<TParams>
 ) => Promise<Response>
 
 interface ApiHandlerOptions {
@@ -70,7 +68,10 @@ function assertResourceDeclared(resource: string) {
  * trong lib/prisma.ts đọc context này; thiếu nó thì mọi dòng audit_logs đều
  * ghi tác nhân rỗng.
  */
-const auditContext: ApiHandlerMiddleware<Session> = async (next, { req, session }) => {
+const auditContext: ApiHandlerMiddleware<Session> = async (
+  next,
+  { req, session }
+) => {
   if (!session) return next()
   const ip =
     req.headers.get("x-forwarded-for")?.split(",")[0]?.trim() ||
@@ -78,7 +79,7 @@ const auditContext: ApiHandlerMiddleware<Session> = async (next, { req, session
     undefined
   return (await withAuditContext(
     { userId: session.user.id, userName: session.user.name, ip },
-    () => next(),
+    () => next()
   )) as Response
 }
 
@@ -87,11 +88,14 @@ const auditContext: ApiHandlerMiddleware<Session> = async (next, { req, session
  * biết user được xem chi nhánh nào. Phạm vi được tính LƯỜI — request không đụng
  * model nào bị guard thì `resolve` không bao giờ chạy.
  */
-const branchScope: ApiHandlerMiddleware<Session> = async (next, { session }) => {
+const branchScope: ApiHandlerMiddleware<Session> = async (
+  next,
+  { session }
+) => {
   if (!session) return next()
   return (await runWithBranchScope(
     { resolve: () => getBranchScope(session) },
-    () => next(),
+    () => next()
   )) as Response
 }
 
@@ -108,7 +112,8 @@ async function onApiError(error: unknown, req: Request): Promise<Response> {
     userAgent: req.headers.get("user-agent") || undefined,
   })
 
-  const message = error instanceof Error ? error.message : "Internal Server Error"
+  const message =
+    error instanceof Error ? error.message : "Internal Server Error"
   return NextResponse.json(
     {
       error: message,
@@ -116,9 +121,14 @@ async function onApiError(error: unknown, req: Request): Promise<Response> {
       // đang in — production thì tuyệt đối không lộ.
       ...(process.env.NODE_ENV === "production"
         ? {}
-        : { debug: { message, stack: error instanceof Error ? error.stack : undefined } }),
+        : {
+            debug: {
+              message,
+              stack: error instanceof Error ? error.stack : undefined,
+            },
+          }),
     },
-    { status: 500 },
+    { status: 500 }
   )
 }
 
@@ -128,9 +138,7 @@ const coreApiHandler = createApiHandler<Session>({
     const session = await getSession()
     return session?.user ? session : null
   },
-  checkPermission: (session, resource, action) =>
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    coreCheckPermission(session as any, resource, action),
+  checkPermission: coreCheckPermission,
   assertResource: assertResourceDeclared,
   wrap: [auditContext, branchScope],
   onError: onApiError,
@@ -138,7 +146,7 @@ const coreApiHandler = createApiHandler<Session>({
 
 export function apiHandler<TParams = Record<string, string>>(
   handler: Handler<TParams>,
-  options?: ApiHandlerOptions,
+  options?: ApiHandlerOptions
 ) {
   const route = coreApiHandler(
     (req, ctx) =>
@@ -147,11 +155,11 @@ export function apiHandler<TParams = Record<string, string>>(
         session: ctx.session ?? ({} as Session),
         params: ctx.params as Promise<TParams>,
       }),
-    options,
+    options
   )
   return async (
     req: NextRequest,
     // Route tĩnh (không có segment động) được Next gọi mà không kèm ctx.
-    routeCtx?: { params: Promise<TParams> },
+    routeCtx?: { params: Promise<TParams> }
   ): Promise<Response> => route(req, routeCtx as never)
 }

package/templates/starter-app/src/lib/auth.ts

@@ -50,7 +50,9 @@ export const getSession = cache(async (): Promise<Session | null> => {
   return {
     user: result.user,
     expires:
-      expiresAt instanceof Date ? expiresAt.toISOString() : String(expiresAt ?? ""),
+      expiresAt instanceof Date
+        ? expiresAt.toISOString()
+        : String(expiresAt ?? ""),
   } as unknown as Session
 })
 

package/templates/starter-app/src/lib/branch-scope.ts

@@ -27,7 +27,7 @@ import type { Session } from "@/types/session"
 export function canViewAllBranches(session: Session): boolean {
   return Boolean(
     session.user?.roles?.includes("admin") ||
-      checkPermission(session as never, "branch", "view-all-branches"),
+      checkPermission(session, "branch", "view-all-branches")
   )
 }
 

package/templates/starter-app/src/lib/crud/index.ts

@@ -1,15 +1,8 @@
-import { createServerCrudService, getModelName } from "@goerp/core/crud/server"
+import { createServerCrudService } from "@goerp/core/crud/server"
 
 import { db } from "@/lib/prisma"
 
-// Engine CRUD generic ở CORE — app chỉ tiêm prisma + map entity(số nhiều)→model Prisma.
-const MODEL_MAP: Record<string, string> = {
-  departments: "department",
-  "job-titles": "jobTitle",
-  "system-alerts": "systemAlert",
-}
-
-export const crudService = createServerCrudService({
-  prisma: db,
-  getModelName: (entity) => getModelName(entity, MODEL_MAP),
-})
+// Engine CRUD generic ở CORE — app chỉ tiêm prisma. Tên model Prisma khai
+// ngay trong từng entity config (`modelName: "jobTitle"`…), không còn
+// MODEL_MAP song song ở đây.
+export const crudService = createServerCrudService({ prisma: db })

package/templates/starter-app/src/lib/errors/log-server-error.ts

@@ -1,7 +1,8 @@
-import {
-  createErrorLogger,
-  type ErrorLoggerDb,
-  type ServerErrorContext,
+import { createErrorLogger } from "@goerp/core/errors/server-error"
+
+import type {
+  ErrorLoggerDb,
+  ServerErrorContext,
 } from "@goerp/core/errors/server-error"
 
 import { db } from "@/lib/prisma"

package/templates/starter-app/src/lib/logger.ts

@@ -12,9 +12,12 @@ type LogContext = Record<string, unknown>
  * được stack — bọc lại ở đây thay vì bắt mỗi call site tự trải ra.
  */
 export const logger = {
-  info: (message: string, context?: LogContext) => coreLogger.info(message, context),
-  warn: (message: string, context?: LogContext) => coreLogger.warn(message, context),
-  debug: (message: string, context?: LogContext) => coreLogger.debug(message, context),
+  info: (message: string, context?: LogContext) =>
+    coreLogger.info(message, context),
+  warn: (message: string, context?: LogContext) =>
+    coreLogger.warn(message, context),
+  debug: (message: string, context?: LogContext) =>
+    coreLogger.debug(message, context),
   error: (message: string, error?: unknown, context?: LogContext) =>
     coreLogger.error(message, {
       ...context,
@@ -22,7 +25,11 @@ export const logger = {
         ? {
             error:
               error instanceof Error
-                ? { name: error.name, message: error.message, stack: error.stack }
+                ? {
+                    name: error.name,
+                    message: error.message,
+                    stack: error.stack,
+                  }
                 : error,
           }
         : {}),

package/templates/starter-app/src/lib/page-guard.ts

@@ -22,14 +22,13 @@ import { getSession } from "@/lib/auth"
 export async function requirePageAccess(
   lang: string,
   resource: string,
-  action = "view",
+  action = "view"
 ): Promise<Session> {
   const session = await getSession()
   const locale = lang || i18n.defaultLocale
 
   if (!session?.user) redirect(`/${locale}/sign-in`)
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  if (!checkPermission(session as any, resource, action)) redirect(`/${locale}`)
+  if (!checkPermission(session, resource, action)) redirect(`/${locale}`)
 
   return session
 }

package/templates/starter-app/src/lib/prisma.ts

@@ -1,8 +1,8 @@
-import { PrismaPg } from "@prisma/adapter-pg"
-import { Prisma, PrismaClient } from "@prisma/client"
 import { createAuditExtension } from "@goerp/core/audit"
 import { createBranchGuardExtension } from "@goerp/core/branch-scope"
 import { configureSettingsService } from "@goerp/core/system/services/settings-service"
+import { PrismaPg } from "@prisma/adapter-pg"
+import { Prisma, PrismaClient } from "@prisma/client"
 
 /**
  * COMPOSITION ROOT của app — nơi duy nhất tạo Prisma client và cắm dây cho các
@@ -71,10 +71,18 @@ export const db = rawClient
       rawClient,
       // Bảng ghi rất nhiều mà không có giá trị điều tra thì loại ra, kẻo dấu vết
       // nghiệp vụ bị nhấn chìm (vinhhoa đo được 1 bảng chiếm 64% số dòng audit).
-      skipModels: ["AuditLog", "ErrorLog", "Session", "Account", "Verification"],
-    }),
+      skipModels: [
+        "AuditLog",
+        "ErrorLog",
+        "Session",
+        "Account",
+        "Verification",
+      ],
+    })
   )
-  .$extends(createBranchGuardExtension({ models: GUARDED_MODELS })) as unknown as PrismaClient
+  .$extends(
+    createBranchGuardExtension({ models: GUARDED_MODELS })
+  ) as unknown as PrismaClient
 
 // Core đọc SystemConfig qua service này. Thiếu dòng dưới thì mọi getSettings()
 // lặng lẽ trả giá trị mặc định và saveSettings() ném lỗi.

package/templates/starter-app/src/lib/rbac/access.ts

@@ -1,9 +1,9 @@
 import "server-only"
 
-import { db } from "@/lib/prisma"
-
 import type { Permission } from "@/types/session"
 
+import { db } from "@/lib/prisma"
+
 export interface UserAccess {
   roles: string[]
   permissions: Permission[]

package/templates/starter-app/src/lib/storage.ts

@@ -1,4 +1,6 @@
-import { configureStorage, type StorageDb } from "@goerp/core/storage"
+import { configureStorage } from "@goerp/core/storage"
+
+import type { StorageDb } from "@goerp/core/storage"
 
 import { db } from "@/lib/prisma"
 

package/templates/starter-app/src/providers/index.tsx

@@ -10,8 +10,9 @@ import { Toaster } from "sonner"
 import type { LocaleType } from "@goerp/core/types"
 import type { ReactNode } from "react"
 
-import { tenant } from "@/configs/tenant"
 import { navigations } from "@/data/navigations"
+
+import { tenant } from "@/configs/tenant"
 import { authBridgeClient } from "@/lib/auth-client"
 
 import { ModeProvider } from "./mode-provider"

package/templates/starter-app/src/providers/theme-provider.tsx

@@ -2,13 +2,14 @@
 
 import { useEffect } from "react"
 import { useSettings } from "@goerp/core/hooks"
+
+import type { ReactNode } from "react"
+
 import {
-  applyBrandThemeTokens,
   THEME_PRESETS,
+  applyBrandThemeTokens,
 } from "@goerp/core/providers/brand-theme"
 
-import type { ReactNode } from "react"
-
 /**
  * Áp màu thương hiệu người dùng chọn trong Customizer vào CSS token
  * (--primary, --ring, --sidebar-background…). Bảng màu calibrate sẵn nằm ở

package/templates/starter-app/src/server/services/company-service.ts

@@ -34,7 +34,7 @@ export interface CompanyProfileInput {
 
 export async function updateSystemCompany(
   data: CompanyProfileInput,
-  updatedBy: string,
+  updatedBy: string
 ) {
   const existing = await db.company.findFirst({ orderBy: { createdAt: "asc" } })
   if (existing) {
@@ -43,5 +43,7 @@ export async function updateSystemCompany(
       data: { ...data, updatedBy },
     })
   }
-  return db.company.create({ data: { ...data, createdBy: updatedBy, updatedBy } })
+  return db.company.create({
+    data: { ...data, createdBy: updatedBy, updatedBy },
+  })
 }

package/templates/starter-app/src/server/services/notification-service.ts

@@ -1,3 +1,9 @@
+import { configureNotificationService } from "@goerp/core/notification"
+
+import type { NotificationDb } from "@goerp/core/notification"
+
+import { db } from "@/lib/prisma"
+
 /**
  * Thông báo trong ứng dụng (chuông ở thanh trên). Engine ở
  * @goerp/core/notification, bảng `notifications` + `push_subscriptions` ship
@@ -8,12 +14,6 @@
  * push vào bundle. Core đã fire-and-forget + catch nên push lỗi không làm hỏng
  * nghiệp vụ đang chạy.
  */
-import {
-  configureNotificationService,
-  type NotificationDb,
-} from "@goerp/core/notification"
-
-import { db } from "@/lib/prisma"
 
 configureNotificationService({
   db: db as unknown as NotificationDb,