Skip to content

Commit 3152d3f

Browse files
committed
Fixes overview repo selection
1 parent efbdbe3 commit 3152d3f

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

src/webviews/apps/plus/home/components/active-work.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export class GlActiveWork extends SignalWatcher(LitElement) {
189189
}
190190

191191
private onChange(_e: MouseEvent) {
192-
void this._activeOverviewState.changeRepository();
192+
this._activeOverviewState.changeRepository();
193193
}
194194
}
195195

src/webviews/apps/plus/home/components/overviewState.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import type {
66
OverviewFilters,
77
} from '../../../../home/protocol';
88
import {
9-
ChangeOverviewRepository,
9+
ChangeOverviewRepositoryCommand,
1010
DidChangeOverviewFilter,
11+
DidChangeOverviewRepository,
1112
DidChangeRepositories,
1213
DidChangeRepositoryWip,
1314
GetActiveOverview,
@@ -44,6 +45,9 @@ export class ActiveOverviewState extends AsyncComputedState<ActiveOverview> {
4445
case DidChangeRepositoryWip.is(msg):
4546
this.run(true);
4647
break;
48+
case DidChangeOverviewRepository.is(msg):
49+
this.run(true);
50+
break;
4751
}
4852
});
4953
}
@@ -52,9 +56,8 @@ export class ActiveOverviewState extends AsyncComputedState<ActiveOverview> {
5256
this._disposable?.dispose();
5357
}
5458

55-
async changeRepository(): Promise<void> {
56-
await this._ipc.sendRequest(ChangeOverviewRepository, undefined);
57-
this.run(true);
59+
changeRepository(): void {
60+
this._ipc.sendCommand(ChangeOverviewRepositoryCommand, undefined);
5861
}
5962
}
6063

@@ -84,6 +87,9 @@ export class InactiveOverviewState extends AsyncComputedState<InactiveOverview>
8487
this.filter.stale = msg.params.filter.stale;
8588
this.run(true);
8689
break;
90+
case DidChangeOverviewRepository.is(msg):
91+
this.run(true);
92+
break;
8793
}
8894
});
8995
void this._ipc.sendRequest(GetOverviewFilterState, undefined).then(rsp => {

src/webviews/home/homeWebview.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,13 @@ import type {
8181
State,
8282
} from './protocol';
8383
import {
84-
ChangeOverviewRepository,
84+
ChangeOverviewRepositoryCommand,
8585
CollapseSectionCommand,
8686
DidChangeIntegrationsConnections,
8787
DidChangeLaunchpad,
8888
DidChangeOrgSettings,
8989
DidChangeOverviewFilter,
90+
DidChangeOverviewRepository,
9091
DidChangePreviewEnabled,
9192
DidChangeRepositories,
9293
DidChangeRepositoryWip,
@@ -235,7 +236,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
235236

236237
if (pick == null || pick === currentRepo) return;
237238

238-
this.selectRepository(pick.path);
239+
return this.selectRepository(pick.path);
239240
}
240241

241242
private onRepositoriesChanged() {
@@ -353,9 +354,9 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
353354
case GetOverviewFilterState.is(e):
354355
void this.host.respond(GetOverviewFilterState, e, this._overviewBranchFilter);
355356
break;
356-
case ChangeOverviewRepository.is(e):
357-
await this.onChooseRepository();
358-
void this.host.respond(ChangeOverviewRepository, e, undefined);
357+
case ChangeOverviewRepositoryCommand.is(e):
358+
if ((await this.onChooseRepository()) == null) return;
359+
void this.host.notify(DidChangeOverviewRepository, undefined);
359360
break;
360361
case TogglePreviewEnabledCommand.is(e):
361362
this.onTogglePreviewEnabled();

src/webviews/home/protocol.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ export const GetLaunchpadSummary = new IpcRequest<GetLaunchpadSummaryRequest, Ge
6363
'launchpad/summary',
6464
);
6565

66-
export interface GetOverviewRequest {
67-
[key: string]: unknown;
68-
}
69-
7066
export interface GetOverviewBranch {
7167
reference: GitBranchReference;
7268

@@ -238,7 +234,8 @@ export const GetInactiveOverview = new IpcRequest<GetInactiveOverviewRequest, Ge
238234
export type GetOverviewFilterStateResponse = OverviewFilters;
239235
export const GetOverviewFilterState = new IpcRequest<void, GetOverviewFilterStateResponse>(scope, 'overviewFilter');
240236

241-
export const ChangeOverviewRepository = new IpcRequest<undefined, undefined>(scope, 'overview/repository/change');
237+
export const ChangeOverviewRepositoryCommand = new IpcCommand<undefined>(scope, 'overview/repository/change');
238+
export const DidChangeOverviewRepository = new IpcNotification<undefined>(scope, 'overview/repository/didChange');
242239

243240
// COMMANDS
244241

0 commit comments

Comments
 (0)