diff --git a/apps/portal/package.json b/apps/portal/package.json index d0444b10..7cbd8406 100644 --- a/apps/portal/package.json +++ b/apps/portal/package.json @@ -77,6 +77,7 @@ "@iconify-json/mdi": "1.2.3", "@iconify-json/tabler": "1.2.23", "@iconify/tools": "4.1.4", + "@iconify/types": "^2.0.0", "@iconify/utils": "2.3.0", "@iconify/vue": "4.1.2", "@intlify/unplugin-vue-i18n": "11.0.1", diff --git a/apps/portal/pnpm-lock.yaml b/apps/portal/pnpm-lock.yaml index 52c65bd7..9f7397f9 100644 --- a/apps/portal/pnpm-lock.yaml +++ b/apps/portal/pnpm-lock.yaml @@ -190,6 +190,9 @@ importers: '@iconify/tools': specifier: 4.1.4 version: 4.1.4 + '@iconify/types': + specifier: ^2.0.0 + version: 2.0.0 '@iconify/utils': specifier: 2.3.0 version: 2.3.0 diff --git a/apps/portal/src/@layouts/plugins/casl.ts b/apps/portal/src/@layouts/plugins/casl.ts index c8fcd5c5..19c5dfa8 100644 --- a/apps/portal/src/@layouts/plugins/casl.ts +++ b/apps/portal/src/@layouts/plugins/casl.ts @@ -48,7 +48,7 @@ export const canNavigate = (to: RouteLocationNormalized) => { // If the target route has specific permissions, check those first if (targetRoute?.meta?.action && targetRoute?.meta?.subject) - return ability.can(targetRoute.meta.action, targetRoute.meta.subject) + return ability.can(targetRoute.meta.action as string, targetRoute.meta.subject as string) // If no specific permissions, fall back to checking if any parent route allows access // @ts-expect-error We should allow passing string | undefined to can because for admin ability we omit defining action & subject diff --git a/apps/portal/src/@layouts/types.ts b/apps/portal/src/@layouts/types.ts index 736fee08..ab1bb0ca 100644 --- a/apps/portal/src/@layouts/types.ts +++ b/apps/portal/src/@layouts/types.ts @@ -4,7 +4,7 @@ import type { AppContentLayoutNav, ContentWidth, FooterType, HorizontalNavType, export interface LayoutConfig { app: { - title: Lowercase + title: string logo: VNode contentWidth: typeof ContentWidth[keyof typeof ContentWidth] contentLayoutNav: typeof AppContentLayoutNav[keyof typeof AppContentLayoutNav] diff --git a/apps/portal/vite.config.ts b/apps/portal/vite.config.ts index 016de2fe..eea4b94c 100644 --- a/apps/portal/vite.config.ts +++ b/apps/portal/vite.config.ts @@ -47,7 +47,7 @@ export default defineConfig({ dirs: ['src/@core/components', 'src/components'], dts: true, resolvers: [ - componentName => { + (componentName: string) => { // Auto import `VueApexCharts` if (componentName === 'VueApexCharts') return { name: 'default', from: 'vue3-apexcharts', as: 'VueApexCharts' }