From de079122ac73b416ae36314f5c91b845752da881 Mon Sep 17 00:00:00 2001
From: Joana Maia <joana@crowd.dev>
Date: Wed, 12 Jul 2023 12:08:38 +0100
Subject: [PATCH 1/2] Add fallback for display name

---
 .../components/organization/dashboard-organization-item.vue | 2 +-
 .../member/components/form/member-form-organizations.vue    | 6 +++++-
 .../src/modules/member/components/member-organizations.vue  | 4 ++--
 .../components/view/organization-view-header.vue            | 4 ++--
 frontend/src/modules/organization/organization-model.js     | 3 +++
 .../modules/organization/pages/organization-form-page.vue   | 4 +++-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/frontend/src/modules/dashboard/components/organization/dashboard-organization-item.vue b/frontend/src/modules/dashboard/components/organization/dashboard-organization-item.vue
index 334a055913..624eec8e4c 100644
--- a/frontend/src/modules/dashboard/components/organization/dashboard-organization-item.vue
+++ b/frontend/src/modules/dashboard/components/organization/dashboard-organization-item.vue
@@ -28,7 +28,7 @@
         <h6
           class="text-xs leading-5 font-medium text-gray-900 hover:text-brand-500 transition"
         >
-          {{ organization.displayName }}
+          {{ organization.displayName || organization.name }}
         </h6>
       </div>
       <div>
diff --git a/frontend/src/modules/member/components/form/member-form-organizations.vue b/frontend/src/modules/member/components/form/member-form-organizations.vue
index ebecc677c2..d32ca0e281 100644
--- a/frontend/src/modules/member/components/form/member-form-organizations.vue
+++ b/frontend/src/modules/member/components/form/member-form-organizations.vue
@@ -145,7 +145,11 @@ const dateRange = reactive<string[][]>([]);
 
 const organizations = computed<Organization[]>({
   get() {
-    return props.modelValue.organizations;
+    return props.modelValue.organizations.map((o) => ({
+      ...o,
+      displayName: o.displayName || o.name,
+      label: o.displayName || o.name,
+    }));
   },
   set(v) {
     emit('update:modelValue', {
diff --git a/frontend/src/modules/member/components/member-organizations.vue b/frontend/src/modules/member/components/member-organizations.vue
index 9f1bb5e331..b7a43e39f3 100644
--- a/frontend/src/modules/member/components/member-organizations.vue
+++ b/frontend/src/modules/member/components/member-organizations.vue
@@ -18,7 +18,7 @@
           <p
             class="text-gray-900 text-sm text-ellipsis truncate hover:text-brand-500 transition leading-relaxed"
           >
-            {{ activeOrganization.displayName || '-' }}
+            {{ activeOrganization.displayName || activeOrganization.name || '-' }}
           </p>
         </div>
       </router-link>
@@ -85,7 +85,7 @@
           class="w-3.5"
         />
         <span class="text-xs">{{
-          activeOrganization.displayName || '-'
+          activeOrganization.displayName || activeOrganization.name || '-'
         }}</span>
       </router-link>
     </div>
diff --git a/frontend/src/modules/organization/components/view/organization-view-header.vue b/frontend/src/modules/organization/components/view/organization-view-header.vue
index fea3d8d320..44a17dbae9 100644
--- a/frontend/src/modules/organization/components/view/organization-view-header.vue
+++ b/frontend/src/modules/organization/components/view/organization-view-header.vue
@@ -5,14 +5,14 @@
         <app-avatar
           :entity="{
             avatar: organization.logo,
-            displayName: organization.displayName?.replace('@', ''),
+            displayName: (organization.displayName || organization.name)?.replace('@', ''),
           }"
           size="xl"
           class="mr-4"
         />
         <div>
           <div class="flex">
-            <h5>{{ organization.displayName }}</h5>
+            <h5>{{ organization.displayName || organization.name }}</h5>
             <app-organization-badge
               class="ml-2"
               :organization="organization"
diff --git a/frontend/src/modules/organization/organization-model.js b/frontend/src/modules/organization/organization-model.js
index 19e9e492ca..a5bb9568ba 100644
--- a/frontend/src/modules/organization/organization-model.js
+++ b/frontend/src/modules/organization/organization-model.js
@@ -22,6 +22,9 @@ i18nInit();
 
 const fields = {
   id: new IdField('id', label('id')),
+  name: new StringField('name', label('name'), {
+    required: true,
+  }),
   displayName: new StringField('displayName', label('name'), {
     required: true,
   }),
diff --git a/frontend/src/modules/organization/pages/organization-form-page.vue b/frontend/src/modules/organization/pages/organization-form-page.vue
index 035401332c..c02037ad54 100644
--- a/frontend/src/modules/organization/pages/organization-form-page.vue
+++ b/frontend/src/modules/organization/pages/organization-form-page.vue
@@ -154,6 +154,7 @@ const props = defineProps({
 
 const { fields } = OrganizationModel;
 const formSchema = new FormSchema([
+  fields.name,
   fields.displayName,
   fields.headline,
   fields.description,
@@ -182,7 +183,8 @@ function getInitialModel(record) {
   return JSON.parse(
     JSON.stringify(
       formSchema.initialValues({
-        displayName: record ? record.displayName : '',
+        name: record ? record.name : '',
+        displayName: record ? record.displayName || record.name : '',
         headline: record ? record.headline : '',
         description: record ? record.description : '',
         joinedAt: record ? record.joinedAt : '',

From 7ab9dddcc0a8d5882ca7bcf79790b3d8ec486400 Mon Sep 17 00:00:00 2001
From: Joana Maia <joana@crowd.dev>
Date: Wed, 12 Jul 2023 12:39:39 +0100
Subject: [PATCH 2/2] Fix organiztaoins mapping

---
 .../member/components/form/member-form-organizations.vue    | 6 +-----
 frontend/src/modules/member/pages/member-form-page.vue      | 6 +++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/modules/member/components/form/member-form-organizations.vue b/frontend/src/modules/member/components/form/member-form-organizations.vue
index d32ca0e281..ebecc677c2 100644
--- a/frontend/src/modules/member/components/form/member-form-organizations.vue
+++ b/frontend/src/modules/member/components/form/member-form-organizations.vue
@@ -145,11 +145,7 @@ const dateRange = reactive<string[][]>([]);
 
 const organizations = computed<Organization[]>({
   get() {
-    return props.modelValue.organizations.map((o) => ({
-      ...o,
-      displayName: o.displayName || o.name,
-      label: o.displayName || o.name,
-    }));
+    return props.modelValue.organizations;
   },
   set(v) {
     emit('update:modelValue', {
diff --git a/frontend/src/modules/member/pages/member-form-page.vue b/frontend/src/modules/member/pages/member-form-page.vue
index 7e115d0109..e630baa05f 100644
--- a/frontend/src/modules/member/pages/member-form-page.vue
+++ b/frontend/src/modules/member/pages/member-form-page.vue
@@ -202,7 +202,11 @@ function getInitialModel(r) {
         attributes: r
           ? filteredAttributes(r.attributes)
           : {},
-        organizations: r ? r.organizations : [],
+        organizations: r ? r.organizations.map((o) => ({
+          ...o,
+          displayName: o.displayName || o.name,
+          label: o.displayName || o.name,
+        })) : [],
         ...attributes,
         tags: r ? r.tags : [],
         username: r ? r.username : {},