[OpenMFP] Fix value access of ref (#2230)

* fix value access of ref (cherry picked from commit 9e10550) * decompose openMFP
gardener · Dec 16, 2024 · aaa6f68 · aaa6f68
1 parent 8754a10
commit aaa6f68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/frontend/src/composables/useProjectContext.js b/frontend/src/composables/useProjectContext.js
@@ -31,6 +31,8 @@ export function createProjectContextComposable (options = {}) {
     configStore = useConfigStore(),
   } = options
 
+  const { accountId } = openMFP
+
   function normalizeManifest (value) {
     const object = Object.assign({
       apiVersion: 'core.gardener.cloud/v1beta1',
@@ -62,9 +64,9 @@ export function createProjectContextComposable (options = {}) {
 
   function createProjectManifest () {
     manifest.value = {}
-    if (openMFP.accountId) {
+    if (accountId.value) {
       set(manifest.value, ['metadata', 'label', 'openmfp.org/managed-by'], 'true')
-      set(manifest.value, ['metadata', 'annotations', 'openmfp.org/account-id'], openMFP.accountId)
+      set(manifest.value, ['metadata', 'annotations', 'openmfp.org/account-id'], accountId.value)
     }
     initialManifest.value = cloneDeep(normalizedManifest.value)
   }

diff --git a/frontend/src/views/GAdministration.vue b/frontend/src/views/GAdministration.vue
@@ -547,6 +547,8 @@ useProvideProjectContext({
   configStore,
 })
 
+const { accountId } = openMFP
+
 const color = ref('primary')
 const errorMessage = ref(undefined)
 const detailedErrorMessage = ref(undefined)
@@ -651,9 +653,9 @@ async function updateProperty (key, value, options = {}) {
       metadata: { name },
       spec: { namespace },
     }
-    if (openMFP.accountId && !get(projectStore.project, ['metadata', 'annotations', 'openmfp.org/account-id'])) {
+    if (accountId.value && !get(projectStore.project, ['metadata', 'annotations', 'openmfp.org/account-id'])) {
       set(mergePatchDocument, ['metadata', 'labels', 'openmfp.org/managed-by'], 'true')
-      set(mergePatchDocument, ['metadata', 'annotations', 'openmfp.org/account-id'], openMFP.accountId)
+      set(mergePatchDocument, ['metadata', 'annotations', 'openmfp.org/account-id'], accountId.value)
     }
     set(mergePatchDocument, ['spec', key], value)
     await projectStore.patchProject(mergePatchDocument)

diff --git a/frontend/src/views/GProjectList.vue b/frontend/src/views/GProjectList.vue
@@ -146,15 +146,15 @@ import filter from 'lodash/filter'
 
 const projectStore = useProjectStore()
 const authzStore = useAuthzStore()
-const openMFP = useOpenMFP()
+const { accountId } = useOpenMFP()
 
 const canCreateProject = toRef(authzStore, 'canCreateProject')
 
 const projectDialog = ref(false)
 
 const projectList = computed(() => {
-  const belongsToAccount = project => openMFP.accountId === get(project, ['metadata', 'annotations', 'openmfp.org/account-id'])
-  return !openMFP.accountId
+  const belongsToAccount = project => accountId.value === get(project, ['metadata', 'annotations', 'openmfp.org/account-id'])
+  return !accountId.value
     ? projectStore.projectList
     : filter(projectStore.projectList, belongsToAccount)
 })