From 8e91ea45ff8cf42cfbb339a0478b05f659f419b6 Mon Sep 17 00:00:00 2001
From: darta <josepmaria@isardvdi.com>
Date: Sat, 28 May 2022 08:52:58 +0200
Subject: [PATCH] fix(admin): groups select refresh at each modal open

---
 admin/src/admin/static/js/groups.js | 59 ++++++++++++++++-------------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/admin/src/admin/static/js/groups.js b/admin/src/admin/static/js/groups.js
index f89fe09..dc0dadd 100644
--- a/admin/src/admin/static/js/groups.js
+++ b/admin/src/admin/static/js/groups.js
@@ -5,32 +5,7 @@ $(document).on('shown.bs.modal', '#modalAddDesktop', function () {
 
 $(document).ready(function() {
 
-    $.ajax({
-        type: "GET",
-        "url": "/api/groups",
-        success: function(data)
-        {
-            $(".groups-select").append(
-                '<option value="" default>None</option>'
-            )
-            data.forEach(element => {
-                var groupOrigins = [];
-                ['keycloak'].forEach(o => {
-                    if (element[o]) {
-                        groupOrigins.push(o)
-                    }
-                })
-                $(".groups-select").append(
-                    '<option value="' + element.name + '">' + element.name + '</option>'
-                )
-            });
-            $('.groups-select').select2();
-        },
-        error: function(data)
-        {
-            alert('Something went wrong on our side...')
-        }
-    });
+    update_modal_groups();
 
     $('.btn-global-resync').on('click', function () {
         $.ajax({
@@ -52,6 +27,7 @@ $(document).ready(function() {
     
 	// Open new group modal
 	$('.btn-new').on('click', function () {
+        update_modal_groups()
         $('#modalAddGroup').modal({
             backdrop: 'static',
             keyboard: false
@@ -219,4 +195,33 @@ $(document).ready(function() {
             break;
         }
     });
-})
\ No newline at end of file
+})
+
+function update_modal_groups(){
+    $.ajax({
+        type: "GET",
+        "url": "/api/groups",
+        success: function(data)
+        {
+            $(".groups-select").empty().append(
+                '<option value="" default>None</option>'
+            )
+            data.forEach(element => {
+                var groupOrigins = [];
+                ['keycloak'].forEach(o => {
+                    if (element[o]) {
+                        groupOrigins.push(o)
+                    }
+                })
+                $(".groups-select").append(
+                    '<option value="' + element.name + '">' + element.name + '</option>'
+                )
+            });
+            $('.groups-select').select2();
+        },
+        error: function(data)
+        {
+            alert('Something went wrong on our side...')
+        }
+    });
+}
\ No newline at end of file