Use 2020-03-01 API version for ARM calls

package.json

@@ -42,7 +42,6 @@
     "applicationinsights": "1.8.0",
     "babel-polyfill": "6.26.0",
     "bootstrap": "3.4.1",
-    "botframework-webchat": "4.10.1",
     "canvas": "2.6.1",
     "clean-webpack-plugin": "0.1.19",
     "copy-webpack-plugin": "6.0.2",

src/Common/Constants.ts

@@ -50,7 +50,7 @@ export class ArmApiVersions {
   public static readonly arcadiaLivy: string = "2019-11-01-preview";
   public static readonly arm: string = "2015-11-01";
   public static readonly armFeatures: string = "2014-08-01-preview";
-  public static readonly publicVersion = "2020-04-01";
+  public static readonly publicVersion = "2020-03-01";
 }
 
 export class ArmResourceTypes {

src/Explorer/ComponentRegisterer.ts

@@ -78,4 +78,3 @@ ko.components.register("upload-file-pane", new PaneComponents.UploadFilePaneComp
 ko.components.register("string-input-pane", new PaneComponents.StringInputPaneComponent());
 ko.components.register("setup-notebooks-pane", new PaneComponents.SetupNotebooksPaneComponent());
 ko.components.register("github-repos-pane", new PaneComponents.GitHubReposPaneComponent());
-ko.components.register("support-pane", new PaneComponents.SupportPaneComponent());

src/Explorer/Controls/SupportPaneComponent/SupportPaneComponent.tsx

@@ -1,47 +0,0 @@
-import * as _ from "underscore";
-import React from "react";
-import ReactWebChat, { createDirectLine } from "botframework-webchat";
-
-export interface SupportPaneComponentProps {
-  directLineToken: string;
-  userToken: string;
-  subId: string;
-  rg:string;
-  accName:string;
-}
-
-export class SupportPaneComponent extends React.Component<SupportPaneComponentProps> {
-  private readonly userId: string = _.uniqueId();
-
-
-  constructor(props: SupportPaneComponentProps) {
-    super(props);
-  
-  }
-
-  public render(): JSX.Element {
-    const styleOptions = {
-      bubbleBackground: "rgba(0, 0, 255, .1)",
-      bubbleFromUserBackground: "rgba(0, 255, 0, .1)"
-    };
-    
-    const directLine = createDirectLine({ token: this.props.directLineToken  });
-       const dl =
-  {
-    ...directLine,
-    postActivity: (activity: any) => {
-      // Add whatever needs to be added.                  
-       activity.channelData.token = this.props.userToken;
-       activity.channelData.subId = this.props.subId;
-       activity.channelData.rg = this.props.rg;
-       activity.channelData.accName = this.props.accName;
-       
-      //activity.channelData.MyKey = "hello";
-      return directLine.postActivity(activity)
-    }
-  }
-
-    return <ReactWebChat directLine={dl} userid={this.userId} styleOptions={styleOptions}/>;
-    
-  }
-}

src/Explorer/Controls/SupportPaneComponent/SupportPaneComponentAdapter.tsx

@@ -1,64 +0,0 @@
-import * as ko from "knockout";
-import * as React from "react";
-import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
-import Explorer from "../../Explorer";
-import { SupportPaneComponent } from "./SupportPaneComponent";
-import { userContext } from "../../../UserContext";
-
-export interface SupportPaneComponentParams {
-  directLineAccessToken: string;
-  userToken: string;
-  subId: string;
-  rg: string;
-  accName: string;
-}
-
-export class SupportPaneComponentAdapter implements ReactAdapter {
-  public parameters: ko.Observable<SupportPaneComponentParams>;
-
-  constructor(private container: Explorer) {
-    
-    this.parameters = ko.observable<SupportPaneComponentParams>({
-      directLineAccessToken: this.container.conversationToken(),
-      userToken: this.container.userToken(),
-      subId: this.container.subId(),
-      rg: this.container.rg(),
-      accName: this.container.accName()
-    });
-    this.container.conversationToken.subscribe(accessToken => {
-      this.parameters().directLineAccessToken = accessToken;
-      this.forceRender();
-    });
-    this.container.userToken.subscribe(userToken => {
-      this.parameters().userToken = userToken;
-      this.forceRender();
-    });
-    this.container.subId.subscribe(subId => {
-      this.parameters().subId = subId;
-      this.forceRender();
-    });
-    this.container.rg.subscribe(rg => {
-      this.parameters().rg = rg;
-      this.forceRender();
-    });
-    this.container.accName.subscribe(accName => {
-      this.parameters().accName = accName;
-      this.forceRender();
-    });
-    
-  }
-
-  public renderComponent(): JSX.Element {
-    return <SupportPaneComponent 
-    directLineToken={this.parameters().directLineAccessToken} 
-    userToken={this.parameters().userToken}
-    subId={this.parameters().subId}
-    rg={this.parameters().rg}
-    accName={this.parameters().accName}
-    />;
-  }
-
-  public forceRender(): void {
-    this.parameters.valueHasMutated();
-  }
-}

src/Explorer/Explorer.ts

@@ -69,7 +69,6 @@ import { RouteHandler } from "../RouteHandlers/RouteHandler";
 import { SaveQueryPane } from "./Panes/SaveQueryPane";
 import { SettingsPane } from "./Panes/SettingsPane";
 import { SetupNotebooksPane } from "./Panes/SetupNotebooksPane";
-import { SupportPane } from "./Panes/SupportPane";
 import { SplashScreenComponentAdapter } from "./SplashScreen/SplashScreenComponentApdapter";
 import { Splitter, SplitterBounds, SplitterDirection } from "../Common/Splitter";
 import { StringInputPane } from "./Panes/StringInputPane";
@@ -176,11 +175,6 @@ export default class Explorer {
   public isAuthWithResourceToken: ko.Observable<boolean>;
   public isResourceTokenCollectionNodeSelected: ko.Computed<boolean>;
   private resourceTreeForResourceToken: ResourceTreeAdapterForResourceToken;
-  public conversationToken: ko.Observable<string>;
-  public userToken: ko.Observable<string>;
-  public subId: ko.Observable<string>;
-  public rg: ko.Observable<string>;
-  public accName: ko.Observable<string>;
 
   // Tabs
   public isTabsContentExpanded: ko.Observable<boolean>;
@@ -201,7 +195,6 @@ export default class Explorer {
   public newVertexPane: NewVertexPane;
   public cassandraAddCollectionPane: CassandraAddCollectionPane;
   public settingsPane: SettingsPane;
-  public supportPane: SupportPane;
   public executeSprocParamsPane: ExecuteSprocParamsPane;
   public renewAdHocAccessPane: RenewAdHocAccessPane;
   public uploadItemsPane: UploadItemsPane;
@@ -332,16 +325,10 @@ export default class Explorer {
     this.hasStorageAnalyticsAfecFeature = ko.observable(false);
     this.hasStorageAnalyticsAfecFeature.subscribe((enabled: boolean) => this.refreshCommandBarButtons());
     this.isSynapseLinkUpdating = ko.observable<boolean>(false);
-    this.conversationToken = ko.observable<string>();
-    this.userToken = ko.observable<string>();
-    this.subId = ko.observable<string>();
-    this.rg = ko.observable<string>();
-    this.accName = ko.observable<string>();
     this.isAccountReady.subscribe(async (isAccountReady: boolean) => {
       if (isAccountReady) {
         this.isAuthWithResourceToken() ? this.refreshDatabaseForResourceToken() : this.refreshAllDatabases(true);
         RouteHandler.getInstance().initHandler();
-        this.generateConversationToken();
         this.notebookWorkspaceManager = new NotebookWorkspaceManager(this.armEndpoint());
         this.arcadiaWorkspaces = ko.observableArray();
         this._arcadiaManager = new ArcadiaResourceManager(this.armEndpoint());
@@ -715,12 +702,6 @@ export default class Explorer {
       container: this
     });
 
-    this.supportPane = new SupportPane({
-      id: "supportpane",
-      visible: ko.observable<boolean>(false),
-      container: this
-    });
-
     this.executeSprocParamsPane = new ExecuteSprocParamsPane({
       id: "executesprocparamspane",
       visible: ko.observable<boolean>(false),
@@ -1611,52 +1592,6 @@ export default class Explorer {
     });
   }
 
-  private async generateConversationToken() {
-    const response = await fetch("https://directline.botframework.com/v3/directline/tokens/generate", {
-      method: "POST",
-      headers: {
-        [Constants.HttpHeaders.authorization]: "Bearer BSjLmJJHZRA.PxahjJGCNOKl7q9tiodWyVcqJOIzG894vAAqCme639o",
-        Accept: "application/json",
-        [Constants.HttpHeaders.contentType]: "application/json"
-      },
-      body: JSON.stringify({
-        "user": {
-          "id": `dl_${_.uniqueId()}`,
-          "name": this.getUserName()
-        }
-      })
-    });
-
-    if (!response.ok) {
-      throw new Error(await response.json());
-    }
-
-    const tokenResponse: { conversationId: string; token: string; expires_in: number } = await response.json();
-    this.conversationToken(tokenResponse?.token);
-    if (tokenResponse?.expires_in) {
-      setTimeout(() => this.generateConversationToken(), (tokenResponse?.expires_in - 1000) * 1000);
-    }
-  }
-
-  private getUserName() {
-    const accessToken = userContext?.authorizationToken;
-    if (!accessToken) {
-      return "Cosmos DB User";
-    }
-
-    let name;
-    try {
-      const tokenPayload = decryptJWTToken(accessToken);
-      if (tokenPayload && tokenPayload.hasOwnProperty("name")) {
-        name = tokenPayload.name;
-      }
-    } catch (error) {
-      // ignore
-    } finally {
-      return name;
-    }
-  }
-
   private async _getArcadiaWorkspaces(): Promise<ArcadiaWorkspaceItem[]> {
     try {
       const workspaces = await this._arcadiaManager.listWorkspacesAsync([userContext.subscriptionId]);
@@ -2005,11 +1940,6 @@ export default class Explorer {
         resourceGroup: inputs.resourceGroup,
         subscriptionId: inputs.subscriptionId
       });
-      
-      this.userToken(userContext.authorizationToken);
-      this.subId(userContext.subscriptionId);
-      this.rg(userContext.resourceGroup);
-      this.accName(userContext.databaseAccount.name);
       TelemetryProcessor.traceSuccess(
         Action.LoadDatabaseAccount,
         {

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.ts

@@ -27,7 +27,6 @@ import SynapseIcon from "../../../../images/synapse-link.svg";
 import { configContext, Platform } from "../../../ConfigContext";
 import Explorer from "../../Explorer";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
-import { AuthType } from "../../../AuthType";
 
 export class CommandBarComponentButtonFactory {
   private static counter: number = 0;
@@ -179,21 +178,6 @@ export class CommandBarComponentButtonFactory {
       buttons.push(settingsPaneButton);
     }
 
-    if (window.authType === AuthType.AAD) {
-      const label = "Chat Assistant";
-      const supportPaneButton: CommandButtonComponentProps = {
-        iconSrc: FeedbackIcon,
-        iconAlt: label,
-        onCommandClick: () => container.supportPane.open(),
-        commandButtonLabel: null,
-        ariaLabel: label,
-        tooltipText: label,
-        hasPopup: true,
-        disabled: false
-      };
-      buttons.push(supportPaneButton);
-    }
-
     if (container.isHostedDataExplorerEnabled()) {
       const label = "Open Full Screen";
       const fullScreenButton: CommandButtonComponentProps = {

src/Explorer/Panes/PaneComponents.ts

@@ -20,7 +20,6 @@ import UploadFilePaneTemplate from "./UploadFilePane.html";
 import StringInputPaneTemplate from "./StringInputPane.html";
 import SetupNotebooksPaneTemplate from "./SetupNotebooksPane.html";
 import GitHubReposPaneTemplate from "./GitHubReposPane.html";
-import SupportPaneTemplate from "./SupportPane.html";
 
 export class PaneComponent {
   constructor(data: any) {
@@ -225,12 +224,3 @@ export class GitHubReposPaneComponent {
     };
   }
 }
-
-export class SupportPaneComponent {
-  constructor() {
-    return {
-      viewModel: PaneComponent,
-      template: SupportPaneTemplate
-    };
-  }
-}

src/Explorer/Panes/SupportPane.html

@@ -1,35 +0,0 @@
-<div data-bind="visible: visible, event: { keydown: onPaneKeyDown }">
-  <div class="contextual-pane-out" data-bind="click: cancel, clickBubble: false"></div>
-  <div class="contextual-pane" id="supportpane">
-    <!-- Save Query form -- Start -->
-    <div class="contextual-pane-in">
-      <div class="paneContentContainer">
-        <!-- Save Query header - Start -->
-        <div class="firstdivbg headerline">
-          <span role="heading" aria-level="2" data-bind="text: title"></span>
-          <div
-            class="closeImg"
-            role="button"
-            aria-label="Close pane"
-            tabindex="0"
-            data-bind="click: cancel, event: { keypress: onCloseKeyPress }"
-          >
-            <img src="../../../images/close-black.svg" title="Close" alt="Close" />
-          </div>
-        </div>
-        <!-- Save Query header - End -->
-
-        <!-- Save Query inputs - Start -->
-        <div class="paneMainContent">
-          <div class="pkPadding" style="height: 100%;" data-bind="react: supportPaneComponentAdapter"></div>
-        </div>
-      </div>
-    </div>
-    <!-- Save Query form  - Start -->
-    <!-- Loader - Start -->
-    <div class="dataExplorerLoaderContainer dataExplorerPaneLoaderContainer" data-bind="visible: isExecuting">
-      <img class="dataExplorerLoader" src="/LoadingIndicator_3Squares.gif" />
-    </div>
-    <!-- Loader - End -->
-  </div>
-</div>

src/Explorer/Panes/SupportPane.ts

@@ -1,28 +0,0 @@
-import * as ViewModels from "../../Contracts/ViewModels";
-import { ContextualPaneBase } from "./ContextualPaneBase";
-import { SupportPaneComponentAdapter } from "../Controls/SupportPaneComponent/SupportPaneComponentAdapter";
-
-export class SupportPane extends ContextualPaneBase {
-  public supportPaneComponentAdapter: SupportPaneComponentAdapter;
-
-  constructor(options: ViewModels.PaneOptions) {
-    super(options);
-    this.title("Cosmos DB Chat Assistant");
-    this.resetData();
-    this.supportPaneComponentAdapter = new SupportPaneComponentAdapter(this.container);
-  }
-
-  public open() {
-    super.open();
-    this.supportPaneComponentAdapter.forceRender();
-  }
-
-  public close() {
-    super.close();
-    this.supportPaneComponentAdapter.forceRender();
-  }
-
-  public submit() {
-    // override default behavior because this is not a form
-  }
-}

src/Utils/arm/generatedClients/2020-04-01/cassandraResources.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Lists the Cassandra keyspaces under an existing Azure Cosmos DB database account. */
 export async function listCassandraKeyspaces(

src/Utils/arm/generatedClients/2020-04-01/collection.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given database account and collection. */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/collectionPartition.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given collection, split by partition. */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/collectionPartitionRegion.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given collection and region, split by partition. */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/collectionRegion.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given database account, collection and region. */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/database.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given database account and database. */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/databaseAccountRegion.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given database account and region. */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/databaseAccounts.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the properties of an existing Azure Cosmos DB database account. */
 export async function get(

src/Utils/arm/generatedClients/2020-04-01/gremlinResources.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Lists the Gremlin databases under an existing Azure Cosmos DB database account. */
 export async function listGremlinDatabases(

src/Utils/arm/generatedClients/2020-04-01/mongoDBResources.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Lists the MongoDB databases under an existing Azure Cosmos DB database account. */
 export async function listMongoDBDatabases(

src/Utils/arm/generatedClients/2020-04-01/operations.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Lists all of the available Cosmos DB Resource Provider operations. */
 export async function list(): Promise<Types.OperationListResult> {

src/Utils/arm/generatedClients/2020-04-01/partitionKeyRangeId.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given partition key range id. */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/partitionKeyRangeIdRegion.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given partition key range id and region. */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/percentile.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given database account. This url is only for PBS and Replication Latency data */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/percentileSourceTarget.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given account, source and target region. This url is only for PBS and Replication Latency data */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/percentileTarget.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Retrieves the metrics determined by the given filter for the given account target region. This url is only for PBS and Replication Latency data */
 export async function listMetrics(

src/Utils/arm/generatedClients/2020-04-01/sqlResources.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Lists the SQL databases under an existing Azure Cosmos DB database account. */
 export async function listSqlDatabases(

src/Utils/arm/generatedClients/2020-04-01/tableResources.ts

@@ -7,7 +7,7 @@
 import { armRequest } from "../../request";
 import * as Types from "./types";
 import { configContext } from "../../../../ConfigContext";
-const apiVersion = "2020-04-01";
+const apiVersion = "2020-03-01";
 
 /* Lists the Tables under an existing Azure Cosmos DB database account. */
 export async function listTables(

src/explorer.html

@@ -7,10 +7,8 @@
     <title>Azure Cosmos DB</title>
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
   </head>
-  
 
   <body>
-    
     <div class="flexContainer">
       <div id="divExplorer" class="flexContainer hideOverflows" style="display: none">
         <!-- Main Command Bar - Start -->
@@ -291,7 +289,6 @@
       <upload-file-pane params="{data: uploadFilePane}"></upload-file-pane>
       <string-input-pane params="{data: stringInputPane}"></string-input-pane>
       <setup-notebooks-pane params="{data: setupNotebooksPane}"></setup-notebooks-pane>
-      <support-pane params="{data: supportPane}"></support-pane>
 
       <!-- ko if: isGitHubPaneEnabled -->
       <github-repos-pane params="{data: gitHubReposPane}"></github-repos-pane>