diff --git a/cypress/fixtures/projectRemotes.json b/cypress/fixtures/projectRemotes.json index 3118fe5e6..2ee9669c0 100644 --- a/cypress/fixtures/projectRemotes.json +++ b/cypress/fixtures/projectRemotes.json @@ -1,7 +1,7 @@ [ { "id": "hyndc7nx9keq76p1bkw9831arcndeeu3trwsc7kxt3osmpi6j9oeke", - "name": "dabit3", + "person": { "name": "dabit3" }, "delegate": true } ] diff --git a/src/base/projects/PeerSelector.spec.ts b/src/base/projects/PeerSelector.spec.ts index bbc3cf9b8..47c564381 100644 --- a/src/base/projects/PeerSelector.spec.ts +++ b/src/base/projects/PeerSelector.spec.ts @@ -7,7 +7,7 @@ const defaultProps = { peers: [ { "id": "hyyg555wwkkutaysg6yr67qnu5d5ji54iur3n5uzzszndh8dp7ofue", - "name": "sebastinez", + "person": { "name": "sebastinez" }, "delegate": true } ], @@ -73,12 +73,12 @@ describe('Events', () => { peers: [ { "id": "hyy841u4phudmr8s5rg1jjwd1ct7x7438wmjwtsm464y8uyxyhyi6c", - "name": "cloudhead", + "person": { "name": "cloudhead" }, "delegate": true }, { "id": "hyyg555wwkkutaysg6yr67qnu5d5ji54iur3n5uzzszndh8dp7ofue", - "name": "sebastinez", + "person": { "name": "sebastinez" }, "delegate": true } ] diff --git a/src/base/projects/PeerSelector.svelte b/src/base/projects/PeerSelector.svelte index e4c280ce2..ef3f0d67e 100644 --- a/src/base/projects/PeerSelector.svelte +++ b/src/base/projects/PeerSelector.svelte @@ -17,8 +17,8 @@ onMount(() => { meta = peers.find(p => p.id === peer); items = peers.map(p => { - if (! p.name) console.debug("Not able to resolve peer identity for: ", p.id); - let key = p.name ? `${p.name} ${p.id}` : p.id; + if (! p.person?.name) console.debug("Not able to resolve peer identity for: ", p.id); + let key = p.person?.name ? `${p.person.name} ${p.id}` : p.id; return { key, value: p.id, badge: p.delegate ? "delegate" : null }; }); @@ -72,7 +72,7 @@ {#if meta} - {meta.name ?? formatSeedId(meta.id)} + {meta.person?.name ?? formatSeedId(meta.id)} {#if meta.delegate} delegate diff --git a/src/commit.ts b/src/commit.ts index 3714c0fc1..9941e9573 100644 --- a/src/commit.ts +++ b/src/commit.ts @@ -1,4 +1,4 @@ -import type { Stats } from "@app/project"; +import type { Stats, Person } from "@app/project"; import type { Diff } from "@app/diff"; import { ApiError } from "@app/api"; @@ -33,10 +33,6 @@ export interface GroupedCommitsHistory { stats: Stats; } -export interface Person { - name: string; -} - export interface CommitContext { committer?: { peer: { diff --git a/src/project.ts b/src/project.ts index 99da0f717..4db458954 100644 --- a/src/project.ts +++ b/src/project.ts @@ -86,9 +86,13 @@ export interface Remote { heads: Branches; } +export interface Person { + name: string; +} + export interface Peer { id: PeerId; - name: string; + person?: Person; delegate: boolean; }