Commit 73c5275

committed

fix: wrong message handler.

1 parent 6b28fa3 commit 73c5275Copy full SHA for 73c5275

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ function App() {`
`53`	`53`	`await onRefreshStatus();`
`54`	`54`	`}, 30 * 1000);`
`55`	`55`	`}`
`56`		`- }, 5 * 1000);`
	`56`	`+ }, 3 * 1000);`
`57`	`57`
`58`	`58`	`return () => {`
`59`	`59`	`window.clearTimeout(statusChecker.current);`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,12 @@ function AddComment() {`
`36`	`36`	`const showAllowMergeBtn = mrStatusOk && mergeRequest?.author?.id !== user?.id;`
`37`	`37`
`38`	`38`	`const getAgreed = () => {`
`39`		`- let agreed = true;`
`40`	`39`	`const index = reviewers.reviewers.findIndex((r) => r.reviewer.id === user.id);`
`41`		`-`
	`40`	`+letagreed=reviewers.volunteer_reviewers.findIndex((r)=>r.reviewer.id===user.id)>=0;`
`42`	`41`	`if (index >= 0) {`
`43`	`42`	`agreed = reviewers.reviewers[index].value === 100;`
`44`		`- } else {`
`45`		`- agreed = reviewers.volunteer_reviewers.findIndex((r) => r.reviewer.id === user.id) >= 0;`
`46`	`43`	`}`
	`44`	`+`
`47`	`45`	`return agreed;`
`48`	`46`	`};`
`49`	`47`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ function StatusCheck(props: Props) {`
`59`	`59`	`);`
`60`	`60`	`})`
`61`	`61`	`) : (`
`62`		`- <li>No related job(s) found</li>`
	`62`	`+ <li>No related job found</li>`
`63`	`63`	`)}`
`64`	`64`	`</ul>`
`65`	`65`	`</>`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,15 @@`
`1`	`1`	`import { vscode } from 'webviews/constants/vscode';`
	`2`	`+import { nanoid } from 'nanoid';`
`2`	`3`	`import { IRequestMessage, IReplyMessage } from 'src/typings/message';`
`3`	`4`
`4`	`5`	`export class MessageHandler {`
`5`	`6`	`private _commandHandler: ((message: any) => void) \| null;`
`6`		`- private lastSentReq: number;`
	`7`	`+ // private lastSentReq: string;`
`7`	`8`	`private pendingReplies: any;`
`8`	`9`
`9`	`10`	`constructor(commandHandler: any) {`
`10`	`11`	`this._commandHandler = commandHandler;`
`11`		`- this.lastSentReq = 0;`
	`12`	`+ // this.lastSentReq = nanoid();`
`12`	`13`	`this.pendingReplies = Object.create(null);`
`13`	`14`	`window.addEventListener('message', this.handleMessage.bind(this));`
`14`	`15`	`}`
`@@ -18,7 +19,7 @@ export class MessageHandler {`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`public async postMessage(message: any): Promise<any> {`
`21`		`- const req = String(++this.lastSentReq);`
	`22`	`+ const req = nanoid();`
`22`	`23`	`return new Promise<any>((resolve, reject) => {`
`23`	`24`	`this.pendingReplies[req] = {`
`24`	`25`	`resolve: resolve,`

Comments

(0)