recommendations prototype

azure-pipelines.cg.yml

@@ -3,9 +3,6 @@
 # Add steps that build, run tests, deploy, and more:
 # https://aka.ms/yaml
 
-trigger:
-- master
-
 pool:
   vmImage: "ubuntu-latest"
 

src/Common/dataAccess/createStoredProcedure.ts

@@ -1,76 +1,28 @@
-import { AuthType } from "../../AuthType";
 import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
-import {
-  SqlStoredProcedureCreateUpdateParameters,
-  SqlStoredProcedureResource
-} from "../../Utils/arm/generatedClients/2020-04-01/types";
-import { client } from "../CosmosClient";
-import {
-  createUpdateSqlStoredProcedure,
-  getSqlStoredProcedure
-} from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function createStoredProcedure(
   databaseId: string,
   collectionId: string,
   storedProcedure: StoredProcedureDefinition
 ): Promise<StoredProcedureDefinition & Resource> {
+  let createdStoredProcedure: StoredProcedureDefinition & Resource;
   const clearMessage = logConsoleProgress(`Creating stored procedure ${storedProcedure.id}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      try {
-        const getResponse = await getSqlStoredProcedure(
-          userContext.subscriptionId,
-          userContext.resourceGroup,
-          userContext.databaseAccount.name,
-          databaseId,
-          collectionId,
-          storedProcedure.id
-        );
-        if (getResponse?.properties?.resource) {
-          throw new Error(
-            `Create stored procedure failed: stored procedure with id ${storedProcedure.id} already exists`
-          );
-        }
-      } catch (error) {
-        if (error.code !== "NotFound") {
-          throw error;
-        }
-      }
-
-      const createSprocParams: SqlStoredProcedureCreateUpdateParameters = {
-        properties: {
-          resource: storedProcedure as SqlStoredProcedureResource,
-          options: {}
-        }
-      };
-      const rpResponse = await createUpdateSqlStoredProcedure(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId,
-        storedProcedure.id,
-        createSprocParams
-      );
-      return rpResponse && (rpResponse.properties?.resource as StoredProcedureDefinition & Resource);
-    }
-
     const response = await client()
       .database(databaseId)
       .container(collectionId)
       .scripts.storedProcedures.create(storedProcedure);
-    return response?.resource;
+    createdStoredProcedure = response.resource;
   } catch (error) {
     logConsoleError(`Error while creating stored procedure ${storedProcedure.id}:\n ${JSON.stringify(error)}`);
     logError(JSON.stringify(error), "CreateStoredProcedure", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+
+  clearMessage();
+  return createdStoredProcedure;
 }

src/Common/dataAccess/createTrigger.ts

@@ -1,71 +1,28 @@
-import { AuthType } from "../../AuthType";
 import { Resource, TriggerDefinition } from "@azure/cosmos";
-import {
-  SqlTriggerCreateUpdateParameters,
-  SqlTriggerResource
-} from "../../Utils/arm/generatedClients/2020-04-01/types";
-import { client } from "../CosmosClient";
-import { createUpdateSqlTrigger, getSqlTrigger } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function createTrigger(
   databaseId: string,
   collectionId: string,
   trigger: TriggerDefinition
 ): Promise<TriggerDefinition & Resource> {
+  let createdTrigger: TriggerDefinition & Resource;
   const clearMessage = logConsoleProgress(`Creating trigger ${trigger.id}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      try {
-        const getResponse = await getSqlTrigger(
-          userContext.subscriptionId,
-          userContext.resourceGroup,
-          userContext.databaseAccount.name,
-          databaseId,
-          collectionId,
-          trigger.id
-        );
-        if (getResponse?.properties?.resource) {
-          throw new Error(`Create trigger failed: trigger with id ${trigger.id} already exists`);
-        }
-      } catch (error) {
-        if (error.code !== "NotFound") {
-          throw error;
-        }
-      }
-
-      const createTriggerParams: SqlTriggerCreateUpdateParameters = {
-        properties: {
-          resource: trigger as SqlTriggerResource,
-          options: {}
-        }
-      };
-      const rpResponse = await createUpdateSqlTrigger(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId,
-        trigger.id,
-        createTriggerParams
-      );
-      return rpResponse && (rpResponse.properties?.resource as TriggerDefinition & Resource);
-    }
-
     const response = await client()
       .database(databaseId)
       .container(collectionId)
       .scripts.triggers.create(trigger);
-    return response.resource;
+    createdTrigger = response.resource;
   } catch (error) {
     logConsoleError(`Error while creating trigger ${trigger.id}:\n ${JSON.stringify(error)}`);
     logError(JSON.stringify(error), "CreateTrigger", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+
+  clearMessage();
+  return createdTrigger;
 }

src/Common/dataAccess/createUserDefinedFunction.ts

@@ -1,76 +1,28 @@
-import { AuthType } from "../../AuthType";
 import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
-import {
-  SqlUserDefinedFunctionCreateUpdateParameters,
-  SqlUserDefinedFunctionResource
-} from "../../Utils/arm/generatedClients/2020-04-01/types";
-import { client } from "../CosmosClient";
-import {
-  createUpdateSqlUserDefinedFunction,
-  getSqlUserDefinedFunction
-} from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function createUserDefinedFunction(
   databaseId: string,
   collectionId: string,
   userDefinedFunction: UserDefinedFunctionDefinition
 ): Promise<UserDefinedFunctionDefinition & Resource> {
+  let createdUserDefinedFunction: UserDefinedFunctionDefinition & Resource;
   const clearMessage = logConsoleProgress(`Creating user defined function ${userDefinedFunction.id}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      try {
-        const getResponse = await getSqlUserDefinedFunction(
-          userContext.subscriptionId,
-          userContext.resourceGroup,
-          userContext.databaseAccount.name,
-          databaseId,
-          collectionId,
-          userDefinedFunction.id
-        );
-        if (getResponse?.properties?.resource) {
-          throw new Error(
-            `Create user defined function failed: user defined function with id ${userDefinedFunction.id} already exists`
-          );
-        }
-      } catch (error) {
-        if (error.code !== "NotFound") {
-          throw error;
-        }
-      }
-
-      const createUDFParams: SqlUserDefinedFunctionCreateUpdateParameters = {
-        properties: {
-          resource: userDefinedFunction as SqlUserDefinedFunctionResource,
-          options: {}
-        }
-      };
-      const rpResponse = await createUpdateSqlUserDefinedFunction(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId,
-        userDefinedFunction.id,
-        createUDFParams
-      );
-      return rpResponse && (rpResponse.properties?.resource as UserDefinedFunctionDefinition & Resource);
-    }
-
     const response = await client()
       .database(databaseId)
       .container(collectionId)
       .scripts.userDefinedFunctions.create(userDefinedFunction);
-    return response?.resource;
+    createdUserDefinedFunction = response.resource;
   } catch (error) {
     logConsoleError(`Error while creating user defined function ${userDefinedFunction.id}:\n ${JSON.stringify(error)}`);
     logError(JSON.stringify(error), "CreateUserupdateUserDefinedFunction", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+
+  clearMessage();
+  return createdUserDefinedFunction;
 }

src/Common/dataAccess/deleteStoredProcedure.ts

@@ -1,10 +1,7 @@
-import { AuthType } from "../../AuthType";
-import { client } from "../CosmosClient";
-import { deleteSqlStoredProcedure } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function deleteStoredProcedure(
   databaseId: string,
@@ -13,28 +10,17 @@ export async function deleteStoredProcedure(
 ): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting stored procedure ${storedProcedureId}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      await deleteSqlStoredProcedure(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId,
-        storedProcedureId
-      );
-    } else {
-      await client()
-        .database(databaseId)
-        .container(collectionId)
-        .scripts.storedProcedure(storedProcedureId)
-        .delete();
-    }
+    await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.storedProcedure(storedProcedureId)
+      .delete();
   } catch (error) {
     logConsoleError(`Error while deleting stored procedure ${storedProcedureId}:\n ${JSON.stringify(error)}`);
     logError(JSON.stringify(error), "DeleteStoredProcedure", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+
+  clearMessage();
+  return undefined;
 }

src/Common/dataAccess/deleteTrigger.ts

@@ -1,36 +1,22 @@
-import { AuthType } from "../../AuthType";
-import { client } from "../CosmosClient";
-import { deleteSqlTrigger } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function deleteTrigger(databaseId: string, collectionId: string, triggerId: string): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting trigger ${triggerId}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      await deleteSqlTrigger(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId,
-        triggerId
-      );
-    } else {
-      await client()
-        .database(databaseId)
-        .container(collectionId)
-        .scripts.trigger(triggerId)
-        .delete();
-    }
+    await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.trigger(triggerId)
+      .delete();
   } catch (error) {
     logConsoleError(`Error while deleting trigger ${triggerId}:\n ${JSON.stringify(error)}`);
     logError(JSON.stringify(error), "DeleteTrigger", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+
+  clearMessage();
+  return undefined;
 }

src/Common/dataAccess/deleteUserDefinedFunction.ts

@@ -1,36 +1,22 @@
-import { AuthType } from "../../AuthType";
-import { client } from "../CosmosClient";
-import { deleteSqlUserDefinedFunction } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function deleteUserDefinedFunction(databaseId: string, collectionId: string, id: string): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting user defined function ${id}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      await deleteSqlUserDefinedFunction(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId,
-        id
-      );
-    } else {
-      await client()
-        .database(databaseId)
-        .container(collectionId)
-        .scripts.userDefinedFunction(id)
-        .delete();
-    }
+    await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.userDefinedFunction(id)
+      .delete();
   } catch (error) {
     logConsoleError(`Error while deleting user defined function ${id}:\n ${JSON.stringify(error)}`);
     logError(JSON.stringify(error), "DeleteUserDefinedFunction", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+
+  clearMessage();
+  return undefined;
 }

src/Common/dataAccess/readDatabases.ts

@@ -12,14 +12,14 @@ import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function readDatabases(): Promise<DataModels.Database[]> {
+  if (userContext.defaultExperience === DefaultAccountExperienceType.Table) {
+    return [{ id: "TablesDB" } as DataModels.Database];
+  }
+
   let databases: DataModels.Database[];
   const clearMessage = logConsoleProgress(`Querying databases`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience !== DefaultAccountExperienceType.Table
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       databases = await readDatabasesWithARM();
     } else {
       const sdkResponse = await client()

src/Common/dataAccess/readOffers.ts

@@ -13,13 +13,10 @@ export const readOffers = async (): Promise<Offer[]> => {
   const clearMessage = logConsoleProgress(`Querying offers`);
   try {
     if (configContext.platform === Platform.Portal) {
-      const offers = sendCachedDataMessage<Offer[]>(MessageTypes.AllOffers, [
+      return sendCachedDataMessage<Offer[]>(MessageTypes.AllOffers, [
         userContext.databaseAccount.id,
         ClientDefaults.portalCacheTimeoutMs
       ]);
-      clearMessage();
-
-      return offers;
     }
   } catch (error) {
     // If error getting cached Offers, continue on and read via SDK

src/Common/dataAccess/readStoredProcedures.ts

@@ -1,41 +1,27 @@
-import { AuthType } from "../../AuthType";
 import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
-import { client } from "../CosmosClient";
-import { listSqlStoredProcedures } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function readStoredProcedures(
   databaseId: string,
   collectionId: string
 ): Promise<(StoredProcedureDefinition & Resource)[]> {
+  let sprocs: (StoredProcedureDefinition & Resource)[];
   const clearMessage = logConsoleProgress(`Querying stored procedures for container ${collectionId}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      const rpResponse = await listSqlStoredProcedures(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId
-      );
-      return rpResponse?.value?.map(sproc => sproc.properties?.resource as StoredProcedureDefinition & Resource);
-    }
-
     const response = await client()
       .database(databaseId)
       .container(collectionId)
       .scripts.storedProcedures.readAll()
       .fetchAll();
-    return response?.resources;
+    sprocs = response.resources;
   } catch (error) {
     logConsoleError(`Failed to query stored procedures for container ${collectionId}: ${JSON.stringify(error)}`);
     logError(JSON.stringify(error), "ReadStoredProcedures", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+  clearMessage();
+  return sprocs;
 }

src/Common/dataAccess/readTriggers.ts

@@ -1,41 +1,27 @@
-import { AuthType } from "../../AuthType";
 import { Resource, TriggerDefinition } from "@azure/cosmos";
-import { client } from "../CosmosClient";
-import { listSqlTriggers } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function readTriggers(
   databaseId: string,
   collectionId: string
 ): Promise<(TriggerDefinition & Resource)[]> {
+  let triggers: (TriggerDefinition & Resource)[];
   const clearMessage = logConsoleProgress(`Querying triggers for container ${collectionId}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      const rpResponse = await listSqlTriggers(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId
-      );
-      return rpResponse?.value?.map(trigger => trigger.properties?.resource as TriggerDefinition & Resource);
-    }
-
     const response = await client()
       .database(databaseId)
       .container(collectionId)
       .scripts.triggers.readAll()
       .fetchAll();
-    return response?.resources;
+    triggers = response.resources;
   } catch (error) {
     logConsoleError(`Failed to query triggers for container ${collectionId}: ${JSON.stringify(error)}`);
     logError(JSON.stringify(error), "ReadTriggers", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+  clearMessage();
+  return triggers;
 }

src/Common/dataAccess/readUserDefinedFunctions.ts

@@ -1,41 +1,27 @@
-import { AuthType } from "../../AuthType";
 import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
-import { client } from "../CosmosClient";
-import { listSqlUserDefinedFunctions } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function readUserDefinedFunctions(
   databaseId: string,
   collectionId: string
 ): Promise<(UserDefinedFunctionDefinition & Resource)[]> {
+  let udfs: (UserDefinedFunctionDefinition & Resource)[];
   const clearMessage = logConsoleProgress(`Querying user defined functions for container ${collectionId}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      const rpResponse = await listSqlUserDefinedFunctions(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId
-      );
-      return rpResponse?.value?.map(udf => udf.properties?.resource as UserDefinedFunctionDefinition & Resource);
-    }
-
     const response = await client()
       .database(databaseId)
       .container(collectionId)
       .scripts.userDefinedFunctions.readAll()
       .fetchAll();
-    return response?.resources;
+    udfs = response.resources;
   } catch (error) {
     logConsoleError(`Failed to query user defined functions for container ${collectionId}: ${JSON.stringify(error)}`);
     logError(JSON.stringify(error), "ReadUserDefinedFunctions", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+  clearMessage();
+  return udfs;
 }

src/Common/dataAccess/updateOffer.ts

@@ -406,14 +406,10 @@ const updateOfferWithSDK = async (params: UpdateOfferParams): Promise<Offer> =>
 
   const options: RequestOptions = {};
   if (params.migrateToAutoPilot) {
-    options.initialHeaders = {
-      [HttpHeaders.migrateOfferToAutopilot]: "true"
-    };
+    options.initialHeaders[HttpHeaders.migrateOfferToAutopilot] = "true";
     delete newOffer.content.offerAutopilotSettings;
   } else if (params.migrateToManual) {
-    options.initialHeaders = {
-      [HttpHeaders.migrateOfferToManualThroughput]: "true"
-    };
+    options.initialHeaders[HttpHeaders.migrateOfferToManualThroughput] = "true";
     newOffer.content.offerAutopilotSettings = { maxThroughput: 0 };
   }
 

src/Common/dataAccess/updateStoredProcedure.ts

@@ -1,71 +1,29 @@
-import { AuthType } from "../../AuthType";
 import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
-import {
-  SqlStoredProcedureCreateUpdateParameters,
-  SqlStoredProcedureResource
-} from "../../Utils/arm/generatedClients/2020-04-01/types";
-import { client } from "../CosmosClient";
-import {
-  createUpdateSqlStoredProcedure,
-  getSqlStoredProcedure
-} from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function updateStoredProcedure(
   databaseId: string,
   collectionId: string,
   storedProcedure: StoredProcedureDefinition
 ): Promise<StoredProcedureDefinition & Resource> {
+  let updatedStoredProcedure: StoredProcedureDefinition & Resource;
   const clearMessage = logConsoleProgress(`Updating stored procedure ${storedProcedure.id}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      const getResponse = await getSqlStoredProcedure(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId,
-        storedProcedure.id
-      );
-
-      if (getResponse?.properties?.resource) {
-        const createSprocParams: SqlStoredProcedureCreateUpdateParameters = {
-          properties: {
-            resource: storedProcedure as SqlStoredProcedureResource,
-            options: {}
-          }
-        };
-        const rpResponse = await createUpdateSqlStoredProcedure(
-          userContext.subscriptionId,
-          userContext.resourceGroup,
-          userContext.databaseAccount.name,
-          databaseId,
-          collectionId,
-          storedProcedure.id,
-          createSprocParams
-        );
-        return rpResponse && (rpResponse.properties?.resource as StoredProcedureDefinition & Resource);
-      }
-
-      throw new Error(`Failed to update stored procedure: ${storedProcedure.id} does not exist.`);
-    }
-
     const response = await client()
       .database(databaseId)
       .container(collectionId)
       .scripts.storedProcedure(storedProcedure.id)
       .replace(storedProcedure);
-    return response?.resource;
+    updatedStoredProcedure = response.resource;
   } catch (error) {
-    const errorMessage = error.code === "NotFound" ? `${storedProcedure.id} does not exist.` : JSON.stringify(error);
-    logConsoleError(`Error while updating stored procedure ${storedProcedure.id}:\n ${errorMessage}`);
-    logError(errorMessage, "UpdateStoredProcedure", error.code);
+    logConsoleError(`Error while updating stored procedure ${storedProcedure.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "UpdateStoredProcedure", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+
+  clearMessage();
+  return updatedStoredProcedure;
 }

src/Common/dataAccess/updateTrigger.ts

@@ -1,68 +1,29 @@
-import { AuthType } from "../../AuthType";
-import {
-  SqlTriggerCreateUpdateParameters,
-  SqlTriggerResource
-} from "../../Utils/arm/generatedClients/2020-04-01/types";
 import { TriggerDefinition } from "@azure/cosmos";
-import { client } from "../CosmosClient";
-import { createUpdateSqlTrigger, getSqlTrigger } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function updateTrigger(
   databaseId: string,
   collectionId: string,
   trigger: TriggerDefinition
 ): Promise<TriggerDefinition> {
+  let updatedTrigger: TriggerDefinition;
   const clearMessage = logConsoleProgress(`Updating trigger ${trigger.id}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      const getResponse = await getSqlTrigger(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId,
-        trigger.id
-      );
-
-      if (getResponse?.properties?.resource) {
-        const createTriggerParams: SqlTriggerCreateUpdateParameters = {
-          properties: {
-            resource: trigger as SqlTriggerResource,
-            options: {}
-          }
-        };
-        const rpResponse = await createUpdateSqlTrigger(
-          userContext.subscriptionId,
-          userContext.resourceGroup,
-          userContext.databaseAccount.name,
-          databaseId,
-          collectionId,
-          trigger.id,
-          createTriggerParams
-        );
-        return rpResponse && (rpResponse.properties?.resource as TriggerDefinition);
-      }
-
-      throw new Error(`Failed to update trigger: ${trigger.id} does not exist.`);
-    }
-
     const response = await client()
       .database(databaseId)
       .container(collectionId)
       .scripts.trigger(trigger.id)
       .replace(trigger);
-    return response?.resource;
+    updatedTrigger = response.resource;
   } catch (error) {
-    const errorMessage = error.code === "NotFound" ? `${trigger.id} does not exist.` : JSON.stringify(error);
-    logConsoleError(`Error while updating trigger ${trigger.id}:\n ${errorMessage}`);
-    logError(errorMessage, "UpdateTrigger", error.code);
+    logConsoleError(`Error while updating trigger ${trigger.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "UpdateTrigger", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+
+  clearMessage();
+  return updatedTrigger;
 }

src/Common/dataAccess/updateUserDefinedFunction.ts

@@ -1,72 +1,29 @@
-import { AuthType } from "../../AuthType";
 import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
-import {
-  SqlUserDefinedFunctionCreateUpdateParameters,
-  SqlUserDefinedFunctionResource
-} from "../../Utils/arm/generatedClients/2020-04-01/types";
-import { client } from "../CosmosClient";
-import {
-  createUpdateSqlUserDefinedFunction,
-  getSqlUserDefinedFunction
-} from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
 import { logError } from "../Logger";
 import { sendNotificationForError } from "./sendNotificationForError";
-import { userContext } from "../../UserContext";
 
 export async function updateUserDefinedFunction(
   databaseId: string,
   collectionId: string,
   userDefinedFunction: UserDefinedFunctionDefinition
 ): Promise<UserDefinedFunctionDefinition & Resource> {
+  let updatedUserDefinedFunction: UserDefinedFunctionDefinition & Resource;
   const clearMessage = logConsoleProgress(`Updating user defined function ${userDefinedFunction.id}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
-      const getResponse = await getSqlUserDefinedFunction(
-        userContext.subscriptionId,
-        userContext.resourceGroup,
-        userContext.databaseAccount.name,
-        databaseId,
-        collectionId,
-        userDefinedFunction.id
-      );
-
-      if (getResponse?.properties?.resource) {
-        const createUDFParams: SqlUserDefinedFunctionCreateUpdateParameters = {
-          properties: {
-            resource: userDefinedFunction as SqlUserDefinedFunctionResource,
-            options: {}
-          }
-        };
-        const rpResponse = await createUpdateSqlUserDefinedFunction(
-          userContext.subscriptionId,
-          userContext.resourceGroup,
-          userContext.databaseAccount.name,
-          databaseId,
-          collectionId,
-          userDefinedFunction.id,
-          createUDFParams
-        );
-        return rpResponse && (rpResponse.properties?.resource as UserDefinedFunctionDefinition & Resource);
-      }
-
-      throw new Error(`Failed to update user defined function: ${userDefinedFunction.id} does not exist.`);
-    }
-
     const response = await client()
       .database(databaseId)
       .container(collectionId)
       .scripts.userDefinedFunction(userDefinedFunction.id)
       .replace(userDefinedFunction);
-    return response?.resource;
+    updatedUserDefinedFunction = response.resource;
   } catch (error) {
-    const errorMessage =
-      error.code === "NotFound" ? `${userDefinedFunction.id} does not exist.` : JSON.stringify(error);
-    logConsoleError(`Error while updating user defined function ${userDefinedFunction.id}:\n ${errorMessage}`);
-    logError(errorMessage, "UpdateUserupdateUserDefinedFunction", error.code);
+    logConsoleError(`Error while updating user defined function ${userDefinedFunction.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "UpdateUserupdateUserDefinedFunction", error.code);
     sendNotificationForError(error);
-    throw error;
-  } finally {
-    clearMessage();
   }
+
+  clearMessage();
+  return updatedUserDefinedFunction;
 }

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -408,8 +408,8 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
               Action.SettingsV2Updated,
               {
                 databaseAccountName: this.container.databaseAccount().name,
-                databaseName: this.collection?.databaseId,
-                collectionName: this.collection?.id(),
+                databaseName: this.collection && this.collection.databaseId,
+                collectionName: this.collection && this.collection.id(),
                 defaultExperience: this.container.defaultExperience(),
                 dataExplorerArea: Constants.Areas.Tab,
                 tabTitle: this.props.settingsTab.tabTitle(),
@@ -457,8 +457,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         Action.SettingsV2Updated,
         {
           databaseAccountName: this.container.databaseAccount()?.name,
-          databaseName: this.collection?.databaseId,
-          collectionName: this.collection?.id(),
           defaultExperience: this.container.defaultExperience(),
           dataExplorerArea: Constants.Areas.Tab,
           tabTitle: this.props.settingsTab.tabTitle()
@@ -473,12 +471,9 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         Action.SettingsV2Updated,
         {
           databaseAccountName: this.container.databaseAccount()?.name,
-          databaseName: this.collection?.databaseId,
-          collectionName: this.collection?.id(),
           defaultExperience: this.container.defaultExperience(),
           dataExplorerArea: Constants.Areas.Tab,
-          tabTitle: this.props.settingsTab.tabTitle(),
-          error: reason
+          tabTitle: this.props.settingsTab.tabTitle()
         },
         startKey
       );

src/Explorer/Controls/ThroughputInput/ThroughputInputComponent.html

@@ -45,7 +45,7 @@
 
     <input
       class="throughputModeRadio nonFirstRadio"
-      aria-label="Manual mode"
+      aria-label="Provisioned Throughput mode"
       type="radio"
       role="radio"
       tabindex="0"

src/Explorer/Controls/ThroughputInput/ThroughputInputComponentAutoscaleV3.html

@@ -44,7 +44,7 @@
 
     <input
       class="throughputModeRadio nonFirstRadio"
-      aria-label="Manual mode"
+      aria-label="Provisioned Throughput mode"
       type="radio"
       role="radio"
       tabindex="0"

src/Explorer/Explorer.ts

@@ -37,6 +37,7 @@ import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer
 import { BrowseQueriesPane } from "./Panes/BrowseQueriesPane";
 import { CassandraAPIDataClient, TableDataClient, TablesAPIDataClient } from "./Tables/TableDataClient";
 import { CommandBarComponentAdapter } from "./Menus/CommandBar/CommandBarComponentAdapter";
+import { RecommendationsAdapter } from "./Recommendations/RecommendationsAdapter";
 import { configContext, Platform, updateConfigContext } from "../ConfigContext";
 import { ConsoleData, ConsoleDataType } from "./Menus/NotificationConsole/NotificationConsoleComponent";
 import { decryptJWTToken, getAuthorizationHeader } from "../Utils/AuthorizationUtils";
@@ -207,6 +208,7 @@ export default class Explorer {
   public isLinkInjectionEnabled: ko.Computed<boolean>;
   public isSettingsV2Enabled: ko.Observable<boolean>;
   public isGitHubPaneEnabled: ko.Observable<boolean>;
+  public isRecosEnabled: ko.Observable<boolean>;
   public isPublishNotebookPaneEnabled: ko.Observable<boolean>;
   public isCopyNotebookPaneEnabled: ko.Observable<boolean>;
   public isHostedDataExplorerEnabled: ko.Computed<boolean>;
@@ -261,6 +263,7 @@ export default class Explorer {
   private _dialogProps: ko.Observable<DialogProps>;
   private addSynapseLinkDialog: DialogComponentAdapter;
   private _addSynapseLinkDialogProps: ko.Observable<DialogProps>;
+  private recommendationsAdapter: RecommendationsAdapter
 
   private static readonly MaxNbDatabasesToAutoExpand = 5;
 
@@ -415,6 +418,7 @@ export default class Explorer {
     //this.isSettingsV2Enabled = ko.computed<boolean>(() => this.isFeatureEnabled(Constants.Features.enableSettingsV2));
     this.isSettingsV2Enabled = ko.observable(false);
     this.isGitHubPaneEnabled = ko.observable<boolean>(false);
+    this.isRecosEnabled = ko.observable<boolean>(false);
     this.isPublishNotebookPaneEnabled = ko.observable<boolean>(false);
     this.isCopyNotebookPaneEnabled = ko.observable<boolean>(false);
 
@@ -888,7 +892,7 @@ export default class Explorer {
 
     this.commandBarComponentAdapter = new CommandBarComponentAdapter(this);
     this.notificationConsoleComponentAdapter = new NotificationConsoleComponentAdapter(this);
-
+    
     this._initSettings();
 
     TelemetryProcessor.traceSuccess(
@@ -915,6 +919,7 @@ export default class Explorer {
 
         this.gitHubReposPane = this.notebookManager.gitHubReposPane;
         this.isGitHubPaneEnabled(true);
+        this.isRecosEnabled(true);
       }
 
       this.refreshCommandBarButtons();
@@ -1001,6 +1006,8 @@ export default class Explorer {
     });
     this.addSynapseLinkDialog = new DialogComponentAdapter();
     this.addSynapseLinkDialog.parameters = this._addSynapseLinkDialogProps;
+    this.recommendationsAdapter = new RecommendationsAdapter(this);
+    
   }
 
   public openEnableSynapseLinkDialog(): void {

src/Explorer/Panes/AddCollectionPane.html

@@ -276,7 +276,7 @@
               <!-- Fixed option button - Start -->
               <div class="tab">
                   <input type="radio" id="tab1" name="storage" value="10" class="radio" data-bind="checked: storage">
-                  <label for="tab1">Fixed (20 GB)</label>
+                  <label for="tab1">Fixed (10 GB)</label>
               </div>
               <!-- Fixed option button - End -->
 

src/Explorer/Panes/AddDatabasePane.html

@@ -74,8 +74,8 @@
 
           <input id="database-id" type="text" aria-required="true" autocomplete="off" pattern="[^/?#\\]*[^/?# \\]"
               title="May not end with space nor contain characters '\' '/' '#' '?'"
-              size="40" class="collid" data-bind="textInput: databaseId, hasFocus: firstFieldHasFocus, attr: { 'aria-label': databaseIdLabel, 'placeholder': databaseIdPlaceHolder }"
-              autofocus>
+              size="40" class="collid" data-bind="textInput: databaseId, hasFocus: firstFieldHasFocus, attr: { placeholder: databaseIdPlaceHolder }"
+              aria-label="Database id" autofocus>
 
           <!-- Database provisioned throughput - Start -->
           <!-- ko if: canConfigureThroughput -->

src/Explorer/Recommendations/RecommendationsAdapter.tsx

@@ -0,0 +1,50 @@
+/**
+ * This adapter is responsible to render the React component
+ * If the component signals a change through the callback passed in the properties, it must render the React component when appropriate
+ * and update any knockout observables passed from the parent.
+ */
+import * as ko from "knockout";
+import * as React from "react";
+import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
+import * as ViewModels from "../../Contracts/ViewModels";
+import { MessageBar, MessageBarType, Text} from "office-ui-fabric-react";
+import { StyleConstants } from "../../Common/Constants";
+import Explorer from "../Explorer";
+// import {getRecommendations} from "./api";
+import { configContext } from "../../ConfigContext";
+import { JunoClient } from "../../Juno/JunoClient";
+import { ICardTokens, Card } from "@uifabric/react-cards";
+import {Recommendations, RecommendationProps} from "./RecommendationsComponent";
+// import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
+
+export class RecommendationsAdapter implements ReactAdapter {
+public parameters: ko.Observable<number>;
+  public container: Explorer;
+  
+  
+
+  constructor(container: Explorer) {
+    this.container = container;
+    this.parameters = ko.observable<number>(Date.now());
+  
+  }
+
+  public forceRender(): void {
+    window.requestAnimationFrame(() => this.parameters(Date.now()));
+  }
+
+  public renderComponent(): JSX.Element {
+    //const backgroundColor = StyleConstants.BaseLight;
+    
+    
+    return (
+      <Recommendations explorer={this.container}/>
+    );
+  }
+
+  public triggerRender(): void {
+    window.requestAnimationFrame(() => this.parameters(Date.now()));
+  }
+
+  
+}

src/Explorer/Recommendations/RecommendationsComponent.tsx

@@ -0,0 +1,89 @@
+import { ICardTokens, Card } from "@uifabric/react-cards";
+import React from "react";
+import { JunoClient } from "../../Juno/JunoClient";
+import Explorer from "../Explorer";
+import { MessageBar, MessageBarButton, MessageBarType, IMessageBarStyles, Spinner } from "office-ui-fabric-react";
+import { FontSize } from "../Controls/GitHub/GitHubStyleConstants";
+
+export interface RecommendationProps {
+    explorer: Explorer;
+
+  }
+
+  export const recoStyles: Partial<IMessageBarStyles> = { root: { backgroundColor: "#0078d4" ,
+   color:"white", fontSize: "16px"}, text: {fontSize: "16px"}, icon: {display: "none"}};
+
+   export const recoButtonStyles = {root: {fontSize: "10px"}};
+
+export class Recommendations extends React.Component<RecommendationProps> {
+
+    public state: { recoMessage: string; loadingInfo: boolean;};
+    container: Explorer;
+    
+        
+    constructor(props: RecommendationProps) {
+        super(props);
+        //this.container = this.container;
+        this.state = {
+          recoMessage:"",
+          loadingInfo: false
+        }
+        this.loadInfo();
+      }
+
+      private async loadInfo(){
+        this.setState({loadingInfo: true});
+        let junoClient = new JunoClient(this.props.explorer.databaseAccount);
+      
+        let resp = await junoClient.getRecos();
+        // this.state.recoMessage = resp.description;
+      
+        this.setState({recoMessage: resp.description});
+        this.setState({loadingInfo: false});
+      }
+
+      private clear = () => {
+        this.setState({recoMessage: null})
+      };
+
+      private clear1()
+      {
+        this.setState({recoMessage: null})
+      }
+
+    render() {
+      if (this.state.loadingInfo)
+      {
+        return (<React.Fragment> <Spinner/> Loading your Recommendation </React.Fragment>);
+      }
+      else
+      {
+        if (this.state.recoMessage)
+        {
+        return (
+          <React.Fragment>
+            <MessageBar           
+              dismissButtonAriaLabel="Close"
+              messageBarType={MessageBarType.warning}
+              actions={
+                <div>
+                   <MessageBarButton onClick={this.clear} styles={recoButtonStyles}>Remind me later</MessageBarButton>
+                  <MessageBarButton onClick={this.clear} styles={recoButtonStyles}>Got it</MessageBarButton>
+                </div>
+              }
+              styles={recoStyles}
+            >
+            {this.state.recoMessage}
+             </MessageBar>
+
+          </React.Fragment>);
+        }
+        else
+        {
+            return null;
+        }
+      
+      }
+    
+  }
+}

src/Explorer/Recommendations/api.ts

@@ -0,0 +1,10 @@
+import { JunoClient } from "../../Juno/JunoClient";
+
+export const getRecommendations(endpoint: string): string {
+    let url = `${endpoint}/api/notebooks/recos`;
+    const response = await window.fetch(url, {
+        method: "GET",
+        headers: JunoClient.getHeaders()
+      });
+  
+ }

src/Explorer/Tabs/DatabaseSettingsTab.html

@@ -85,13 +85,6 @@
           <span>Learn more about minimum throughput </span>
           <a href="https://docs.microsoft.com/azure/cosmos-db/set-throughput" target="_blank">here.</a>
         </p>
-        <p data-bind="visible: canRequestBelowMinRU">
-          Need to scale below <span data-bind="text: minRUsText"></span> RU/s? Reach out by filling
-          <a
-            href="https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRzBPrdEMjvxPuDm8fCLUtXpUQ0JLV1Y5VVlDS1RNUE1aRzVHQlVQTVA1SS4u"
-            >this questionnaire</a
-          >.
-        </p>
         <p data-bind="visible: canRequestSupport">
           <!-- TODO: Replace link with call to the Azure Support blade -->
           <a href="https://aka.ms/cosmosdbfeedback?subject=Cosmos%20DB%20More%20Throughput%20Request"

src/Explorer/Tabs/DatabaseSettingsTab.ts

@@ -61,7 +61,6 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
   public saveSettingsButton: ViewModels.Button;
   public discardSettingsChangesButton: ViewModels.Button;
 
-  public canRequestBelowMinRU: ko.PureComputed<boolean>;
   public canRequestSupport: ko.PureComputed<boolean>;
   public canThroughputExceedMaximumValue: ko.Computed<boolean>;
   public costsVisible: ko.Computed<boolean>;
@@ -69,7 +68,6 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
   public isTemplateReady: ko.Observable<boolean>;
   public minRUAnotationVisible: ko.Computed<boolean>;
   public minRUs: ko.Computed<number>;
-  public minRUsText: ko.PureComputed<string>;
   public maxRUs: ko.Computed<number>;
   public maxRUsText: ko.PureComputed<string>;
   public maxRUThroughputInputLimit: ko.Computed<number>;
@@ -205,11 +203,6 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
     this.canThroughputExceedMaximumValue = ko.pureComputed<boolean>(
       () => configContext.platform === Platform.Portal && !this.container.isRunningOnNationalCloud()
     );
-
-    this.canRequestBelowMinRU = ko.pureComputed(() => {
-      return true; // TODO: Implement and test
-    });
-
     this.canRequestSupport = ko.pureComputed(() => {
       if (
         configContext.platform === Platform.Emulator ||
@@ -284,8 +277,6 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
       return this.maxRUs();
     });
 
-    this.minRUsText = ko.pureComputed(() => this.minRUs().toLocaleString());
-
     this.maxRUsText = ko.pureComputed(() => {
       return SharedConstants.CollectionCreation.DefaultCollectionRUs1Million.toLocaleString();
     });

src/Explorer/Tree/UserDefinedFunction.ts

@@ -56,7 +56,7 @@ export default class UserDefinedFunction {
 
     const userDefinedFunctionTabs: UserDefinedFunctionTab[] = this.container.tabsManager.getTabs(
       ViewModels.CollectionTabKind.UserDefinedFunctions,
-      tab => tab.node?.rid === this.rid
+      tab => tab.collection && tab.collection.rid === this.rid
     ) as UserDefinedFunctionTab[];
     let userDefinedFunctionTab: UserDefinedFunctionTab = userDefinedFunctionTabs && userDefinedFunctionTabs[0];
 

src/Juno/JunoClient.ts

@@ -41,6 +41,11 @@ export interface IGalleryItem {
   pendingScanJobIds: string[];
 }
 
+export interface IRecommendationData {
+  id: number;
+  description: string;
+}
+
 export interface IPublicGalleryData {
   metadata: IPublicGalleryMetaData;
   notebooksData: IGalleryItem[];
@@ -127,6 +132,20 @@ export class JunoClient {
     };
   }
 
+  public async getRecos(): Promise<IRecommendationData> {
+    var db = this.databaseAccount().id.split("/");
+    var subId = db[2];
+    var rg = db[4];
+    var acc = db[8];
+    const url = `https://localhost/api/recommendations?subId=${subId}&rg=${rg}&account=${acc}`;
+    const response = await window.fetch(url, {
+      method: "GET",
+      headers: JunoClient.getHeaders()
+    });
+
+    return response.json();
+  }
+
   public async getGitHubToken(code: string): Promise<IGitHubResponse<IGitHubOAuthToken>> {
     const githubParams = JunoClient.getGitHubClientParams();
     githubParams.append("code", code);

src/Utils/WindowUtils.test.ts

@@ -1,39 +1,49 @@
 import { getDataExplorerWindow } from "./WindowUtils";
 
-interface MockWindow {
-  parent?: MockWindow;
-  top?: MockWindow;
-}
+const createWindow = (dataExplorerPlatform: unknown, parent: Window): Window => {
+  // TODO: Need to `any` here since we're creating a mock window object
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const mockWindow: any = {};
+  if (dataExplorerPlatform !== undefined) {
+    mockWindow.dataExplorerPlatform = dataExplorerPlatform;
+  }
+  if (parent) {
+    mockWindow.parent = parent;
+  }
+  return mockWindow;
+};
 
 describe("WindowUtils", () => {
   describe("getDataExplorerWindow", () => {
-    it("should return undefined if current window is at the top", () => {
-      const mockWindow: MockWindow = {};
-      mockWindow.parent = mockWindow;
+    it("should return current window if current window has dataExplorerPlatform property", () => {
+      const currentWindow = createWindow(0, undefined);
 
-      expect(getDataExplorerWindow(mockWindow as Window)).toEqual(undefined);
+      expect(getDataExplorerWindow(currentWindow)).toEqual(currentWindow);
     });
 
-    it("should return current window if parent is top", () => {
-      const dataExplorerWindow: MockWindow = {};
-      const portalWindow: MockWindow = {};
-      dataExplorerWindow.parent = portalWindow;
-      dataExplorerWindow.top = portalWindow;
+    it("should return current window's parent if current window's parent has dataExplorerPlatform property", () => {
+      const parentWindow = createWindow(0, undefined);
+      const currentWindow = createWindow(undefined, parentWindow);
 
-      expect(getDataExplorerWindow(dataExplorerWindow as Window)).toEqual(dataExplorerWindow);
+      expect(getDataExplorerWindow(currentWindow)).toEqual(parentWindow);
     });
 
-    it("should return closest window to top if in nested windows", () => {
-      const terminalWindow: MockWindow = {};
-      const dataExplorerWindow: MockWindow = {};
-      const portalWindow: MockWindow = {};
-      dataExplorerWindow.top = portalWindow;
-      dataExplorerWindow.parent = portalWindow;
-      terminalWindow.top = portalWindow;
-      terminalWindow.parent = dataExplorerWindow;
+    it("should return undefined if none of the windows in the hierarchy have dataExplorerPlatform property and window's parent is reference to itself", () => {
+      const parentWindow = createWindow(undefined, undefined);
 
-      expect(getDataExplorerWindow(terminalWindow as Window)).toEqual(dataExplorerWindow);
-      expect(getDataExplorerWindow(dataExplorerWindow as Window)).toEqual(dataExplorerWindow);
+      // TODO: Need to `any` here since parent is a readonly property
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (parentWindow as any).parent = parentWindow; // If a window does not have a parent, its parent property is a reference to itself.
+      const currentWindow = createWindow(undefined, parentWindow);
+
+      expect(getDataExplorerWindow(currentWindow)).toBeUndefined();
+    });
+
+    it("should return undefined if none of the windows in the hierarchy have dataExplorerPlatform property and window's parent is not defined", () => {
+      const parentWindow = createWindow(undefined, undefined);
+      const currentWindow = createWindow(undefined, parentWindow);
+
+      expect(getDataExplorerWindow(currentWindow)).toBeUndefined();
     });
   });
 });

src/Utils/WindowUtils.ts

@@ -1,18 +1,23 @@
 export const getDataExplorerWindow = (currentWindow: Window): Window | undefined => {
-  // Data explorer is always loaded in an iframe, so traverse the parents until we hit the top and return the first child window.
+  // Start with the current window and traverse up the parent hierarchy to find a window
+  // with `dataExplorerPlatform` property
+  let dataExplorerWindow: Window | undefined = currentWindow;
+
   try {
-    while (currentWindow) {
-      if (currentWindow.parent === currentWindow) {
-        return undefined;
+    // TODO: Need to `any` here since the window imports Explorer which can't be in strict mode yet
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    while (dataExplorerWindow && (dataExplorerWindow as any).dataExplorerPlatform === undefined) {
+      // If a window does not have a parent, its parent property is a reference to itself.
+      if (dataExplorerWindow.parent === dataExplorerWindow) {
+        dataExplorerWindow = undefined;
+      } else {
+        dataExplorerWindow = dataExplorerWindow.parent;
       }
-      if (currentWindow.parent === currentWindow.top) {
-        return currentWindow;
-      }
-      currentWindow = currentWindow.parent;
     }
   } catch (error) {
-    // Hitting a cross domain error means we are in the portal and the current window is data explorer
-    return currentWindow;
+    // This can happen if we come across parent from a different origin
+    dataExplorerWindow = undefined;
   }
-  return undefined;
+
+  return dataExplorerWindow;
 };

src/explorer.html

@@ -11,6 +11,11 @@
   <body>
     <div class="flexContainer">
       <div id="divExplorer" class="flexContainer hideOverflows" style="display: none">
+        <!-- ko if: isRecosEnabled -->
+        <div>
+          <div data-bind="react: recommendationsAdapter"></div>         
+        </div>
+        <!-- /ko -->
         <!-- Main Command Bar - Start -->
         <div data-bind="react: commandBarComponentAdapter"></div>
         <!-- Main Command Bar - End -->

webpack.config.js

@@ -92,7 +92,7 @@ module.exports = function(env = {}, argv = {}) {
   const rules = [fontRule, lessRule, imagesRule, cssRule, htmlRule, typescriptRule];
   const envVars = {
     GIT_SHA: gitSha,
-    PORT: process.env.PORT || "1234"
+    PORT: process.env.PORT || "2223"
   };
 
   if (mode === "production") {