feat: introduce dynamic navItems extension points and remove scopes

owncloud · Apr 24, 2024 · a043097 · a043097
1 parent 07e75e4
commit a043097
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/packages/web-pkg/src/composables/piniaStores/extensionRegistry/extensionRegistry.ts b/packages/web-pkg/src/composables/piniaStores/extensionRegistry/extensionRegistry.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 import { ref, Ref, unref } from 'vue'
 import { useConfigStore } from '../config'
-import { Extension, ExtensionPoint, ExtensionScope, ExtensionType } from './types'
+import { Extension, ExtensionPoint, ExtensionType } from './types'
 
 export const useExtensionRegistry = defineStore('extensionRegistry', () => {
   const configStore = useConfigStore()
@@ -14,7 +14,6 @@ export const useExtensionRegistry = defineStore('extensionRegistry', () => {
   const requestExtensions = <T extends Extension>(
     type: ExtensionType,
     options?: {
-      scopes?: ExtensionScope[]
       extensionPointIds?: string[]
     }
   ) => {
@@ -23,7 +22,6 @@ export const useExtensionRegistry = defineStore('extensionRegistry', () => {
         (e) =>
           e.type === type &&
           !configStore.options.disabledExtensions.includes(e.id) &&
-          (!options?.scopes || e.scopes?.some((s) => options?.scopes.includes(s))) &&
           (!options?.extensionPointIds ||
             e.extensionPointIds?.some((id) => options?.extensionPointIds.includes(id)))
       )

diff --git a/packages/web-pkg/src/composables/piniaStores/extensionRegistry/types.ts b/packages/web-pkg/src/composables/piniaStores/extensionRegistry/types.ts
@@ -10,13 +10,10 @@ export type ExtensionType = StringUnionOrAnyString<
   'action' | 'customComponent' | 'folderView' | 'search' | 'sidebarNav' | 'sidebarPanel'
 >
 
-export type ExtensionScope = StringUnionOrAnyString<'resource' | 'user' | 'group'>
-
 export type BaseExtension = {
   id: string
   type: ExtensionType
   extensionPointIds?: string[]
-  scopes?: ExtensionScope[] // TODO: deprecated
   userPreference?: {
     optionLabel?: string
   }

diff --git a/packages/web-runtime/src/container/api.ts b/packages/web-runtime/src/container/api.ts
@@ -72,11 +72,18 @@ const announceNavigationItems = (
     throw new ApiError("navigationItems can't be blank")
   }
 
+  const navExtensionPoint = {
+    id: `app.${applicationId}.navItems`,
+    extensionType: 'sidebarNav',
+    multiple: true
+  }
+  extensionRegistry.registerExtensionPoint(navExtensionPoint)
+
   const navExtensions = navigationItems.map((navItem) => ({
     id: `app.${applicationId}.${navItem.name}`,
     type: 'sidebarNav',
     navItem,
-    scopes: [`app.${applicationId}`]
+    extensionPointIds: [navExtensionPoint.id]
   })) as SidebarNavExtension[]
 
   extensionRegistry.registerExtensions(computed(() => navExtensions))

diff --git a/packages/web-runtime/src/helpers/navItems.ts b/packages/web-runtime/src/helpers/navItems.ts
@@ -13,6 +13,8 @@ export const getExtensionNavItems = ({
   appId: string
 }) =>
   extensionRegistry
-    .requestExtensions<SidebarNavExtension>('sidebarNav', { scopes: [`app.${appId}`] })
+    .requestExtensions<SidebarNavExtension>('sidebarNav', {
+      extensionPointIds: [`app.${appId}.navItems`]
+    })
     .map(({ navItem }) => navItem)
     .filter((n) => !Object.hasOwn(n, 'isVisible') || n.isVisible())