ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix to ensure that we rewrite spark ui links correctly (#4962)

Browse Source
This commit is contained in:
Chris LaFreniere
2019-04-09 18:23:21 -07:00
committed by GitHub
parent 37f45b10a3
commit d332ae1132
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/sql/workbench/parts/notebook/models/cell.ts
View File

@@ -390,16 +390,8 @@ export class CellModel implements ICellModel {
let endpoint = this.getKnoxEndpoint(model.activeConnection); let endpoint = this.getKnoxEndpoint(model.activeConnection);
let host = endpoint && endpoint.ipAddress ? endpoint.ipAddress : model.activeConnection.serverName; let host = endpoint && endpoint.ipAddress ? endpoint.ipAddress : model.activeConnection.serverName;
let html = result.data['text/html']; let html = result.data['text/html'];
html = html.replace(/(https?:\/\/mssql-master.*\/proxy)(.*)/g, function (a, b, c) { html =this.rewriteUrlUsingRegex(/(https?:\/\/mssql-master.*\/proxy)(.*)/g, html, host);
let ret = ''; html =this.rewriteUrlUsingRegex(/(https?:\/\/master.*master-svc.*\/proxy)(.*)/g, html, host);
if (b !== '') {
ret = 'https://' + host + ':30443/gateway/default/yarn/proxy';
}
if (c !== '') {
ret = ret + c;
}
return ret;
});
(<nb.IDisplayResult>output).data['text/html'] = html; (<nb.IDisplayResult>output).data['text/html'] = html;
} }
} }
@@ -409,6 +401,19 @@ export class CellModel implements ICellModel {
return output; return output;
} }
private rewriteUrlUsingRegex(regex: RegExp, html: string, host: string): string {
return html.replace(regex, function (a, b, c) {
let ret = '';
if (b !== '') {
ret = 'https://' + host + ':30443/gateway/default/yarn/proxy';
}
if (c !== '') {
ret = ret + c;
}
return ret;
});
}
private getDisplayId(msg: nb.IIOPubMessage): string | undefined { private getDisplayId(msg: nb.IIOPubMessage): string | undefined {
let transient = (msg.content.transient || {}); let transient = (msg.content.transient || {});
return transient['display_id'] as string; return transient['display_id'] as string;