From edf060164d8051b410c4d8117787e900357890a9 Mon Sep 17 00:00:00 2001
From: "Anne M. P." <annemerete.pettersen@origo.oslo.kommune.no>
Date: Thu, 5 Oct 2023 11:55:57 +0200
Subject: [PATCH 1/5] Add contributors to objective

---
 firestore.indexes.json                   |  41 ++++++++
 firestore.rules                          |   1 +
 src/components/drawers/EditKeyResult.vue | 122 +++++++++++++++++++++--
 3 files changed, 155 insertions(+), 9 deletions(-)

diff --git a/firestore.indexes.json b/firestore.indexes.json
index ef4f1e42d..31d88087f 100644
--- a/firestore.indexes.json
+++ b/firestore.indexes.json
@@ -283,6 +283,24 @@
           "order": "DESCENDING"
         }
       ]
+    },
+    {
+      "collectionGroup": "objectiveContributors",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "archived",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "item",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "objective",
+          "order": "ASCENDING"
+        }
+      ]
     }
   ],
   "fieldOverrides": [
@@ -469,6 +487,29 @@
           "queryScope": "COLLECTION_GROUP"
         }
       ]
+    },
+    {
+      "collectionGroup": "objectiveContributors",
+      "fieldPath": "auto",
+      "ttl": false,
+      "indexes": [
+        {
+          "order": "ASCENDING",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "order": "DESCENDING",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "arrayConfig": "CONTAINS",
+          "queryScope": "COLLECTION"
+        },
+        {
+          "arrayConfig": "CONTAINS",
+          "queryScope": "COLLECTION_GROUP"
+        }
+      ]
     }
   ]
 }
