) => this.onKeyDown(event)}
- >
-
(this.containerElt = input)}>
-
-
- {this.props.useTextarea ? (
-
@@ -21,11 +37,14 @@ export const CollapsedResourceTree: FunctionComponent
-
+
-
+
{userContext.apiType} API
diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts
index fc97d559d..bb8a2787b 100644
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -95,6 +95,8 @@ export class Flights {
public static readonly MongoIndexing = "mongoindexing";
public static readonly AutoscaleTest = "autoscaletest";
public static readonly PartitionKeyTest = "partitionkeytest";
+ public static readonly PKPartitionKeyTest = "pkpartitionkeytest";
+ public static readonly Phoenix = "phoenix";
}
export class AfecFeatures {
@@ -336,6 +338,12 @@ export enum ConflictOperationType {
Delete = "delete",
}
+export enum ConnectionStatusType {
+ Connecting = "Connecting",
+ Connected = "Connected",
+ Failed = "Connection Failed",
+}
+
export const EmulatorMasterKey =
//[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")]
"C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
@@ -349,6 +357,11 @@ export class Notebook {
public static readonly kernelRestartInitialDelayMs = 1000;
public static readonly kernelRestartMaxDelayMs = 20000;
public static readonly autoSaveIntervalMs = 120000;
+ public static readonly temporarilyDownMsg = "Notebooks is currently not available. We are working on it.";
+ public static readonly mongoShellTemporarilyDownMsg =
+ "We have identified an issue with the Mongo Shell and it is unavailable right now. We are actively working on the mitigation.";
+ public static readonly cassandraShellTemporarilyDownMsg =
+ "We have identified an issue with the Cassandra Shell and it is unavailable right now. We are actively working on the mitigation.";
}
export class SparkLibrary {
diff --git a/src/Common/MongoProxyClient.test.ts b/src/Common/MongoProxyClient.test.ts
index 3a5a02365..1c49141a0 100644
--- a/src/Common/MongoProxyClient.test.ts
+++ b/src/Common/MongoProxyClient.test.ts
@@ -3,8 +3,16 @@ import { resetConfigContext, updateConfigContext } from "../ConfigContext";
import { DatabaseAccount } from "../Contracts/DataModels";
import { Collection } from "../Contracts/ViewModels";
import DocumentId from "../Explorer/Tree/DocumentId";
+import { extractFeatures } from "../Platform/Hosted/extractFeatures";
import { updateUserContext } from "../UserContext";
-import { deleteDocument, getEndpoint, queryDocuments, readDocument, updateDocument } from "./MongoProxyClient";
+import {
+ deleteDocument,
+ getEndpoint,
+ getFeatureEndpointOrDefault,
+ queryDocuments,
+ readDocument,
+ updateDocument,
+} from "./MongoProxyClient";
const databaseId = "testDB";
@@ -246,4 +254,31 @@ describe("MongoProxyClient", () => {
expect(endpoint).toEqual("https://main.documentdb.ext.azure.com/api/guest/mongo/explorer");
});
});
+ describe("getFeatureEndpointOrDefault", () => {
+ beforeEach(() => {
+ resetConfigContext();
+ updateConfigContext({
+ BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
+ });
+ const params = new URLSearchParams({
+ "feature.mongoProxyEndpoint": "https://localhost:12901",
+ "feature.mongoProxyAPIs": "readDocument|createDocument",
+ });
+ const features = extractFeatures(params);
+ updateUserContext({
+ authType: AuthType.AAD,
+ features: features,
+ });
+ });
+
+ it("returns a local endpoint", () => {
+ const endpoint = getFeatureEndpointOrDefault("readDocument");
+ expect(endpoint).toEqual("https://localhost:12901/api/mongo/explorer");
+ });
+
+ it("returns a production endpoint", () => {
+ const endpoint = getFeatureEndpointOrDefault("deleteDocument");
+ expect(endpoint).toEqual("https://main.documentdb.ext.azure.com/api/mongo/explorer");
+ });
+ });
});
diff --git a/src/Common/MongoProxyClient.ts b/src/Common/MongoProxyClient.ts
index 2945f1288..668a0ab16 100644
--- a/src/Common/MongoProxyClient.ts
+++ b/src/Common/MongoProxyClient.ts
@@ -6,6 +6,7 @@ import * as DataModels from "../Contracts/DataModels";
import { MessageTypes } from "../Contracts/ExplorerContracts";
import { Collection } from "../Contracts/ViewModels";
import DocumentId from "../Explorer/Tree/DocumentId";
+import { hasFlag } from "../Platform/Hosted/extractFeatures";
import { userContext } from "../UserContext";
import { logConsoleError } from "../Utils/NotificationConsoleUtils";
import { ApiType, HttpHeaders, HttpStatusCodes } from "./Constants";
@@ -78,7 +79,7 @@ export function queryDocuments(
: "",
};
- const endpoint = getEndpoint() || "";
+ const endpoint = getFeatureEndpointOrDefault("resourcelist") || "";
const headers = {
...defaultHeaders,
@@ -141,7 +142,8 @@ export function readDocument(
: "",
};
- const endpoint = getEndpoint();
+ const endpoint = getFeatureEndpointOrDefault("readDocument");
+
return window
.fetch(`${endpoint}?${queryString.stringify(params)}`, {
method: "GET",
@@ -181,7 +183,7 @@ export function createDocument(
pk: collection && collection.partitionKey && !collection.partitionKey.systemKey ? partitionKeyProperty : "",
};
- const endpoint = getEndpoint();
+ const endpoint = getFeatureEndpointOrDefault("createDocument");
return window
.fetch(`${endpoint}/resourcelist?${queryString.stringify(params)}`, {
@@ -225,7 +227,7 @@ export function updateDocument(
? documentId.partitionKeyProperty
: "",
};
- const endpoint = getEndpoint();
+ const endpoint = getFeatureEndpointOrDefault("updateDocument");
return window
.fetch(`${endpoint}?${queryString.stringify(params)}`, {
@@ -266,7 +268,7 @@ export function deleteDocument(databaseId: string, collection: Collection, docum
? documentId.partitionKeyProperty
: "",
};
- const endpoint = getEndpoint();
+ const endpoint = getFeatureEndpointOrDefault("deleteDocument");
return window
.fetch(`${endpoint}?${queryString.stringify(params)}`, {
@@ -309,7 +311,7 @@ export function createMongoCollectionWithProxy(
autoPilotThroughput: params.autoPilotMaxThroughput?.toString(),
};
- const endpoint = getEndpoint();
+ const endpoint = getFeatureEndpointOrDefault("createCollectionWithProxy");
return window
.fetch(
@@ -333,8 +335,15 @@ export function createMongoCollectionWithProxy(
});
}
-export function getEndpoint(): string {
- let url = (configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT) + "/api/mongo/explorer";
+export function getFeatureEndpointOrDefault(feature: string): string {
+ return hasFlag(userContext.features.mongoProxyAPIs, feature)
+ ? getEndpoint(userContext.features.mongoProxyEndpoint)
+ : getEndpoint();
+}
+
+export function getEndpoint(customEndpoint?: string): string {
+ let url = customEndpoint ? customEndpoint : configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT;
+ url += "/api/mongo/explorer";
if (userContext.authType === AuthType.EncryptedToken) {
url = url.replace("api/mongo", "api/guest/mongo");
diff --git a/src/Common/ResourceTreeContainer.tsx b/src/Common/ResourceTreeContainer.tsx
index fe04f9e04..00693a2c0 100644
--- a/src/Common/ResourceTreeContainer.tsx
+++ b/src/Common/ResourceTreeContainer.tsx
@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from "react";
+import React, { FunctionComponent, MutableRefObject, useEffect, useRef } from "react";
import arrowLeftImg from "../../images/imgarrowlefticon.svg";
import refreshImg from "../../images/refresh-cosmos.svg";
import { AuthType } from "../AuthType";
@@ -6,6 +6,7 @@ import Explorer from "../Explorer/Explorer";
import { ResourceTokenTree } from "../Explorer/Tree/ResourceTokenTree";
import { ResourceTree } from "../Explorer/Tree/ResourceTree";
import { userContext } from "../UserContext";
+import { NormalizedEventKey } from "./Constants";
export interface ResourceTreeContainerProps {
toggleLeftPaneExpanded: () => void;
@@ -18,6 +19,22 @@ export const ResourceTreeContainer: FunctionComponent {
+ const focusButton = useRef() as MutableRefObject;
+
+ useEffect(() => {
+ if (isLeftPaneExpanded) {
+ if (focusButton.current) {
+ focusButton.current.focus();
+ }
+ }
+ });
+
+ const onKeyPressToggleLeftPaneExpanded = (event: React.KeyboardEvent) => {
+ if (event.key === NormalizedEventKey.Space || event.key === NormalizedEventKey.Enter) {
+ toggleLeftPaneExpanded();
+ event.stopPropagation();
+ }
+ };
return (
{/* Collections Window - - Start */}
@@ -43,9 +60,11 @@ export const ResourceTreeContainer: FunctionComponent
@@ -54,7 +73,7 @@ export const ResourceTreeContainer: FunctionComponent
{userContext.authType === AuthType.ResourceToken ? (
= ({ children }:
return (
-
);
diff --git a/src/Contracts/DataModels.ts b/src/Contracts/DataModels.ts
index efd5ffb78..a8957c662 100644
--- a/src/Contracts/DataModels.ts
+++ b/src/Contracts/DataModels.ts
@@ -1,3 +1,5 @@
+import { ConnectionStatusType } from "../Common/Constants";
+
export interface DatabaseAccount {
id: string;
name: string;
@@ -496,3 +498,8 @@ export interface MemoryUsageInfo {
freeKB: number;
totalKB: number;
}
+
+export interface ContainerConnectionInfo {
+ status: ConnectionStatusType;
+ //need to add ram and rom info
+}
diff --git a/src/Controls/Heatmap/Heatmap.test.ts b/src/Controls/Heatmap/Heatmap.test.ts
index 473e55225..e5f8f5ef6 100644
--- a/src/Controls/Heatmap/Heatmap.test.ts
+++ b/src/Controls/Heatmap/Heatmap.test.ts
@@ -22,8 +22,8 @@ describe("The Heatmap Control", () => {
};
let heatmap: Heatmap;
- let theme: PortalTheme = 1;
- const divElement: string = ``;
+ const theme: PortalTheme = 1;
+ const divElement = ``;
describe("drawHeatmap rendering", () => {
beforeEach(() => {
@@ -100,7 +100,7 @@ describe("iframe rendering when there is no data", () => {
});
it("should show a no data message with a dark theme", () => {
- let data = {
+ const data = {
data: {
signature: "pcIframe",
data: {
@@ -111,7 +111,7 @@ describe("iframe rendering when there is no data", () => {
},
};
- const divElement: string = ``;
+ const divElement = ``;
document.body.innerHTML = divElement;
handleMessage(data as MessageEvent);
@@ -120,7 +120,7 @@ describe("iframe rendering when there is no data", () => {
});
it("should show a no data message with a white theme", () => {
- let data = {
+ const data = {
data: {
signature: "pcIframe",
data: {
@@ -131,7 +131,7 @@ describe("iframe rendering when there is no data", () => {
},
};
- const divElement: string = ``;
+ const divElement = ``;
document.body.innerHTML = divElement;
handleMessage(data as MessageEvent);
diff --git a/src/Controls/Heatmap/Heatmap.ts b/src/Controls/Heatmap/Heatmap.ts
index 3cdc4589d..0b9c3b796 100644
--- a/src/Controls/Heatmap/Heatmap.ts
+++ b/src/Controls/Heatmap/Heatmap.ts
@@ -39,7 +39,7 @@ export class Heatmap {
}
}
- private _getFontStyles(size: number = StyleConstants.MediumFontSize, color: string = "#838383"): FontSettings {
+ private _getFontStyles(size: number = StyleConstants.MediumFontSize, color = "#838383"): FontSettings {
return {
family: StyleConstants.DataExplorerFont,
size,
@@ -78,9 +78,9 @@ export class Heatmap {
// go thru all rows and create 2d matrix for heatmap...
for (let i = 0; i < rows.length; i++) {
output.yAxisPoints.push(rows[i]);
- let dataPoints: number[] = [];
+ const dataPoints: number[] = [];
for (let a = 0; a < output.xAxisPoints.length; a++) {
- let row: PartitionTimeStampToData = data[rows[i]];
+ const row: PartitionTimeStampToData = data[rows[i]];
dataPoints.push(row[output.xAxisPoints[a]]["Normalized Throughput"]);
}
output.dataPoints.push(dataPoints);
@@ -193,7 +193,7 @@ export class Heatmap {
this._getLayoutSettings(),
this._getChartDisplaySettings()
);
- let plotDiv: any = document.getElementById(Heatmap.elementId);
+ const plotDiv: any = document.getElementById(Heatmap.elementId);
plotDiv.on("plotly_click", (data: any) => {
let timeSelected: string = data.points[0].x;
timeSelected = timeSelected.replace(" ", "T");
@@ -205,7 +205,7 @@ export class Heatmap {
break;
}
}
- let output = [];
+ const output = [];
for (let i = 0; i < this._chartData.dataPoints.length; i++) {
output.push(this._chartData.dataPoints[i][xAxisIndex]);
}
diff --git a/src/Explorer/ContextMenuButtonFactory.tsx b/src/Explorer/ContextMenuButtonFactory.tsx
index 70d02e5aa..a52254cc3 100644
--- a/src/Explorer/ContextMenuButtonFactory.tsx
+++ b/src/Explorer/ContextMenuButtonFactory.tsx
@@ -83,6 +83,7 @@ export const createCollectionContextMenuButton = (
items.push({
iconSrc: HostedTerminalIcon,
+ isDisabled: useNotebook.getState().isShellEnabled && userContext.features.notebooksTemporarilyDown,
onClick: () => {
const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
if (useNotebook.getState().isShellEnabled) {
diff --git a/src/Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent.tsx b/src/Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent.tsx
index d662db58b..76d710cb7 100644
--- a/src/Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent.tsx
+++ b/src/Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent.tsx
@@ -1,5 +1,6 @@
import { Icon, Label, Stack } from "@fluentui/react";
import * as React from "react";
+import { NormalizedEventKey } from "../../../Common/Constants";
import { accordionStackTokens } from "../Settings/SettingsRenderUtils";
export interface CollapsibleSectionProps {
@@ -30,6 +31,13 @@ export class CollapsibleSectionComponent extends React.Component {
+ if (event.key === NormalizedEventKey.Space || event.key === NormalizedEventKey.Enter) {
+ this.toggleCollapsed();
+ event.stopPropagation();
+ }
+ };
+
public render(): JSX.Element {
return (
<>
@@ -39,6 +47,11 @@ export class CollapsibleSectionComponent extends React.Component
void;
closeDialog: () => void;
+ showOkCancelModalDialog: (
+ title: string,
+ subText: string,
+ okLabel: string,
+ onOk: () => void,
+ cancelLabel: string,
+ onCancel: () => void,
+ choiceGroupProps?: IChoiceGroupProps,
+ textFieldProps?: TextFieldProps,
+ primaryButtonDisabled?: boolean
+ ) => void;
+ showOkModalDialog: (title: string, subText: string) => void;
}
-export const useDialog: UseStore = create((set) => ({
+export const useDialog: UseStore = create((set, get) => ({
visible: false,
openDialog: (props: DialogProps) => set(() => ({ visible: true, dialogProps: props })),
closeDialog: () =>
- set((state) => ({ visible: false, openDialog: state.openDialog, closeDialog: state.closeDialog }), true),
+ set(
+ (state) => ({
+ visible: false,
+ openDialog: state.openDialog,
+ closeDialog: state.closeDialog,
+ showOkCancelModalDialog: state.showOkCancelModalDialog,
+ showOkModalDialog: state.showOkModalDialog,
+ }),
+ true // TODO: This probably should not be true but its causing a prod bug so easier to just set the proper state above
+ ),
+ showOkCancelModalDialog: (
+ title: string,
+ subText: string,
+ okLabel: string,
+ onOk: () => void,
+ cancelLabel: string,
+ onCancel: () => void,
+ choiceGroupProps?: IChoiceGroupProps,
+ textFieldProps?: TextFieldProps,
+ primaryButtonDisabled?: boolean
+ ): void =>
+ get().openDialog({
+ isModal: true,
+ title,
+ subText,
+ primaryButtonText: okLabel,
+ secondaryButtonText: cancelLabel,
+ onPrimaryButtonClick: () => {
+ get().closeDialog();
+ onOk && onOk();
+ },
+ onSecondaryButtonClick: () => {
+ get().closeDialog();
+ onCancel && onCancel();
+ },
+ choiceGroupProps,
+ textFieldProps,
+ primaryButtonDisabled,
+ }),
+ showOkModalDialog: (title: string, subText: string): void =>
+ get().openDialog({
+ isModal: true,
+ title,
+ subText,
+ primaryButtonText: "Close",
+ secondaryButtonText: undefined,
+ onPrimaryButtonClick: () => {
+ get().closeDialog();
+ },
+ onSecondaryButtonClick: undefined,
+ }),
}));
export interface TextFieldProps extends ITextFieldProps {
@@ -119,8 +181,7 @@ export const Dialog: FC = () => {
text: secondaryButtonText,
onClick: onSecondaryButtonClick,
}
- : {};
-
+ : undefined;
return visible ? (
{choiceGroupProps &&