diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-paragraph.interface.ts b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-paragraph.interface.ts index 689104668db..2ea3916ea1e 100644 --- a/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-paragraph.interface.ts +++ b/zeppelin-web-angular/projects/zeppelin-sdk/src/interfaces/message-paragraph.interface.ts @@ -77,10 +77,10 @@ export interface ParagraphConfig { } export interface ParagraphResults { + [index: number]: Record; + code?: string; msg?: ParagraphIResultsMsgItem[]; - - [index: number]: Record; } export enum DatasetType { diff --git a/zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts b/zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts index 29a05ddf8ca..9ac4df73c23 100644 --- a/zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts +++ b/zeppelin-web-angular/projects/zeppelin-sdk/src/message.ts @@ -52,6 +52,7 @@ export class Message { private wsUrl?: string; private ticket?: Ticket; private uniqueClientId = Math.random().toString(36).substring(2, 7); + // TODO: Clean up this variable with `msgId` in server-side. See ZEPPELIN-6419, ZEPPELIN-4985 private lastMsgIdSeqSent = 0; private readonly normalCloseCode = 1000; @@ -174,27 +175,6 @@ export class Message { receive(op: K): Observable[K]> { return this.received$.pipe( filter(message => message.op === op), - filter(message => { - if (!message.msgId) { - // when msgId is not specified, it is not response to client request. - // always process them - return true; - } - const uniqueClientId = message.msgId.split('-')[0]; - const msgIdSeqReceived = parseInt(message.msgId.split('-')[1], 10); - const isResponseForRequestFromThisClient = uniqueClientId === this.uniqueClientId; - - if (message.op === OP.PARAGRAPH) { - if (isResponseForRequestFromThisClient && this.lastMsgIdSeqSent > msgIdSeqReceived) { - console.log('PARAPGRAPH is already updated by shortcircuit'); - return false; - } else { - return true; - } - } else { - return true; - } - }), map(message => message.data) ) as Observable[K]>; }