Skip to content

Add fallback for display name #1105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joanagmaia merged 2 commits into from
Jul 12, 2023
Merged

Add fallback for display name #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de07912
Add fallback for display name
joanagmaia Jul 12, 2023
7ab9ddd
Fix organiztaoins mapping
joanagmaia Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/modules/dashboard/components/organization/dashboard-organization-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/member/components/member-organizations.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -85,7 +85,7 @@
class="w-3.5"
/>
<span class="text-xs">{{
activeOrganization.displayName || '-'
activeOrganization.displayName || activeOrganization.name || '-'
}}</span>
</router-link>
</div>
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/modules/member/pages/member-form-page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 : {},
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/organization/components/view/organization-view-header.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/modules/organization/organization-model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}),
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/modules/organization/pages/organization-form-page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ const props = defineProps({

const { fields } = OrganizationModel;
const formSchema = new FormSchema([
fields.name,
fields.displayName,
fields.headline,
fields.description,
Expand Down Expand Up @@ -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 : '',
Expand Down