Fixes draft contributor names and sorting

gitkraken · Jan 18, 2024 · d2f8ed2 · d2f8ed2
1 parent 9935ae9
commit d2f8ed2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/src/plus/gk/account/organizationService.ts b/src/plus/gk/account/organizationService.ts
@@ -148,6 +148,7 @@ export class OrganizationService implements Disposable {
 			if (this._fullOrganizations == null) {
 				this._fullOrganizations = new Map();
 			}
+			organization.members.sort((a, b) => (a.name ?? a.username).localeCompare(b.name ?? b.username));
 			this._fullOrganizations.set(id, organization);
 		}
 		return this._fullOrganizations.get(id);

diff --git a/src/plus/webviews/patchDetails/patchDetailsWebview.ts b/src/plus/webviews/patchDetails/patchDetailsWebview.ts
@@ -532,7 +532,7 @@ export class PatchDetailsWebviewProvider
 
 			const items = members.map(member => {
 				const item: OrganizationMemberQuickPickItem = {
-					label: member.name,
+					label: member.name ?? member.username,
 					description: member.email,
 					// TODO: needs to support current collaborator selections
 					picked: initSelections ? initSelections.has(member.id) : false,

diff --git a/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts b/src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts
@@ -309,7 +309,9 @@ export class GlDraftDetails extends GlTreeBase {
 					<gk-avatar .src=${userSelection.avatarUrl}></gk-avatar>
 				</div>
 				<div class="user-selection__info">
-					<div class="user-selection__name">${userSelection.member.name}</div>
+					<div class="user-selection__name">
+						${userSelection.member.name ?? userSelection.member.username}
+					</div>
 				</div>
 				<div class="user-selection__actions">
 					${when(

diff --git a/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts b/src/webviews/apps/plus/patchDetails/components/gl-patch-create.ts
@@ -141,7 +141,9 @@ export class GlPatchCreate extends GlTreeBase<GlPatchCreateEvents> {
 					<gk-avatar .src=${userSelection.avatarUrl}></gk-avatar>
 				</div>
 				<div class="user-selection__info">
-					<div class="user-selection__name">${userSelection.member.name}</div>
+					<div class="user-selection__name">
+						${userSelection.member.name ?? userSelection.member.username}
+					</div>
 				</div>
 				<div class="user-selection__actions">
 					<gk-popover>

diff --git a/src/webviews/apps/plus/patchDetails/patchDetails.scss b/src/webviews/apps/plus/patchDetails/patchDetails.scss
@@ -175,6 +175,13 @@ textarea.message-input__control {
 
 	&__info {
 		flex: 1;
+		min-width: 0;
+		white-space: nowrap;
+	}
+
+	&__name {
+		overflow: hidden;
+		text-overflow: ellipsis;
 	}
 
 	&__actions {