fixup! Reference managers by UID

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Sep 22, 2022 · e12e89a · e12e89a
1 parent 31ec9cc
commit e12e89a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/src/components/AppContent/ChartContent.vue b/src/components/AppContent/ChartContent.vue
@@ -30,19 +30,28 @@ export default {
  },
  computed: {
  transformData() {
+ const contactsByUid = {}
+ const contacts = Object.keys(this.contactsList).map(key => {
+ const [uid, addressbook] = key.split('~')
+ if (!contactsByUid[addressbook]) {
+ contactsByUid[addressbook] = {}
+ }
+ return (contactsByUid[addressbook][uid] = this.contactsList[key])
+ })
+
  const headManagers = []
- const tempContacts = Object.keys(this.contactsList || {}).filter(key => this.contactsList[key].managersName).reduce((prev, cur) => {
- const contact = this.contactsList[cur]
- const manager = this.contactsList[contact.managersName]
+ const tempContacts = contacts.filter(contact => contact.managersName).reduce((prev, contact) => {
  prev.push(transformNode(contact))
- if (manager && !manager.managersName && !headManagers.includes(manager?.uid)) {
+
+ const manager = contactsByUid[contact.addressbook.id][contact.managersName]
+ if (manager && !manager.managersName && !headManagers.includes(manager.uid)) {
  prev.push(transformNode(manager))
- headManagers.push(manager?.uid)
+ headManagers.push(manager.uid)
  }
  return prev
  }, [])
 
- return headManagers.map(id => getChart(tempContacts, id))
+ return headManagers.map(uid => getChart(tempContacts, uid))
  },
  },
 }

diff --git a/src/components/ChartTemplate.vue b/src/components/ChartTemplate.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="org-chart-node">
  <div class="inner-box">
- <a href="" @click.prevent.stop="onAvatarClick(data.nodeId)">
+ <a href="" @click.prevent.stop="onAvatarClick(data.key)">
  <Avatar
  :disable-tooltip="true"
  :display-name="data.fullName"

diff --git a/src/utils/chartUtils.js b/src/utils/chartUtils.js
@@ -2,7 +2,9 @@ import { generateUrl } from '@nextcloud/router'
 import { GROUP_ALL_CONTACTS } from '../models/constants.ts'
 
 export const getChart = (list, parent, nodes = []) => {
- if (!nodes.length) nodes.push(list.find(node => node.nodeId === parent))
+ if (!nodes.length) {
+ nodes.push(list.find(node => node.nodeId === parent))
+ }
  const children = list.filter(node => {
  return node.parentNodeId === parent
  })
@@ -18,7 +20,8 @@ export const getChart = (list, parent, nodes = []) => {
 export const transformNode = (contact) => {
  return {
  nodeId: contact.uid,
- parentNodeId: contact.managersName ? contact.managersName.split('~')[0] : null,
+ key: contact.key,
+ parentNodeId: contact.managersName,
  fullName: contact.displayName,
  org: contact.org,
  photoUrl: `${contact.url}?photo`,