From cf15de2538c676a574c282f0e41428c59e6b20d0 Mon Sep 17 00:00:00 2001
From: Edward Hibbert <edward@ehibbert.org.uk>
Date: Mon, 25 Nov 2024 10:41:21 +0000
Subject: [PATCH] Don't lose group networks when archiving.

---
 resources/js/components/GroupActions.vue |  4 ++++
 resources/js/components/GroupHeading.vue | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/GroupActions.vue b/resources/js/components/GroupActions.vue
index f5834b98c..aa605f20d 100644
--- a/resources/js/components/GroupActions.vue
+++ b/resources/js/components/GroupActions.vue
@@ -120,6 +120,10 @@ export default {
       group.id = this.idgroups
       group.archived_at = (new Date()).toISOString()
       group.description = group.free_text
+
+      // Make sure we don't stomp on the networks.
+      delete group.networks
+
       await this.$store.dispatch('groups/edit', group)
 
       await this.$store.dispatch('groups/fetch', {
diff --git a/resources/js/components/GroupHeading.vue b/resources/js/components/GroupHeading.vue
index ecb1401f1..de5e3139a 100644
--- a/resources/js/components/GroupHeading.vue
+++ b/resources/js/components/GroupHeading.vue
@@ -17,7 +17,7 @@
         <div class="pl-md-4 d-flex w-xs-100 w-md-50 maybeborder pt-3 p-md-0 d-flex flex-column justify-content-center">
           <div class="d-flex justify-content-between w-100">
             <div class="flex-wrap">
-              <b>{{ group.location }}</b> <br/>
+              <b>{{ location }}</b> <br/>
               <ExternalLink v-if="group.website" :href="group.website">{{ __('groups.website') }}</ExternalLink>
             </div>
             <GroupActions :idgroups="idgroups" :can-see-delete="canSeeDelete" :can-perform-delete="canPerformDelete"
@@ -63,6 +63,20 @@ export default {
     groupImage() {
       return this.group && this.group.group_image && this.group.group_image.image ? ('/uploads/mid_' + this.group.group_image.image.path) : DEFAULT_PROFILE
     },
+    location() {
+      // This is a bit of finagling to deal with us not yet having full use of APIs in the client.
+      let ret = null
+
+      if (this.group) {
+        if (typeof this.group.location === 'string') {
+          ret = this.group.location
+        } else {
+          ret = this.group.location.name
+        }
+      }
+
+      return ret
+    }
   },
   methods: {
     brokenGroupImage(event) {