@nuxt-customer-portal/core 0.4.8 → 0.4.9

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @nuxt-customer-portal/core
 
+## 0.4.9
+
 ## 0.4.8
 
 ## 0.4.7

package/app/composables/usePortalFeatures.ts

@@ -1,5 +1,6 @@
 import type { PortalFeatureDefinition } from '@nuxt-customer-portal/core/shared/types/feature'
 import {
+  isPortalFeatureEnabled,
   mergePortalModuleMenuContributions,
   sortPortalDashboardWidgets,
   upsertPortalFeature
@@ -9,44 +10,33 @@ export const usePortalFeatures = () => {
   const features = useState<PortalFeatureDefinition[]>('portal-features', () => [])
   const enabledModules = useState<string[] | null>('portal-enabled-modules', () => null)
 
-  const featureEnabled = (feature: PortalFeatureDefinition) => {
-    if (!enabledModules.value) {
-      return true
-    }
-    if (!['timesheets', 'invoices', 'service-requests', 'invoice-timesheets'].includes(feature.id)) {
-      return true
-    }
-    return enabledModules.value.includes(feature.id)
-  }
+  const enabledFeatures = computed(() =>
+    features.value.filter((feature) => isPortalFeatureEnabled(feature, enabledModules.value))
+  )
 
   const registerFeature = (feature: PortalFeatureDefinition) => {
     features.value = upsertPortalFeature(features.value, feature)
   }
 
   const navigation = computed(() =>
-    features.value
-      .filter(featureEnabled)
+    enabledFeatures.value
       .flatMap((feature) => feature.navigation ?? [])
       .sort((a, b) => (a.order ?? 100) - (b.order ?? 100))
   )
 
   const dashboardWidgets = computed(() =>
-    sortPortalDashboardWidgets(
-      features.value.filter(featureEnabled).flatMap((feature) => feature.dashboardWidgets ?? [])
-    )
+    sortPortalDashboardWidgets(enabledFeatures.value.flatMap((feature) => feature.dashboardWidgets ?? []))
   )
 
   const modules = computed(() => {
-    const enabledFeatures = features.value.filter(featureEnabled)
     return mergePortalModuleMenuContributions(
-      enabledFeatures.flatMap((feature) => feature.modules ?? []),
-      enabledFeatures.flatMap((feature) => feature.moduleMenuItems ?? [])
+      enabledFeatures.value.flatMap((feature) => feature.modules ?? []),
+      enabledFeatures.value.flatMap((feature) => feature.moduleMenuItems ?? [])
     ).sort((a, b) => (a.order ?? 100) - (b.order ?? 100))
   })
 
   const surfaces = computed(() =>
-    features.value
-      .filter(featureEnabled)
+    enabledFeatures.value
       .flatMap((feature) => feature.surfaces ?? [])
       .sort((a, b) => (a.order ?? 100) - (b.order ?? 100) || a.id.localeCompare(b.id))
   )
@@ -55,14 +45,14 @@ export const usePortalFeatures = () => {
     computed(() => surfaces.value.filter((contribution) => contribution.surface === surface))
 
   const clientIntegrations = computed(() =>
-    features.value
-      .filter(featureEnabled)
+    enabledFeatures.value
       .flatMap((feature) => (feature.clientIntegration ? [feature.clientIntegration] : []))
       .sort((left, right) => left.moduleId.localeCompare(right.moduleId))
   )
 
   return {
     features: readonly(features),
+    enabledFeatures: readonly(enabledFeatures),
     navigation,
     modules,
     dashboardWidgets,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt-customer-portal/core",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "license": "MIT",
   "homepage": "https://nuxt-customer-portal.com",
   "repository": {

package/portal.manifest.mjs

@@ -1,6 +1,6 @@
 export default {
   id: 'core',
-  version: '0.4.8',
+  version: '0.4.9',
   source: '@nuxt-customer-portal/core',
   dependsOn: [],
   schema: './server/db/schema/index.ts',

package/shared/feature-registry.ts

@@ -8,6 +8,13 @@ import type {
   PortalRolePolicy
 } from './types/feature'
 
+const configurablePortalFeatureIds = new Set(['timesheets', 'invoices', 'service-requests', 'invoice-timesheets'])
+
+export const isPortalFeatureEnabled = (
+  feature: PortalFeatureDefinition,
+  enabledModules: readonly string[] | null
+): boolean => !enabledModules || !configurablePortalFeatureIds.has(feature.id) || enabledModules.includes(feature.id)
+
 export const mergePortalModuleMenuContributions = (
   modules: readonly PortalModuleContribution[],
   contributions: readonly PortalModuleMenuContribution[]