Fixed and updated 1 test snapshot

configs/mpac.json

@@ -1,5 +1,4 @@
 {
   "JUNO_ENDPOINT": "https://tools-staging.cosmos.azure.com",
-  "isTerminalEnabled" : true,
-  "isPhoenixEnabled" : true
+  "isTerminalEnabled" : true
 }

configs/prod.json

@@ -1,5 +1,4 @@
 {
  "JUNO_ENDPOINT": "https://tools.cosmos.azure.com",
- "isTerminalEnabled" : false,
- "isPhoenixEnabled" : false
+ "isTerminalEnabled" : false
 }

src/Common/Constants.ts

@@ -99,7 +99,6 @@ export class Flights {
   public static readonly PhoenixNotebooks = "phoenixnotebooks";
   public static readonly PhoenixFeatures = "phoenixfeatures";
   public static readonly NotebooksDownBanner = "notebooksdownbanner";
-  public static readonly FreeTierAutoscaleThroughput = "freetierautoscalethroughput";
 }
 
 export class AfecFeatures {

src/ConfigContext.ts

@@ -40,7 +40,6 @@ export interface ConfigContext {
   GITHUB_TEST_ENV_CLIENT_ID: string;
   GITHUB_CLIENT_SECRET?: string; // No need to inject secret for prod. Juno already knows it.
   isTerminalEnabled: boolean;
-  isPhoenixEnabled: boolean;
   hostedExplorerURL: string;
   armAPIVersion?: string;
   msalRedirectURI?: string;
@@ -52,10 +51,10 @@ let configContext: Readonly<ConfigContext> = {
   allowedParentFrameOrigins: [
     `^https:\\/\\/cosmos\\.azure\\.(com|cn|us)$`,
     `^https:\\/\\/[\\.\\w]*portal\\.azure\\.(com|cn|us)$`,
-    `^https:\\/\\/[\\.\\w]*portal\\.microsoftazure\\.de$`,
+    `^https:\\/\\/[\\.\\w]*portal\\.microsoftazure.de$`,
     `^https:\\/\\/[\\.\\w]*ext\\.azure\\.(com|cn|us)$`,
     `^https:\\/\\/[\\.\\w]*\\.ext\\.microsoftazure\\.de$`,
-    `^https:\\/\\/cosmos-db-dataexplorer-germanycentral\\.azurewebsites\\.de$`,
+    `^https://cosmos-db-dataexplorer-germanycentral.azurewebsites.de$`,
   ], // Webpack injects this at build time
   gitSha: process.env.GIT_SHA,
   hostedExplorerURL: "https://cosmos.azure.com/",
@@ -72,7 +71,6 @@ let configContext: Readonly<ConfigContext> = {
   JUNO_ENDPOINT: "https://tools.cosmos.azure.com",
   BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
   isTerminalEnabled: false,
-  isPhoenixEnabled: false,
 };
 
 export function resetConfigContext(): void {

src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx

@@ -19,7 +19,7 @@ import { Action, ActionModifiers } from "../../../../../Shared/Telemetry/Telemet
 import * as TelemetryProcessor from "../../../../../Shared/Telemetry/TelemetryProcessor";
 import { userContext } from "../../../../../UserContext";
 import * as AutoPilotUtils from "../../../../../Utils/AutoPilotUtils";
-import { autoPilotThroughput1K, autoPilotThroughput4K } from "../../../../../Utils/AutoPilotUtils";
+import { minAutoPilotThroughput } from "../../../../../Utils/AutoPilotUtils";
 import { calculateEstimateNumber, usageInGB } from "../../../../../Utils/PricingUtils";
 import { Int32 } from "../../../../Panes/Tables/Validators/EntityPropertyValidationCommon";
 import {
@@ -540,7 +540,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
         step={AutoPilotUtils.autoPilotIncrementStep}
         value={this.overrideWithProvisionedThroughputSettings() ? "" : this.props.maxAutoPilotThroughput?.toString()}
         onChange={this.onAutoPilotThroughputChange}
-        min={userContext.features.freetierAutoscaleThroughput ? autoPilotThroughput1K : autoPilotThroughput4K}
+        min={minAutoPilotThroughput}
         errorMessage={this.props.throughputError}
       />
       {!this.overrideWithProvisionedThroughputSettings() && this.getAutoPilotUsageCost()}

src/Explorer/Controls/ThroughputInput/ThroughputInput.test.tsx

@@ -5,7 +5,6 @@ const props = {
   isDatabase: false,
   showFreeTierExceedThroughputTooltip: true,
   isSharded: true,
-  isFreeTier: false,
   setThroughputValue: () => jest.fn(),
   setIsAutoscale: () => jest.fn(),
   setIsThroughputCapExceeded: () => jest.fn(),

src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx

@@ -14,7 +14,6 @@ import "./ThroughputInput.less";
 export interface ThroughputInputProps {
   isDatabase: boolean;
   isSharded: boolean;
-  isFreeTier: boolean;
   showFreeTierExceedThroughputTooltip: boolean;
   setThroughputValue: (throughput: number) => void;
   setIsAutoscale: (isAutoscale: boolean) => void;
@@ -24,20 +23,15 @@ export interface ThroughputInputProps {
 
 export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
   isDatabase,
-  isSharded,
-  isFreeTier,
   showFreeTierExceedThroughputTooltip,
   setThroughputValue,
   setIsAutoscale,
   setIsThroughputCapExceeded,
+  isSharded,
   onCostAcknowledgeChange,
 }: ThroughputInputProps) => {
   const [isAutoscaleSelected, setIsAutoScaleSelected] = useState<boolean>(true);
-  const [throughput, setThroughput] = useState<number>(
-    isFreeTier && userContext.features.freetierAutoscaleThroughput
-      ? AutoPilotUtils.autoPilotThroughput1K
-      : AutoPilotUtils.autoPilotThroughput4K
-  );
+  const [throughput, setThroughput] = useState<number>(AutoPilotUtils.minAutoPilotThroughput);
   const [isCostAcknowledged, setIsCostAcknowledged] = useState<boolean>(false);
   const [throughputError, setThroughputError] = useState<string>("");
   const [totalThroughputUsed, setTotalThroughputUsed] = useState<number>(0);
@@ -157,15 +151,11 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
 
   const handleOnChangeMode = (event: React.ChangeEvent<HTMLInputElement>, mode: string): void => {
     if (mode === "Autoscale") {
-      const defaultThroughput =
-        isFreeTier && userContext.features.freetierAutoscaleThroughput
-          ? AutoPilotUtils.autoPilotThroughput1K
-          : AutoPilotUtils.autoPilotThroughput4K;
-      setThroughput(defaultThroughput);
+      setThroughput(AutoPilotUtils.minAutoPilotThroughput);
       setIsAutoScaleSelected(true);
-      setThroughputValue(defaultThroughput);
+      setThroughputValue(AutoPilotUtils.minAutoPilotThroughput);
       setIsAutoscale(true);
-      checkThroughputCap(defaultThroughput);
+      checkThroughputCap(AutoPilotUtils.minAutoPilotThroughput);
     } else {
       setThroughput(SharedConstants.CollectionCreation.DefaultCollectionRUs400);
       setIsAutoScaleSelected(false);
@@ -236,11 +226,7 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
             }}
             onChange={(event, newInput?: string) => onThroughputValueChange(newInput)}
             step={AutoPilotUtils.autoPilotIncrementStep}
-            min={
-              userContext.features.freetierAutoscaleThroughput
-                ? AutoPilotUtils.autoPilotThroughput1K
-                : AutoPilotUtils.autoPilotThroughput4K
-            }
+            min={AutoPilotUtils.minAutoPilotThroughput}
             value={throughput.toString()}
             aria-label="Max request units per second"
             required={true}

src/Explorer/Controls/ThroughputInput/__snapshots__/ThroughputInput.test.tsx.snap

@@ -3,7 +3,6 @@
 exports[`ThroughputInput Pane should render Default properly 1`] = `
 <ThroughputInput
   isDatabase={false}
-  isFreeTier={false}
   isSharded={true}
   onCostAcknowledgeChange={[Function]}
   setIsAutoscale={[Function]}

src/Explorer/Explorer.tsx

@@ -386,12 +386,6 @@ export default class Explorer {
         });
         connectionStatus.status = ConnectionStatusType.Failed;
         useNotebook.getState().resetContainerConnection(connectionStatus);
-        useDialog
-          .getState()
-          .showOkModalDialog(
-            "Connection Failed",
-            "We are unable to connect to the temporary workspace. Please try again in a few minutes. If the error persists, file a support ticket."
-          );
         throw error;
       } finally {
         useNotebook.getState().setIsAllocating(false);
@@ -1244,10 +1238,7 @@ export default class Explorer {
     await useNotebook.getState().refreshNotebooksEnabledStateForAccount();
 
     // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
-    const isNotebookEnabled =
-      userContext.features.notebooksDownBanner ||
-      useNotebook.getState().isPhoenixNotebooks ||
-      useNotebook.getState().isPhoenixFeatures;
+    const isNotebookEnabled = userContext.features.notebooksDownBanner || useNotebook.getState().isPhoenixNotebooks;
     useNotebook.getState().setIsNotebookEnabled(isNotebookEnabled);
     useNotebook
       .getState()

src/Explorer/Notebook/NotebookContainerClient.ts

@@ -19,7 +19,6 @@ export class NotebookContainerClient {
   private isResettingWorkspace: boolean;
   private phoenixClient: PhoenixClient;
   private retryOptions: promiseRetry.Options;
-  private scheduleTimerId: NodeJS.Timeout;
 
   constructor(private onConnectionLost: () => void) {
     this.phoenixClient = new PhoenixClient();
@@ -28,36 +27,36 @@ export class NotebookContainerClient {
       maxTimeout: Notebook.retryAttemptDelayMs,
       minTimeout: Notebook.retryAttemptDelayMs,
     };
-
-    this.initHeartbeat(Constants.Notebook.heartbeatDelayMs);
-  }
-
-  private initHeartbeat(delayMs: number): void {
-    this.scheduleHeartbeat(delayMs);
-
-    useNotebook.subscribe(
-      () => this.scheduleHeartbeat(delayMs),
-      (state) => state.notebookServerInfo
-    );
-  }
-
-  private scheduleHeartbeat(delayMs: number) {
-    if (this.scheduleTimerId) {
-      clearInterval(this.scheduleTimerId);
-    }
-
     const notebookServerInfo = useNotebook.getState().notebookServerInfo;
     if (notebookServerInfo?.notebookServerEndpoint) {
-      this.scheduleTimerId = setInterval(async () => {
-        const notebookServerInfo = useNotebook.getState().notebookServerInfo;
-        if (notebookServerInfo?.notebookServerEndpoint) {
-          const memoryUsageInfo = await this.getMemoryUsage();
-          useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo);
-        }
-      }, delayMs);
+      this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
+    } else {
+      const unsub = useNotebook.subscribe(
+        (newServerInfo: DataModels.NotebookWorkspaceConnectionInfo) => {
+          if (newServerInfo?.notebookServerEndpoint) {
+            this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
+          }
+          unsub();
+        },
+        (state) => state.notebookServerInfo
+      );
     }
   }
 
+  /**
+   * Heartbeat: each ping schedules another ping
+   */
+  private scheduleHeartbeat(delayMs: number): void {
+    setTimeout(async () => {
+      const memoryUsageInfo = await this.getMemoryUsage();
+      useNotebook.getState().setMemoryUsageInfo(memoryUsageInfo);
+      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+      if (notebookServerInfo?.notebookServerEndpoint) {
+        this.scheduleHeartbeat(Constants.Notebook.heartbeatDelayMs);
+      }
+    }, delayMs);
+  }
+
   public async getMemoryUsage(): Promise<DataModels.MemoryUsageInfo> {
     const notebookServerInfo = useNotebook.getState().notebookServerInfo;
     if (!notebookServerInfo || !notebookServerInfo.notebookServerEndpoint) {

src/Explorer/Notebook/NotebookContentClient.ts

@@ -303,8 +303,8 @@ export class NotebookContentClient {
   private getServerConfig(): ServerConfig {
     const notebookServerInfo = useNotebook.getState().notebookServerInfo;
     return {
-      endpoint: notebookServerInfo?.notebookServerEndpoint,
-      token: notebookServerInfo?.authToken,
+      endpoint: notebookServerInfo.notebookServerEndpoint,
+      token: notebookServerInfo.authToken,
       crossDomain: true,
     };
   }

src/Explorer/Panes/AddCollectionPanel.tsx

@@ -249,7 +249,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                     showFreeTierExceedThroughputTooltip={this.isFreeTierAccount() && !isFirstResourceCreated}
                     isDatabase={true}
                     isSharded={this.state.isSharded}
-                    isFreeTier={this.isFreeTierAccount()}
                     setThroughputValue={(throughput: number) => (this.newDatabaseThroughput = throughput)}
                     setIsAutoscale={(isAutoscale: boolean) => (this.isNewDatabaseAutoscale = isAutoscale)}
                     setIsThroughputCapExceeded={(isThroughputCapExceeded: boolean) =>
@@ -484,7 +483,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
               showFreeTierExceedThroughputTooltip={this.isFreeTierAccount() && !isFirstResourceCreated}
               isDatabase={false}
               isSharded={this.state.isSharded}
-              isFreeTier={this.isFreeTierAccount()}
               setThroughputValue={(throughput: number) => (this.collectionThroughput = throughput)}
               setIsAutoscale={(isAutoscale: boolean) => (this.isCollectionAutoscale = isAutoscale)}
               setIsThroughputCapExceeded={(isThroughputCapExceeded: boolean) =>

src/Explorer/Panes/AddDatabasePanel/AddDatabasePanel.tsx

@@ -146,10 +146,9 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
     // TODO add feature flag that disables validation for customers with custom accounts
     if (isAutoscaleSelected) {
       if (!AutoPilotUtils.isValidAutoPilotThroughput(throughput)) {
-        const minAutoPilotThroughput = userContext.features.freetierAutoscaleThroughput
-          ? AutoPilotUtils.autoPilotThroughput1K
-          : AutoPilotUtils.autoPilotThroughput4K;
-        setFormErrors(`Please enter a value greater than ${minAutoPilotThroughput} for autopilot throughput`);
+        setFormErrors(
+          `Please enter a value greater than ${AutoPilotUtils.minAutoPilotThroughput} for autopilot throughput`
+        );
         return false;
       }
     }
@@ -242,7 +241,6 @@ export const AddDatabasePanel: FunctionComponent<AddDatabasePaneProps> = ({
             showFreeTierExceedThroughputTooltip={isFreeTierAccount && !useDatabases.getState().isFirstResourceCreated()}
             isDatabase={true}
             isSharded={databaseCreateNewShared}
-            isFreeTier={isFreeTierAccount}
             setThroughputValue={(newThroughput: number) => (throughput = newThroughput)}
             setIsAutoscale={(isAutoscale: boolean) => (isAutoscaleSelected = isAutoscale)}
             setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}

src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx

@@ -262,7 +262,6 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
               }
               isDatabase
               isSharded
-              isFreeTier={isFreeTierAccount}
               setThroughputValue={(throughput: number) => (newKeySpaceThroughput = throughput)}
               setIsAutoscale={(isAutoscale: boolean) => (isNewKeySpaceAutoscale = isAutoscale)}
               setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}
@@ -336,7 +335,6 @@ export const CassandraAddCollectionPane: FunctionComponent<CassandraAddCollectio
             showFreeTierExceedThroughputTooltip={isFreeTierAccount && !useDatabases.getState().isFirstResourceCreated()}
             isDatabase={false}
             isSharded
-            isFreeTier={isFreeTierAccount}
             setThroughputValue={(throughput: number) => (tableThroughput = throughput)}
             setIsAutoscale={(isAutoscale: boolean) => (isTableAutoscale = isAutoscale)}
             setIsThroughputCapExceeded={(isCapExceeded: boolean) => setIsThroughputCapExceeded(isCapExceeded)}

src/Explorer/Panes/CopyNotebookPane/CopyNotebookPane.tsx

@@ -10,6 +10,7 @@ import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUti
 import Explorer from "../../Explorer";
 import { NotebookContentItem, NotebookContentItemType } from "../../Notebook/NotebookContentItem";
 import { useNotebook } from "../../Notebook/useNotebook";
+import { ResourceTreeAdapter } from "../../Tree/ResourceTreeAdapter";
 import { RightPaneForm, RightPaneFormProps } from "../RightPaneForm/RightPaneForm";
 import { CopyNotebookPaneComponent, CopyNotebookPaneProps } from "./CopyNotebookPaneComponent";
 
@@ -103,14 +104,11 @@ export const CopyNotebookPane: FunctionComponent<CopyNotebookPanelProps> = ({
     switch (location.type) {
       case "MyNotebooks":
         parent = {
-          name: useNotebook.getState().notebookFolderName,
+          name: ResourceTreeAdapter.MyNotebooksTitle,
           path: useNotebook.getState().notebookBasePath,
           type: NotebookContentItemType.Directory,
         };
         isGithubTree = false;
-        if (useNotebook.getState().isPhoenixNotebooks) {
-          await container.allocateContainer();
-        }
         break;
 
       case "GitHub":

src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.test.tsx

@@ -29,7 +29,6 @@ describe("Table query select Panel", () => {
   it("Should checked availableCheckbox by default", () => {
     const wrapper = mount(<TableQuerySelectPanel {...props} />);
     expect(wrapper.find("#availableCheckbox").first().props()).toEqual({
-      ariaPositionInSet: 0,
       id: "availableCheckbox",
       label: "Available Columns",
       checked: true,

src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.tsx

@@ -128,9 +128,8 @@ export const TableQuerySelectPanel: FunctionComponent<TableQuerySelectPanelProps
               label="Available Columns"
               checked={isAvailableColumnChecked}
               onChange={availableColumnsCheckboxClick}
-              ariaPositionInSet={0}
             />
-            {columnOptions.map((column, index) => {
+            {columnOptions.map((column) => {
               return (
                 <Checkbox
                   label={column.columnName}
@@ -138,7 +137,6 @@ export const TableQuerySelectPanel: FunctionComponent<TableQuerySelectPanelProps
                   key={column.columnName}
                   checked={column.selected}
                   disabled={!column.editable}
-                  ariaPositionInSet={index + 1}
                 />
               );
             })}

src/Explorer/Panes/Tables/TableQuerySelectPanel/__snapshots__/TableQuerySelectPanel.test.tsx.snap

@@ -37,14 +37,12 @@ exports[`Table query select Panel should render Default properly 1`] = `
             className="column-select-view"
           >
             <StyledCheckboxBase
-              ariaPositionInSet={0}
               checked={true}
               id="availableCheckbox"
               label="Available Columns"
               onChange={[Function]}
             >
               <CheckboxBase
-                ariaPositionInSet={0}
                 checked={true}
                 id="availableCheckbox"
                 label="Available Columns"
@@ -330,7 +328,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
                   <input
                     aria-checked="true"
                     aria-label="Available Columns"
-                    aria-posinset={0}
                     checked={true}
                     className="input-55"
                     data-ktp-execute-target={true}
@@ -649,7 +646,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
               </CheckboxBase>
             </StyledCheckboxBase>
             <StyledCheckboxBase
-              ariaPositionInSet={1}
               checked={true}
               disabled={false}
               key=""
@@ -657,7 +653,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
               onChange={[Function]}
             >
               <CheckboxBase
-                ariaPositionInSet={1}
                 checked={true}
                 disabled={false}
                 label=""
@@ -944,7 +939,6 @@ exports[`Table query select Panel should render Default properly 1`] = `
                     aria-checked="true"
                     aria-disabled={false}
                     aria-label=""
-                    aria-posinset={1}
                     checked={true}
                     className="input-55"
                     data-ktp-execute-target={true}

src/Explorer/Panes/Tables/Validators/EntityTableHelper.tsx

@@ -35,60 +35,6 @@ const {
   Smallint,
   Tinyint,
   Timestamp,
-  // List
-  List_Ascii,
-  List_Bigint,
-  List_Blob,
-  List_Boolean,
-  List_Date,
-  List_Decimal,
-  List_Double,
-  List_Float,
-  List_Int,
-  List_Text,
-  List_Timestamp,
-  List_Uuid,
-  List_Varchar,
-  List_Varint,
-  List_Inet,
-  List_Smallint,
-  List_Tinyint,
-  // Map
-  Map_Ascii,
-  Map_Bigint,
-  Map_Blob,
-  Map_Boolean,
-  Map_Date,
-  Map_Decimal,
-  Map_Double,
-  Map_Float,
-  Map_Int,
-  Map_Text,
-  Map_Timestamp,
-  Map_Uuid,
-  Map_Varchar,
-  Map_Varint,
-  Map_Inet,
-  Map_Smallint,
-  Map_Tinyint,
-  // Set
-  Set_Ascii,
-  Set_Bigint,
-  Set_Blob,
-  Set_Boolean,
-  Set_Date,
-  Set_Decimal,
-  Set_Double,
-  Set_Float,
-  Set_Int,
-  Set_Text,
-  Set_Timestamp,
-  Set_Uuid,
-  Set_Varchar,
-  Set_Varint,
-  Set_Inet,
-  Set_Smallint,
-  Set_Tinyint,
 } = TableConstants.CassandraType;
 export const cassandraOptions = [
   { key: Text, text: Text },
@@ -108,60 +54,6 @@ export const cassandraOptions = [
   { key: Smallint, text: Smallint },
   { key: Tinyint, text: Tinyint },
   { key: Timestamp, text: Timestamp },
-  // List
-  { key: List_Ascii, text: List_Ascii },
-  { key: List_Bigint, text: List_Bigint },
-  { key: List_Blob, text: List_Blob },
-  { key: List_Boolean, text: List_Boolean },
-  { key: List_Date, text: List_Date },
-  { key: List_Decimal, text: List_Decimal },
-  { key: List_Double, text: List_Double },
-  { key: List_Float, text: List_Float },
-  { key: List_Int, text: List_Int },
-  { key: List_Text, text: List_Text },
-  { key: List_Timestamp, text: List_Timestamp },
-  { key: List_Uuid, text: List_Uuid },
-  { key: List_Varchar, text: List_Varchar },
-  { key: List_Varint, text: List_Varint },
-  { key: List_Inet, text: List_Inet },
-  { key: List_Smallint, text: List_Smallint },
-  { key: List_Tinyint, text: List_Tinyint },
-  // Map
-  { key: Map_Ascii, text: Map_Ascii },
-  { key: Map_Bigint, text: Map_Bigint },
-  { key: Map_Blob, text: Map_Blob },
-  { key: Map_Boolean, text: Map_Boolean },
-  { key: Map_Date, text: Map_Date },
-  { key: Map_Decimal, text: Map_Decimal },
-  { key: Map_Double, text: Map_Double },
-  { key: Map_Float, text: Map_Float },
-  { key: Map_Int, text: Map_Int },
-  { key: Map_Text, text: Map_Text },
-  { key: Map_Timestamp, text: Map_Timestamp },
-  { key: Map_Uuid, text: Map_Uuid },
-  { key: Map_Varchar, text: Map_Varchar },
-  { key: Map_Varint, text: Map_Varint },
-  { key: Map_Inet, text: Map_Inet },
-  { key: Map_Smallint, text: Map_Smallint },
-  { key: Map_Tinyint, text: Map_Tinyint },
-  // Set
-  { key: Set_Ascii, text: Set_Ascii },
-  { key: Set_Bigint, text: Set_Bigint },
-  { key: Set_Blob, text: Set_Blob },
-  { key: Set_Boolean, text: Set_Boolean },
-  { key: Set_Date, text: Set_Date },
-  { key: Set_Decimal, text: Set_Decimal },
-  { key: Set_Double, text: Set_Double },
-  { key: Set_Float, text: Set_Float },
-  { key: Set_Int, text: Set_Int },
-  { key: Set_Text, text: Set_Text },
-  { key: Set_Timestamp, text: Set_Timestamp },
-  { key: Set_Uuid, text: Set_Uuid },
-  { key: Set_Varchar, text: Set_Varchar },
-  { key: Set_Varint, text: Set_Varint },
-  { key: Set_Inet, text: Set_Inet },
-  { key: Set_Smallint, text: Set_Smallint },
-  { key: Set_Tinyint, text: Set_Tinyint },
 ];
 
 export const imageProps: IImageProps = {

src/Explorer/Tables/Constants.ts

@@ -27,60 +27,6 @@ export const CassandraType = {
   Inet: "Inet",
   Smallint: "Smallint",
   Tinyint: "Tinyint",
-
-  List_Ascii: "List<Ascii>",
-  List_Bigint: "List<Bigint>",
-  List_Blob: "List<Blob>",
-  List_Boolean: "List<Boolean>",
-  List_Date: "List<Date>",
-  List_Decimal: "List<Decimal>",
-  List_Double: "List<Double>",
-  List_Float: "List<Float>",
-  List_Int: "List<Int>",
-  List_Text: "List<Text>",
-  List_Timestamp: "List<Timestamp>",
-  List_Uuid: "List<Uuid>",
-  List_Varchar: "List<Varchar>",
-  List_Varint: "List<Varint>",
-  List_Inet: "List<Inet>",
-  List_Smallint: "List<Smallint>",
-  List_Tinyint: "List<Tinyint>",
-
-  Map_Ascii: "Map<Ascii>",
-  Map_Bigint: "Map<Bigint>",
-  Map_Blob: "Map<Blob>",
-  Map_Boolean: "Map<Boolean>",
-  Map_Date: "Map<Date>",
-  Map_Decimal: "Map<Decimal>",
-  Map_Double: "Map<Double>",
-  Map_Float: "Map<Float>",
-  Map_Int: "Map<Int>",
-  Map_Text: "Map<Text>",
-  Map_Timestamp: "Map<Timestamp>",
-  Map_Uuid: "Map<Uuid>",
-  Map_Varchar: "Map<Varchar>",
-  Map_Varint: "Map<Varint>",
-  Map_Inet: "Map<Inet>",
-  Map_Smallint: "Map<Smallint>",
-  Map_Tinyint: "Map<Tinyint>",
-
-  Set_Ascii: "Set<Ascii>",
-  Set_Bigint: "Set<Bigint>",
-  Set_Blob: "Set<Blob>",
-  Set_Boolean: "Set<Boolean>",
-  Set_Date: "Set<Date>",
-  Set_Decimal: "Set<Decimal>",
-  Set_Double: "Set<Double>",
-  Set_Float: "Set<Float>",
-  Set_Int: "Set<Int>",
-  Set_Text: "Set<Text>",
-  Set_Timestamp: "Set<Timestamp>",
-  Set_Uuid: "Set<Uuid>",
-  Set_Varchar: "Set<Varchar>",
-  Set_Varint: "Set<Varint>",
-  Set_Inet: "Set<Inet>",
-  Set_Smallint: "Set<Smallint>",
-  Set_Tinyint: "Set<Tinyint>",
 };
 
 export const ClauseRule = {

src/Explorer/Tree/Collection.ts

@@ -308,7 +308,7 @@ export default class Collection implements ViewModels.Collection {
         collectionName: this.id(),
 
         dataExplorerArea: Constants.Areas.Tab,
-        tabTitle: this.rawDataModel.id + " - Items",
+        tabTitle: "Items",
       });
       this.documentIds([]);
 
@@ -316,7 +316,7 @@ export default class Collection implements ViewModels.Collection {
         partitionKey: this.partitionKey,
         documentIds: ko.observableArray<DocumentId>([]),
         tabKind: ViewModels.CollectionTabKind.Documents,
-        title: this.rawDataModel.id + " - Items",
+        title: "Items",
         collection: this,
         node: this,
         tabPath: `${this.databaseId}>${this.id()}>Documents`,

src/Platform/Hosted/extractFeatures.ts

@@ -1,5 +1,4 @@
 export type Features = {
-  // set only via feature flags
   readonly canExceedMaximumValue: boolean;
   readonly cosmosdb: boolean;
   readonly enableChangeFeedPolicy: boolean;
@@ -9,6 +8,12 @@ export type Features = {
   readonly enableReactPane: boolean;
   readonly enableRightPanelV2: boolean;
   readonly enableSchema: boolean;
+  autoscaleDefault: boolean;
+  partitionKeyDefault: boolean;
+  partitionKeyDefault2: boolean;
+  phoenixNotebooks: boolean;
+  phoenixFeatures: boolean;
+  notebooksDownBanner: boolean;
   readonly enableSDKoperations: boolean;
   readonly enableSpark: boolean;
   readonly enableTtl: boolean;
@@ -29,22 +34,11 @@ export type Features = {
   readonly mongoProxyEndpoint?: string;
   readonly mongoProxyAPIs?: string;
   readonly enableThroughputCap: boolean;
-
-  // can be set via both flight and feature flag
-  autoscaleDefault: boolean;
-  partitionKeyDefault: boolean;
-  partitionKeyDefault2: boolean;
-  phoenixNotebooks?: boolean;
-  phoenixFeatures?: boolean;
-  notebooksDownBanner: boolean;
-  freetierAutoscaleThroughput: boolean;
 };
 
 export function extractFeatures(given = new URLSearchParams(window.location.search)): Features {
   const downcased = new URLSearchParams();
-  const set = (value: string, key: string) => {
-    downcased.set(key.toLowerCase(), value);
-  };
+  const set = (value: string, key: string) => downcased.set(key.toLowerCase(), value);
   const get = (key: string, defaultValue?: string) =>
     downcased.get("feature." + key) ?? downcased.get(key) ?? defaultValue;
 
@@ -88,9 +82,10 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     autoscaleDefault: "true" === get("autoscaledefault"),
     partitionKeyDefault: "true" === get("partitionkeytest"),
     partitionKeyDefault2: "true" === get("pkpartitionkeytest"),
+    phoenixNotebooks: "true" === get("phoenixnotebooks"),
+    phoenixFeatures: "true" === get("phoenixfeatures"),
     notebooksDownBanner: "true" === get("notebooksDownBanner"),
     enableThroughputCap: "true" === get("enablethroughputcap"),
-    freetierAutoscaleThroughput: "true" === get("freetierautoscalethroughput"),
   };
 }
 

src/Utils/AutoPilotUtils.ts

@@ -1,16 +1,11 @@
-import { userContext } from "UserContext";
+export const minAutoPilotThroughput = 4000;
 
-export const autoPilotThroughput1K = 1000;
 export const autoPilotIncrementStep = 1000;
-export const autoPilotThroughput4K = 4000;
 
 export function isValidAutoPilotThroughput(maxThroughput: number): boolean {
   if (!maxThroughput) {
     return false;
   }
-  const minAutoPilotThroughput = userContext.features.freetierAutoscaleThroughput
-    ? autoPilotThroughput4K
-    : autoPilotThroughput1K;
   if (maxThroughput < minAutoPilotThroughput) {
     return false;
   }

src/Utils/MessageValidation.test.ts

@@ -2,28 +2,26 @@ import { isInvalidParentFrameOrigin, isReadyMessage } from "./MessageValidation"
 
 describe("isInvalidParentFrameOrigin", () => {
   test.each`
-    domain                                                              | expected
-    ${"https://cosmos.azure.com"}                                       | ${false}
-    ${"https://cosmos.azure.us"}                                        | ${false}
-    ${"https://cosmos.azure.cn"}                                        | ${false}
-    ${"https://portal.azure.com"}                                       | ${false}
-    ${"https://portal.azure.us"}                                        | ${false}
-    ${"https://portal.azure.cn"}                                        | ${false}
-    ${"https://portal.microsoftazure.de"}                               | ${false}
-    ${"https://subdomain.portal.azure.com"}                             | ${false}
-    ${"https://subdomain.portal.azure.us"}                              | ${false}
-    ${"https://subdomain.portal.azure.cn"}                              | ${false}
-    ${"https://main.documentdb.ext.azure.com"}                          | ${false}
-    ${"https://main.documentdb.ext.azure.us"}                           | ${false}
-    ${"https://main.documentdb.ext.azure.cn"}                           | ${false}
-    ${"https://cosmos-db-dataexplorer-germanycentral.azurewebsites.de"} | ${false}
-    ${"https://main.documentdb.ext.microsoftazure.de"}                  | ${false}
-    ${"https://random.domain"}                                          | ${true}
-    ${"https://malicious.cloudapp.azure.com"}                           | ${true}
-    ${"https://malicious.germanycentral.cloudapp.microsoftazure.de"}    | ${true}
-    ${"https://maliciousazure.com"}                                     | ${true}
-    ${"https://maliciousportalsazure.com"}                              | ${true}
-    ${"https://cosmos-db-dataexplorer-germanycentralAazurewebsites.de"} | ${true}
+    domain                                                           | expected
+    ${"https://cosmos.azure.com"}                                    | ${false}
+    ${"https://cosmos.azure.us"}                                     | ${false}
+    ${"https://cosmos.azure.cn"}                                     | ${false}
+    ${"https://portal.azure.com"}                                    | ${false}
+    ${"https://portal.azure.us"}                                     | ${false}
+    ${"https://portal.azure.cn"}                                     | ${false}
+    ${"https://portal.microsoftazure.de"}                            | ${false}
+    ${"https://subdomain.portal.azure.com"}                          | ${false}
+    ${"https://subdomain.portal.azure.us"}                           | ${false}
+    ${"https://subdomain.portal.azure.cn"}                           | ${false}
+    ${"https://main.documentdb.ext.azure.com"}                       | ${false}
+    ${"https://main.documentdb.ext.azure.us"}                        | ${false}
+    ${"https://main.documentdb.ext.azure.cn"}                        | ${false}
+    ${"https://main.documentdb.ext.microsoftazure.de"}               | ${false}
+    ${"https://random.domain"}                                       | ${true}
+    ${"https://malicious.cloudapp.azure.com"}                        | ${true}
+    ${"https://malicious.germanycentral.cloudapp.microsoftazure.de"} | ${true}
+    ${"https://maliciousazure.com"}                                  | ${true}
+    ${"https://maliciousportalsazure.com"}                           | ${true}
   `("returns $expected when called with $domain", ({ domain, expected }) => {
     expect(isInvalidParentFrameOrigin({ origin: domain } as MessageEvent)).toBe(expected);
   });

src/hooks/useKnockoutExplorer.ts

@@ -351,11 +351,6 @@ function updateContextsFromPortalMessage(inputs: DataExplorerInputsFrame) {
   if (inputs.features) {
     Object.assign(userContext.features, extractFeatures(new URLSearchParams(inputs.features)));
   }
-  //Updating phoenix feature flags for MPAC based of config context
-  if (configContext.isPhoenixEnabled === true) {
-    userContext.features.phoenixNotebooks = true;
-    userContext.features.phoenixFeatures = true;
-  }
   if (inputs.flights) {
     if (inputs.flights.indexOf(Flights.AutoscaleTest) !== -1) {
       userContext.features.autoscaleDefault;
@@ -378,9 +373,6 @@ function updateContextsFromPortalMessage(inputs: DataExplorerInputsFrame) {
     if (inputs.flights.indexOf(Flights.NotebooksDownBanner) !== -1) {
       userContext.features.notebooksDownBanner = true;
     }
-    if (inputs.flights.indexOf(Flights.FreeTierAutoscaleThroughput) !== -1) {
-      userContext.features.freetierAutoscaleThroughput = true;
-    }
   }
 }