@@ -21,11 +37,14 @@ export const CollapsedResourceTree: FunctionComponent
-
+
-
+
{userContext.apiType} API
diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts
index 57b65c43e..f33c2650a 100644
--- a/src/Common/Constants.ts
+++ b/src/Common/Constants.ts
@@ -94,7 +94,9 @@ export class Flights {
public static readonly MongoIndexEditor = "mongoindexeditor";
public static readonly MongoIndexing = "mongoindexing";
public static readonly AutoscaleTest = "autoscaletest";
- public static readonly SchemaAnalyzer = "schemaanalyzer";
+ public static readonly PartitionKeyTest = "partitionkeytest";
+ public static readonly PKPartitionKeyTest = "pkpartitionkeytest";
+ public static readonly Phoenix = "phoenix";
}
export class AfecFeatures {
@@ -336,6 +338,14 @@ export enum ConflictOperationType {
Delete = "delete",
}
+export enum ConnectionStatusType {
+ Connect = "Connect",
+ Connecting = "Connecting",
+ Connected = "Connected",
+ Failed = "Connection Failed",
+ ReConnect = "Reconnect",
+}
+
export const EmulatorMasterKey =
//[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")]
"C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
@@ -345,10 +355,32 @@ export const StyleConstants = require("less-vars-loader!../../less/Common/Consta
export class Notebook {
public static readonly defaultBasePath = "./notebooks";
- public static readonly heartbeatDelayMs = 5000;
+ public static readonly heartbeatDelayMs = 60000;
public static readonly kernelRestartInitialDelayMs = 1000;
public static readonly kernelRestartMaxDelayMs = 20000;
public static readonly autoSaveIntervalMs = 120000;
+ public static readonly memoryGuageToGB = 1048576;
+ 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.";
+ public static saveNotebookModalTitle = "Save Notebook in temporary workspace";
+ public static saveNotebookModalContent =
+ "This notebook will be saved in the temporary workspace and will be removed when the session expires. To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends.";
+ public static newNotebookModalTitle = "Create Notebook in temporary workspace";
+ public static newNotebookUploadModalTitle = "Upload Notebook in temporary workspace";
+ public static newNotebookModalContent1 =
+ "A temporary workspace will be created to enable you to work with notebooks. When the session expires, any notebooks in the workspace will be removed.";
+ public static newNotebookModalContent2 =
+ "To save your work permanently, save your notebooks to a GitHub repository or download the notebooks to your local machine before the session ends. ";
+ public static galleryNotebookDownloadContent1 =
+ "To download, run, and make changes to this sample notebook, a temporary workspace will be created. When the session expires, any notebooks in the workspace will be removed.";
+ public static galleryNotebookDownloadContent2 =
+ "To save your work permanently, save your notebooks to a GitHub repository or download the Notebooks to your local machine before the session ends. ";
+ public static cosmosNotebookHomePageUrl = "https://aka.ms/cosmos-notebooks-limits";
+ public static cosmosNotebookGitDocumentationUrl = "https://aka.ms/cosmos-notebooks-github";
+ public static learnMore = "Learn more.";
}
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/ResourceTree.tsx b/src/Common/ResourceTreeContainer.tsx
similarity index 61%
rename from src/Common/ResourceTree.tsx
rename to src/Common/ResourceTreeContainer.tsx
index da9c1bad4..00693a2c0 100644
--- a/src/Common/ResourceTree.tsx
+++ b/src/Common/ResourceTreeContainer.tsx
@@ -1,18 +1,40 @@
-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";
+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 ResourceTreeProps {
+export interface ResourceTreeContainerProps {
toggleLeftPaneExpanded: () => void;
isLeftPaneExpanded: boolean;
+ container: Explorer;
}
-export const ResourceTree: FunctionComponent = ({
+export const ResourceTreeContainer: FunctionComponent = ({
toggleLeftPaneExpanded,
isLeftPaneExpanded,
-}: ResourceTreeProps): JSX.Element => {
+ container,
+}: ResourceTreeContainerProps): JSX.Element => {
+ 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 (
{userContext.authType === AuthType.ResourceToken ? (
-
- ) : (
+
{/* Collections Window - - Start */}
@@ -38,9 +60,11 @@ export const ResourceTree: FunctionComponent = ({
id="expandToggleLeftPaneButton"
role="button"
onClick={toggleLeftPaneExpanded}
+ onKeyPress={onKeyPressToggleLeftPaneExpanded}
tabIndex={0}
aria-label="Collapse Tree"
title="Collapse Tree"
+ ref={focusButton}
>
@@ -48,9 +72,11 @@ export const ResourceTree: FunctionComponent = ({
{content}
+ {content}
{!this.props.showAuthorizeAccess && (
<>
diff --git a/src/Explorer/Controls/InputTypeahead/InputTypeahead.less b/src/Explorer/Controls/InputTypeahead/InputTypeahead.less
index e56bfaa51..082fd937f 100644
--- a/src/Explorer/Controls/InputTypeahead/InputTypeahead.less
+++ b/src/Explorer/Controls/InputTypeahead/InputTypeahead.less
@@ -5,6 +5,12 @@
display: inline-block;
width: 100%;
+ .input-type-head-text-field {
+ width: 100%;
+ }
+ .input-query-form {
+ width: 100%;
+ }
textarea {
width: 100%;
line-height: 1;
@@ -21,4 +27,11 @@
}
}
}
-
+.input-typeahead-chocies-container {
+ border: 1px solid lightgrey;
+ padding: 5px 10px 5px 10px;
+ cursor: pointer;
+ .choice-caption{
+ font-size: 14px;
+ }
+}
\ No newline at end of file
diff --git a/src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx b/src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
index 69f01a745..13b91012a 100644
--- a/src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
+++ b/src/Explorer/Controls/InputTypeahead/InputTypeaheadComponent.tsx
@@ -6,14 +6,13 @@
* typeaheadOverrideOptions: { dynamic:false }
*
*/
-import "jquery-typeahead";
+import { getTheme, IconButton, IIconProps, List, Stack, TextField } from "@fluentui/react";
import * as React from "react";
-import { KeyCodes } from "../../../Common/Constants";
import "./InputTypeahead.less";
export interface Item {
caption: string;
- value: any;
+ value: string;
}
/**
@@ -75,170 +74,128 @@ export interface InputTypeaheadComponentProps {
useTextarea?: boolean;
}
-interface OnClickItem {
- matchedKey: string;
- value: any;
- caption: string;
- group: string;
+interface InputTypeaheadComponentState {
+ isSuggestionVisible: boolean;
+ selectedChoice: Item;
+ filteredChoices: Item[];
}
-interface Cache {
- inputValue: string;
- selection: Item;
-}
-
-interface InputTypeaheadComponentState {}
-
export class InputTypeaheadComponent extends React.Component<
InputTypeaheadComponentProps,
InputTypeaheadComponentState
> {
- private inputElt: HTMLElement;
- private containerElt: HTMLElement;
-
- private cache: Cache;
- private inputValue: string;
- private selection: Item;
-
- public constructor(props: InputTypeaheadComponentProps) {
+ constructor(props: InputTypeaheadComponentProps) {
super(props);
- this.cache = {
- inputValue: null,
- selection: null,
+ this.state = {
+ isSuggestionVisible: false,
+ filteredChoices: [],
+ selectedChoice: {
+ caption: "",
+ value: "",
+ },
};
}
- /**
- * Props have changed
- * @param prevProps
- * @param prevState
- * @param snapshot
- */
- public componentDidUpdate(
- prevProps: InputTypeaheadComponentProps,
- prevState: InputTypeaheadComponentState,
- snapshot: any
- ): void {
- if (prevProps.defaultValue !== this.props.defaultValue) {
- $(this.inputElt).val(this.props.defaultValue);
- this.initializeTypeahead();
- }
- }
-
- /**
- * Executed once react is done building the DOM for this component
- */
- public componentDidMount(): void {
- this.initializeTypeahead();
- }
-
- public render(): JSX.Element {
+ private onRenderCell = (item: Item): JSX.Element => {
return (
-
-
) => this.onKeyDown(event)}
- >
-
(this.containerElt = input)}>
-
-
- {this.props.useTextarea ? (
-