From b986442a758814af30dc17a5b8035af3204b96d6 Mon Sep 17 00:00:00 2001 From: 25ThienNgoc Date: Sat, 1 Aug 2026 07:42:32 +0700 Subject: [PATCH 1/9] commit: T225 approval row documentType parity and dashboard quick access empty state --- src/views/ApprovalsView.vue | 88 +++++++++++++++++++------------------ src/views/DashboardView.vue | 11 ++++- 2 files changed, 56 insertions(+), 43 deletions(-) diff --git a/src/views/ApprovalsView.vue b/src/views/ApprovalsView.vue index ac3ff8d..f1e349f 100644 --- a/src/views/ApprovalsView.vue +++ b/src/views/ApprovalsView.vue @@ -320,7 +320,6 @@ function isPendingApproval(status) { } function approveLabel(status) { - if (isPendingApproval(status)) return "Duyệt phiếu"; return "Duyệt phiếu"; } @@ -481,43 +480,44 @@ function getRejectionReason(receipt) { Đang tải danh sách phiếu chờ duyệt...

- - - - - - - - - + +
{{ totalElements }} phiếu chờ duyệt @@ -578,8 +584,13 @@ function getRejectionReason(receipt) {

- Chi tiết phiếu {{ (detailState.receipt?.documentType || documentType) === "out" ? "xuất" : "nhập" }} chờ - duyệt + Chi tiết phiếu + {{ + (detailState.receipt?.documentType || documentType) === "out" + ? "xuất" + : "nhập" + }} + chờ duyệt

diff --git a/src/views/DashboardView.vue b/src/views/DashboardView.vue index 66e5e84..8d93056 100644 --- a/src/views/DashboardView.vue +++ b/src/views/DashboardView.vue @@ -11,6 +11,12 @@ import { getPendingApprovals } from "../services/importReceiptService"; import { getProducts } from "../services/productService"; import { canAccessRoute } from "../services/permissionService"; import { getWarehouses } from "../services/warehouseService"; +import ApexCharts from "vue3-apexcharts"; +import { getDashboardOverview } from "../services/dashboardService"; + +defineOptions({ + components: { ApexCharts }, +}); const router = useRouter(); @@ -18,6 +24,8 @@ const isLoading = ref(true); const isRetrying = ref(false); const errorMessage = ref(""); const summary = ref({ products: 0, warehouses: 0, stock: 0, warnings: 0 }); +const dashboardOverview = ref(null); +const dashboardOverviewFailed = ref(false); const pendingImportItems = ref([]); const pendingImportFailed = ref(false); const pendingExportItems = ref([]); @@ -29,6 +37,54 @@ const warehouseCountFailed = ref(false); const warningCountFailed = ref(false); const stockTotalFailed = ref(false); +const pendingApprovalsTotal = computed(() => { + if (!dashboardOverview.value) return 0; + return ( + Number(dashboardOverview.value.pendingTasks.importReceipts || 0) + + Number(dashboardOverview.value.pendingTasks.exportReceipts || 0) + ); +}); + +const chartSeries = computed(() => [ + { + name: "Số lượng", + data: [ + Number(dashboardOverview.value?.overview.totalStock || 0), + pendingApprovalsTotal.value, + Number(dashboardOverview.value?.pendingTasks.inventoryAlerts || 0), + ], + }, +]); + +const chartOptions = { + chart: { + type: "bar", + toolbar: { show: false }, + }, + plotOptions: { + bar: { + horizontal: false, + borderRadius: 8, + columnWidth: "56%", + }, + }, + dataLabels: { enabled: false }, + xaxis: { + categories: ["Tồn kho", "Phê duyệt", "Cảnh báo"], + }, + yaxis: { + labels: { + formatter: (value) => new Intl.NumberFormat("vi-VN").format(value), + }, + }, + colors: ["#3b82f6", "#f59e0b", "#ef4444"], + tooltip: { + y: { + formatter: (value) => new Intl.NumberFormat("vi-VN").format(value), + }, + }, +}; + const canSeeImportApprovals = computed(() => canAccessRoute("/approvals")); const canSeeExportApprovals = computed(() => canAccessRoute("/pending-export-approvals"), @@ -39,6 +95,7 @@ const visibleKpiCardCount = computed(() => (canSeeWarnings.value ? 4 : 2)); const hasAnyApiError = computed(() => { return ( Boolean(errorMessage.value) || + dashboardOverviewFailed.value || pendingImportFailed.value || pendingExportFailed.value || lowStockFailed.value || @@ -147,6 +204,8 @@ async function loadDashboardData(forceReload = false) { isLoading.value = true; isRetrying.value = true; errorMessage.value = ""; + dashboardOverview.value = null; + dashboardOverviewFailed.value = false; pendingImportItems.value = []; pendingImportFailed.value = false; pendingExportItems.value = []; @@ -160,16 +219,32 @@ async function loadDashboardData(forceReload = false) { summary.value = { products: 0, warehouses: 0, stock: 0, warnings: 0 }; try { - const [productsResult, warehouseResult] = await Promise.allSettled([ - loadProductCount(), - loadWarehouseCount(), - ]); + const [overviewResult, productsResult, warehouseResult] = + await Promise.allSettled([ + loadDashboardOverview(), + loadProductCount(), + loadWarehouseCount(), + ]); let productsResponse = 0; let warehouseData = 0; let stockTotal = null; let warningCount = 0; + if (overviewResult.status === "fulfilled") { + dashboardOverview.value = overviewResult.value; + dashboardOverviewFailed.value = false; + } else { + dashboardOverview.value = null; + dashboardOverviewFailed.value = true; + if (overviewResult.reason?.status === 401) { + isLoading.value = false; + isRetrying.value = false; + router.replace("/login"); + return; + } + } + if (productsResult.status === "fulfilled") { productsResponse = productsResult.value; productCountFailed.value = false; @@ -331,6 +406,10 @@ async function loadLowStockCount() { return Number(data?.totalElements || 0); } +async function loadDashboardOverview() { + return await getDashboardOverview(); +} + async function loadPendingApprovals() { const importItems = []; const exportItems = []; @@ -593,6 +672,59 @@ function openRoute(path) { +
+
+
+

Chart

+

Tổng quan chính

+
+ +
+ +
+
+
+
+
+
+ +
+
+

Không thể tải dữ liệu biểu đồ

+

Dữ liệu dashboard chưa được đồng bộ với backend.

+
+ +
+
+ +
+
+
+ +
+
+

Chưa có dữ liệu biểu đồ

+

Biểu đồ sẽ hiển thị khi backend trả dữ liệu tổng quan.

+
+
+
+
Date: Sat, 1 Aug 2026 09:32:00 +0700 Subject: [PATCH 3/9] commit T226 dashboard client timeout, permission-aware chart series, and safe pendingTasks fallback --- src/services/dashboardService.js | 6 +++- src/views/DashboardView.vue | 58 ++++++++++++++++++++------------ 2 files changed, 41 insertions(+), 23 deletions(-) diff --git a/src/services/dashboardService.js b/src/services/dashboardService.js index 0eb9b06..81237ff 100644 --- a/src/services/dashboardService.js +++ b/src/services/dashboardService.js @@ -1,8 +1,12 @@ import axios from "axios" import { clearAuth, getAuthorizationHeader } from "./authService" +const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || "http://localhost:8080" +const API_TIMEOUT_MS = 15000 + const dashboardClient = axios.create({ - baseURL: import.meta.env.VITE_API_BASE_URL || "http://localhost:8080", + baseURL: API_BASE_URL, + timeout: API_TIMEOUT_MS, headers: { "Content-Type": "application/json" }, }) diff --git a/src/views/DashboardView.vue b/src/views/DashboardView.vue index 8d93056..2d8ff14 100644 --- a/src/views/DashboardView.vue +++ b/src/views/DashboardView.vue @@ -37,26 +37,7 @@ const warehouseCountFailed = ref(false); const warningCountFailed = ref(false); const stockTotalFailed = ref(false); -const pendingApprovalsTotal = computed(() => { - if (!dashboardOverview.value) return 0; - return ( - Number(dashboardOverview.value.pendingTasks.importReceipts || 0) + - Number(dashboardOverview.value.pendingTasks.exportReceipts || 0) - ); -}); - -const chartSeries = computed(() => [ - { - name: "Số lượng", - data: [ - Number(dashboardOverview.value?.overview.totalStock || 0), - pendingApprovalsTotal.value, - Number(dashboardOverview.value?.pendingTasks.inventoryAlerts || 0), - ], - }, -]); - -const chartOptions = { +const chartOptions = computed(() => ({ chart: { type: "bar", toolbar: { show: false }, @@ -70,7 +51,7 @@ const chartOptions = { }, dataLabels: { enabled: false }, xaxis: { - categories: ["Tồn kho", "Phê duyệt", "Cảnh báo"], + categories: chartCategories.value, }, yaxis: { labels: { @@ -83,7 +64,7 @@ const chartOptions = { formatter: (value) => new Intl.NumberFormat("vi-VN").format(value), }, }, -}; +})); const canSeeImportApprovals = computed(() => canAccessRoute("/approvals")); const canSeeExportApprovals = computed(() => @@ -91,6 +72,39 @@ const canSeeExportApprovals = computed(() => ); const canSeeWarnings = computed(() => canAccessRoute("/inventory")); const canSeeAlerts = computed(() => canAccessRoute("/alerts")); + +const chartCategories = computed(() => { + const categories = []; + if (canSeeWarnings.value) categories.push("Tồn kho"); + if (canSeeImportApprovals.value || canSeeExportApprovals.value) + categories.push("Phê duyệt"); + if (canSeeAlerts.value) categories.push("Cảnh báo"); + return categories; +}); + +const pendingApprovalsTotal = computed(() => { + return ( + Number(dashboardOverview.value?.pendingTasks?.importReceipts || 0) + + Number(dashboardOverview.value?.pendingTasks?.exportReceipts || 0) + ); +}); + +const chartSeries = computed(() => [ + { + name: "Số lượng", + data: [ + ...(canSeeWarnings.value + ? [Number(dashboardOverview.value?.overview?.totalStock || 0)] + : []), + ...(canSeeImportApprovals.value || canSeeExportApprovals.value + ? [pendingApprovalsTotal.value] + : []), + ...(canSeeAlerts.value + ? [Number(dashboardOverview.value?.pendingTasks?.inventoryAlerts || 0)] + : []), + ], + }, +]); const visibleKpiCardCount = computed(() => (canSeeWarnings.value ? 4 : 2)); const hasAnyApiError = computed(() => { return ( From 7dcf58bee037ade7928cdae4b1b648b74ab51ea6 Mon Sep 17 00:00:00 2001 From: 25ThienNgoc Date: Sat, 1 Aug 2026 10:57:23 +0700 Subject: [PATCH 4/9] T227 account profile layout --- src/components/AppSidebar.vue | 5 + src/router/index.js | 2 + src/services/profileService.js | 92 +++++++++++++++++ src/views/ProfileView.vue | 182 +++++++++++++++++++++++++++++++++ 4 files changed, 281 insertions(+) create mode 100644 src/services/profileService.js create mode 100644 src/views/ProfileView.vue diff --git a/src/components/AppSidebar.vue b/src/components/AppSidebar.vue index b87d7cd..7c81bda 100644 --- a/src/components/AppSidebar.vue +++ b/src/components/AppSidebar.vue @@ -75,6 +75,11 @@ const menuSections = [ icon: "mdi-file-excel-outline", }, { label: "Cảnh báo tồn kho", to: "/alerts", icon: "mdi-alert-outline" }, + { + label: "Hồ sơ", + to: "/profile", + icon: "mdi-account-outline", + }, { label: "Nhân viên", to: "/employees", diff --git a/src/router/index.js b/src/router/index.js index b466e62..6544fdf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -16,6 +16,7 @@ import PendingExportApprovalsView from '../views/PendingExportApprovalsView.vue' import ImportExcelView from '../views/ImportExcelView.vue' import AlertsView from '../views/AlertsView.vue' import UsersView from '../views/UsersView.vue' +import ProfileView from '../views/ProfileView.vue' import EmployeeListView from '../views/employees/EmployeeListView.vue' import CategoryListView from '../views/categories/CategoryListView.vue' @@ -42,6 +43,7 @@ const routes = [ { path: '/approvals', component: ApprovalsView, meta: { title: 'Chờ duyệt' } }, { path: '/import-excel', component: ImportExcelView, meta: { title: 'Import Excel' } }, { path: '/alerts', component: AlertsView, meta: { title: 'Cảnh báo tồn kho' } }, + { path: '/profile', component: ProfileView, meta: { title: 'Hồ sơ' } }, { path: '/employees', component: EmployeeListView, meta: { title: 'Nhân viên' } }, { path: '/users', component: UsersView, meta: { title: 'Nhân viên & phân quyền' } }, diff --git a/src/services/profileService.js b/src/services/profileService.js new file mode 100644 index 0000000..8cb2808 --- /dev/null +++ b/src/services/profileService.js @@ -0,0 +1,92 @@ +import axios from 'axios' +import { clearAuth, getAuthorizationHeader, getCurrentUser } from './authService' + +const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:8080' + +const profileClient = axios.create({ + baseURL: API_BASE_URL, + headers: { + 'Content-Type': 'application/json', + }, +}) + +export async function getCurrentProfile() { + const fallbackProfile = normalizeProfile(getCurrentUser()) + + try { + const endpoints = ['/api/auth/me', '/api/auth/profile'] + const currentUser = getCurrentUser() + + if (currentUser?.employeeId) { + endpoints.unshift(`/api/employees/${currentUser.employeeId}`) + } + + for (const endpoint of endpoints) { + try { + const { data } = await profileClient.get(endpoint, { + headers: getAuthorizationHeader(), + }) + + const normalized = normalizeProfile(data, fallbackProfile) + if (hasProfileData(normalized)) { + return normalized + } + } catch (error) { + if (error.response?.status === 401) { + clearAuth() + throw normalizeProfileError(error, 'Phiên đăng nhập đã hết hạn.') + } + + if (error.response?.status === 404) { + continue + } + + if (error.response?.status && error.response.status < 500) { + break + } + } + } + + return fallbackProfile + } catch (error) { + if (hasProfileData(fallbackProfile)) { + return fallbackProfile + } + + throw normalizeProfileError(error, 'Không thể tải thông tin hồ sơ.') + } +} + +function normalizeProfile(data = {}, fallback = {}) { + return { + id: data?.id ?? data?.employeeId ?? fallback?.id ?? fallback?.employeeId ?? null, + employeeId: data?.employeeId ?? data?.id ?? fallback?.employeeId ?? fallback?.id ?? null, + fullName: data?.fullName ?? fallback?.fullName ?? '', + email: data?.email ?? fallback?.email ?? '', + role: data?.roleName ?? data?.role ?? data?.roleCode ?? fallback?.roleName ?? fallback?.role ?? fallback?.roleCode ?? '', + roleCode: data?.roleCode ?? fallback?.roleCode ?? '', + status: data?.status ?? fallback?.status ?? '', + } +} + +function hasProfileData(profile) { + return Boolean(profile?.fullName || profile?.email || profile?.role || profile?.status || profile?.employeeId) +} + +function normalizeProfileError(error, fallbackMessage) { + if (error?.response?.status === 401) { + clearAuth() + } + + if (error?.response?.data) { + return { + status: error.response.status, + message: error.response.data.message || fallbackMessage, + } + } + + return { + status: error?.status || 0, + message: error?.message || fallbackMessage, + } +} diff --git a/src/views/ProfileView.vue b/src/views/ProfileView.vue new file mode 100644 index 0000000..69e0188 --- /dev/null +++ b/src/views/ProfileView.vue @@ -0,0 +1,182 @@ + + + + + From c42bf18c3080b4753ad07be40eb7edca1bcac128 Mon Sep 17 00:00:00 2001 From: 25ThienNgoc Date: Sat, 1 Aug 2026 12:02:16 +0700 Subject: [PATCH 5/9] commit T227 profile 401 rethrow/null fallback and permission-gated dashboard approval totals --- src/services/profileService.js | 16 +++- src/views/DashboardView.vue | 12 ++- src/views/ProfileView.vue | 146 +++++++++++++++++++++++---------- 3 files changed, 126 insertions(+), 48 deletions(-) diff --git a/src/services/profileService.js b/src/services/profileService.js index 8cb2808..a267281 100644 --- a/src/services/profileService.js +++ b/src/services/profileService.js @@ -2,9 +2,11 @@ import axios from 'axios' import { clearAuth, getAuthorizationHeader, getCurrentUser } from './authService' const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:8080' +const API_TIMEOUT_MS = 15000 const profileClient = axios.create({ baseURL: API_BASE_URL, + timeout: API_TIMEOUT_MS, headers: { 'Content-Type': 'application/json', }, @@ -47,13 +49,23 @@ export async function getCurrentProfile() { } } - return fallbackProfile + if (hasProfileData(fallbackProfile)) { + return fallbackProfile + } + + return null } catch (error) { + const normalizedError = normalizeProfileError(error, 'Không thể tải thông tin hồ sơ.') + + if (normalizedError.status === 401) { + throw normalizedError + } + if (hasProfileData(fallbackProfile)) { return fallbackProfile } - throw normalizeProfileError(error, 'Không thể tải thông tin hồ sơ.') + throw normalizedError } } diff --git a/src/views/DashboardView.vue b/src/views/DashboardView.vue index 2d8ff14..feb72d5 100644 --- a/src/views/DashboardView.vue +++ b/src/views/DashboardView.vue @@ -83,10 +83,14 @@ const chartCategories = computed(() => { }); const pendingApprovalsTotal = computed(() => { - return ( - Number(dashboardOverview.value?.pendingTasks?.importReceipts || 0) + - Number(dashboardOverview.value?.pendingTasks?.exportReceipts || 0) - ); + const importReceipts = canSeeImportApprovals.value + ? Number(dashboardOverview.value?.pendingTasks?.importReceipts || 0) + : 0; + const exportReceipts = canSeeExportApprovals.value + ? Number(dashboardOverview.value?.pendingTasks?.exportReceipts || 0) + : 0; + + return importReceipts + exportReceipts; }); const chartSeries = computed(() => [ diff --git a/src/views/ProfileView.vue b/src/views/ProfileView.vue index 69e0188..0ea50b2 100644 --- a/src/views/ProfileView.vue +++ b/src/views/ProfileView.vue @@ -1,36 +1,36 @@ From f98b0a9b9b8a0cc13acd36dc7f653b64ad245c28 Mon Sep 17 00:00:00 2001 From: 25ThienNgoc Date: Sat, 1 Aug 2026 12:29:28 +0700 Subject: [PATCH 6/9] commit T227 profile error propagation and dashboard overview rejection error banner --- src/services/profileService.js | 14 ++++++++++++-- src/views/DashboardView.vue | 3 +++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/services/profileService.js b/src/services/profileService.js index a267281..edba39c 100644 --- a/src/services/profileService.js +++ b/src/services/profileService.js @@ -15,6 +15,8 @@ const profileClient = axios.create({ export async function getCurrentProfile() { const fallbackProfile = normalizeProfile(getCurrentUser()) + let lastError = null + try { const endpoints = ['/api/auth/me', '/api/auth/profile'] const currentUser = getCurrentUser() @@ -34,11 +36,15 @@ export async function getCurrentProfile() { return normalized } } catch (error) { - if (error.response?.status === 401) { + const normalizedError = normalizeProfileError(error, 'Phiên đăng nhập đã hết hạn.') + + if (normalizedError.status === 401) { clearAuth() - throw normalizeProfileError(error, 'Phiên đăng nhập đã hết hạn.') + throw normalizedError } + lastError = normalizedError + if (error.response?.status === 404) { continue } @@ -53,6 +59,10 @@ export async function getCurrentProfile() { return fallbackProfile } + if (lastError) { + throw lastError + } + return null } catch (error) { const normalizedError = normalizeProfileError(error, 'Không thể tải thông tin hồ sơ.') diff --git a/src/views/DashboardView.vue b/src/views/DashboardView.vue index feb72d5..f3c0815 100644 --- a/src/views/DashboardView.vue +++ b/src/views/DashboardView.vue @@ -261,6 +261,9 @@ async function loadDashboardData(forceReload = false) { router.replace("/login"); return; } + + errorMessage.value = + overviewResult.reason?.message || "Không thể tải dữ liệu dashboard."; } if (productsResult.status === "fulfilled") { From 5a2c634024d8ab7e92406b126f9f0ca81ea0c1f2 Mon Sep 17 00:00:00 2001 From: 25ThienNgoc Date: Sat, 1 Aug 2026 13:46:58 +0700 Subject: [PATCH 7/9] commit: T227 profile 404 fallback handling and conditional KPI loading by route permissions --- src/services/productService.js | 5 ++++ src/services/warehouseService.js | 5 ++++ src/views/DashboardView.vue | 39 ++++++++++++++++++++++++-------- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/services/productService.js b/src/services/productService.js index 71a8231..733c091 100644 --- a/src/services/productService.js +++ b/src/services/productService.js @@ -1,5 +1,6 @@ import axios from 'axios' import { clearAuth, getAuthorizationHeader } from './authService' +import { canAccessRoute } from '../services/permissionService' const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:8080' @@ -11,6 +12,10 @@ const productClient = axios.create({ }) export async function getProducts({ page = 0, size = 10, keyword = '', categoryId = '', status = '' } = {}) { + if (!canAccessRoute('/products')) { + return { content: [], totalElements: 0 } + } + try { const { data } = await productClient.get('/api/products', { headers: getAuthorizationHeader(), diff --git a/src/services/warehouseService.js b/src/services/warehouseService.js index 2e6511b..e3ee7fb 100644 --- a/src/services/warehouseService.js +++ b/src/services/warehouseService.js @@ -1,5 +1,6 @@ import axios from 'axios' import { clearAuth, getAuthorizationHeader } from './authService' +import { canAccessRoute } from '../services/permissionService' const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || 'http://localhost:8080' @@ -17,6 +18,10 @@ const warehouseClient = axios.create({ * - Mã kho không được cho trùng và không cho phép sửa đổi để đảm bảo tính toàn vẹn dữ liệu. */ export async function getWarehouses({ keyword = '', status = '' } = {}) { + if (!canAccessRoute('/warehouses')) { + return { content: [], totalElements: 0 } + } + try { const { data } = await warehouseClient.get('/api/warehouses', { headers: getAuthorizationHeader(), diff --git a/src/views/DashboardView.vue b/src/views/DashboardView.vue index f3c0815..9455b89 100644 --- a/src/views/DashboardView.vue +++ b/src/views/DashboardView.vue @@ -72,6 +72,8 @@ const canSeeExportApprovals = computed(() => ); const canSeeWarnings = computed(() => canAccessRoute("/inventory")); const canSeeAlerts = computed(() => canAccessRoute("/alerts")); +const canSeeProducts = computed(() => canAccessRoute("/products")); +const canSeeWarehouses = computed(() => canAccessRoute("/warehouses")); const chartCategories = computed(() => { const categories = []; @@ -237,25 +239,41 @@ async function loadDashboardData(forceReload = false) { summary.value = { products: 0, warehouses: 0, stock: 0, warnings: 0 }; try { - const [overviewResult, productsResult, warehouseResult] = - await Promise.allSettled([ - loadDashboardOverview(), - loadProductCount(), - loadWarehouseCount(), - ]); + let overviewResult = { status: "fulfilled", value: null }; + const requests = [Promise.resolve(overviewResult)]; + let productsResult = { status: "fulfilled", value: 0 }; + let warehouseResult = { status: "fulfilled", value: 0 }; + + if (canSeeProducts.value) { + requests.push(loadProductCount()); + } else { + requests.push(Promise.resolve(0)); + } + + if (canSeeWarehouses.value) { + requests.push(loadWarehouseCount()); + } else { + requests.push(Promise.resolve(0)); + } + + const [overviewResultValue, productsCountResult, warehouseCountResult] = + await Promise.allSettled(requests); + + productsResult = productsCountResult ?? { status: "fulfilled", value: 0 }; + warehouseResult = warehouseCountResult ?? { status: "fulfilled", value: 0 }; let productsResponse = 0; let warehouseData = 0; let stockTotal = null; let warningCount = 0; - if (overviewResult.status === "fulfilled") { - dashboardOverview.value = overviewResult.value; + if (overviewResultValue.status === "fulfilled") { + dashboardOverview.value = overviewResultValue.value; dashboardOverviewFailed.value = false; } else { dashboardOverview.value = null; dashboardOverviewFailed.value = true; - if (overviewResult.reason?.status === 401) { + if (overviewResultValue.reason?.status === 401) { isLoading.value = false; isRetrying.value = false; router.replace("/login"); @@ -263,7 +281,8 @@ async function loadDashboardData(forceReload = false) { } errorMessage.value = - overviewResult.reason?.message || "Không thể tải dữ liệu dashboard."; + overviewResultValue.reason?.message || + "Không thể tải dữ liệu dashboard."; } if (productsResult.status === "fulfilled") { From 43e76627cbae34bda021b3403354a23f899ae37d Mon Sep 17 00:00:00 2001 From: 25ThienNgoc Date: Sat, 1 Aug 2026 14:21:57 +0700 Subject: [PATCH 8/9] commit: T227 profile 404 fallback handling and conditional KPI loading by route permissions --- src/views/DashboardView.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/DashboardView.vue b/src/views/DashboardView.vue index 9455b89..dd20bdb 100644 --- a/src/views/DashboardView.vue +++ b/src/views/DashboardView.vue @@ -239,8 +239,7 @@ async function loadDashboardData(forceReload = false) { summary.value = { products: 0, warehouses: 0, stock: 0, warnings: 0 }; try { - let overviewResult = { status: "fulfilled", value: null }; - const requests = [Promise.resolve(overviewResult)]; + const requests = [loadDashboardOverview()]; let productsResult = { status: "fulfilled", value: 0 }; let warehouseResult = { status: "fulfilled", value: 0 }; From 682ff3f1990fea5b90d1656380da80863467e80b Mon Sep 17 00:00:00 2001 From: 25ThienNgoc Date: Sat, 1 Aug 2026 19:10:31 +0700 Subject: [PATCH 9/9] commit: T227 dashboard overview role gating and conditional KPI card rendering --- src/views/DashboardView.vue | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/views/DashboardView.vue b/src/views/DashboardView.vue index dd20bdb..2d28676 100644 --- a/src/views/DashboardView.vue +++ b/src/views/DashboardView.vue @@ -74,6 +74,13 @@ const canSeeWarnings = computed(() => canAccessRoute("/inventory")); const canSeeAlerts = computed(() => canAccessRoute("/alerts")); const canSeeProducts = computed(() => canAccessRoute("/products")); const canSeeWarehouses = computed(() => canAccessRoute("/warehouses")); +const canSeeDashboardOverview = computed( + () => + canSeeWarnings.value || + canSeeAlerts.value || + canSeeImportApprovals.value || + canSeeExportApprovals.value, +); const chartCategories = computed(() => { const categories = []; @@ -111,7 +118,13 @@ const chartSeries = computed(() => [ ], }, ]); -const visibleKpiCardCount = computed(() => (canSeeWarnings.value ? 4 : 2)); +const visibleKpiCardCount = computed(() => { + let count = 0; + if (canSeeProducts.value) count += 1; + if (canSeeWarehouses.value) count += 1; + if (canSeeWarnings.value) count += 2; + return count || 2; +}); const hasAnyApiError = computed(() => { return ( Boolean(errorMessage.value) || @@ -239,10 +252,16 @@ async function loadDashboardData(forceReload = false) { summary.value = { products: 0, warehouses: 0, stock: 0, warnings: 0 }; try { - const requests = [loadDashboardOverview()]; + const requests = []; let productsResult = { status: "fulfilled", value: 0 }; let warehouseResult = { status: "fulfilled", value: 0 }; + if (canSeeDashboardOverview.value) { + requests.push(loadDashboardOverview()); + } else { + requests.push(Promise.resolve(null)); + } + if (canSeeProducts.value) { requests.push(loadProductCount()); } else { @@ -656,7 +675,7 @@ function openRoute(path) { class="kpi-grid" :class="{ 'kpi-grid--two-columns': !canSeeWarnings }" > -
+
@@ -669,7 +688,7 @@ function openRoute(path) {
-
+