From 9c7f844d5915ed0e776f348a6c6102cca542099c Mon Sep 17 00:00:00 2001
From: Karl Burtram <karlb@microsoft.com>
Date: Tue, 4 Feb 2020 11:15:31 -0800
Subject: [PATCH] Import "fromPromise" so Observables work correctly (#9034)

* Import "fromPromise" so Observables work correctly

* Bump distro guid

* Fix unit test missing file error

* Bump distro to pick up latest changes
---
 build/gulpfile.vscode.js                                        | 1 +
 package.json                                                    | 2 +-
 src/bootstrap-window.js                                         | 1 +
 .../browser/widgets/insights/insightsWidget.component.ts        | 1 +
 .../bootstrap/browser/commonServiceInterface.service.ts         | 1 +
 test/all.js                                                     | 1 +
 test/electron/renderer.js                                       | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index 43daac0b49..af42d520d3 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -43,6 +43,7 @@ const nodeModules = [
 	'electron',
 	'original-fs',
 	'rxjs/Observable',
+	'rxjs/add/observable/fromPromise',
 	'rxjs/Subject',
 	'rxjs/Observer',
 	'slickgrid/lib/jquery.event.drag-2.3.0',
diff --git a/package.json b/package.json
index 6e058f2575..7256b26869 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "azuredatastudio",
   "version": "1.15.0",
-  "distro": "b71b4af5016533d971958cc37e25b43b9c3754a5",
+  "distro": "922d292f69c5d36ab6f0dbbd94a63c81219afaaf",
   "author": {
     "name": "Microsoft Corporation"
   },
diff --git a/src/bootstrap-window.js b/src/bootstrap-window.js
index 7b2c31b81a..ec524e41ac 100644
--- a/src/bootstrap-window.js
+++ b/src/bootstrap-window.js
@@ -111,6 +111,7 @@ exports.load = function (modulePaths, resultCallback, options) {
 		'@angular/platform-browser-dynamic',
 		'@angular/router',
 		'rxjs/Observable',
+		'rxjs/add/observable/fromPromise',
 		'rxjs/Subject',
 		'rxjs/Observer',
 		'slickgrid/lib/jquery.event.drag-2.3.0',
diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts
index bb50d8706a..69766a2514 100644
--- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts
+++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts
@@ -8,6 +8,7 @@ import {
 	ComponentFactoryResolver, ViewChild, ChangeDetectorRef, Injector
 } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromPromise';
 
 import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget';
 import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service';
diff --git a/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts b/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts
index fd23c05904..60f29177f3 100644
--- a/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts
+++ b/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts
@@ -6,6 +6,7 @@
 /* Node Modules */
 import { Injectable, Inject } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromPromise';
 
 /* SQL imports */
 import { IDefaultComponentParams, IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams';
diff --git a/test/all.js b/test/all.js
index 7a6dea1ac5..9641323dbc 100644
--- a/test/all.js
+++ b/test/all.js
@@ -63,6 +63,7 @@ function main() {
 			'angular2-grid',
 			'ng2-charts',
 			'rxjs/add/observable/of',
+			'rxjs/add/observable/fromPromise',
 			'rxjs/Observable',
 			'rxjs/Subject',
 			'rxjs/Observer'
diff --git a/test/electron/renderer.js b/test/electron/renderer.js
index 6fe0d8ebd4..954a2fc782 100644
--- a/test/electron/renderer.js
+++ b/test/electron/renderer.js
@@ -51,6 +51,7 @@ function initLoader(opts) {
 			'angular2-grid',
 			'ng2-charts',
 			'rxjs/add/observable/of',
+			'rxjs/add/observable/fromPromise',
 			'rxjs/Observable',
 			'rxjs/Subject',
 			'rxjs/Observer'