Fix merge conflcits

dfpc-coe · Oct 15, 2024 · 71797e7 · 71797e7
1 parent 6ce5ec4
commit 71797e7
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 18 deletions.
diff --git a/api/web/src/components/Admin/AdminConfig.vue b/api/web/src/components/Admin/AdminConfig.vue
@@ -21,16 +21,19 @@
             </div>
             <div class='card-body row'>
                 <div
-                    @click='opened.has("agol") ? opened.delete("agol") : opened.add("agol")'
                     class='col-lg-12 hover-light py-2 cursor-pointer'
+                    @click='opened.has("agol") ? opened.delete("agol") : opened.add("agol")'
                 >
-                    <IconChevronDown v-if='opened.has("agol")'/>
-                    <IconChevronRight v-else/>
+                    <IconChevronDown v-if='opened.has("agol")' />
+                    <IconChevronRight v-else />
 
                     <span class='mx-2 user-select-none'>ArcGIS Online</span>
                 </div>
 
-                <div v-if='opened.has("agol")' class='col-lg-12 py-2 border rounded'>
+                <div
+                    v-if='opened.has("agol")'
+                    class='col-lg-12 py-2 border rounded'
+                >
                     <div class='row'>
                         <div class='col-lg-12'>
                             <TablerToggle
@@ -49,16 +52,19 @@
                 </div>
 
                 <div
-                    @click='opened.has("media") ? opened.delete("media") : opened.add("media")'
                     class='col-lg-12 hover-light py-2 cursor-pointer'
+                    @click='opened.has("media") ? opened.delete("media") : opened.add("media")'
                 >
-                    <IconChevronDown v-if='opened.has("media")'/>
-                    <IconChevronRight v-else/>
+                    <IconChevronDown v-if='opened.has("media")' />
+                    <IconChevronRight v-else />
 
                     <span class='mx-2 user-select-none'>Media Server</span>
                 </div>
 
-                <div v-if='opened.has("media")' class='col-lg-12 py-2 border rounded'>
+                <div
+                    v-if='opened.has("media")'
+                    class='col-lg-12 py-2 border rounded'
+                >
                     <div class='row'>
                         <div class='col-lg-12'>
                             <TablerInput
@@ -88,21 +94,28 @@
                 </div>
 
                 <div
-                    @click='opened.has("groups") ? opened.delete("groups") : opened.add("groups")'
                     class='col-lg-12 hover-light py-2 cursor-pointer'
+                    @click='opened.has("groups") ? opened.delete("groups") : opened.add("groups")'
                 >
-                    <IconChevronDown v-if='opened.has("groups")'/>
-                    <IconChevronRight v-else/>
+                    <IconChevronDown v-if='opened.has("groups")' />
+                    <IconChevronRight v-else />
 
                     <span class='mx-2 user-select-none'>TAK User Groups</span>
                 </div>
 
-                <div v-if='opened.has("groups")' class='col-lg-12 py-2 border rounded'>
+                <div
+                    v-if='opened.has("groups")'
+                    class='col-lg-12 py-2 border rounded'
+                >
                     <div class='row'>
-                        <div v-for='group in Object.keys(config["group::names"])' :key='group' class='col-lg-12'>
+                        <div
+                            v-for='group in groups'
+                            :key='group'
+                            class='col-lg-12'
+                        >
                             <TablerInput
+                                v-model='config[`group::${group}`]'
                                 :label='group'
-                                v-model='config["group::names"][group]'
                                 :disabled='!edit'
                             />
                         </div>

diff --git a/api/web/src/components/CloudTAK/Menu/Mission/MissionLogs.vue b/api/web/src/components/CloudTAK/Menu/Mission/MissionLogs.vue
@@ -27,7 +27,10 @@
                 :key='log.id'
                 class='col-12 pb-2'
             >
-                <TablerLoading v-if='loading.ids.has(logidx)' desc='Deleting Log'/>
+                <TablerLoading
+                    v-if='loading.ids.has(logidx)'
+                    desc='Deleting Log'
+                />
                 <template v-else>
                     <div class='d-flex'>
                         <label
@@ -65,18 +68,25 @@
             </div>
         </div>
 
-        <TablerLoading v-if='loading.create' desc='Creating Log' :compact='true'/>
+        <TablerLoading
+            v-if='loading.create'
+            desc='Creating Log'
+            :compact='true'
+        />
 
         <template v-if='role.permissions.includes("MISSION_WRITE")'>
             <div class='mx-2'>
                 <TablerInput
                     v-model='createLog'
                     label='Create Log'
-                    @keyup.enter='submitOnEnter ? submitLog() : undefined'
                     :rows='4'
+                    @keyup.enter='submitOnEnter ? submitLog() : undefined'
                 />
 
-                <TablerToggle label='Submit on Enter' v-model='submitOnEnter'/>
+                <TablerToggle
+                    v-model='submitOnEnter'
+                    label='Submit on Enter'
+                />
 
                 <div class='d-flex my-2'>
                     <div class='ms-auto'>