diff --git a/firestore.rules b/firestore.rules
index 8d391cf01..c8648737a 100644
--- a/firestore.rules
+++ b/firestore.rules
@@ -188,6 +188,7 @@ service cloud.firestore {
     match /objectiveContributors/{document} {
       allow read: if isSignedIn();
       allow create: if isSuperAdmin() || isMemberOfObjectiveParentAfter(document, 'objectiveContributors');
+      allow update: if isSuperAdmin() || isMemberOfObjectiveParentAfter(document, 'objectiveContributors');
       allow delete: if isSuperAdmin() || isMemberOfObjectiveParentBefore(document, 'objectiveContributors');
     }
 
diff --git a/src/components/drawers/EditKeyResult.vue b/src/components/drawers/EditKeyResult.vue
index d423229c6..e065af318 100644
--- a/src/components/drawers/EditKeyResult.vue
+++ b/src/components/drawers/EditKeyResult.vue
@@ -35,16 +35,16 @@
             :rows="2"
             :label="$t('fields.description')"
           />
-          <!-- TODO: Include when related views have been implemented -->
-          <!--form-component
+          <form-component
             v-if="isOrganization || isDepartment"
-            v-model="thisKeyResult.parent"
+            v-model="contributor"
             name="owner"
             input-type="select"
             :select-options="ownerOptions"
+            :select-reduce="(option) => option.value"
             :label="$t('fields.owner')"
             rules="required"
-          /-->
+          />
         </template>
 
         <template v-else-if="pageIndex === 2">
@@ -155,11 +155,13 @@
 import { mapState } from 'vuex';
 import { db } from '@/config/firebaseConfig';
 import KeyResult from '@/db/KeyResult';
-import { isDepartment, isOrganization } from '@/util/getActiveItemType';
+import ObjectiveContributors from '@/db/ObjectiveContributors';
 import { PktButton } from '@oslokommune/punkt-vue2';
 import { FormSection, BtnSave, BtnDelete } from '@/components/generic/form';
 import ArchivedRestore from '@/components/ArchivedRestore.vue';
 import PagedDrawerWrapper from '@/components/drawers/PagedDrawerWrapper.vue';
+import { isDepartment, isOrganization } from '@/util/getActiveItemType';
+import getActiveItemType from '@/util/getActiveItemType';
 
 export default {
   name: 'EditKeyResult',
@@ -196,6 +198,9 @@ export default {
     thisKeyResult: null,
     pageCount: 2,
     loading: false,
+    contributor: null,
+    contributors: [],
+    keyResultOwners: [],
   }),
 
   computed: {
@@ -228,6 +233,15 @@ export default {
       }
       return {};
     },
+    childCollection() {
+      if (isOrganization(this.activeItem)) {
+        return 'departments';
+      }
+      if (isDepartment(this.activeItem)) {
+        return 'products';
+      }
+      return null;
+    },
     thisLevelOption() {
       return {
         value: this.thisLevel.path,
@@ -268,8 +282,12 @@ export default {
           .then((snapshot) => {
             this.thisKeyResult = snapshot.data();
             this.thisKeyResult.id = this.keyResult.id;
+            this.contributor = this.ownerOptions.find(o => o.name === this.keyResult.parent.name);
             this.loading = false;
           });
+
+        this.getObjectiveContributors();
+        this.getKeyResultOwners();
       },
     },
     // thisLevel: {
@@ -284,6 +302,8 @@ export default {
   },
 
   methods: {
+    isDepartment, isOrganization,
+
     async save() {
       const { pageIndex, next } = this.$refs.drawer;
 
@@ -295,7 +315,10 @@ export default {
         try {
           const { name, description, unit, weight, startValue, targetValue } =
             this.thisKeyResult;
-          const parent = this.activeItemRef;
+
+          const parent = db.doc(this.contributor);
+          console.log("PARENT. ", parent);
+
           const data = {
             name,
             description: description || '',
@@ -303,7 +326,7 @@ export default {
             weight: weight || 1,
             startValue,
             targetValue,
-            parent,
+            parent
           };
 
           if (this.thisKeyResult?.id) {
@@ -315,10 +338,30 @@ export default {
               ...data,
               objective: objectiveRef,
             });
-            this.thisKeyResult.id = id;
-            this.thisKeyResult.objective = objectiveRef;
+
+            await db.collection('keyResults')
+              .doc(id)
+              .get()
+              .then((snapshot) => {
+                this.thisKeyResult = snapshot.data();
+                this.thisKeyResult.objective = objectiveRef;
+                console.log("snapshot.parent", snapshot);
+                //this.thisKeyResult.parent = snapshot.parent;
+                this.thisKeyResult.id = id;
+                this.contributor = this.ownerOptions.find(o => o.name === this.keyResult.parent.name);
+                this.loading = false;
+              });
+            console.log("kr parent", this.thisKeyResult)
+            //parentRef = await activePeriodRef.get().then((snapshot) => snapshot.data().parent);
+
+            // TODO: Map this shit
+            // this.thisKeyResult.id = id;
+            //this.thisKeyResult.objective = objectiveRef;
+            //this.thisKeyResult.parent = data.parent;
+            //this.keyResultOwners.push(this.thisKeyResult); // TODO: ????
             this.$emit('create', this.thisKeyResult);
           }
+          await this.syncObjectiveContributor();
           this.$refs.drawer.next();
         } catch (error) {
           console.log(error);
@@ -334,6 +377,7 @@ export default {
       this.loading = true;
       try {
         await KeyResult.archive(this.thisKeyResult.id);
+        await this.syncObjectiveContributor();
         this.thisKeyResult.archived = true;
         this.$emit('archive', this.thisKeyResult);
       } catch (error) {
@@ -347,6 +391,7 @@ export default {
     async restore() {
       try {
         await KeyResult.restore(this.thisKeyResult.id);
+        await this.syncObjectiveContributor();
         this.thisKeyResult.archived = false;
         this.$emit('restore', this.thisKeyResult);
       } catch {
@@ -356,6 +401,65 @@ export default {
       }
     },
 
+    async getObjectiveContributors() {
+      const objectiveRef = await db.doc(`objectives/${this.objective.id}`);
+      const objectiveContributorsRefs = db
+        .collection('objectiveContributors')
+        .where('objective', '==', objectiveRef)
+        .where('archived', '==', false);
+
+      this.$bind('contributors', objectiveContributorsRefs);
+    },
+
+    async getKeyResultOwners() {
+      const objectiveRef = await db.doc(`objectives/${this.objective.id}`);
+      const keyResultRefs = db
+        .collection('keyResults')
+        .where('objective', '==', objectiveRef)
+        .where('archived', '==', false);
+
+      this.$bind('keyResultOwners', keyResultRefs);
+    },
+
+    async syncObjectiveContributor() {
+      let contributors = [...this.contributors];
+      let keyResultOwners = [...this.keyResultOwners];
+
+      // Filter out already present links
+      this.contributors.map(c => {
+        this.keyResultOwners.map(k => {
+          if (c.item.name === k.parent.name) {
+            contributors = contributors.filter((con) => con.item.name !== c.item.name);
+            keyResultOwners = keyResultOwners.filter((kr) => kr.parent.name !== k.parent.name);
+          }
+        });
+      });
+
+      // Add missing contributor
+      keyResultOwners.map(k => {
+        this.createObjectiveContributor(k.parent)
+      });
+
+      // Remove redundant contributors
+      contributors.map(c => {
+        this.removeObjectiveContributor(c.item);
+      });
+    },
+
+    createObjectiveContributor(item) {
+      const itemType = getActiveItemType(item);
+      const itemRef = db.doc(`${itemType}s/${item.id}`);
+      const objectiveRef = db.doc(`objectives/${this.objective.id}`);
+      ObjectiveContributors.create(itemRef, objectiveRef);
+    },
+
+    async removeObjectiveContributor(item) {
+      const itemType = getActiveItemType(item);
+      const itemRef = db.doc(`${itemType}s/${item.id}`);
+      const objectiveRef = db.doc(`objectives/${this.objective.id}`);
+      return ObjectiveContributors.remove(itemRef, objectiveRef);
+    },
+
     close(e) {
       this.$emit('close', e);
     },

From 57dd82f94d070a7bca15a219f753d0cc3fc3f35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?=
 <simen.heggestoyl@origo.oslo.kommune.no>
Date: Thu, 5 Oct 2023 12:08:04 +0200
Subject: [PATCH 2/5] Testing without `$bind`

---
 src/components/drawers/EditKeyResult.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/components/drawers/EditKeyResult.vue b/src/components/drawers/EditKeyResult.vue
index e065af318..165ef4c39 100644
--- a/src/components/drawers/EditKeyResult.vue
+++ b/src/components/drawers/EditKeyResult.vue
@@ -413,12 +413,15 @@ export default {
 
     async getKeyResultOwners() {
       const objectiveRef = await db.doc(`objectives/${this.objective.id}`);
-      const keyResultRefs = db
+      const keyResults = await db
         .collection('keyResults')
         .where('objective', '==', objectiveRef)
-        .where('archived', '==', false);
+        .where('archived', '==', false)
+        .get()
+        .then((snapshot) => snapshot.docs)
+        .then((docs) => docs.map((d) => d.data()));
 
-      this.$bind('keyResultOwners', keyResultRefs);
+      this.keyResultOwners = keyResults;
     },
 
     async syncObjectiveContributor() {
@@ -436,8 +439,8 @@ export default {
       });
 
       // Add missing contributor
-      keyResultOwners.map(k => {
-        this.createObjectiveContributor(k.parent)
+      keyResultOwners.map(async (k) => {
+        this.createObjectiveContributor(await k.parent.get());
       });
 
       // Remove redundant contributors
@@ -447,7 +450,7 @@ export default {
     },
 
     createObjectiveContributor(item) {
-      const itemType = getActiveItemType(item);
+      const itemType = getActiveItemType(item.data());
       const itemRef = db.doc(`${itemType}s/${item.id}`);
       const objectiveRef = db.doc(`objectives/${this.objective.id}`);
       ObjectiveContributors.create(itemRef, objectiveRef);

From 7755f728df79681f1903a5906d81c2cceb2a3be8 Mon Sep 17 00:00:00 2001
From: "Anne M. P." <annemerete.pettersen@origo.oslo.kommune.no>
Date: Thu, 12 Oct 2023 08:53:42 +0200
Subject: [PATCH 3/5] Added async await logic

---
 src/components/drawers/EditKeyResult.vue      | 118 ++++++++----------
 .../ObjectiveContributors.js                  |  11 ++
 2 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/src/components/drawers/EditKeyResult.vue b/src/components/drawers/EditKeyResult.vue
index 165ef4c39..3b975a6a5 100644
--- a/src/components/drawers/EditKeyResult.vue
+++ b/src/components/drawers/EditKeyResult.vue
@@ -41,7 +41,6 @@
             name="owner"
             input-type="select"
             :select-options="ownerOptions"
-            :select-reduce="(option) => option.value"
             :label="$t('fields.owner')"
             rules="required"
           />
@@ -199,8 +198,6 @@ export default {
     pageCount: 2,
     loading: false,
     contributor: null,
-    contributors: [],
-    keyResultOwners: [],
   }),
 
   computed: {
@@ -214,11 +211,11 @@ export default {
     thisLevel() {
       if (isOrganization(this.activeItem)) {
         return this.organizations.find((o) => o.id === this.activeItem.id);
-      }
-      if (isDepartment(this.activeItem)) {
+      } else if (isDepartment(this.activeItem)) {
         return this.departments.find((d) => d.id === this.activeItem.id);
+      } else {
+        return this.products.find((p) => p.id === this.activeItem.id);
       }
-      return {};
     },
     children() {
       if (isOrganization(this.activeItem)) {
@@ -231,16 +228,7 @@ export default {
           (product) => product.department.id === this.activeItem.id
         );
       }
-      return {};
-    },
-    childCollection() {
-      if (isOrganization(this.activeItem)) {
-        return 'departments';
-      }
-      if (isDepartment(this.activeItem)) {
-        return 'products';
-      }
-      return null;
+      return [];
     },
     thisLevelOption() {
       return {
@@ -290,15 +278,15 @@ export default {
         this.getKeyResultOwners();
       },
     },
-    // thisLevel: {
-    //   immediate: true,
-    //   async handler() {
-    //     // Set currentLevel as default option for key result owner
-    //     if (!this.keyResult.id) {
-    //       this.thisKeyResult.parent = this.thisLevelOption;
-    //     }
-    //   },
-    // },
+     thisLevel: {
+       immediate: true,
+       async handler() {
+         // Set currentLevel as default option for key result owner
+         if (!this.keyResult?.id) {
+           this.contributor = this.thisLevelOption;
+         }
+       },
+     },
   },
 
   methods: {
@@ -316,8 +304,7 @@ export default {
           const { name, description, unit, weight, startValue, targetValue } =
             this.thisKeyResult;
 
-          const parent = db.doc(this.contributor);
-          console.log("PARENT. ", parent);
+          const parent = db.doc(this.contributor.value);
 
           const data = {
             name,
@@ -338,27 +325,8 @@ export default {
               ...data,
               objective: objectiveRef,
             });
-
-            await db.collection('keyResults')
-              .doc(id)
-              .get()
-              .then((snapshot) => {
-                this.thisKeyResult = snapshot.data();
-                this.thisKeyResult.objective = objectiveRef;
-                console.log("snapshot.parent", snapshot);
-                //this.thisKeyResult.parent = snapshot.parent;
-                this.thisKeyResult.id = id;
-                this.contributor = this.ownerOptions.find(o => o.name === this.keyResult.parent.name);
-                this.loading = false;
-              });
-            console.log("kr parent", this.thisKeyResult)
-            //parentRef = await activePeriodRef.get().then((snapshot) => snapshot.data().parent);
-
-            // TODO: Map this shit
-            // this.thisKeyResult.id = id;
-            //this.thisKeyResult.objective = objectiveRef;
-            //this.thisKeyResult.parent = data.parent;
-            //this.keyResultOwners.push(this.thisKeyResult); // TODO: ????
+            this.thisKeyResult.id = id;
+            this.thisKeyResult.objective = objectiveRef;
             this.$emit('create', this.thisKeyResult);
           }
           await this.syncObjectiveContributor();
@@ -403,12 +371,23 @@ export default {
 
     async getObjectiveContributors() {
       const objectiveRef = await db.doc(`objectives/${this.objective.id}`);
-      const objectiveContributorsRefs = db
+      const objectiveContributors = await db
         .collection('objectiveContributors')
         .where('objective', '==', objectiveRef)
-        .where('archived', '==', false);
+        .where('archived', '==', false)
+        .get()
+        .then((snapshot) => snapshot.docs)
+        .then((docs) => docs.map((d) => d.data()));
 
-      this.$bind('contributors', objectiveContributorsRefs);
+      const contributors = await Promise.all(
+        objectiveContributors.map(async (con) => {
+          return {
+            ref: await con.item.get(),
+            name: await con.item.get().then((snapshot) => snapshot.data().name),
+          }
+        })
+      );
+      return contributors;
     },
 
     async getKeyResultOwners() {
@@ -421,31 +400,42 @@ export default {
         .then((snapshot) => snapshot.docs)
         .then((docs) => docs.map((d) => d.data()));
 
-      this.keyResultOwners = keyResults;
+      const keyResultNames = await Promise.all(
+        keyResults.map(async (owner) => {
+          return {
+            ref: await owner.parent.get(),
+            name: await owner.parent.get().then((snapshot) => snapshot.data().name),
+          }
+        })
+      );
+      return keyResultNames;
     },
 
     async syncObjectiveContributor() {
-      let contributors = [...this.contributors];
-      let keyResultOwners = [...this.keyResultOwners];
+      const keyResultOwners = await this.getKeyResultOwners();
+      const contributors = await this.getObjectiveContributors();
+
+      let contributorsCopy = [...contributors];
+      let keyResultOwnersCopy = [...keyResultOwners];
 
       // Filter out already present links
-      this.contributors.map(c => {
-        this.keyResultOwners.map(k => {
-          if (c.item.name === k.parent.name) {
-            contributors = contributors.filter((con) => con.item.name !== c.item.name);
-            keyResultOwners = keyResultOwners.filter((kr) => kr.parent.name !== k.parent.name);
+      contributors.map(async c => {
+        keyResultOwners.map(async k => {
+          if (c.name === k.name) {
+            contributorsCopy = contributorsCopy.filter((con) => con.name !== c.name);
+            keyResultOwnersCopy = keyResultOwnersCopy.filter((kr) => kr.name !== k.name);
           }
         });
       });
 
       // Add missing contributor
-      keyResultOwners.map(async (k) => {
-        this.createObjectiveContributor(await k.parent.get());
+      keyResultOwnersCopy.map(async (k) => {
+        this.createObjectiveContributor(await k.ref);
       });
 
       // Remove redundant contributors
-      contributors.map(c => {
-        this.removeObjectiveContributor(c.item);
+      contributorsCopy.map(async c => {
+        this.removeObjectiveContributor(await c.ref);
       });
     },
 
@@ -457,7 +447,7 @@ export default {
     },
 
     async removeObjectiveContributor(item) {
-      const itemType = getActiveItemType(item);
+      const itemType = getActiveItemType(item.data());
       const itemRef = db.doc(`${itemType}s/${item.id}`);
       const objectiveRef = db.doc(`objectives/${this.objective.id}`);
       return ObjectiveContributors.remove(itemRef, objectiveRef);
diff --git a/src/db/ObjectiveContributors/ObjectiveContributors.js b/src/db/ObjectiveContributors/ObjectiveContributors.js
index 6fcd4bb62..7f2e8ac16 100644
--- a/src/db/ObjectiveContributors/ObjectiveContributors.js
+++ b/src/db/ObjectiveContributors/ObjectiveContributors.js
@@ -12,6 +12,17 @@ const create = async (itemRef, objectiveRef) => {
     throw new Error(`Cannot find objcetive with ID ${objectiveRef.id}`);
   }
 
+  const contributors = await db
+    .collection('objectiveContributors')
+    .where('objective', '==', objectiveRef)
+    .where('item', '==', itemRef)
+    .get()
+    .then((snapshot) => snapshot.docs.map((doc) => doc.ref));
+
+  if (contributors.length > 0) {
+    return;
+  }
+
   const data = { item: itemRef, objective: objectiveRef };
 
   validateCreateProps(props, data);

From 6f5c8549aced9d4e22050d22f1ed818a80e6bed8 Mon Sep 17 00:00:00 2001
From: "Anne M. P." <annemerete.pettersen@origo.oslo.kommune.no>
Date: Thu, 12 Oct 2023 12:55:18 +0200
Subject: [PATCH 4/5] Linting

---
 src/components/drawers/EditKeyResult.vue      | 49 ++++++++++---------
 .../ObjectiveContributors.js                  |  2 +-
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/components/drawers/EditKeyResult.vue b/src/components/drawers/EditKeyResult.vue
index 3b975a6a5..923d9c54c 100644
--- a/src/components/drawers/EditKeyResult.vue
+++ b/src/components/drawers/EditKeyResult.vue
@@ -159,8 +159,10 @@ import { PktButton } from '@oslokommune/punkt-vue2';
 import { FormSection, BtnSave, BtnDelete } from '@/components/generic/form';
 import ArchivedRestore from '@/components/ArchivedRestore.vue';
 import PagedDrawerWrapper from '@/components/drawers/PagedDrawerWrapper.vue';
-import { isDepartment, isOrganization } from '@/util/getActiveItemType';
-import getActiveItemType from '@/util/getActiveItemType';
+import getActiveItemType, {
+  isDepartment,
+  isOrganization,
+} from '@/util/getActiveItemType';
 
 export default {
   name: 'EditKeyResult',
@@ -211,11 +213,11 @@ export default {
     thisLevel() {
       if (isOrganization(this.activeItem)) {
         return this.organizations.find((o) => o.id === this.activeItem.id);
-      } else if (isDepartment(this.activeItem)) {
+      }
+      if (isDepartment(this.activeItem)) {
         return this.departments.find((d) => d.id === this.activeItem.id);
-      } else {
-        return this.products.find((p) => p.id === this.activeItem.id);
       }
+      return this.products.find((p) => p.id === this.activeItem.id);
     },
     children() {
       if (isOrganization(this.activeItem)) {
@@ -270,7 +272,9 @@ export default {
           .then((snapshot) => {
             this.thisKeyResult = snapshot.data();
             this.thisKeyResult.id = this.keyResult.id;
-            this.contributor = this.ownerOptions.find(o => o.name === this.keyResult.parent.name);
+            this.contributor = this.ownerOptions.find(
+              (o) => o.name === this.keyResult.parent.name
+            );
             this.loading = false;
           });
 
@@ -278,19 +282,20 @@ export default {
         this.getKeyResultOwners();
       },
     },
-     thisLevel: {
-       immediate: true,
-       async handler() {
-         // Set currentLevel as default option for key result owner
-         if (!this.keyResult?.id) {
-           this.contributor = this.thisLevelOption;
-         }
-       },
-     },
+    thisLevel: {
+      immediate: true,
+      async handler() {
+        // Set currentLevel as default option for key result owner
+        if (!this.keyResult?.id) {
+          this.contributor = this.thisLevelOption;
+        }
+      },
+    },
   },
 
   methods: {
-    isDepartment, isOrganization,
+    isDepartment,
+    isOrganization,
 
     async save() {
       const { pageIndex, next } = this.$refs.drawer;
@@ -313,7 +318,7 @@ export default {
             weight: weight || 1,
             startValue,
             targetValue,
-            parent
+            parent,
           };
 
           if (this.thisKeyResult?.id) {
@@ -384,7 +389,7 @@ export default {
           return {
             ref: await con.item.get(),
             name: await con.item.get().then((snapshot) => snapshot.data().name),
-          }
+          };
         })
       );
       return contributors;
@@ -405,7 +410,7 @@ export default {
           return {
             ref: await owner.parent.get(),
             name: await owner.parent.get().then((snapshot) => snapshot.data().name),
-          }
+          };
         })
       );
       return keyResultNames;
@@ -419,8 +424,8 @@ export default {
       let keyResultOwnersCopy = [...keyResultOwners];
 
       // Filter out already present links
-      contributors.map(async c => {
-        keyResultOwners.map(async k => {
+      contributors.map(async (c) => {
+        keyResultOwners.map(async (k) => {
           if (c.name === k.name) {
             contributorsCopy = contributorsCopy.filter((con) => con.name !== c.name);
             keyResultOwnersCopy = keyResultOwnersCopy.filter((kr) => kr.name !== k.name);
@@ -434,7 +439,7 @@ export default {
       });
 
       // Remove redundant contributors
-      contributorsCopy.map(async c => {
+      contributorsCopy.map(async (c) => {
         this.removeObjectiveContributor(await c.ref);
       });
     },
diff --git a/src/db/ObjectiveContributors/ObjectiveContributors.js b/src/db/ObjectiveContributors/ObjectiveContributors.js
index 7f2e8ac16..f1d0e0dd9 100644
--- a/src/db/ObjectiveContributors/ObjectiveContributors.js
+++ b/src/db/ObjectiveContributors/ObjectiveContributors.js
@@ -20,7 +20,7 @@ const create = async (itemRef, objectiveRef) => {
     .then((snapshot) => snapshot.docs.map((doc) => doc.ref));
 
   if (contributors.length > 0) {
-    return;
+    return undefined;
   }
 
   const data = { item: itemRef, objective: objectiveRef };

From a964f050e53d8267a51ddc55c7f9662c4581bd21 Mon Sep 17 00:00:00 2001
From: "Anne M. P." <annemerete.pettersen@origo.oslo.kommune.no>
Date: Fri, 13 Oct 2023 12:59:05 +0200
Subject: [PATCH 5/5] Fix after code review

---
 firestore.rules                               |  1 -
 src/components/drawers/EditKeyResult.vue      | 32 +++++++++++--------
 .../ObjectiveContributors.js                  |  3 +-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/firestore.rules b/firestore.rules
index c8648737a..8d391cf01 100644
--- a/firestore.rules
+++ b/firestore.rules
@@ -188,7 +188,6 @@ service cloud.firestore {
     match /objectiveContributors/{document} {
       allow read: if isSignedIn();
       allow create: if isSuperAdmin() || isMemberOfObjectiveParentAfter(document, 'objectiveContributors');
-      allow update: if isSuperAdmin() || isMemberOfObjectiveParentAfter(document, 'objectiveContributors');
       allow delete: if isSuperAdmin() || isMemberOfObjectiveParentBefore(document, 'objectiveContributors');
     }
 
diff --git a/src/components/drawers/EditKeyResult.vue b/src/components/drawers/EditKeyResult.vue
index 923d9c54c..d5b2d3de0 100644
--- a/src/components/drawers/EditKeyResult.vue
+++ b/src/components/drawers/EditKeyResult.vue
@@ -277,9 +277,6 @@ export default {
             );
             this.loading = false;
           });
-
-        this.getObjectiveContributors();
-        this.getKeyResultOwners();
       },
     },
     thisLevel: {
@@ -420,27 +417,36 @@ export default {
       const keyResultOwners = await this.getKeyResultOwners();
       const contributors = await this.getObjectiveContributors();
 
-      let contributorsCopy = [...contributors];
-      let keyResultOwnersCopy = [...keyResultOwners];
+      let redundantContributors = [...contributors];
+      let keyResWithNoContributor = [...keyResultOwners];
 
       // Filter out already present links
-      contributors.map(async (c) => {
-        keyResultOwners.map(async (k) => {
+      contributors.forEach((c) => {
+        keyResultOwners.forEach((k) => {
           if (c.name === k.name) {
-            contributorsCopy = contributorsCopy.filter((con) => con.name !== c.name);
-            keyResultOwnersCopy = keyResultOwnersCopy.filter((kr) => kr.name !== k.name);
+            redundantContributors = redundantContributors.filter(
+              (con) => con.name !== c.name
+            );
+            keyResWithNoContributor = keyResWithNoContributor.filter(
+              (kr) => kr.name !== k.name
+            );
           }
         });
       });
 
+      // We only need one contributor element per unique keyRes parent (here mapped by name)
+      const uniqueKeyResWithNoContributor = keyResWithNoContributor.filter(
+        (value, index, self) => index === self.findIndex((t) => t.name === value.name)
+      );
+
       // Add missing contributor
-      keyResultOwnersCopy.map(async (k) => {
-        this.createObjectiveContributor(await k.ref);
+      uniqueKeyResWithNoContributor.forEach((k) => {
+        this.createObjectiveContributor(k.ref);
       });
 
       // Remove redundant contributors
-      contributorsCopy.map(async (c) => {
-        this.removeObjectiveContributor(await c.ref);
+      redundantContributors.forEach((c) => {
+        this.removeObjectiveContributor(c.ref);
       });
     },
 
diff --git a/src/db/ObjectiveContributors/ObjectiveContributors.js b/src/db/ObjectiveContributors/ObjectiveContributors.js
index f1d0e0dd9..11a546844 100644
--- a/src/db/ObjectiveContributors/ObjectiveContributors.js
+++ b/src/db/ObjectiveContributors/ObjectiveContributors.js
@@ -19,8 +19,9 @@ const create = async (itemRef, objectiveRef) => {
     .get()
     .then((snapshot) => snapshot.docs.map((doc) => doc.ref));
 
+  // Avoid creating duplicates
   if (contributors.length > 0) {
-    return undefined;
+    return contributors[0];
   }
 
   const data = { item: itemRef, objective: objectiveRef };