From b009501a533e6ebfa79dde4c48554c99ee53c9c2 Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Thu, 18 Mar 2021 17:24:22 +0100
Subject: [PATCH] Fixed runner group update recognition being weired

ref #98
---
 src/components/runners/RunnerDetail.svelte | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/runners/RunnerDetail.svelte b/src/components/runners/RunnerDetail.svelte
index bc2198ac..2615017a 100644
--- a/src/components/runners/RunnerDetail.svelte
+++ b/src/components/runners/RunnerDetail.svelte
@@ -1,6 +1,5 @@
 <script>
   import { getLocaleFromNavigator, _ } from "svelte-i18n";
-  import lodashIsEqual from "lodash.isequal";
   import store from "../../store";
   import {
     RunnerService,
@@ -20,7 +19,7 @@
   $: original_data = {};
   $: editable = {};
   $: group = {}
-  $: changes_performed = !lodashIsEqual(original_data, editable);
+  $: changes_performed = !(JSON.stringify(original_data) == JSON.stringify(editable));
   $: isEmailValid =
     (editable.email || "") === "" ||
     (editable.email && isEmail(editable.email || ""));
@@ -35,8 +34,23 @@
   runner_promise.then((data) => {
     data_loaded = true;
     original_data_pdf = Object.assign(original_data_pdf, data);
+    data.group = data.group.id;
     original_data = Object.assign(original_data, data);
     editable = Object.assign(editable, original_data);
+
+    RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
+      const orgs = val.map((r) => {
+        return { label: r.name, value: r };
+      });
+      groups = groups.concat(orgs);
+      RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
+        const teams = val.map((r) => {
+          return { label: `${r.parentGroup.name} > ${r.name}`, value: r };
+        });
+        groups = groups.concat(teams);
+        group = groups.find(g => g.value.id == editable.group)
+      });
+    });
   });
   document.addEventListener("click", function (e) {
     if (
@@ -47,19 +61,6 @@
     }
   });
   let groups = [];
-  RunnerOrganizationService.runnerOrganizationControllerGetAll().then((val) => {
-    const orgs = val.map((r) => {
-      return { label: r.name, value: r };
-    });
-    groups = groups.concat(orgs);
-    RunnerTeamService.runnerTeamControllerGetAll().then((val) => {
-      const teams = val.map((r) => {
-        return { label: `${r.parentGroup.name} > ${r.name}`, value: r };
-      });
-      groups = groups.concat(teams);
-      group = groups.find(g => g.value.id == editable.group.id)
-    });
-  });
   function submit() {
     if (data_loaded === true && save_enabled) {
       Toastify({
@@ -68,7 +69,6 @@
       }).showToast();
       let postdata = {};
       postdata = Object.assign(postdata, editable);
-      postdata.group = postdata.group.id;
       RunnerService.runnerControllerPut(original_data.id, postdata)
         .then((resp) => {
           Object.assign(original_data, editable);
@@ -384,7 +384,7 @@
         placeholder={$_('search-for-an-organization-or-team-by-name-or-id')}
         noOptionsMessage={$_('no-organization-or-team-found')}
         bind:selectedValue={group}
-        on:select={(selectedValue) => {editable.group = selectedValue.detail.value}}
+        on:select={(selectedValue) => {editable.group = selectedValue.detail.value.id}}
         on:clear={() => (editable.group = null)} />
     </div>
     <div class="text-sm w-full">