Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 38 additions & 0 deletions packages/client-runtime/src/state/projectGrouping.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { describe, expect, it } from "@effect/vitest";

import { deriveProjectGroupLabel } from "./projectGrouping.ts";

const repositoryIdentity = (owner: string, name: string) => ({
canonicalKey: `github.com/${owner}/${name}`,
displayName: `${owner}/${name}`,
name,
owner,
locator: {
source: "git-remote" as const,
remoteName: "origin",
remoteUrl: `git@github.com:${owner}/${name}.git`,
},
});

describe("deriveProjectGroupLabel", () => {
it("prefers the short repository name over the owner-qualified display name", () => {
const project = {
title: "Custom title",
repositoryIdentity: repositoryIdentity("pingdotgg", "t3code"),
};

expect(deriveProjectGroupLabel({ representative: project, members: [project] })).toBe("t3code");
});

it("falls back to the display name when a repository name is unavailable", () => {
const { name: _name, ...identityWithoutName } = repositoryIdentity("macs-holding", "internal");
const project = {
title: "Custom title",
repositoryIdentity: identityWithoutName,
};

expect(deriveProjectGroupLabel({ representative: project, members: [project] })).toBe(
"macs-holding/internal",
);
});
});
14 changes: 7 additions & 7 deletions packages/client-runtime/src/state/projectGrouping.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,19 +165,19 @@ export function deriveProjectGroupLabel(input: {
readonly representative: Pick<EnvironmentProject, "title" | "repositoryIdentity">;
readonly members: ReadonlyArray<Pick<EnvironmentProject, "title" | "repositoryIdentity">>;
}): string {
const sharedDisplayNames = uniqueNonEmptyValues(
input.members.map((member) => member.repositoryIdentity?.displayName),
);
if (sharedDisplayNames.length === 1) {
return sharedDisplayNames[0]!;
}

const sharedRepositoryNames = uniqueNonEmptyValues(
input.members.map((member) => member.repositoryIdentity?.name),
);
if (sharedRepositoryNames.length === 1) {
return sharedRepositoryNames[0]!;
}

const sharedDisplayNames = uniqueNonEmptyValues(
input.members.map((member) => member.repositoryIdentity?.displayName),
);
if (sharedDisplayNames.length === 1) {
return sharedDisplayNames[0]!;
}

return input.representative.title;
}
Loading