Some checks failed
CodeQL Analysis / CodeQL (javascript-typescript) (push) Failing after 1m15s
Deploy / Build API Image (push) Failing after 20s
Deploy / Build AI Services Image (push) Failing after 12s
E2E Tests / Playwright E2E (push) Failing after 16s
Deploy / Deploy to Staging (push) Has been skipped
Deploy / Deploy to Production (push) Has been skipped
Deploy / Smoke Test Production (push) Has been skipped
Security Scanning / Trivy Scan — AI Services Image (push) Failing after 35s
Security Scanning / Trivy Filesystem Scan (push) Failing after 30s
Backup Verification / Backup Restore Verification (push) Failing after 14m37s
Security Scanning / Trivy Scan — API Image (push) Failing after 1m4s
Security Scanning / Trivy Scan — Web Image (push) Failing after 36s
Security Scanning / Dependency Audit (pnpm) (push) Failing after 11m6s
Deploy / Build Web Image (push) Failing after 12s
Deploy / Smoke Test Staging (push) Has been skipped
Deploy / Rollback Staging (push) Has been skipped
Deploy / Rollback Production (push) Has been skipped
CI / Lint → Typecheck → Test → Build (22) (push) Failing after 8s
CI / E2E Tests (push) Has been skipped
Security Scanning / Security Gate (push) Has been cancelled
Backend — DELETE endpoints (hard delete, ADMIN or owner):
- DELETE /projects/:id (Admin) — new DeleteProjectCommand/Handler,
repository.delete() adapter, module wiring.
- DELETE /industrial/parks/:id (Admin) — same pattern.
- DELETE /listings/:id (JWT + owner-or-Admin check in handler).
Frontend — API clients:
- lib/du-an-api.ts: add create/update/delete + CreateProjectPayload,
UpdateProjectPayload types.
- lib/khu-cong-nghiep-api.ts: add createPark/updatePark/deletePark +
Create/Update payload types.
- lib/listings-api.ts: add delete().
Dashboard pages — new:
- /projects (Quản lý dự án): list with filters + edit/delete actions,
/projects/new form (sectioned Cards, zod-validated), /projects/[id]/edit
with danger-zone delete.
- /industrial-parks (Quản lý KCN): same triad. Fix occupancy-rate display
(percentage already 0-100, no need to *100).
Dashboard listings page:
- Add Edit/Delete row actions with confirm + useMutation; error banner
on mutation failure. Table view gains a "Thao tác" column; list view
gains a footer action bar below each card.
Dashboard nav:
- Catalog group: /du-an → /projects (Quản lý dự án), /khu-cong-nghiep
→ /industrial-parks (Quản lý KCN). Desktop primaryNav updated too.
Public homepage:
- Add "Bất động sản" as a 5th feature card/tab → /search, using
listingsApi for the "Featured listings" section.
- Bump grid to lg:grid-cols-5, update features subtitle copy ("Năm/Five
core services").
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
309 lines
8.9 KiB
TypeScript
309 lines
8.9 KiB
TypeScript
import { apiClient } from './api-client';
|
|
|
|
// ─── Types ──────────────────────────────────────────────
|
|
|
|
export type IndustrialParkStatus =
|
|
| 'PLANNING'
|
|
| 'UNDER_CONSTRUCTION'
|
|
| 'OPERATIONAL'
|
|
| 'FULL';
|
|
|
|
export type VietnamRegion = 'NORTH' | 'CENTRAL' | 'SOUTH';
|
|
|
|
export interface IndustrialParkListItem {
|
|
id: string;
|
|
name: string;
|
|
nameEn: string | null;
|
|
slug: string;
|
|
developer: string;
|
|
status: IndustrialParkStatus;
|
|
province: string;
|
|
region: VietnamRegion;
|
|
totalAreaHa: number;
|
|
occupancyRate: number;
|
|
remainingAreaHa: number;
|
|
tenantCount: number;
|
|
landRentUsdM2Year: number | null;
|
|
rbfRentUsdM2Month: number | null;
|
|
rbwRentUsdM2Month: number | null;
|
|
targetIndustries: string[];
|
|
latitude: number;
|
|
longitude: number;
|
|
}
|
|
|
|
export interface IndustrialParkDetail {
|
|
id: string;
|
|
name: string;
|
|
nameEn: string | null;
|
|
slug: string;
|
|
developer: string;
|
|
operator: string | null;
|
|
status: IndustrialParkStatus;
|
|
latitude: number;
|
|
longitude: number;
|
|
address: string;
|
|
district: string;
|
|
province: string;
|
|
region: VietnamRegion;
|
|
totalAreaHa: number;
|
|
leasableAreaHa: number;
|
|
occupancyRate: number;
|
|
remainingAreaHa: number;
|
|
tenantCount: number;
|
|
establishedYear: number | null;
|
|
landRentUsdM2Year: number | null;
|
|
rbfRentUsdM2Month: number | null;
|
|
rbwRentUsdM2Month: number | null;
|
|
managementFeeUsd: number | null;
|
|
infrastructure: Record<string, string> | null;
|
|
connectivity: Record<string, { name: string; distanceKm: number }> | null;
|
|
incentives: Record<string, unknown> | null;
|
|
targetIndustries: string[];
|
|
existingTenants: { name: string; country: string; industry: string }[] | null;
|
|
certifications: string[] | null;
|
|
media: { url: string; type: string; caption?: string }[] | null;
|
|
documents: { url: string; name: string }[] | null;
|
|
description: string | null;
|
|
descriptionEn: string | null;
|
|
isVerified: boolean;
|
|
listingCount: number;
|
|
createdAt: string;
|
|
updatedAt: string;
|
|
}
|
|
|
|
export interface IndustrialParkStats {
|
|
totalParks: number;
|
|
totalAreaHa: number;
|
|
avgOccupancyRate: number;
|
|
totalTenants: number;
|
|
byRegion: { region: string; count: number; avgOccupancy: number }[];
|
|
byStatus: { status: string; count: number }[];
|
|
topProvinces: { province: string; count: number; avgRent: number | null }[];
|
|
}
|
|
|
|
export interface IndustrialMarketData {
|
|
totalParks: number;
|
|
avgOccupancyRate: number;
|
|
avgLandRentUsdM2: number | null;
|
|
avgRbfRentUsdM2: number | null;
|
|
rentByRegion: { region: string; avgLandRent: number | null; avgRbfRent: number | null; parkCount: number }[];
|
|
rentByProvince: { province: string; avgLandRent: number | null; avgRbfRent: number | null; parkCount: number }[];
|
|
}
|
|
|
|
// ─── Industrial Listing Types ───────────────────────────
|
|
|
|
export type IndustrialPropertyType =
|
|
| 'INDUSTRIAL_LAND'
|
|
| 'READY_BUILT_FACTORY'
|
|
| 'READY_BUILT_WAREHOUSE'
|
|
| 'LOGISTICS_CENTER'
|
|
| 'OFFICE_IN_PARK'
|
|
| 'DATA_CENTER';
|
|
|
|
export type IndustrialLeaseType =
|
|
| 'LAND_LEASE'
|
|
| 'FACTORY_LEASE'
|
|
| 'WAREHOUSE_LEASE'
|
|
| 'SUBLEASE';
|
|
|
|
export type IndustrialListingStatus =
|
|
| 'DRAFT'
|
|
| 'ACTIVE'
|
|
| 'RESERVED'
|
|
| 'LEASED'
|
|
| 'EXPIRED';
|
|
|
|
export interface IndustrialListingItem {
|
|
id: string;
|
|
parkId: string;
|
|
parkName: string;
|
|
parkSlug: string;
|
|
propertyType: IndustrialPropertyType;
|
|
leaseType: IndustrialLeaseType;
|
|
status: IndustrialListingStatus;
|
|
title: string;
|
|
description: string | null;
|
|
areaM2: number;
|
|
ceilingHeightM: number | null;
|
|
priceUsdM2: number | null;
|
|
pricingUnit: string | null;
|
|
totalLeasePrice: number | null;
|
|
minLeaseYears: number | null;
|
|
maxLeaseYears: number | null;
|
|
availableFrom: string | null;
|
|
media: { url: string; type: string; caption?: string }[] | null;
|
|
viewCount: number;
|
|
publishedAt: string | null;
|
|
}
|
|
|
|
export interface SearchIndustrialListingsParams {
|
|
parkId?: string;
|
|
propertyType?: IndustrialPropertyType;
|
|
leaseType?: IndustrialLeaseType;
|
|
minAreaM2?: number;
|
|
maxAreaM2?: number;
|
|
minPriceUsdM2?: number;
|
|
maxPriceUsdM2?: number;
|
|
q?: string;
|
|
page?: number;
|
|
limit?: number;
|
|
}
|
|
|
|
export interface CreateIndustrialParkPayload {
|
|
name: string;
|
|
nameEn?: string;
|
|
slug: string;
|
|
developer: string;
|
|
operator?: string;
|
|
status: IndustrialParkStatus;
|
|
latitude: number;
|
|
longitude: number;
|
|
address: string;
|
|
district: string;
|
|
province: string;
|
|
region: VietnamRegion;
|
|
totalAreaHa: number;
|
|
leasableAreaHa: number;
|
|
occupancyRate: number;
|
|
remainingAreaHa: number;
|
|
tenantCount?: number;
|
|
establishedYear?: number;
|
|
landRentUsdM2Year?: number;
|
|
rbfRentUsdM2Month?: number;
|
|
rbwRentUsdM2Month?: number;
|
|
managementFeeUsd?: number;
|
|
infrastructure?: Record<string, unknown>;
|
|
connectivity?: Record<string, unknown>;
|
|
incentives?: Record<string, unknown>;
|
|
targetIndustries: string[];
|
|
description?: string;
|
|
descriptionEn?: string;
|
|
}
|
|
|
|
export interface UpdateIndustrialParkPayload {
|
|
name?: string;
|
|
nameEn?: string;
|
|
developer?: string;
|
|
operator?: string;
|
|
status?: IndustrialParkStatus;
|
|
occupancyRate?: number;
|
|
remainingAreaHa?: number;
|
|
tenantCount?: number;
|
|
landRentUsdM2Year?: number;
|
|
rbfRentUsdM2Month?: number;
|
|
rbwRentUsdM2Month?: number;
|
|
managementFeeUsd?: number;
|
|
infrastructure?: Record<string, unknown>;
|
|
connectivity?: Record<string, unknown>;
|
|
incentives?: Record<string, unknown>;
|
|
targetIndustries?: string[];
|
|
description?: string;
|
|
descriptionEn?: string;
|
|
isVerified?: boolean;
|
|
}
|
|
|
|
export interface PaginatedResult<T> {
|
|
data: T[];
|
|
total: number;
|
|
page: number;
|
|
limit: number;
|
|
totalPages: number;
|
|
}
|
|
|
|
export interface SearchIndustrialParksParams {
|
|
q?: string;
|
|
province?: string;
|
|
region?: VietnamRegion;
|
|
status?: IndustrialParkStatus;
|
|
minAreaHa?: number;
|
|
maxRentUsdM2?: number;
|
|
targetIndustry?: string;
|
|
page?: number;
|
|
limit?: number;
|
|
}
|
|
|
|
// ─── Labels ─────────────────────────────────────────────
|
|
|
|
export const PARK_STATUS_LABELS: Record<IndustrialParkStatus, string> = {
|
|
PLANNING: 'Quy hoạch',
|
|
UNDER_CONSTRUCTION: 'Đang xây dựng',
|
|
OPERATIONAL: 'Đang hoạt động',
|
|
FULL: 'Đã lấp đầy',
|
|
};
|
|
|
|
export const PARK_STATUS_COLORS: Record<IndustrialParkStatus, string> = {
|
|
PLANNING: 'bg-blue-100 text-blue-800',
|
|
UNDER_CONSTRUCTION: 'bg-amber-100 text-amber-800',
|
|
OPERATIONAL: 'bg-green-100 text-green-800',
|
|
FULL: 'bg-red-100 text-red-800',
|
|
};
|
|
|
|
export const REGION_LABELS: Record<VietnamRegion, string> = {
|
|
NORTH: 'Miền Bắc',
|
|
CENTRAL: 'Miền Trung',
|
|
SOUTH: 'Miền Nam',
|
|
};
|
|
|
|
export const PROPERTY_TYPE_LABELS: Record<IndustrialPropertyType, string> = {
|
|
INDUSTRIAL_LAND: 'Đất công nghiệp',
|
|
READY_BUILT_FACTORY: 'Nhà xưởng xây sẵn',
|
|
READY_BUILT_WAREHOUSE: 'Kho bãi xây sẵn',
|
|
LOGISTICS_CENTER: 'Trung tâm logistics',
|
|
OFFICE_IN_PARK: 'Văn phòng trong KCN',
|
|
DATA_CENTER: 'Trung tâm dữ liệu',
|
|
};
|
|
|
|
export const LEASE_TYPE_LABELS: Record<IndustrialLeaseType, string> = {
|
|
LAND_LEASE: 'Thuê đất',
|
|
FACTORY_LEASE: 'Thuê nhà xưởng',
|
|
WAREHOUSE_LEASE: 'Thuê kho bãi',
|
|
SUBLEASE: 'Cho thuê lại',
|
|
};
|
|
|
|
// ─── API Functions ──────────────────────────────────────
|
|
|
|
export const industrialApi = {
|
|
search: (params: SearchIndustrialParksParams = {}) => {
|
|
const query = new URLSearchParams();
|
|
Object.entries(params).forEach(([key, value]) => {
|
|
if (value !== undefined && value !== '') query.append(key, String(value));
|
|
});
|
|
const qs = query.toString();
|
|
return apiClient.get<PaginatedResult<IndustrialParkListItem>>(
|
|
`/industrial/parks${qs ? `?${qs}` : ''}`,
|
|
);
|
|
},
|
|
|
|
getBySlug: (slug: string) =>
|
|
apiClient.get<IndustrialParkDetail>(`/industrial/parks/${slug}`),
|
|
|
|
compare: (ids: string[]) =>
|
|
apiClient.post<IndustrialParkDetail[]>('/industrial/parks/compare', { ids }),
|
|
|
|
getStats: () =>
|
|
apiClient.get<IndustrialParkStats>('/industrial/parks/stats'),
|
|
|
|
getMarket: () =>
|
|
apiClient.get<IndustrialMarketData>('/industrial/market'),
|
|
|
|
searchListings: (params: SearchIndustrialListingsParams = {}) => {
|
|
const query = new URLSearchParams();
|
|
Object.entries(params).forEach(([key, value]) => {
|
|
if (value !== undefined && value !== '') query.append(key, String(value));
|
|
});
|
|
const qs = query.toString();
|
|
return apiClient.get<PaginatedResult<IndustrialListingItem>>(
|
|
`/industrial/listings${qs ? `?${qs}` : ''}`,
|
|
);
|
|
},
|
|
|
|
createPark: (payload: CreateIndustrialParkPayload) =>
|
|
apiClient.post<IndustrialParkDetail>('/industrial/parks', payload),
|
|
|
|
updatePark: (id: string, payload: UpdateIndustrialParkPayload) =>
|
|
apiClient.patch<IndustrialParkDetail>(`/industrial/parks/${id}`, payload),
|
|
|
|
deletePark: (id: string) =>
|
|
apiClient.delete<{ success: boolean }>(`/industrial/parks/${id}`),
|
|
};
|