Skip to content

Commit 8f3dc02

Browse files
author
iamhyc
committed
feat(pro): integrate comment thread interaction
1 parent 4d18c27 commit 8f3dc02

File tree

10 files changed

+364
-5
lines changed

10 files changed

+364
-5
lines changed
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

src/api/extendedBase.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ export interface DocumentReviewCommentSchema extends DocumentReviewSchema {
4646
}
4747

4848
export interface DocumentRangesSchema {
49-
changes: DocumentReviewChangeSchema[],
50-
comments: DocumentReviewCommentSchema[],
49+
changes?: DocumentReviewChangeSchema[],
50+
comments?: DocumentReviewCommentSchema[],
5151
}
5252

5353
export interface ExtendedResponseSchema extends ResponseSchema {
@@ -75,7 +75,7 @@ export class ExtendedBaseAPI extends BaseAPI {
7575
async getAllCommentThreads(identity: Identity, project_id: string) {
7676
this.setIdentity(identity);
7777
return await this.request('GET', `project/${project_id}/threads`, undefined, (res) => {
78-
const threads = JSON.parse(res!);
78+
const threads = JSON.parse(res!);
7979
return {threads};
8080
}) as ExtendedResponseSchema;
8181
}

src/collaboration/clientManager.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { SocketIOAPI, UpdateUserSchema } from '../api/socketio';
55
import { VirtualFileSystem } from '../core/remoteFileSystemProvider';
66
import { ChatViewProvider } from './chatViewProvider';
77
import { LocalReplicaSCMProvider } from '../scm/localReplicaSCM';
8+
import { ReviewPanelProvider } from './reviewPanelProvider';
89

910
interface ExtendedUpdateUserSchema extends UpdateUserSchema {
1011
selection?: {
@@ -59,6 +60,7 @@ export class ClientManager {
5960
private readonly onlineUsers: {[K:string]:ExtendedUpdateUserSchema} = {};
6061
private connectedFlag: boolean = true;
6162
private readonly chatViewer: ChatViewProvider;
63+
private readonly reviewPanel: ReviewPanelProvider;
6264

6365
constructor(
6466
private readonly vfs: VirtualFileSystem,
@@ -101,6 +103,7 @@ export class ClientManager {
101103
});
102104

103105
this.chatViewer = new ChatViewProvider(this.vfs, this.publicId, this.context.extensionUri, this.socket);
106+
this.reviewPanel = new ReviewPanelProvider(this.vfs, this.context, this.socket);
104107
this.status = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 0);
105108
this.updateStatus();
106109
}
@@ -376,6 +379,8 @@ export class ClientManager {
376379
}),
377380
// register chat view provider
378381
...this.chatViewer.triggers,
382+
// register review panel provider
383+
...this.reviewPanel.triggers,
379384
// update this client's position
380385
vscode.window.onDidChangeTextEditorSelection(async e => {
381386
if (e.kind===undefined) { return; }

0 commit comments

Comments
 (0)