From 5741802c25cf3efc903eae299443e9c47724b068 Mon Sep 17 00:00:00 2001 From: victor-meng <56978073+victor-meng@users.noreply.github.com> Date: Fri, 30 Oct 2020 15:09:24 -0700 Subject: [PATCH 01/13] refactor error handling part 1 (#307) - created `getErrorMessage` function which takes in an error string or any type of error object and returns the correct error message - replaced `error.message` with `getErrorMessage` since `error` could be a string in some cases - merged sendNotificationForError.ts with ErrorHandlingUtils.ts - some minor refactoring In part 2, I will make the following changes: - Make `Logger.logError` function take an error message string instead of an error object. This will reduce some redundancy where the `getErrorMessage` function is being called twice (the error object passed by the caller is already an error message). - Update every `TelemetryProcessor.traceFailure` call to make sure we pass in an error message instead of an error object since we stringify the data we send. --- src/Common/CosmosClient.ts | 3 +- src/Common/ErrorHandlingUtils.ts | 55 ++++++++++++++++--- src/Common/ErrorParserUtility.ts | 14 ----- src/Common/Logger.ts | 12 ++-- src/Common/QueriesClient.ts | 37 +++---------- src/Common/dataAccess/createTrigger.ts | 9 +-- src/Common/dataAccess/readOffers.ts | 4 +- .../dataAccess/sendNotificationForError.ts | 20 ------- .../updateOfferThroughputBeyondLimit.ts | 12 +++- .../Controls/Settings/SettingsComponent.tsx | 3 +- src/Explorer/Explorer.ts | 33 ++++++----- .../GraphExplorerComponent/GraphExplorer.tsx | 5 +- .../GraphExplorerComponent/GremlinClient.ts | 12 ++-- src/Explorer/Panes/AddCollectionPane.ts | 8 +-- src/Explorer/Panes/BrowseQueriesPane.ts | 7 ++- src/Explorer/Panes/RenewAdHocAccessPane.ts | 3 +- src/Explorer/Panes/SaveQueryPane.ts | 16 +++--- src/Explorer/Panes/SetupNotebooksPane.ts | 3 +- src/Explorer/Tabs/DocumentsTab.ts | 9 ++- src/Explorer/Tabs/SettingsTab.ts | 3 +- src/Explorer/Tree/Collection.ts | 16 +++--- src/Explorer/Tree/Database.ts | 8 ++- src/Explorer/Tree/StoredProcedure.ts | 3 +- src/GitHub/GitHubContentProvider.ts | 3 +- src/HostedExplorer.ts | 15 +++-- src/Platform/Hosted/Main.ts | 3 +- src/workers/upload/index.ts | 3 +- tsconfig.strict.json | 2 - 28 files changed, 162 insertions(+), 159 deletions(-) delete mode 100644 src/Common/dataAccess/sendNotificationForError.ts diff --git a/src/Common/CosmosClient.ts b/src/Common/CosmosClient.ts index de71c11b1..f54e8a073 100644 --- a/src/Common/CosmosClient.ts +++ b/src/Common/CosmosClient.ts @@ -1,6 +1,7 @@ import * as Cosmos from "@azure/cosmos"; import { RequestInfo, setAuthorizationTokenHeaderUsingMasterKey } from "@azure/cosmos"; import { configContext, Platform } from "../ConfigContext"; +import { getErrorMessage } from "./ErrorHandlingUtils"; import { logConsoleError } from "../Utils/NotificationConsoleUtils"; import { EmulatorMasterKey, HttpHeaders } from "./Constants"; import { userContext } from "../UserContext"; @@ -69,7 +70,7 @@ export async function getTokenFromAuthService(verb: string, resourceType: string const result = JSON.parse(await response.json()); return result; } catch (error) { - logConsoleError(`Failed to get authorization headers for ${resourceType}: ${error.message}`); + logConsoleError(`Failed to get authorization headers for ${resourceType}: ${getErrorMessage(error)}`); return Promise.reject(error); } } diff --git a/src/Common/ErrorHandlingUtils.ts b/src/Common/ErrorHandlingUtils.ts index f100e0b07..e5acc6b49 100644 --- a/src/Common/ErrorHandlingUtils.ts +++ b/src/Common/ErrorHandlingUtils.ts @@ -1,11 +1,52 @@ -import { CosmosError, sendNotificationForError } from "./dataAccess/sendNotificationForError"; +import { HttpStatusCodes } from "./Constants"; +import { MessageTypes } from "../Contracts/ExplorerContracts"; +import { SubscriptionType } from "../Contracts/ViewModels"; import { logConsoleError } from "../Utils/NotificationConsoleUtils"; import { logError } from "./Logger"; -import { replaceKnownError } from "./ErrorParserUtility"; +import { sendMessage } from "./MessageHandler"; -export const handleError = (error: CosmosError, consoleErrorPrefix: string, area: string): void => { - const sanitizedErrorMsg = replaceKnownError(error.message); - logConsoleError(`${consoleErrorPrefix}:\n ${sanitizedErrorMsg}`); - logError(sanitizedErrorMsg, area, error.code); - sendNotificationForError(error); +export interface CosmosError { + code: number; + message?: string; +} + +export const handleError = (error: string | CosmosError, consoleErrorPrefix: string, area: string): void => { + const errorMessage = getErrorMessage(error); + const errorCode = typeof error === "string" ? undefined : error.code; + // logs error to data explorer console + logConsoleError(`${consoleErrorPrefix}:\n ${errorMessage}`); + // logs error to both app insight and kusto + logError(errorMessage, area, errorCode); + // checks for errors caused by firewall and sends them to portal to handle + sendNotificationForError(errorMessage, errorCode); +}; + +export const getErrorMessage = (error: string | CosmosError | Error): string => { + const errorMessage = typeof error === "string" ? error : error.message; + return replaceKnownError(errorMessage); +}; + +const sendNotificationForError = (errorMessage: string, errorCode: number): void => { + if (errorCode === HttpStatusCodes.Forbidden) { + if (errorMessage?.toLowerCase().indexOf("sharedoffer is disabled for your account") > 0) { + return; + } + sendMessage({ + type: MessageTypes.ForbiddenError, + reason: errorMessage + }); + } +}; + +const replaceKnownError = (errorMessage: string): string => { + if ( + window.dataExplorer?.subscriptionType() === SubscriptionType.Internal && + errorMessage.indexOf("SharedOffer is Disabled for your account") >= 0 + ) { + return "Database throughput is not supported for internal subscriptions."; + } else if (errorMessage.indexOf("Partition key paths must contain only valid") >= 0) { + return "Partition key paths must contain only valid characters and not contain a trailing slash or wildcard character."; + } + + return errorMessage; }; diff --git a/src/Common/ErrorParserUtility.ts b/src/Common/ErrorParserUtility.ts index 95d1ace34..968737f5c 100644 --- a/src/Common/ErrorParserUtility.ts +++ b/src/Common/ErrorParserUtility.ts @@ -1,18 +1,4 @@ import * as DataModels from "../Contracts/DataModels"; -import * as ViewModels from "../Contracts/ViewModels"; - -export function replaceKnownError(err: string): string { - if ( - window.dataExplorer.subscriptionType() === ViewModels.SubscriptionType.Internal && - err.indexOf("SharedOffer is Disabled for your account") >= 0 - ) { - return "Database throughput is not supported for internal subscriptions."; - } else if (err.indexOf("Partition key paths must contain only valid") >= 0) { - return "Partition key paths must contain only valid characters and not contain a trailing slash or wildcard character."; - } - - return err; -} export function parse(err: any): DataModels.ErrorDataModel[] { try { diff --git a/src/Common/Logger.ts b/src/Common/Logger.ts index 73d50a15e..39b3196c5 100644 --- a/src/Common/Logger.ts +++ b/src/Common/Logger.ts @@ -1,3 +1,4 @@ +import { CosmosError, getErrorMessage } from "./ErrorHandlingUtils"; import { sendMessage } from "./MessageHandler"; import { Diagnostics, MessageTypes } from "../Contracts/ExplorerContracts"; import { appInsights } from "../Shared/appInsights"; @@ -21,14 +22,9 @@ export function logWarning(message: string, area: string, code?: number): void { return _logEntry(entry); } -export function logError(message: string | Error, area: string, code?: number): void { - let logMessage: string; - if (typeof message === "string") { - logMessage = message; - } else { - logMessage = JSON.stringify(message, Object.getOwnPropertyNames(message)); - } - const entry: Diagnostics.LogEntry = _generateLogEntry(Diagnostics.LogEntryLevel.Error, logMessage, area, code); +export function logError(error: string | CosmosError | Error, area: string, code?: number): void { + const errorMessage: string = getErrorMessage(error); + const entry: Diagnostics.LogEntry = _generateLogEntry(Diagnostics.LogEntryLevel.Error, errorMessage, area, code); return _logEntry(entry); } diff --git a/src/Common/QueriesClient.ts b/src/Common/QueriesClient.ts index c54d167fc..7a3106890 100644 --- a/src/Common/QueriesClient.ts +++ b/src/Common/QueriesClient.ts @@ -12,6 +12,7 @@ import { BackendDefaults, HttpStatusCodes, SavedQueries } from "./Constants"; import { userContext } from "../UserContext"; import { createDocument, deleteDocument, queryDocuments, queryDocumentsPage } from "./DocumentClientUtilityBase"; import { createCollection } from "./dataAccess/createCollection"; +import { handleError } from "./ErrorHandlingUtils"; import * as ErrorParserUtility from "./ErrorParserUtility"; import * as Logger from "./Logger"; @@ -53,13 +54,8 @@ export class QueriesClient { return Promise.resolve(collection); }, (error: any) => { - const stringifiedError: string = error.message; - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Failed to set up account for saving queries: ${stringifiedError}` - ); - Logger.logError(stringifiedError, "setupQueriesCollection"); - return Promise.reject(stringifiedError); + handleError(error, "Failed to set up account for saving queries", "setupQueriesCollection"); + return Promise.reject(error); } ) .finally(() => NotificationConsoleUtils.clearInProgressMessageWithId(id)); @@ -163,25 +159,15 @@ export class QueriesClient { return Promise.resolve(queries); }, (error: any) => { - const stringifiedError: string = error.message; - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Failed to fetch saved queries: ${stringifiedError}` - ); - Logger.logError(stringifiedError, "getSavedQueries"); - return Promise.reject(stringifiedError); + handleError(error, "Failed to fetch saved queries", "getSavedQueries"); + return Promise.reject(error); } ); }, (error: any) => { // should never get into this state but we handle this regardless - const stringifiedError: string = error.message; - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Failed to fetch saved queries: ${stringifiedError}` - ); - Logger.logError(stringifiedError, "getSavedQueries"); - return Promise.reject(stringifiedError); + handleError(error, "Failed to fetch saved queries", "getSavedQueries"); + return Promise.reject(error); } ) .finally(() => NotificationConsoleUtils.clearInProgressMessageWithId(id)); @@ -232,13 +218,8 @@ export class QueriesClient { return Promise.resolve(); }, (error: any) => { - const stringifiedError: string = error.message; - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Failed to delete query ${query.queryName}: ${stringifiedError}` - ); - Logger.logError(stringifiedError, "deleteQuery"); - return Promise.reject(stringifiedError); + handleError(error, `Failed to delete query ${query.queryName}`, "deleteQuery"); + return Promise.reject(error); } ) .finally(() => NotificationConsoleUtils.clearInProgressMessageWithId(id)); diff --git a/src/Common/dataAccess/createTrigger.ts b/src/Common/dataAccess/createTrigger.ts index 341dd46e7..179d0103e 100644 --- a/src/Common/dataAccess/createTrigger.ts +++ b/src/Common/dataAccess/createTrigger.ts @@ -7,9 +7,8 @@ import { } 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 { logError } from "../Logger"; -import { sendNotificationForError } from "./sendNotificationForError"; +import { handleError } from "../ErrorHandlingUtils"; +import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils"; import { userContext } from "../../UserContext"; export async function createTrigger( @@ -66,9 +65,7 @@ export async function createTrigger( .scripts.triggers.create(trigger); return response.resource; } catch (error) { - logConsoleError(`Error while creating trigger ${trigger.id}:\n ${error.message}`); - logError(error.message, "CreateTrigger", error.code); - sendNotificationForError(error); + handleError(error, `Error while creating trigger ${trigger.id}`, "CreateTrigger"); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/readOffers.ts b/src/Common/dataAccess/readOffers.ts index c3717c5b3..8fc743c9c 100644 --- a/src/Common/dataAccess/readOffers.ts +++ b/src/Common/dataAccess/readOffers.ts @@ -1,7 +1,7 @@ import { Offer } from "../../Contracts/DataModels"; import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils"; import { client } from "../CosmosClient"; -import { handleError } from "../ErrorHandlingUtils"; +import { handleError, getErrorMessage } from "../ErrorHandlingUtils"; export const readOffers = async (): Promise => { const clearMessage = logConsoleProgress(`Querying offers`); @@ -13,7 +13,7 @@ export const readOffers = async (): Promise => { return response?.resources; } catch (error) { // This should be removed when we can correctly identify if an account is serverless when connected using connection string too. - if (error.message.includes("Reading or replacing offers is not supported for serverless accounts")) { + if (getErrorMessage(error)?.includes("Reading or replacing offers is not supported for serverless accounts")) { return []; } diff --git a/src/Common/dataAccess/sendNotificationForError.ts b/src/Common/dataAccess/sendNotificationForError.ts deleted file mode 100644 index 8c7666991..000000000 --- a/src/Common/dataAccess/sendNotificationForError.ts +++ /dev/null @@ -1,20 +0,0 @@ -import * as Constants from "../Constants"; -import { sendMessage } from "../MessageHandler"; -import { MessageTypes } from "../../Contracts/ExplorerContracts"; - -export interface CosmosError { - code: number; - message?: string; -} - -export function sendNotificationForError(error: CosmosError): void { - if (error && error.code === Constants.HttpStatusCodes.Forbidden) { - if (error.message && error.message.toLowerCase().indexOf("sharedoffer is disabled for your account") > 0) { - return; - } - sendMessage({ - type: MessageTypes.ForbiddenError, - reason: error && error.message ? error.message : error - }); - } -} diff --git a/src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts b/src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts index b25ed571a..1b713de85 100644 --- a/src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts +++ b/src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts @@ -1,8 +1,9 @@ import { Platform, configContext } from "../../ConfigContext"; import { getAuthorizationHeader } from "../../Utils/AuthorizationUtils"; import { AutoPilotOfferSettings } from "../../Contracts/DataModels"; -import { logConsoleProgress, logConsoleInfo, logConsoleError } from "../../Utils/NotificationConsoleUtils"; +import { logConsoleProgress, logConsoleInfo } from "../../Utils/NotificationConsoleUtils"; import { HttpHeaders } from "../Constants"; +import { handleError } from "../ErrorHandlingUtils"; interface UpdateOfferThroughputRequest { subscriptionId: string; @@ -44,8 +45,13 @@ export async function updateOfferThroughputBeyondLimit(request: UpdateOfferThrou clearMessage(); return undefined; } + const error = await response.json(); - logConsoleError(`Failed to request an increase in throughput for ${request.throughput}: ${error.message}`); + handleError( + error, + `Failed to request an increase in throughput for ${request.throughput}`, + "updateOfferThroughputBeyondLimit" + ); clearMessage(); - throw new Error(error.message); + throw error; } diff --git a/src/Explorer/Controls/Settings/SettingsComponent.tsx b/src/Explorer/Controls/Settings/SettingsComponent.tsx index a3c14f5f8..2966e1cf8 100644 --- a/src/Explorer/Controls/Settings/SettingsComponent.tsx +++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx @@ -50,6 +50,7 @@ import { getMongoDBCollectionIndexTransformationProgress, readMongoDBCollectionThroughRP } from "../../../Common/dataAccess/readMongoDBCollection"; +import { getErrorMessage } from "../../../Common/ErrorHandlingUtils"; interface SettingsV2TabInfo { tab: SettingsV2TabTypes; @@ -437,7 +438,7 @@ export class SettingsComponent extends React.Component { - const stringifiedError: string = error.message; + const stringifiedError: string = getErrorMessage(error); this.renewTokenError("Invalid connection string specified"); NotificationConsoleUtils.logConsoleMessage( ConsoleDataType.Error, @@ -1141,7 +1142,7 @@ export default class Explorer { NotificationConsoleUtils.clearInProgressMessageWithId(id); NotificationConsoleUtils.logConsoleMessage( ConsoleDataType.Error, - `Failed to generate share url: ${error.message}` + `Failed to generate share url: ${getErrorMessage(error)}` ); console.error(error); } @@ -1166,7 +1167,10 @@ export default class Explorer { deferred.resolve(); }, (error: any) => { - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, `Failed to connect: ${error.message}`); + NotificationConsoleUtils.logConsoleMessage( + ConsoleDataType.Error, + `Failed to connect: ${getErrorMessage(error)}` + ); deferred.reject(error); } ) @@ -1440,19 +1444,20 @@ export default class Explorer { this._setLoadingStatusText("Failed to fetch databases."); this.isRefreshingExplorer(false); deferred.reject(error); + const errorMessage = getErrorMessage(error); TelemetryProcessor.traceFailure( Action.LoadDatabases, { databaseAccountName: this.databaseAccount().name, defaultExperience: this.defaultExperience(), dataExplorerArea: Constants.Areas.ResourceTree, - error: error.message + error: errorMessage }, startKey ); NotificationConsoleUtils.logConsoleMessage( ConsoleDataType.Error, - `Error while refreshing databases: ${error.message}` + `Error while refreshing databases: ${errorMessage}` ); } ); @@ -1554,8 +1559,7 @@ export default class Explorer { return Promise.all(sparkPromises).then(() => workspaceItems); } catch (error) { - Logger.logError(error, "Explorer/this._arcadiaManager.listWorkspacesAsync"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error.message); + handleError(error, "Get Arcadia workspaces failed", "Explorer/this._arcadiaManager.listWorkspacesAsync"); return Promise.resolve([]); } } @@ -1590,10 +1594,10 @@ export default class Explorer { ); } catch (error) { this._isInitializingNotebooks = false; - Logger.logError(error, "initNotebooks/getNotebookConnectionInfoAsync"); - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Failed to get notebook workspace connection info: ${error.message}` + handleError( + error, + `Failed to get notebook workspace connection info: ${getErrorMessage(error)}`, + "initNotebooks/getNotebookConnectionInfoAsync" ); throw error; } finally { @@ -1669,8 +1673,7 @@ export default class Explorer { await this.notebookWorkspaceManager.startNotebookWorkspaceAsync(this.databaseAccount().id, "default"); } } catch (error) { - Logger.logError(error, "Explorer/ensureNotebookWorkspaceRunning"); - NotificationConsoleUtils.logConsoleError(`Failed to initialize notebook workspace: ${error.message}`); + handleError(error, "Failed to initialize notebook workspace", "Explorer/ensureNotebookWorkspaceRunning"); } finally { clearMessage && clearMessage(); } @@ -2052,7 +2055,7 @@ export default class Explorer { databaseAccountName: this.databaseAccount() && this.databaseAccount().name, defaultExperience: this.defaultExperience && this.defaultExperience(), dataExplorerArea: Constants.Areas.ResourceTree, - trace: error.message + trace: getErrorMessage(error) }, startKey ); @@ -2514,7 +2517,7 @@ export default class Explorer { (error: any) => { NotificationConsoleUtils.logConsoleMessage( ConsoleDataType.Error, - `Could not download notebook ${error.message}` + `Could not download notebook ${getErrorMessage(error)}` ); clearMessage(); diff --git a/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx b/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx index bbe2982b7..974ec3a8f 100644 --- a/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx +++ b/src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx @@ -29,6 +29,7 @@ import { InputProperty } from "../../../Contracts/ViewModels"; import { QueryIterator, ItemDefinition, Resource } from "@azure/cosmos"; import LoadingIndicatorIcon from "../../../../images/LoadingIndicator_3Squares.gif"; import { queryDocuments, queryDocumentsPage } from "../../../Common/DocumentClientUtilityBase"; +import { getErrorMessage } from "../../../Common/ErrorHandlingUtils"; export interface GraphAccessor { applyFilter: () => void; @@ -892,7 +893,7 @@ export class GraphExplorer extends React.Component (this.queryTotalRequestCharge = result.requestCharge), (error: any) => { - const errorMsg = `Failure in submitting query: ${query}: ${error.message}`; + const errorMsg = `Failure in submitting query: ${query}: ${getErrorMessage(error)}`; GraphExplorer.reportToConsole(ConsoleDataType.Error, errorMsg); this.setState({ filterQueryError: errorMsg @@ -1826,7 +1827,7 @@ export class GraphExplorer extends React.Component this.processGremlinQueryResults(result)) .catch((error: any) => { - const errorMsg = `Failed to process query result: ${error.message}`; + const errorMsg = `Failed to process query result: ${getErrorMessage(error)}`; GraphExplorer.reportToConsole(ConsoleDataType.Error, errorMsg); this.setState({ filterQueryError: errorMsg diff --git a/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts b/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts index 05627e2bf..7350f71d5 100644 --- a/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts +++ b/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts @@ -8,6 +8,7 @@ import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUti import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent"; import { HashMap } from "../../../Common/HashMap"; import * as Logger from "../../../Common/Logger"; +import { getErrorMessage } from "../../../Common/ErrorHandlingUtils"; export interface GremlinClientParameters { endpoint: string; @@ -58,14 +59,11 @@ export class GremlinClient { } }, failureCallback: (result: Result, error: any) => { - if (typeof error !== "string") { - error = error.message; - } - + const errorMessage = getErrorMessage(error); const requestId = result.requestId; if (!requestId || !this.pendingResults.has(requestId)) { - const msg = `Error: ${error}, unknown requestId:${requestId} ${GremlinClient.getRequestChargeString( + const msg = `Error: ${errorMessage}, unknown requestId:${requestId} ${GremlinClient.getRequestChargeString( result.requestCharge )}`; GremlinClient.reportError(msg); @@ -73,11 +71,11 @@ export class GremlinClient { // Fail all pending requests if no request id (fatal) if (!requestId) { this.pendingResults.keys().forEach((reqId: string) => { - this.abortPendingRequest(reqId, error, null); + this.abortPendingRequest(reqId, errorMessage, null); }); } } else { - this.abortPendingRequest(requestId, error, result.requestCharge); + this.abortPendingRequest(requestId, errorMessage, result.requestCharge); } }, infoCallback: (msg: string) => { diff --git a/src/Explorer/Panes/AddCollectionPane.ts b/src/Explorer/Panes/AddCollectionPane.ts index 08141f678..8c38a7809 100644 --- a/src/Explorer/Panes/AddCollectionPane.ts +++ b/src/Explorer/Panes/AddCollectionPane.ts @@ -15,6 +15,7 @@ import { configContext, Platform } from "../../ConfigContext"; import { ContextualPaneBase } from "./ContextualPaneBase"; import { DynamicListItem } from "../Controls/DynamicList/DynamicListComponent"; import { createCollection } from "../../Common/dataAccess/createCollection"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export interface AddCollectionPaneOptions extends ViewModels.PaneOptions { isPreferredApiTable: ko.Computed; @@ -881,10 +882,9 @@ export default class AddCollectionPane extends ContextualPaneBase { this.resetData(); this.container.refreshAllDatabases(); }, - (reason: any) => { + (error: any) => { this.isExecuting(false); - const message = ErrorParserUtility.parse(reason); - const errorMessage = ErrorParserUtility.replaceKnownError(message[0].message); + const errorMessage: string = getErrorMessage(error); this.formErrors(errorMessage); this.formErrorsDetails(errorMessage); const addCollectionPaneFailedMessage = { @@ -912,7 +912,7 @@ export default class AddCollectionPane extends ContextualPaneBase { flight: this.container.flight() }, dataExplorerArea: Constants.Areas.ContextualPane, - error: reason + error: errorMessage }; TelemetryProcessor.traceFailure(Action.CreateCollection, addCollectionPaneFailedMessage, startKey); } diff --git a/src/Explorer/Panes/BrowseQueriesPane.ts b/src/Explorer/Panes/BrowseQueriesPane.ts index 5c194c970..af3ef0a15 100644 --- a/src/Explorer/Panes/BrowseQueriesPane.ts +++ b/src/Explorer/Panes/BrowseQueriesPane.ts @@ -7,6 +7,7 @@ import * as Logger from "../../Common/Logger"; import { QueriesGridComponentAdapter } from "../Controls/QueriesGridReactComponent/QueriesGridComponentAdapter"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import QueryTab from "../Tabs/QueryTab"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export class BrowseQueriesPane extends ContextualPaneBase { public queriesGridComponentAdapter: QueriesGridComponentAdapter; @@ -60,17 +61,19 @@ export class BrowseQueriesPane extends ContextualPaneBase { startKey ); } catch (error) { + const errorMessage = getErrorMessage(error); TelemetryProcessor.traceFailure( Action.SetupSavedQueries, { databaseAccountName: this.container && this.container.databaseAccount().name, defaultExperience: this.container && this.container.defaultExperience(), dataExplorerArea: Areas.ContextualPane, - paneTitle: this.title() + paneTitle: this.title(), + error: errorMessage }, startKey ); - this.formErrors(`Failed to setup a collection for saved queries: ${error.message}`); + this.formErrors(`Failed to setup a collection for saved queries: ${errorMessage}`); } finally { this.isExecuting(false); } diff --git a/src/Explorer/Panes/RenewAdHocAccessPane.ts b/src/Explorer/Panes/RenewAdHocAccessPane.ts index 440df54ee..f9476c341 100644 --- a/src/Explorer/Panes/RenewAdHocAccessPane.ts +++ b/src/Explorer/Panes/RenewAdHocAccessPane.ts @@ -7,6 +7,7 @@ import { ContextualPaneBase } from "./ContextualPaneBase"; import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent"; import { DefaultExperienceUtility } from "../../Shared/DefaultExperienceUtility"; import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export class RenewAdHocAccessPane extends ContextualPaneBase { public accessKey: ko.Observable; @@ -82,7 +83,7 @@ export class RenewAdHocAccessPane extends ContextualPaneBase { this.container .renewShareAccess(this.accessKey()) .fail((error: any) => { - const errorMessage: string = error.message; + const errorMessage: string = getErrorMessage(error); NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, `Failed to connect: ${errorMessage}`); this.formErrors(errorMessage); this.formErrorsDetails(errorMessage); diff --git a/src/Explorer/Panes/SaveQueryPane.ts b/src/Explorer/Panes/SaveQueryPane.ts index 4d249d6a9..b379f6d3a 100644 --- a/src/Explorer/Panes/SaveQueryPane.ts +++ b/src/Explorer/Panes/SaveQueryPane.ts @@ -8,6 +8,7 @@ import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsol import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import QueryTab from "../Tabs/QueryTab"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export class SaveQueryPane extends ContextualPaneBase { public queryName: ko.Observable; @@ -87,18 +88,17 @@ export class SaveQueryPane extends ContextualPaneBase { }, (error: any) => { this.isExecuting(false); - if (typeof error != "string") { - error = error.message; - } + const errorMessage = getErrorMessage(error); this.formErrors("Failed to save query"); - this.formErrorsDetails(`Failed to save query: ${error}`); + this.formErrorsDetails(`Failed to save query: ${errorMessage}`); TelemetryProcessor.traceFailure( Action.SaveQuery, { databaseAccountName: this.container.databaseAccount().name, defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.ContextualPane, - paneTitle: this.title() + paneTitle: this.title(), + error: errorMessage }, startKey ); @@ -132,18 +132,20 @@ export class SaveQueryPane extends ContextualPaneBase { startKey ); } catch (error) { + const errorMessage = getErrorMessage(error); TelemetryProcessor.traceFailure( Action.SetupSavedQueries, { databaseAccountName: this.container && this.container.databaseAccount().name, defaultExperience: this.container && this.container.defaultExperience(), dataExplorerArea: Constants.Areas.ContextualPane, - paneTitle: this.title() + paneTitle: this.title(), + error: errorMessage }, startKey ); this.formErrors("Failed to setup a container for saved queries"); - this.formErrors(`Failed to setup a container for saved queries: ${error.message}`); + this.formErrorsDetails(`Failed to setup a container for saved queries: ${errorMessage}`); } finally { this.isExecuting(false); } diff --git a/src/Explorer/Panes/SetupNotebooksPane.ts b/src/Explorer/Panes/SetupNotebooksPane.ts index 6a8e56dc9..a95bcb667 100644 --- a/src/Explorer/Panes/SetupNotebooksPane.ts +++ b/src/Explorer/Panes/SetupNotebooksPane.ts @@ -6,6 +6,7 @@ import { ContextualPaneBase } from "./ContextualPaneBase"; import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import * as ko from "knockout"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export class SetupNotebooksPane extends ContextualPaneBase { private description: ko.Observable; @@ -85,7 +86,7 @@ export class SetupNotebooksPane extends ContextualPaneBase { "Successfully created a default notebook workspace for the account" ); } catch (error) { - const errorMessage = typeof error == "string" ? error : error.message; + const errorMessage = getErrorMessage(error); TelemetryProcessor.traceFailure( Action.CreateNotebookWorkspace, { diff --git a/src/Explorer/Tabs/DocumentsTab.ts b/src/Explorer/Tabs/DocumentsTab.ts index 1779e10a0..368c85ada 100644 --- a/src/Explorer/Tabs/DocumentsTab.ts +++ b/src/Explorer/Tabs/DocumentsTab.ts @@ -32,6 +32,7 @@ import { createDocument } from "../../Common/DocumentClientUtilityBase"; import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export default class DocumentsTab extends TabsBase { public selectedDocumentId: ko.Observable; @@ -774,10 +775,8 @@ export default class DocumentsTab extends TabsBase { }, error => { this.isExecutionError(true); - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - typeof error === "string" ? error : error.message - ); + const errorMessage = getErrorMessage(error); + NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, errorMessage); if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) { TelemetryProcessor.traceFailure( Action.Tab, @@ -788,7 +787,7 @@ export default class DocumentsTab extends TabsBase { defaultExperience: this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: this.tabTitle(), - error: error + error: errorMessage }, this.onLoadStartKey ); diff --git a/src/Explorer/Tabs/SettingsTab.ts b/src/Explorer/Tabs/SettingsTab.ts index 4ae2785fe..29dfbe9fc 100644 --- a/src/Explorer/Tabs/SettingsTab.ts +++ b/src/Explorer/Tabs/SettingsTab.ts @@ -22,6 +22,7 @@ import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandBu import { userContext } from "../../UserContext"; import { updateOfferThroughputBeyondLimit } from "../../Common/dataAccess/updateOfferThroughputBeyondLimit"; import { configContext, Platform } from "../../ConfigContext"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; const ttlWarning: string = ` The system will automatically delete items based on the TTL value (in seconds) you provide, without needing a delete operation explicitly issued by a client application. @@ -1174,7 +1175,7 @@ export default class SettingsTab extends TabsBase implements ViewModels.WaitsFor defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: this.tabTitle(), - error: error.message + error: getErrorMessage(error) }, startKey ); diff --git a/src/Explorer/Tree/Collection.ts b/src/Explorer/Tree/Collection.ts index 14192ae2b..a1921cda7 100644 --- a/src/Explorer/Tree/Collection.ts +++ b/src/Explorer/Tree/Collection.ts @@ -40,6 +40,7 @@ import Explorer from "../Explorer"; import { userContext } from "../../UserContext"; import TabsBase from "../Tabs/TabsBase"; import { fetchPortalNotifications } from "../../Common/PortalNotifications"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export default class Collection implements ViewModels.Collection { public nodeKind: string; @@ -610,6 +611,7 @@ export default class Collection implements ViewModels.Collection { settingsTab.pendingNotification(pendingNotification); }, (error: any) => { + const errorMessage = getErrorMessage(error); TelemetryProcessor.traceFailure( Action.Tab, { @@ -619,13 +621,13 @@ export default class Collection implements ViewModels.Collection { defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: settingsTabOptions.title, - error: error + error: errorMessage }, startKey ); NotificationConsoleUtils.logConsoleMessage( ConsoleDataType.Error, - `Error while fetching container settings for container ${this.id()}: ${error.message}` + `Error while fetching container settings for container ${this.id()}: ${errorMessage}` ); throw error; } @@ -869,7 +871,7 @@ export default class Collection implements ViewModels.Collection { collectionName: this.id(), defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.ResourceTree, - error: typeof error === "string" ? error : error.message + error: getErrorMessage(error) }); } ); @@ -928,7 +930,7 @@ export default class Collection implements ViewModels.Collection { collectionName: this.id(), defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.ResourceTree, - error: typeof error === "string" ? error : error.message + error: getErrorMessage(error) }); } ); @@ -988,7 +990,7 @@ export default class Collection implements ViewModels.Collection { collectionName: this.id(), defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.ResourceTree, - error: typeof error === "string" ? error : error.message + error: getErrorMessage(error) }); } ); @@ -1185,7 +1187,7 @@ export default class Collection implements ViewModels.Collection { }, error => { record.numFailed++; - record.errors = [...record.errors, error.message]; + record.errors = [...record.errors, getErrorMessage(error)]; return Q.resolve(); } ); @@ -1238,7 +1240,7 @@ export default class Collection implements ViewModels.Collection { (error: any) => { Logger.logError( JSON.stringify({ - error: error.message, + error: getErrorMessage(error), accountName: this.container && this.container.databaseAccount(), databaseName: this.databaseId, collectionName: this.id() diff --git a/src/Explorer/Tree/Database.ts b/src/Explorer/Tree/Database.ts index faa33d406..83bb3c361 100644 --- a/src/Explorer/Tree/Database.ts +++ b/src/Explorer/Tree/Database.ts @@ -16,6 +16,7 @@ import { readCollections } from "../../Common/dataAccess/readCollections"; import { readDatabaseOffer } from "../../Common/dataAccess/readDatabaseOffer"; import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType"; import { fetchPortalNotifications } from "../../Common/PortalNotifications"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export default class Database implements ViewModels.Database { public nodeKind: string; @@ -88,6 +89,7 @@ export default class Database implements ViewModels.Database { this.container.tabsManager.activateNewTab(settingsTab); }, (error: any) => { + const errorMessage = getErrorMessage(error); TelemetryProcessor.traceFailure( Action.Tab, { @@ -97,13 +99,13 @@ export default class Database implements ViewModels.Database { defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: "Scale", - error: error + error: errorMessage }, startKey ); NotificationConsoleUtils.logConsoleMessage( ConsoleDataType.Error, - `Error while fetching database settings for database ${this.id()}: ${error.message}` + `Error while fetching database settings for database ${this.id()}: ${errorMessage}` ); throw error; } @@ -239,7 +241,7 @@ export default class Database implements ViewModels.Database { (error: any) => { Logger.logError( JSON.stringify({ - error: error.message, + error: getErrorMessage(error), accountName: this.container && this.container.databaseAccount(), databaseName: this.id(), collectionName: this.id() diff --git a/src/Explorer/Tree/StoredProcedure.ts b/src/Explorer/Tree/StoredProcedure.ts index f2db0b577..1c35dfa8f 100644 --- a/src/Explorer/Tree/StoredProcedure.ts +++ b/src/Explorer/Tree/StoredProcedure.ts @@ -9,6 +9,7 @@ import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import Explorer from "../Explorer"; import StoredProcedureTab from "../Tabs/StoredProcedureTab"; import TabsBase from "../Tabs/TabsBase"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; const sampleStoredProcedureBody: string = `// SAMPLE STORED PROCEDURE function sample(prefix) { @@ -158,7 +159,7 @@ export default class StoredProcedure { sprocTab.onExecuteSprocsResult(result, result.scriptLogs); }, (error: any) => { - sprocTab.onExecuteSprocsError(error.message); + sprocTab.onExecuteSprocsError(getErrorMessage(error)); } ) .finally(() => { diff --git a/src/GitHub/GitHubContentProvider.ts b/src/GitHub/GitHubContentProvider.ts index 9d6dcc82b..6142b7a6f 100644 --- a/src/GitHub/GitHubContentProvider.ts +++ b/src/GitHub/GitHubContentProvider.ts @@ -9,6 +9,7 @@ import { NotebookUtil } from "../Explorer/Notebook/NotebookUtil"; import { GitHubClient, IGitHubFile, IGitHubResponse } from "./GitHubClient"; import * as GitHubUtils from "../Utils/GitHubUtils"; import UrlUtility from "../Common/UrlUtility"; +import { getErrorMessage } from "../Common/ErrorHandlingUtils"; export interface GitHubContentProviderParams { gitHubClient: GitHubClient; @@ -423,7 +424,7 @@ export class GitHubContentProvider implements IContentProvider { request: {}, status: error.errno, response: error, - responseText: error.message, + responseText: getErrorMessage(error), responseType: "json" }; } diff --git a/src/HostedExplorer.ts b/src/HostedExplorer.ts index 77024a87c..ac24eeaea 100644 --- a/src/HostedExplorer.ts +++ b/src/HostedExplorer.ts @@ -21,6 +21,7 @@ import { import { DialogComponentAdapter } from "./Explorer/Controls/DialogReactComponent/DialogComponentAdapter"; import { DialogProps } from "./Explorer/Controls/DialogReactComponent/DialogComponent"; import { DirectoryListProps } from "./Explorer/Controls/Directory/DirectoryListComponent"; +import { getErrorMessage } from "./Common/ErrorHandlingUtils"; import { initializeIcons } from "office-ui-fabric-react/lib/Icons"; import { LocalStorageUtility, StorageKey, SessionStorageUtility } from "./Shared/StorageUtility"; import * as Logger from "./Common/Logger"; @@ -509,12 +510,13 @@ class HostedExplorer { } }); } catch (error) { - Logger.logError(error, "HostedExplorer/_getArcadiaToken"); + const errorMessage = getErrorMessage(error); + Logger.logError(errorMessage, "HostedExplorer/_getArcadiaToken"); this._sendMessageToExplorerFrame({ actionType: ActionType.TransmitCachedData, message: { id: message && message.id, - error: error.message + error: errorMessage } }); } @@ -559,12 +561,9 @@ class HostedExplorer { }); }, error => { - if (typeof error !== "string") { - error = JSON.stringify(error, Object.getOwnPropertyNames(error)); - } this._sendMessageToExplorerFrame({ type: MessageTypes.GetAccessAadResponse, - error + error: getErrorMessage(error) }); } ); @@ -1008,7 +1007,7 @@ class HostedExplorer { return accounts; } catch (error) { - this._logConsoleMessage(ConsoleDataType.Error, `Failed to fetch accounts: ${error.message}`); + this._logConsoleMessage(ConsoleDataType.Error, `Failed to fetch accounts: ${getErrorMessage(error)}`); this._clearInProgressMessageWithId(id); throw error; @@ -1047,7 +1046,7 @@ class HostedExplorer { displayText: "Error loading account" }); this._updateLoadingStatusText(`Failed to load selected account: ${newAccount.name}`); - this._logConsoleMessage(ConsoleDataType.Error, `Failed to connect: ${error.message}`); + this._logConsoleMessage(ConsoleDataType.Error, `Failed to connect: ${getErrorMessage(error)}`); this._clearInProgressMessageWithId(id); throw error; } diff --git a/src/Platform/Hosted/Main.ts b/src/Platform/Hosted/Main.ts index d424704f4..e218a136e 100644 --- a/src/Platform/Hosted/Main.ts +++ b/src/Platform/Hosted/Main.ts @@ -23,6 +23,7 @@ import "../../Explorer/Tables/DataTable/DataTableBindingManager"; import Explorer from "../../Explorer/Explorer"; import { updateUserContext } from "../../UserContext"; import { configContext } from "../../ConfigContext"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export default class Main { private static _databaseAccountId: string; @@ -245,7 +246,7 @@ export default class Main { ); }, (error: any) => { - deferred.reject(`Failed to generate encrypted token: ${error.message}`); + deferred.reject(`Failed to generate encrypted token: ${getErrorMessage(error)}`); } ); diff --git a/src/workers/upload/index.ts b/src/workers/upload/index.ts index 7f5172db3..5e38b8d79 100644 --- a/src/workers/upload/index.ts +++ b/src/workers/upload/index.ts @@ -3,6 +3,7 @@ import { DocumentClientParams, UploadDetailsRecord, UploadDetails } from "./defi import { client } from "../../Common/CosmosClient"; import { configContext, updateConfigContext } from "../../ConfigContext"; import { updateUserContext } from "../../UserContext"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; let numUploadsSuccessful = 0; let numUploadsFailed = 0; @@ -93,7 +94,7 @@ function createDocumentsFromFile(fileName: string, documentContent: string): voi }) .catch(error => { console.error(error); - recordUploadDetailErrorForFile(fileName, error.message); + recordUploadDetailErrorForFile(fileName, getErrorMessage(error)); numUploadsFailed++; }) .finally(() => { diff --git a/tsconfig.strict.json b/tsconfig.strict.json index 94bd2d8fa..89cfd09a2 100644 --- a/tsconfig.strict.json +++ b/tsconfig.strict.json @@ -15,13 +15,11 @@ "./src/Common/DeleteFeedback.ts", "./src/Common/HashMap.ts", "./src/Common/HeadersUtility.ts", - "./src/Common/Logger.ts", "./src/Common/MessageHandler.ts", "./src/Common/MongoUtility.ts", "./src/Common/ObjectCache.ts", "./src/Common/ThemeUtility.ts", "./src/Common/UrlUtility.ts", - "./src/Common/dataAccess/sendNotificationForError.ts", "./src/ConfigContext.ts", "./src/Contracts/ActionContracts.ts", "./src/Contracts/DataModels.ts", From 473f722dcc163f950b39a00d1215bc703fba5e37 Mon Sep 17 00:00:00 2001 From: Zachary Foster Date: Mon, 2 Nov 2020 14:33:14 -0500 Subject: [PATCH 02/13] E2E Test Rewrite (#300) * Adds tables test * Include .env var * Adds asElement on again * Add further loading states * Format * Hope to not lose focus * Adds ID to shared key and modifies value of input directly * Fix tables test * Format * Try uploading screenshots * indent * Fixes connection string * Try wildcard upload path * Rebuilds test structure, assertions, dependencies * Wait longer for container create * format --- .github/workflows/ci.yml | 5 + src/Explorer/Panes/AddCollectionPane.html | 2 +- test/cassandra/container.spec.ts | 117 +++++++++++++++----- test/mongo/container.spec.ts | 128 ++++++++++++++++------ test/sql/container.spec.ts | 124 +++++++++++++++------ test/tables/container.spec.ts | 111 +++++++++++++++++++ test/utils/shared.ts | 4 +- 7 files changed, 388 insertions(+), 103 deletions(-) create mode 100644 test/tables/container.spec.ts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 78a043e29..53a39150a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -150,6 +150,11 @@ jobs: PORTAL_RUNNER_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_SQL }} MONGO_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_MONGO }} CASSANDRA_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_CASSANDRA }} + TABLES_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_TABLE }} + - uses: actions/upload-artifact@v2 + with: + name: screenshots + path: failed-* nuget: name: Publish Nuget if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/') diff --git a/src/Explorer/Panes/AddCollectionPane.html b/src/Explorer/Panes/AddCollectionPane.html index 775790fce..9167bcf93 100644 --- a/src/Explorer/Panes/AddCollectionPane.html +++ b/src/Explorer/Panes/AddCollectionPane.html @@ -288,7 +288,7 @@ range of values and is likely to have evenly distributed access patterns.

- { it("creates a collection", async () => { try { - const keyspaceId = generateUniqueName("keyspaceid"); - const tableId = generateUniqueName("tableid"); + const keyspaceId = generateUniqueName("key"); + const tableId = generateUniqueName("tab"); const frame = await login(process.env.CASSANDRA_CONNECTION_STRING); // create new table @@ -31,38 +34,69 @@ describe("Collection Add and Delete Cassandra spec", () => { // open database menu await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); - - await frame.waitFor(`div[data-test="${keyspaceId}"]`, { visible: true }); - await frame.waitFor(LOADING_STATE_DELAY); - await frame.waitFor(`div[data-test="${keyspaceId}"]`, { visible: true }); - await frame.click(`div[data-test="${keyspaceId}"]`); - await frame.waitFor(`span[title="${tableId}"]`, { visible: true }); - - // delete container - - // click context menu for container - await frame.waitFor(`div[data-test="${tableId}"] > div > button`, { visible: true }); - await frame.click(`div[data-test="${tableId}"] > div > button`); - - // click delete container - await frame.waitForSelector("body > div.ms-Layer.ms-Layer--fixed"); - await frame.waitFor(RENDER_DELAY); - const elements = await frame.$$('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); - await elements[0].click(); - - // confirm delete container - await frame.type('input[data-test="confirmCollectionId"]', tableId.trim()); - - // click delete - await frame.click('input[data-test="deleteCollection"]'); - await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); await frame.waitFor(LOADING_STATE_DELAY); await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); - await expect(page).not.toMatchElement(`div[data-test="${tableId}"]`); + const databases = await frame.$$(`div[class="databaseHeader main1 nodeItem "] > div[class="treeNodeHeader "]`); + const selectedDbId = await frame.evaluate(element => { + return element.attributes["data-test"].textContent; + }, databases[0]); + + await frame.waitFor(`div[data-test="${selectedDbId}"]`), { visible: true }; + await frame.waitFor(CREATE_DELAY); + await frame.waitFor("div[class='rowData'] > span[class='message']"); + + const didCreateContainer = await frame.$$eval("div[class='rowData'] > span[class='message']", elements => { + return elements.some(el => el.textContent.includes("Successfully created")); + }); + + expect(didCreateContainer).toBe(true); + + await frame.waitFor(`div[data-test="${selectedDbId}"]`), { visible: true }; + await frame.waitFor(LOADING_STATE_DELAY); + + await clickDBMenu(selectedDbId, frame); + + const collections = await frame.$$( + `div[class="collectionHeader main2 nodeItem "] > div[class="treeNodeHeader "]` + ); + + if (collections.length) { + await frame.waitFor(`div[class="collectionHeader main2 nodeItem "] > div[class="treeNodeHeader "]`, { + visible: true + }); + + const textId = await frame.evaluate(element => { + return element.attributes["data-test"].textContent; + }, collections[0]); + await frame.waitFor(`div[data-test="${textId}"]`, { visible: true }); + // delete container + + // click context menu for container + await frame.waitFor(`div[data-test="${textId}"] > div > button`, { visible: true }); + await frame.click(`div[data-test="${textId}"] > div > button`); + + // click delete container + await frame.waitFor(RENDER_DELAY); + await frame.waitFor('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); + await frame.click('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); + + // confirm delete container + await frame.waitFor('input[data-test="confirmCollectionId"]', { visible: true }); + await frame.type('input[data-test="confirmCollectionId"]', textId); + + // click delete + await frame.waitFor('input[data-test="deleteCollection"]', { visible: true }); + await frame.click('input[data-test="deleteCollection"]'); + await frame.waitFor(LOADING_STATE_DELAY); + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + + await expect(page).not.toMatchElement(`div[data-test="${textId}"]`); + } // click context menu for database await frame.waitFor(`div[data-test="${keyspaceId}"] > div > button`); + await frame.waitFor(RENDER_DELAY); const button = await frame.$(`div[data-test="${keyspaceId}"] > div > button`); await button.focus(); await button.asElement().click(); @@ -80,12 +114,35 @@ describe("Collection Add and Delete Cassandra spec", () => { // click delete await frame.click('input[data-test="deleteDatabase"]'); await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + await frame.waitFor(LOADING_STATE_DELAY); + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); await expect(page).not.toMatchElement(`div[data-test="${keyspaceId}"]`); } catch (error) { // eslint-disable-next-line @typescript-eslint/no-explicit-any const testName = (expect as any).getState().currentTestName; - await page.screenshot({ path: `Test Failed ${testName}.png` }); + await page.screenshot({ path: `failed-${testName}.jpg` }); throw error; } }); }); + +async function clickDBMenu(dbId: string, frame: Frame, retries = 0) { + const button = await frame.$(`div[data-test="${dbId}"]`); + await button.focus(); + const handler = await button.asElement(); + await handler.click(); + await ensureMenuIsOpen(dbId, frame, retries); + return button; +} + +async function ensureMenuIsOpen(dbId: string, frame: Frame, retries: number) { + await frame.waitFor(RETRY_DELAY); + const button = await frame.$(`div[data-test="${dbId}"]`); + const classList = await frame.evaluate(button => { + return button.parentElement.classList; + }, button); + if (!Object.values(classList).includes("selected") && retries < 5) { + retries = retries + 1; + await clickDBMenu(dbId, frame, retries); + } +} diff --git a/test/mongo/container.spec.ts b/test/mongo/container.spec.ts index 54febbcf1..b5e0599de 100644 --- a/test/mongo/container.spec.ts +++ b/test/mongo/container.spec.ts @@ -1,17 +1,19 @@ import "expect-puppeteer"; +import { Frame } from "puppeteer"; import { generateUniqueName, login } from "../utils/shared"; jest.setTimeout(300000); - const LOADING_STATE_DELAY = 2500; +const RETRY_DELAY = 5000; +const CREATE_DELAY = 10000; const RENDER_DELAY = 1000; describe("Collection Add and Delete Mongo spec", () => { - it("creates and deletes a collection", async () => { + it("creates a collection", async () => { try { - const dbId = generateUniqueName("TestDatabase"); - const collectionId = generateUniqueName("TestCollection"); - const sharedKey = generateUniqueName("SharedKey"); + const dbId = generateUniqueName("db"); + const collectionId = generateUniqueName("col"); + const sharedKey = `${generateUniqueName()}`; const frame = await login(process.env.MONGO_CONNECTION_STRING); // create new collection @@ -52,39 +54,70 @@ describe("Collection Add and Delete Mongo spec", () => { // validate created // open database menu await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); - - await frame.waitFor(`div[data-test="${dbId}"]`), { visible: true }; - await frame.waitFor(LOADING_STATE_DELAY); - await frame.waitFor(`div[data-test="${dbId}"]`), { visible: true }; - await frame.click(`div[data-test="${dbId}"]`); - await frame.waitFor(`div[data-test="${collectionId}"]`, { visible: true }); - - // delete container - - // click context menu for container - await frame.waitFor(`div[data-test="${collectionId}"] > div > button`, { visible: true }); - await frame.click(`div[data-test="${collectionId}"] > div > button`); - - // click delete container - await frame.waitFor(RENDER_DELAY); - await frame.waitFor('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]', { visible: true }); - await frame.click('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); - - // confirm delete container - await frame.waitFor('input[data-test="confirmCollectionId"]', { visible: true }); - await frame.type('input[data-test="confirmCollectionId"]', collectionId.trim()); - - // click delete - await frame.waitFor('input[data-test="deleteCollection"]', { visible: true }); - await frame.click('input[data-test="deleteCollection"]'); await frame.waitFor(LOADING_STATE_DELAY); await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); - await expect(page).not.toMatchElement(`div[data-test="${collectionId}"]`); + const databases = await frame.$$(`div[class="databaseHeader main1 nodeItem "] > div[class="treeNodeHeader "]`); + const selectedDbId = await frame.evaluate(element => { + return element.attributes["data-test"].textContent; + }, databases[0]); + + await frame.waitFor(`div[data-test="${selectedDbId}"]`), { visible: true }; + await frame.waitFor(CREATE_DELAY); + await frame.waitFor("div[class='rowData'] > span[class='message']"); + + const didCreateContainer = await frame.$$eval("div[class='rowData'] > span[class='message']", elements => { + return elements.some(el => el.textContent.includes("Successfully created")); + }); + + expect(didCreateContainer).toBe(true); + + await frame.waitFor(`div[data-test="${selectedDbId}"]`), { visible: true }; + await frame.waitFor(LOADING_STATE_DELAY); + + await clickDBMenu(selectedDbId, frame); + + const collections = await frame.$$( + `div[class="collectionHeader main2 nodeItem "] > div[class="treeNodeHeader "]` + ); + + if (collections.length) { + await frame.waitFor(`div[class="collectionHeader main2 nodeItem "] > div[class="treeNodeHeader "]`, { + visible: true + }); + + const textId = await frame.evaluate(element => { + return element.attributes["data-test"].textContent; + }, collections[0]); + await frame.waitFor(`div[data-test="${textId}"]`, { visible: true }); + // delete container + + // click context menu for container + await frame.waitFor(`div[data-test="${textId}"] > div > button`, { visible: true }); + await frame.click(`div[data-test="${textId}"] > div > button`); + + // click delete container + await frame.waitFor(RENDER_DELAY); + await frame.waitFor('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); + await frame.click('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); + + // confirm delete container + await frame.waitFor('input[data-test="confirmCollectionId"]', { visible: true }); + await frame.type('input[data-test="confirmCollectionId"]', textId); + + // click delete + await frame.waitFor('input[data-test="deleteCollection"]', { visible: true }); + await frame.click('input[data-test="deleteCollection"]'); + await frame.waitFor(LOADING_STATE_DELAY); + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + + await expect(page).not.toMatchElement(`div[data-test="${textId}"]`); + } // click context menu for database - await frame.waitFor(`div[data-test="${dbId}"] > div > button`); - const button = await frame.$(`div[data-test="${dbId}"] > div > button`); + await frame.waitFor(`div[data-test="${selectedDbId}"] > div > button`); + await frame.waitFor(RENDER_DELAY); + const button = await frame.$(`div[data-test="${selectedDbId}"] > div > button`); await button.focus(); await button.asElement().click(); @@ -96,17 +129,40 @@ describe("Collection Add and Delete Mongo spec", () => { // confirm delete database await frame.waitForSelector('input[data-test="confirmDatabaseId"]', { visible: true }); await frame.waitFor(RENDER_DELAY); - await frame.type('input[data-test="confirmDatabaseId"]', dbId.trim()); + await frame.type('input[data-test="confirmDatabaseId"]', selectedDbId); // click delete await frame.click('input[data-test="deleteDatabase"]'); await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); - await expect(page).not.toMatchElement(`div[data-test="${dbId}"]`); + await frame.waitFor(LOADING_STATE_DELAY); + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + await expect(page).not.toMatchElement(`div[data-test="${selectedDbId}"]`); } catch (error) { // eslint-disable-next-line @typescript-eslint/no-explicit-any const testName = (expect as any).getState().currentTestName; - await page.screenshot({ path: `Test Failed ${testName}.png` }); + await page.screenshot({ path: `failed-${testName}.jpg` }); throw error; } }); }); + +async function clickDBMenu(dbId: string, frame: Frame, retries = 0) { + const button = await frame.$(`div[data-test="${dbId}"]`); + await button.focus(); + const handler = await button.asElement(); + await handler.click(); + await ensureMenuIsOpen(dbId, frame, retries); + return button; +} + +async function ensureMenuIsOpen(dbId: string, frame: Frame, retries: number) { + await frame.waitFor(RETRY_DELAY); + const button = await frame.$(`div[data-test="${dbId}"]`); + const classList = await frame.evaluate(button => { + return button.parentElement.classList; + }, button); + if (!Object.values(classList).includes("selected") && retries < 5) { + retries = retries + 1; + await clickDBMenu(dbId, frame, retries); + } +} diff --git a/test/sql/container.spec.ts b/test/sql/container.spec.ts index 6b801c817..ad5d7f251 100644 --- a/test/sql/container.spec.ts +++ b/test/sql/container.spec.ts @@ -1,16 +1,19 @@ import "expect-puppeteer"; +import { Frame } from "puppeteer"; import { generateUniqueName, login } from "../utils/shared"; jest.setTimeout(300000); const LOADING_STATE_DELAY = 2500; +const RETRY_DELAY = 5000; +const CREATE_DELAY = 10000; const RENDER_DELAY = 1000; describe("Collection Add and Delete SQL spec", () => { it("creates a collection", async () => { try { - const dbId = generateUniqueName("TestDatabase"); - const collectionId = generateUniqueName("TestCollection"); - const sharedKey = generateUniqueName("SharedKey"); + const dbId = generateUniqueName("db"); + const collectionId = generateUniqueName("col"); + const sharedKey = `/skey${generateUniqueName()}`; const frame = await login(process.env.PORTAL_RUNNER_CONNECTION_STRING); // create new collection @@ -51,39 +54,69 @@ describe("Collection Add and Delete SQL spec", () => { // validate created // open database menu await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); - - await frame.waitFor(`div[data-test="${dbId}"]`), { visible: true }; - await frame.waitFor(LOADING_STATE_DELAY); - await frame.waitFor(`div[data-test="${dbId}"]`), { visible: true }; - await frame.click(`div[data-test="${dbId}"]`); - await frame.waitFor(`div[data-test="${collectionId}"]`, { visible: true }); - - // delete container - - // click context menu for container - await frame.waitFor(`div[data-test="${collectionId}"] > div > button`, { visible: true }); - await frame.click(`div[data-test="${collectionId}"] > div > button`); - - // click delete container - await frame.waitFor(RENDER_DELAY); - await frame.waitFor('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); - await frame.click('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); - - // confirm delete container - await frame.waitFor('input[data-test="confirmCollectionId"]', { visible: true }); - await frame.type('input[data-test="confirmCollectionId"]', collectionId); - - // click delete - await frame.waitFor('input[data-test="deleteCollection"]', { visible: true }); - await frame.click('input[data-test="deleteCollection"]'); await frame.waitFor(LOADING_STATE_DELAY); await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + const databases = await frame.$$(`div[class="databaseHeader main1 nodeItem "] > div[class="treeNodeHeader "]`); + const selectedDbId = await frame.evaluate(element => { + return element.attributes["data-test"].textContent; + }, databases[0]); - await expect(page).not.toMatchElement(`div[data-test="${collectionId}"]`); + await frame.waitFor(`div[data-test="${selectedDbId}"]`), { visible: true }; + await frame.waitFor(CREATE_DELAY); + await frame.waitFor("div[class='rowData'] > span[class='message']"); + + const didCreateContainer = await frame.$$eval("div[class='rowData'] > span[class='message']", elements => { + return elements.some(el => el.textContent.includes("Successfully created")); + }); + + expect(didCreateContainer).toBe(true); + + await frame.waitFor(`div[data-test="${selectedDbId}"]`), { visible: true }; + await frame.waitFor(LOADING_STATE_DELAY); + + await clickDBMenu(selectedDbId, frame); + + const collections = await frame.$$( + `div[class="collectionHeader main2 nodeItem "] > div[class="treeNodeHeader "]` + ); + + if (collections.length) { + await frame.waitFor(`div[class="collectionHeader main2 nodeItem "] > div[class="treeNodeHeader "]`, { + visible: true + }); + + const textId = await frame.evaluate(element => { + return element.attributes["data-test"].textContent; + }, collections[0]); + await frame.waitFor(`div[data-test="${textId}"]`, { visible: true }); + // delete container + + // click context menu for container + await frame.waitFor(`div[data-test="${textId}"] > div > button`, { visible: true }); + await frame.click(`div[data-test="${textId}"] > div > button`); + + // click delete container + await frame.waitFor(RENDER_DELAY); + await frame.waitFor('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); + await frame.click('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); + + // confirm delete container + await frame.waitFor('input[data-test="confirmCollectionId"]', { visible: true }); + await frame.type('input[data-test="confirmCollectionId"]', textId); + + // click delete + await frame.waitFor('input[data-test="deleteCollection"]', { visible: true }); + await frame.click('input[data-test="deleteCollection"]'); + await frame.waitFor(LOADING_STATE_DELAY); + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + + await expect(page).not.toMatchElement(`div[data-test="${textId}"]`); + } // click context menu for database - await frame.waitFor(`div[data-test="${dbId}"] > div > button`); - const button = await frame.$(`div[data-test="${dbId}"] > div > button`); + await frame.waitFor(`div[data-test="${selectedDbId}"] > div > button`); + await frame.waitFor(RENDER_DELAY); + const button = await frame.$(`div[data-test="${selectedDbId}"] > div > button`); await button.focus(); await button.asElement().click(); @@ -95,17 +128,40 @@ describe("Collection Add and Delete SQL spec", () => { // confirm delete database await frame.waitForSelector('input[data-test="confirmDatabaseId"]', { visible: true }); await frame.waitFor(RENDER_DELAY); - await frame.type('input[data-test="confirmDatabaseId"]', dbId.trim()); + await frame.type('input[data-test="confirmDatabaseId"]', selectedDbId); // click delete await frame.click('input[data-test="deleteDatabase"]'); await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); - await expect(page).not.toMatchElement(`div[data-test="${dbId}"]`); + await frame.waitFor(LOADING_STATE_DELAY); + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + await expect(page).not.toMatchElement(`div[data-test="${selectedDbId}"]`); } catch (error) { // eslint-disable-next-line @typescript-eslint/no-explicit-any const testName = (expect as any).getState().currentTestName; - await page.screenshot({ path: `Test Failed ${testName}.jpg` }); + await page.screenshot({ path: `failed-${testName}.jpg` }); throw error; } }); }); + +async function clickDBMenu(dbId: string, frame: Frame, retries = 0) { + const button = await frame.$(`div[data-test="${dbId}"]`); + await button.focus(); + const handler = await button.asElement(); + await handler.click(); + await ensureMenuIsOpen(dbId, frame, retries); + return button; +} + +async function ensureMenuIsOpen(dbId: string, frame: Frame, retries: number) { + await frame.waitFor(RETRY_DELAY); + const button = await frame.$(`div[data-test="${dbId}"]`); + const classList = await frame.evaluate(button => { + return button.parentElement.classList; + }, button); + if (!Object.values(classList).includes("selected") && retries < 5) { + retries = retries + 1; + await clickDBMenu(dbId, frame, retries); + } +} diff --git a/test/tables/container.spec.ts b/test/tables/container.spec.ts new file mode 100644 index 000000000..0f1c07eef --- /dev/null +++ b/test/tables/container.spec.ts @@ -0,0 +1,111 @@ +import "expect-puppeteer"; +import { Frame } from "puppeteer"; +import { generateUniqueName, login } from "../utils/shared"; + +jest.setTimeout(300000); +const RETRY_DELAY = 5000; +const LOADING_STATE_DELAY = 2500; +const RENDER_DELAY = 1000; + +describe("Collection Add and Delete Tables spec", () => { + it("creates a collection", async () => { + try { + const tableId = generateUniqueName("tab"); + const frame = await login(process.env.TABLES_CONNECTION_STRING); + + // create new collection + await frame.waitFor('button[data-test="New Table"]', { visible: true }); + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + await frame.click('button[data-test="New Table"]'); + + // type database id + await frame.waitFor('input[data-test="addCollection-newDatabaseId"]'); + const dbInput = await frame.$('input[data-test="addCollection-newDatabaseId"]'); + await dbInput.press("Backspace"); + await dbInput.type(tableId); + + // click submit + await frame.waitFor("#submitBtnAddCollection"); + await frame.click("#submitBtnAddCollection"); + + // validate created + // open database menu + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + await frame.waitFor(LOADING_STATE_DELAY); + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + + await frame.waitFor(`div[data-test="TablesDB"]`), { visible: true }; + await frame.waitFor(LOADING_STATE_DELAY); + + const didCreateContainer = await frame.$$eval("div[class='rowData'] > span[class='message']", elements => { + return elements.some(el => el.textContent.includes("Successfully created")); + }); + + expect(didCreateContainer).toBe(true); + + await frame.waitFor(`div[data-test="TablesDB"]`), { visible: true }; + await frame.waitFor(LOADING_STATE_DELAY); + + await clickTablesMenu(frame); + + const collections = await frame.$$( + `div[class="collectionHeader main2 nodeItem "] > div[class="treeNodeHeader "]` + ); + const textId = await frame.evaluate(element => { + return element.attributes["data-test"].textContent; + }, collections[0]); + await frame.waitFor(`div[data-test="${textId}"]`, { visible: true }); + + // delete container + + // click context menu for container + await frame.waitFor(`div[data-test="${textId}"] > div > button`, { visible: true }); + await frame.click(`div[data-test="${textId}"] > div > button`); + + // click delete container + await frame.waitFor(RENDER_DELAY); + await frame.waitFor('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); + await frame.click('span[class="treeComponentMenuItemLabel deleteCollectionMenuItemLabel"]'); + + // confirm delete container + await frame.waitFor('input[data-test="confirmCollectionId"]', { visible: true }); + await frame.type('input[data-test="confirmCollectionId"]', textId); + + // click delete + await frame.waitFor('input[data-test="deleteCollection"]', { visible: true }); + await frame.click('input[data-test="deleteCollection"]'); + await frame.waitFor(LOADING_STATE_DELAY); + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + await frame.waitFor(LOADING_STATE_DELAY); + await frame.waitForSelector('div[class="splashScreen"] > div[class="title"]', { visible: true }); + + await expect(page).not.toMatchElement(`div[data-test="${textId}"]`); + } catch (error) { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const testName = (expect as any).getState().currentTestName; + await page.screenshot({ path: `failed-${testName}.jpg` }); + throw error; + } + }); +}); + +async function clickTablesMenu(frame: Frame, retries = 0) { + const button = await frame.$(`div[data-test="TablesDB"]`); + await button.focus(); + const handler = await button.asElement(); + await handler.click(); + await ensureMenuIsOpen(frame, retries); + return button; +} + +async function ensureMenuIsOpen(frame: Frame, retries: number) { + await frame.waitFor(RETRY_DELAY); + const button = await frame.$(`div[data-test="TablesDB"]`); + const classList = await frame.evaluate(button => { + return button.parentElement.classList; + }, button); + if (!Object.values(classList).includes("selected") && retries < 5) { + retries = retries + 1; + await clickTablesMenu(frame, retries); + } +} diff --git a/test/utils/shared.ts b/test/utils/shared.ts index 458899700..f7c1f3faf 100644 --- a/test/utils/shared.ts +++ b/test/utils/shared.ts @@ -3,7 +3,7 @@ import { Frame } from "puppeteer"; export async function login(connectionString: string): Promise { const prodUrl = "https://localhost:1234/hostedExplorer.html"; - page.goto(prodUrl); + page.goto(prodUrl, { waitUntil: "networkidle2" }); // log in with connection string const handle = await page.waitForSelector("iframe"); @@ -16,6 +16,6 @@ export async function login(connectionString: string): Promise { return frame; } -export function generateUniqueName(baseName: string, length = 8): string { +export function generateUniqueName(baseName = "", length = 4): string { return `${baseName}${crypto.randomBytes(length).toString("hex")}`; } From e6ca1d25c942811d10cf86f6620b6decf9e5a43a Mon Sep 17 00:00:00 2001 From: Srinath Narayanan Date: Mon, 2 Nov 2020 13:19:45 -0800 Subject: [PATCH 03/13] Added index refresh to SQL API indexing policy editor (#306) * Index refresh component introduced - Made all notifications in Mongo Index editor have 12 font size - Added indexing policy refresh to sql indexing policy editor - Added "you have unsaved changes" message, replace old message for lazy indexing policy changes * formatting changes * addressed PR comments --- .../getIndexTransformationProgress.ts | 28 ++++++ .../dataAccess/readMongoDBCollection.tsx | 28 ------ .../Settings/SettingsComponent.test.tsx | 4 +- .../Controls/Settings/SettingsComponent.tsx | 22 ++--- .../Settings/SettingsRenderUtils.test.tsx | 4 +- .../Controls/Settings/SettingsRenderUtils.tsx | 20 ++--- .../IndexingPolicyComponent.test.tsx | 4 +- .../IndexingPolicyComponent.tsx | 18 +++- .../IndexingPolicyRefreshComponent.test.tsx | 15 ++++ .../IndexingPolicyRefreshComponent.tsx | 62 +++++++++++++ ...dexingPolicyRefreshComponent.test.tsx.snap | 24 ++++++ .../MongoIndexingPolicyComponent.test.tsx | 27 ++---- .../MongoIndexingPolicyComponent.tsx | 86 +++++-------------- ...MongoIndexingPolicyComponent.test.tsx.snap | 3 + .../IndexingPolicyComponent.test.tsx.snap | 3 + .../Controls/Settings/SettingsUtils.test.tsx | 10 ++- .../Controls/Settings/SettingsUtils.tsx | 4 + .../SettingsComponent.test.tsx.snap | 1 + .../SettingsRenderUtils.test.tsx.snap | 42 ++++++--- 19 files changed, 249 insertions(+), 156 deletions(-) create mode 100644 src/Common/dataAccess/getIndexTransformationProgress.ts create mode 100644 src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/IndexingPolicyRefreshComponent.test.tsx create mode 100644 src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/IndexingPolicyRefreshComponent.tsx create mode 100644 src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/__snapshots__/IndexingPolicyRefreshComponent.test.tsx.snap diff --git a/src/Common/dataAccess/getIndexTransformationProgress.ts b/src/Common/dataAccess/getIndexTransformationProgress.ts new file mode 100644 index 000000000..1c08fe847 --- /dev/null +++ b/src/Common/dataAccess/getIndexTransformationProgress.ts @@ -0,0 +1,28 @@ +import { client } from "../CosmosClient"; +import { handleError } from "../ErrorHandlingUtils"; +import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils"; +import * as Constants from "../Constants"; +import { AuthType } from "../../AuthType"; + +export async function getIndexTransformationProgress(databaseId: string, collectionId: string): Promise { + if (window.authType !== AuthType.AAD) { + return undefined; + } + let indexTransformationPercentage: number; + const clearMessage = logConsoleProgress(`Reading container ${collectionId}`); + try { + const response = await client() + .database(databaseId) + .container(collectionId) + .read({ populateQuotaInfo: true }); + + indexTransformationPercentage = parseInt( + response.headers[Constants.HttpHeaders.collectionIndexTransformationProgress] as string + ); + } catch (error) { + handleError(error, `Error while reading container ${collectionId}`, "ReadMongoDBCollection"); + throw error; + } + clearMessage(); + return indexTransformationPercentage; +} diff --git a/src/Common/dataAccess/readMongoDBCollection.tsx b/src/Common/dataAccess/readMongoDBCollection.tsx index 9d7123bda..80013cf94 100644 --- a/src/Common/dataAccess/readMongoDBCollection.tsx +++ b/src/Common/dataAccess/readMongoDBCollection.tsx @@ -2,8 +2,6 @@ import { userContext } from "../../UserContext"; import { getMongoDBCollection } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources"; import { MongoDBCollectionResource } from "../../Utils/arm/generatedClients/2020-04-01/types"; import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils"; -import * as Constants from "../Constants"; -import { client } from "../CosmosClient"; import { handleError } from "../ErrorHandlingUtils"; import { AuthType } from "../../AuthType"; @@ -30,29 +28,3 @@ export async function readMongoDBCollectionThroughRP( clearMessage(); return collection; } - -export async function getMongoDBCollectionIndexTransformationProgress( - databaseId: string, - collectionId: string -): Promise { - if (window.authType !== AuthType.AAD) { - return undefined; - } - let indexTransformationPercentage: number; - const clearMessage = logConsoleProgress(`Reading container ${collectionId}`); - try { - const response = await client() - .database(databaseId) - .container(collectionId) - .read({ populateQuotaInfo: true }); - - indexTransformationPercentage = parseInt( - response.headers[Constants.HttpHeaders.collectionIndexTransformationProgress] as string - ); - } catch (error) { - handleError(error, `Error while reading container ${collectionId}`, "ReadMongoDBCollection"); - throw error; - } - clearMessage(); - return indexTransformationPercentage; -} diff --git a/src/Explorer/Controls/Settings/SettingsComponent.test.tsx b/src/Explorer/Controls/Settings/SettingsComponent.test.tsx index 9d862864c..d4a3b1ec1 100644 --- a/src/Explorer/Controls/Settings/SettingsComponent.test.tsx +++ b/src/Explorer/Controls/Settings/SettingsComponent.test.tsx @@ -8,8 +8,8 @@ import * as DataModels from "../../../Contracts/DataModels"; import ko from "knockout"; import { TtlType, isDirty } from "./SettingsUtils"; import Explorer from "../../Explorer"; -jest.mock("../../../Common/dataAccess/readMongoDBCollection", () => ({ - getMongoDBCollectionIndexTransformationProgress: jest.fn().mockReturnValue(undefined) +jest.mock("../../../Common/dataAccess/getIndexTransformationProgress", () => ({ + getIndexTransformationProgress: jest.fn().mockReturnValue(undefined) })); import { updateCollection, updateMongoDBCollectionThroughRP } from "../../../Common/dataAccess/updateCollection"; jest.mock("../../../Common/dataAccess/updateCollection", () => ({ diff --git a/src/Explorer/Controls/Settings/SettingsComponent.tsx b/src/Explorer/Controls/Settings/SettingsComponent.tsx index 2966e1cf8..878804b22 100644 --- a/src/Explorer/Controls/Settings/SettingsComponent.tsx +++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx @@ -46,10 +46,8 @@ import { Pivot, PivotItem, IPivotProps, IPivotItemProps } from "office-ui-fabric import "./SettingsComponent.less"; import { IndexingPolicyComponent, IndexingPolicyComponentProps } from "./SettingsSubComponents/IndexingPolicyComponent"; import { MongoDBCollectionResource, MongoIndex } from "../../../Utils/arm/generatedClients/2020-04-01/types"; -import { - getMongoDBCollectionIndexTransformationProgress, - readMongoDBCollectionThroughRP -} from "../../../Common/dataAccess/readMongoDBCollection"; +import { readMongoDBCollectionThroughRP } from "../../../Common/dataAccess/readMongoDBCollection"; +import { getIndexTransformationProgress } from "../../../Common/dataAccess/getIndexTransformationProgress"; import { getErrorMessage } from "../../../Common/ErrorHandlingUtils"; interface SettingsV2TabInfo { @@ -212,6 +210,7 @@ export class SettingsComponent extends React.Component => { - const currentProgress = await getMongoDBCollectionIndexTransformationProgress( - this.collection.databaseId, - this.collection.id() - ); + const currentProgress = await getIndexTransformationProgress(this.collection.databaseId, this.collection.id()); this.setState({ indexTransformationProgress: currentProgress }); }; @@ -352,6 +346,7 @@ export class SettingsComponent extends React.Component ); -export const indexingPolicyTTLWarningMessage: JSX.Element = ( +export const indexingPolicynUnsavedWarningMessage: JSX.Element = ( - Changing the Indexing Policy impacts query results while the index transformation occurs. When a change is made and - the indexing mode is set to consistent or lazy, queries return eventual results until the operation completes. For - more information see,{" "} - - Modifying Indexing Policies - - . + You have not saved the latest changes made to your indexing policy. Please click save to confirm the changes. ); @@ -410,8 +404,8 @@ export const mongoIndexingPolicyAADError: JSX.Element = ( export const mongoIndexTransformationRefreshingMessage: JSX.Element = ( - Refreshing index transformation progress - + Refreshing index transformation progress + ); @@ -421,14 +415,14 @@ export const renderMongoIndexTransformationRefreshMessage = ( ): JSX.Element => { if (progress === 0) { return ( - + {"You can make more indexing changes once the current index transformation is complete. "} {"Refresh to check if it has completed."} ); } else { return ( - + {`You can make more indexing changes once the current index transformation has completed. It is ${progress}% complete. `} {"Refresh to check the progress."} diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyComponent.test.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyComponent.test.tsx index 38d192f6c..a232c6ee4 100644 --- a/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyComponent.test.tsx +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyComponent.test.tsx @@ -25,7 +25,9 @@ describe("IndexingPolicyComponent", () => { }, onIndexingPolicyDirtyChange: () => { return; - } + }, + indexTransformationProgress: undefined, + refreshIndexTransformationProgress: () => new Promise(jest.fn()) }; it("renders", () => { diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyComponent.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyComponent.tsx index f1dede13a..992a92b47 100644 --- a/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyComponent.tsx +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyComponent.tsx @@ -1,9 +1,10 @@ import * as React from "react"; import * as DataModels from "../../../../Contracts/DataModels"; import * as monaco from "monaco-editor"; -import { isDirty } from "../SettingsUtils"; +import { isDirty, isIndexTransforming } from "../SettingsUtils"; import { MessageBar, MessageBarType, Stack } from "office-ui-fabric-react"; -import { indexingPolicyTTLWarningMessage, titleAndInputStackProps } from "../SettingsRenderUtils"; +import { indexingPolicynUnsavedWarningMessage, titleAndInputStackProps } from "../SettingsRenderUtils"; +import { IndexingPolicyRefreshComponent } from "./IndexingPolicyRefresh/IndexingPolicyRefreshComponent"; export interface IndexingPolicyComponentProps { shouldDiscardIndexingPolicy: boolean; @@ -12,6 +13,8 @@ export interface IndexingPolicyComponentProps { indexingPolicyContentBaseline: DataModels.IndexingPolicy; onIndexingPolicyContentChange: (newIndexingPolicy: DataModels.IndexingPolicy) => void; logIndexingPolicySuccessMessage: () => void; + indexTransformationProgress: number; + refreshIndexTransformationProgress: () => Promise; onIndexingPolicyDirtyChange: (isIndexingPolicyDirty: boolean) => void; } @@ -51,6 +54,9 @@ export class IndexingPolicyComponent extends React.Component< if (!this.indexingPolicyEditor) { this.createIndexingPolicyEditor(); } else { + this.indexingPolicyEditor.updateOptions({ + readOnly: isIndexTransforming(this.props.indexTransformationProgress) + }); const indexingPolicyEditorModel = this.indexingPolicyEditor.getModel(); const value: string = JSON.stringify(this.props.indexingPolicyContent, undefined, 4); indexingPolicyEditorModel.setValue(value); @@ -84,7 +90,7 @@ export class IndexingPolicyComponent extends React.Component< this.indexingPolicyEditor = monaco.editor.create(this.indexingPolicyDiv.current, { value: value, language: "json", - readOnly: false, + readOnly: isIndexTransforming(this.props.indexTransformationProgress), ariaLabel: "Indexing Policy" }); if (this.indexingPolicyEditor) { @@ -108,8 +114,12 @@ export class IndexingPolicyComponent extends React.Component< public render(): JSX.Element { return ( + {isDirty(this.props.indexingPolicyContent, this.props.indexingPolicyContentBaseline) && ( - {indexingPolicyTTLWarningMessage} + {indexingPolicynUnsavedWarningMessage} )}
diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/IndexingPolicyRefreshComponent.test.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/IndexingPolicyRefreshComponent.test.tsx new file mode 100644 index 000000000..2e0da86de --- /dev/null +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/IndexingPolicyRefreshComponent.test.tsx @@ -0,0 +1,15 @@ +import { shallow } from "enzyme"; +import React from "react"; +import { IndexingPolicyRefreshComponentProps, IndexingPolicyRefreshComponent } from "./IndexingPolicyRefreshComponent"; + +describe("IndexingPolicyRefreshComponent", () => { + it("renders", () => { + const props: IndexingPolicyRefreshComponentProps = { + indexTransformationProgress: 90, + refreshIndexTransformationProgress: () => new Promise(jest.fn()) + }; + + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/IndexingPolicyRefreshComponent.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/IndexingPolicyRefreshComponent.tsx new file mode 100644 index 000000000..0f497fc22 --- /dev/null +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/IndexingPolicyRefreshComponent.tsx @@ -0,0 +1,62 @@ +import * as React from "react"; +import { MessageBar, MessageBarType } from "office-ui-fabric-react"; +import { + mongoIndexTransformationRefreshingMessage, + renderMongoIndexTransformationRefreshMessage +} from "../../SettingsRenderUtils"; +import { handleError } from "../../../../../Common/ErrorHandlingUtils"; +import { isIndexTransforming } from "../../SettingsUtils"; + +export interface IndexingPolicyRefreshComponentProps { + indexTransformationProgress: number; + refreshIndexTransformationProgress: () => Promise; +} + +interface IndexingPolicyRefreshComponentState { + isRefreshing: boolean; +} + +export class IndexingPolicyRefreshComponent extends React.Component< + IndexingPolicyRefreshComponentProps, + IndexingPolicyRefreshComponentState +> { + constructor(props: IndexingPolicyRefreshComponentProps) { + super(props); + this.state = { + isRefreshing: false + }; + } + + private onClickRefreshIndexingTransformationLink = async () => await this.refreshIndexTransformationProgress(); + + private renderIndexTransformationWarning = (): JSX.Element => { + if (this.state.isRefreshing) { + return mongoIndexTransformationRefreshingMessage; + } else if (isIndexTransforming(this.props.indexTransformationProgress)) { + return renderMongoIndexTransformationRefreshMessage( + this.props.indexTransformationProgress, + this.onClickRefreshIndexingTransformationLink + ); + } + return undefined; + }; + + private refreshIndexTransformationProgress = async () => { + this.setState({ isRefreshing: true }); + try { + await this.props.refreshIndexTransformationProgress(); + } catch (error) { + handleError(error, "Refreshing index transformation progress failed.", "RefreshIndexTransformationProgress"); + } finally { + this.setState({ isRefreshing: false }); + } + }; + + public render(): JSX.Element { + return this.renderIndexTransformationWarning() ? ( + {this.renderIndexTransformationWarning()} + ) : ( + <> + ); + } +} diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/__snapshots__/IndexingPolicyRefreshComponent.test.tsx.snap b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/__snapshots__/IndexingPolicyRefreshComponent.test.tsx.snap new file mode 100644 index 000000000..1c44dd435 --- /dev/null +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/IndexingPolicyRefresh/__snapshots__/IndexingPolicyRefreshComponent.test.tsx.snap @@ -0,0 +1,24 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`IndexingPolicyRefreshComponent renders 1`] = ` + + + You can make more indexing changes once the current index transformation has completed. It is 90% complete. + + Refresh to check the progress. + + + +`; diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.test.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.test.tsx index 246bc8186..95ca5eef1 100644 --- a/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.test.tsx +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.test.tsx @@ -2,6 +2,7 @@ import { shallow } from "enzyme"; import React from "react"; import { MongoIndexTypes, MongoNotificationMessage, MongoNotificationType } from "../../SettingsUtils"; import { MongoIndexingPolicyComponent, MongoIndexingPolicyComponentProps } from "./MongoIndexingPolicyComponent"; +import { renderToString } from "react-dom/server"; describe("MongoIndexingPolicyComponent", () => { const baseProps: MongoIndexingPolicyComponentProps = { @@ -21,10 +22,7 @@ describe("MongoIndexingPolicyComponent", () => { return; }, indexTransformationProgress: undefined, - refreshIndexTransformationProgress: () => - new Promise(() => { - return; - }), + refreshIndexTransformationProgress: () => new Promise(jest.fn()), onMongoIndexingPolicySaveableChange: () => { return; }, @@ -38,16 +36,6 @@ describe("MongoIndexingPolicyComponent", () => { expect(wrapper).toMatchSnapshot(); }); - it("isIndexingTransforming", () => { - const wrapper = shallow(); - const mongoIndexingPolicyComponent = wrapper.instance() as MongoIndexingPolicyComponent; - expect(mongoIndexingPolicyComponent.isIndexingTransforming()).toEqual(false); - wrapper.setProps({ indexTransformationProgress: 50 }); - expect(mongoIndexingPolicyComponent.isIndexingTransforming()).toEqual(true); - wrapper.setProps({ indexTransformationProgress: 100 }); - expect(mongoIndexingPolicyComponent.isIndexingTransforming()).toEqual(false); - }); - describe("AddMongoIndexProps test", () => { const wrapper = shallow(); const mongoIndexingPolicyComponent = wrapper.instance() as MongoIndexingPolicyComponent; @@ -55,7 +43,7 @@ describe("MongoIndexingPolicyComponent", () => { it("defaults", () => { expect(mongoIndexingPolicyComponent.isMongoIndexingPolicySaveable()).toEqual(false); expect(mongoIndexingPolicyComponent.isMongoIndexingPolicyDiscardable()).toEqual(false); - expect(mongoIndexingPolicyComponent.getMongoWarningNotificationMessage()).toEqual(undefined); + expect(mongoIndexingPolicyComponent.getMongoWarningNotificationMessage()).toBeUndefined(); }); const sampleWarning = "sampleWarning"; @@ -113,9 +101,12 @@ describe("MongoIndexingPolicyComponent", () => { expect(mongoIndexingPolicyComponent.isMongoIndexingPolicyDiscardable()).toEqual( isMongoIndexingPolicyDiscardable ); - expect(mongoIndexingPolicyComponent.getMongoWarningNotificationMessage()).toEqual( - mongoWarningNotificationMessage - ); + if (mongoWarningNotificationMessage) { + const elementAsString = renderToString(mongoIndexingPolicyComponent.getMongoWarningNotificationMessage()); + expect(elementAsString).toContain(mongoWarningNotificationMessage); + } else { + expect(mongoIndexingPolicyComponent.getMongoWarningNotificationMessage()).toBeUndefined(); + } } ); }); diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.tsx index cc9c25794..435cec265 100644 --- a/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.tsx +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.tsx @@ -25,8 +25,8 @@ import { createAndAddMongoIndexStackProps, separatorStyles, mongoIndexingPolicyAADError, - mongoIndexTransformationRefreshingMessage, - renderMongoIndexTransformationRefreshMessage + indexingPolicynUnsavedWarningMessage, + infoAndToolTipTextStyle } from "../../SettingsRenderUtils"; import { MongoIndex } from "../../../../../Utils/arm/generatedClients/2020-04-01/types"; import { @@ -35,12 +35,13 @@ import { MongoIndexIdField, MongoNotificationType, getMongoIndexType, - getMongoIndexTypeText + getMongoIndexTypeText, + isIndexTransforming } from "../../SettingsUtils"; import { AddMongoIndexComponent } from "./AddMongoIndexComponent"; import { CollapsibleSectionComponent } from "../../../CollapsiblePanel/CollapsibleSectionComponent"; -import { handleError } from "../../../../../Common/ErrorHandlingUtils"; import { AuthType } from "../../../../../AuthType"; +import { IndexingPolicyRefreshComponent } from "../IndexingPolicyRefresh/IndexingPolicyRefreshComponent"; export interface MongoIndexingPolicyComponentProps { mongoIndexes: MongoIndex[]; @@ -56,20 +57,13 @@ export interface MongoIndexingPolicyComponentProps { onMongoIndexingPolicyDiscardableChange: (isMongoIndexingPolicyDiscardable: boolean) => void; } -interface MongoIndexingPolicyComponentState { - isRefreshingIndexTransformationProgress: boolean; -} - interface MongoIndexDisplayProps { definition: JSX.Element; type: JSX.Element; actionButton: JSX.Element; } -export class MongoIndexingPolicyComponent extends React.Component< - MongoIndexingPolicyComponentProps, - MongoIndexingPolicyComponentState -> { +export class MongoIndexingPolicyComponent extends React.Component { private shouldCheckComponentIsDirty = true; private addMongoIndexComponentRefs: React.RefObject[] = []; private initialIndexesColumns: IColumn[] = [ @@ -98,13 +92,6 @@ export class MongoIndexingPolicyComponent extends React.Component< } ]; - constructor(props: MongoIndexingPolicyComponentProps) { - super(props); - this.state = { - isRefreshingIndexTransformationProgress: false - }; - } - componentDidUpdate(prevProps: MongoIndexingPolicyComponentProps): void { if (this.props.indexesToAdd.length > prevProps.indexesToAdd.length) { this.addMongoIndexComponentRefs[prevProps.indexesToAdd.length]?.current?.focus(); @@ -144,10 +131,15 @@ export class MongoIndexingPolicyComponent extends React.Component< return this.props.indexesToAdd.length > 0 || this.props.indexesToDrop.length > 0; }; - public getMongoWarningNotificationMessage = (): string => { - return this.props.indexesToAdd.find( + public getMongoWarningNotificationMessage = (): JSX.Element => { + const warningMessage = this.props.indexesToAdd.find( addMongoIndexProps => addMongoIndexProps.notification?.type === MongoNotificationType.Warning )?.notification.message; + + if (warningMessage) { + return {warningMessage}; + } + return undefined; }; private onRenderRow = (props: IDetailsRowProps): JSX.Element => { @@ -159,7 +151,7 @@ export class MongoIndexingPolicyComponent extends React.Component< { this.props.onIndexDrop(arrayPosition); }} @@ -230,7 +222,7 @@ export class MongoIndexingPolicyComponent extends React.Component< { - this.setState({ isRefreshingIndexTransformationProgress: true }); - try { - await this.props.refreshIndexTransformationProgress(); - } catch (error) { - handleError(error, "Refreshing index transformation progress failed.", "RefreshIndexTransformationProgress"); - } finally { - this.setState({ isRefreshingIndexTransformationProgress: false }); - } - }; - - public isIndexingTransforming = (): boolean => - // index transformation progress can be 0 - this.props.indexTransformationProgress !== undefined && this.props.indexTransformationProgress !== 100; - - private onClickRefreshIndexingTransformationLink = async () => await this.refreshIndexTransformationProgress(); - - private renderIndexTransformationWarning = (): JSX.Element => { - if (this.state.isRefreshingIndexTransformationProgress) { - return mongoIndexTransformationRefreshingMessage; - } else if (this.isIndexingTransforming()) { - return renderMongoIndexTransformationRefreshMessage( - this.props.indexTransformationProgress, - this.onClickRefreshIndexingTransformationLink - ); - } - return undefined; - }; - private renderWarningMessage = (): JSX.Element => { - let warningMessage: string; + let warningMessage: JSX.Element; if (this.getMongoWarningNotificationMessage()) { warningMessage = this.getMongoWarningNotificationMessage(); } else if (this.isMongoIndexingPolicySaveable()) { - warningMessage = - "You have not saved the latest changes made to your indexing policy. Please click save to confirm the changes."; + warningMessage = indexingPolicynUnsavedWarningMessage; } return ( <> - {this.renderIndexTransformationWarning() && ( - {this.renderIndexTransformationWarning()} - )} - - {warningMessage && ( - - {warningMessage} - - )} + + {warningMessage && {warningMessage}} ); }; diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/__snapshots__/MongoIndexingPolicyComponent.test.tsx.snap b/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/__snapshots__/MongoIndexingPolicyComponent.test.tsx.snap index ab19cbb45..577fa2862 100644 --- a/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/__snapshots__/MongoIndexingPolicyComponent.test.tsx.snap +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/__snapshots__/MongoIndexingPolicyComponent.test.tsx.snap @@ -8,6 +8,9 @@ exports[`MongoIndexingPolicyComponent renders 1`] = ` } } > + For queries that filter on multiple properties, create multiple single field indexes instead of a compound index. +
{ expect(notification.type).toEqual(MongoNotificationType.Error); }); }); + +it("isIndexingTransforming", () => { + expect(isIndexTransforming(undefined)).toBeFalsy(); + expect(isIndexTransforming(0)).toBeTruthy(); + expect(isIndexTransforming(90)).toBeTruthy(); + expect(isIndexTransforming(100)).toBeFalsy(); +}); diff --git a/src/Explorer/Controls/Settings/SettingsUtils.tsx b/src/Explorer/Controls/Settings/SettingsUtils.tsx index 556df274f..9e29b73fe 100644 --- a/src/Explorer/Controls/Settings/SettingsUtils.tsx +++ b/src/Explorer/Controls/Settings/SettingsUtils.tsx @@ -250,3 +250,7 @@ export const getMongoIndexTypeText = (index: MongoIndexTypes): string => { } return WildcardText; }; + +export const isIndexTransforming = (indexTransformationProgress: number): boolean => + // index transformation progress can be 0 + indexTransformationProgress !== undefined && indexTransformationProgress !== 100; diff --git a/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap b/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap index 1a0a9747b..db28fa5a8 100644 --- a/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap +++ b/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap @@ -5189,6 +5189,7 @@ exports[`SettingsComponent renders 1`] = ` logIndexingPolicySuccessMessage={[Function]} onIndexingPolicyContentChange={[Function]} onIndexingPolicyDirtyChange={[Function]} + refreshIndexTransformationProgress={[Function]} resetShouldDiscardIndexingPolicy={[Function]} shouldDiscardIndexingPolicy={false} /> diff --git a/src/Explorer/Controls/Settings/__snapshots__/SettingsRenderUtils.test.tsx.snap b/src/Explorer/Controls/Settings/__snapshots__/SettingsRenderUtils.test.tsx.snap index 77b4fc444..90e5c8af8 100644 --- a/src/Explorer/Controls/Settings/__snapshots__/SettingsRenderUtils.test.tsx.snap +++ b/src/Explorer/Controls/Settings/__snapshots__/SettingsRenderUtils.test.tsx.snap @@ -166,15 +166,7 @@ exports[`SettingsUtils functions render 1`] = ` } } > - Changing the Indexing Policy impacts query results while the index transformation occurs. When a change is made and the indexing mode is set to consistent or lazy, queries return eventual results until the operation completes. For more information see, - - - Modifying Indexing Policies - - . + You have not saved the latest changes made to your indexing policy. Please click save to confirm the changes. - + Refreshing index transformation progress - + You can make more indexing changes once the current index transformation is complete. - + You can make more indexing changes once the current index transformation has completed. It is 90% complete. Date: Mon, 2 Nov 2020 16:59:08 -0800 Subject: [PATCH 04/13] Poll on Location header for operation status (#309) --- src/Utils/arm/request.test.ts | 10 +++++----- src/Utils/arm/request.ts | 36 ++++++++--------------------------- 2 files changed, 13 insertions(+), 33 deletions(-) diff --git a/src/Utils/arm/request.test.ts b/src/Utils/arm/request.test.ts index 69f0be223..89b6d488a 100644 --- a/src/Utils/arm/request.test.ts +++ b/src/Utils/arm/request.test.ts @@ -21,13 +21,12 @@ describe("ARM request", () => { it("should poll for async operations", async () => { const headers = new Headers(); - headers.set("azure-asyncoperation", "https://foo.com/operationStatus"); + headers.set("location", "https://foo.com/operationStatus"); window.fetch = jest.fn().mockResolvedValue({ ok: true, headers, - json: async () => { - return { status: "Succeeded" }; - } + status: 200, + json: async () => ({}) }); await armRequest({ apiVersion: "2001-01-01", host: "https://foo.com", path: "foo", method: "GET" }); expect(window.fetch).toHaveBeenCalledTimes(2); @@ -35,10 +34,11 @@ describe("ARM request", () => { it("should throw for failed async operations", async () => { const headers = new Headers(); - headers.set("azure-asyncoperation", "https://foo.com/operationStatus"); + headers.set("location", "https://foo.com/operationStatus"); window.fetch = jest.fn().mockResolvedValue({ ok: true, headers, + status: 200, json: async () => { return { status: "Failed" }; } diff --git a/src/Utils/arm/request.ts b/src/Utils/arm/request.ts index d41803e37..e40e38b8f 100644 --- a/src/Utils/arm/request.ts +++ b/src/Utils/arm/request.ts @@ -70,55 +70,35 @@ export async function armRequest({ host, path, apiVersion, method, body: requ throw error; } - const operationStatusUrl = response.headers && response.headers.get("azure-asyncoperation"); + const operationStatusUrl = response.headers && response.headers.get("location"); if (operationStatusUrl) { - await promiseRetry(() => getOperationStatus(operationStatusUrl)); - // TODO: ARM is supposed to return a resourceLocation property, but it does not https://github.com/microsoft/api-guidelines/blob/vNext/Guidelines.md#target-resource-location - // When Cosmos RP adds resourceLocation, we should use it instead - // For now manually execute a GET if the operation was a mutation and not a deletion - if (method === "POST" || method === "PATCH" || method === "PUT") { - return armRequest({ - host, - path, - apiVersion, - method: "GET" - }); - } + return await promiseRetry(() => getOperationStatus(operationStatusUrl)); } const responseBody = (await response.json()) as T; return responseBody; } -const SUCCEEDED = "Succeeded" as const; -const FAILED = "Failed" as const; -const CANCELED = "Canceled" as const; - -type Status = typeof SUCCEEDED | typeof FAILED | typeof CANCELED; - -interface OperationResponse { - status: Status; - error: unknown; -} - async function getOperationStatus(operationStatusUrl: string) { const response = await window.fetch(operationStatusUrl, { headers: { Authorization: userContext.authorizationToken } }); + if (!response.ok) { const errorResponse = (await response.json()) as ErrorResponse; const error = new Error(errorResponse.message) as ARMError; error.code = errorResponse.code; throw new AbortError(error); } - const body = (await response.json()) as OperationResponse; + + const body = await response.json(); const status = body.status; - if (status === SUCCEEDED) { - return; + if (!status && response.status === 200) { + return body; } - if (status === CANCELED || status === FAILED) { + if (status === "Canceled" || status === "Failed") { const errorMessage = body.error ? JSON.stringify(body.error) : "Operation could not be completed"; const error = new Error(errorMessage); throw new AbortError(error); From a009a8ba5f1e0a4b96e3a2f0b102c0b91667968f Mon Sep 17 00:00:00 2001 From: Zachary Foster Date: Tue, 3 Nov 2020 14:05:54 -0500 Subject: [PATCH 05/13] Adds e2e readme and new endpoint env var (#314) --- .env.example | 7 +++++-- .github/workflows/ci.yml | 1 + README.md | 15 +++++++++------ test/utils/shared.ts | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.env.example b/.env.example index b37aeff49..fdf920188 100644 --- a/.env.example +++ b/.env.example @@ -1,7 +1,10 @@ -# These options are only needed when if running end to end tests locally PORTAL_RUNNER_USERNAME= PORTAL_RUNNER_PASSWORD= PORTAL_RUNNER_SUBSCRIPTION= PORTAL_RUNNER_RESOURCE_GROUP= PORTAL_RUNNER_DATABASE_ACCOUNT= -PORTAL_RUNNER_CONNECTION_STRING= \ No newline at end of file +PORTAL_RUNNER_CONNECTION_STRING= +CASSANDRA_CONNECTION_STRING= +MONGO_CONNECTION_STRING= +TABLES_CONNECTION_STRING= +DATA_EXPLORER_ENDPOINT=https://localhost:1234/hostedExplorer.html \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53a39150a..b04588330 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,6 +151,7 @@ jobs: MONGO_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_MONGO }} CASSANDRA_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_CASSANDRA }} TABLES_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_TABLE }} + DATA_EXPLORER_ENDPOINT: "https://localhost:1234/hostedExplorer.html" - uses: actions/upload-artifact@v2 with: name: screenshots diff --git a/README.md b/README.md index 791985365..f9a05488f 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ To run pure hosted mode, in `webpack.config.js` change index HtmlWebpackPlugin t ### Emulator Development -In a window environment, running `npm run build` will automatically copy the built files from `/dist` over to the default emulator install paths. In a non-windows enironment you can specify an alternate endpoint using `EMULATOR_ENDPOINT` and webpack dev server will proxy requests for you. +In a window environment, running `npm run build` will automatically copy the built files from `/dist` over to the default emulator install paths. In a non-windows environment you can specify an alternate endpoint using `EMULATOR_ENDPOINT` and webpack dev server will proxy requests for you. `PLATFORM=Emulator EMULATOR_ENDPOINT=https://my-vm.azure.com:8081 npm run watch` @@ -60,7 +60,7 @@ The Cosmos Portal that consumes this repo is not currently open source. If you h You can however load a local running instance of data explorer in the production portal. 1. Turn off browser SSL validation for localhost: chrome://flags/#allow-insecure-localhost OR Install valid SSL certs for localhost (on IE, follow these [instructions](https://www.technipages.com/ie-bypass-problem-with-this-websites-security-certificate) to install the localhost certificate in the right place) -2. Whitelist `https://localhost:1234` domain for CORS in the Azure Cosmos DB portal +2. Allowlist `https://localhost:1234` domain for CORS in the Azure Cosmos DB portal 3. Start the project in portal mode: `PLATFORM=Portal npm run watch` 4. Load the portal using the following link: https://ms.portal.azure.com/?dataExplorerSource=https%3A%2F%2Flocalhost%3A1234%2Fexplorer.html @@ -84,16 +84,19 @@ Unit tests are located adjacent to the code under test and run with [Jest](https 4. Install dependencies: `npm install` 5. Run cypress headless(`npm run test`) or in interactive mode(`npm run test:debug`) -#### End to End Production Runners +#### End to End Production Tests Jest and Puppeteer are used for end to end production runners and are contained in `test/`. To run these tests locally: -1. Copy .env.example to .env and fill in all variables -2. Run `npm run test:e2e` +1. Copy .env.example to .env +2. Update the values in .env including your local data explorer endpoint (ask a teammate/codeowner for help with .env values) +3. Make sure all packages are installed `npm install` +4. Run the server `npm run start` and wait for it to start +5. Run `npm run test:e2e` ### Releasing -We generally adhear to the release strategy [documented by the Azure SDK Guidelines](https://azure.github.io/azure-sdk/policies_repobranching.html#release-branches). Most releases should happen from the master branch. If master contains commits that cannot be released, you may create a release from a `release/` or `hotfix/` branch. See linked documentation for more details. +We generally adhere to the release strategy [documented by the Azure SDK Guidelines](https://azure.github.io/azure-sdk/policies_repobranching.html#release-branches). Most releases should happen from the master branch. If master contains commits that cannot be released, you may create a release from a `release/` or `hotfix/` branch. See linked documentation for more details. # Contributing diff --git a/test/utils/shared.ts b/test/utils/shared.ts index f7c1f3faf..352d14a6c 100644 --- a/test/utils/shared.ts +++ b/test/utils/shared.ts @@ -2,7 +2,7 @@ import crypto from "crypto"; import { Frame } from "puppeteer"; export async function login(connectionString: string): Promise { - const prodUrl = "https://localhost:1234/hostedExplorer.html"; + const prodUrl = process.env.DATA_EXPLORER_ENDPOINT; page.goto(prodUrl, { waitUntil: "networkidle2" }); // log in with connection string From 5f1f7a826654ca2d7081e4d52c5e954eb1f7e29a Mon Sep 17 00:00:00 2001 From: victor-meng <56978073+victor-meng@users.noreply.github.com> Date: Tue, 3 Nov 2020 13:40:44 -0800 Subject: [PATCH 06/13] Refactor error handling part 2 (#313) --- src/Common/DocumentClientUtilityBase.ts | 16 +-- src/Common/ErrorHandlingUtils.ts | 20 +-- src/Common/Logger.ts | 6 +- src/Common/QueriesClient.ts | 15 +-- src/Common/dataAccess/createCollection.ts | 2 +- src/Common/dataAccess/createDatabase.ts | 2 +- .../dataAccess/createStoredProcedure.ts | 2 +- src/Common/dataAccess/createTrigger.ts | 2 +- .../dataAccess/createUserDefinedFunction.ts | 4 +- src/Common/dataAccess/deleteCollection.ts | 2 +- src/Common/dataAccess/deleteDatabase.ts | 2 +- .../dataAccess/deleteStoredProcedure.ts | 2 +- src/Common/dataAccess/deleteTrigger.ts | 2 +- .../dataAccess/deleteUserDefinedFunction.ts | 2 +- .../getIndexTransformationProgress.ts | 2 +- src/Common/dataAccess/readCollection.ts | 2 +- src/Common/dataAccess/readCollectionOffer.ts | 2 +- .../dataAccess/readCollectionQuotaInfo.ts | 2 +- src/Common/dataAccess/readCollections.ts | 2 +- src/Common/dataAccess/readDatabaseOffer.ts | 2 +- src/Common/dataAccess/readDatabases.ts | 2 +- .../dataAccess/readMongoDBCollection.tsx | 2 +- src/Common/dataAccess/readOffers.ts | 2 +- src/Common/dataAccess/readStoredProcedures.ts | 2 +- src/Common/dataAccess/readTriggers.ts | 2 +- .../dataAccess/readUserDefinedFunctions.ts | 4 +- src/Common/dataAccess/updateCollection.ts | 2 +- src/Common/dataAccess/updateOffer.ts | 2 +- .../updateOfferThroughputBeyondLimit.ts | 4 +- .../dataAccess/updateStoredProcedure.ts | 2 +- src/Common/dataAccess/updateTrigger.ts | 2 +- .../dataAccess/updateUserDefinedFunction.ts | 4 +- src/Contracts/Diagnostics.ts | 2 +- .../Controls/Arcadia/ArcadiaMenuPicker.tsx | 9 +- .../Notebook/NotebookTerminalComponent.tsx | 11 +- .../CodeOfConductComponent.tsx | 7 +- .../GalleryViewerComponent.tsx | 20 +-- .../NotebookViewerComponent.tsx | 5 +- .../IndexingPolicyRefreshComponent.tsx | 2 +- src/Explorer/Explorer.ts | 53 ++++---- .../GremlinClient.test.ts | 6 +- .../GraphExplorerComponent/GremlinClient.ts | 32 ++--- .../Notebook/NotebookContainerClient.ts | 7 +- src/Explorer/Notebook/NotebookManager.ts | 3 +- src/Explorer/Panes/CopyNotebookPane.tsx | 14 +-- src/Explorer/Panes/GitHubReposPane.ts | 24 +--- .../Panes/PublishNotebookPaneAdapter.tsx | 24 ++-- src/Explorer/Tables/TableDataClient.ts | 114 +++++------------- src/GitHub/GitHubClient.ts | 11 +- src/GitHub/GitHubContentProvider.ts | 18 +-- src/GitHub/GitHubOAuthService.ts | 6 +- src/HostedExplorer.ts | 8 +- .../NotebookWorkspaceManager.ts | 13 +- src/Platform/Hosted/ArmResourceUtils.ts | 11 +- .../ArcadiaResourceManager.ts | 10 +- src/Utils/AuthorizationUtils.ts | 3 +- src/Utils/GalleryUtils.ts | 26 ++-- src/Utils/NotebookConfigurationUtils.ts | 5 +- 58 files changed, 229 insertions(+), 336 deletions(-) diff --git a/src/Common/DocumentClientUtilityBase.ts b/src/Common/DocumentClientUtilityBase.ts index bc5e3ed33..ded90cf05 100644 --- a/src/Common/DocumentClientUtilityBase.ts +++ b/src/Common/DocumentClientUtilityBase.ts @@ -58,8 +58,8 @@ export function executeStoredProcedure( (error: any) => { handleError( error, - `Failed to execute stored procedure ${storedProcedure.id()} for container ${storedProcedure.collection.id()}`, - "ExecuteStoredProcedure" + "ExecuteStoredProcedure", + `Failed to execute stored procedure ${storedProcedure.id()} for container ${storedProcedure.collection.id()}` ); deferred.reject(error); } @@ -88,7 +88,7 @@ export function queryDocumentsPage( deferred.resolve(result); }, (error: any) => { - handleError(error, `Failed to query ${entityName} for container ${resourceName}`, "QueryDocumentsPage"); + handleError(error, "QueryDocumentsPage", `Failed to query ${entityName} for container ${resourceName}`); deferred.reject(error); } ) @@ -109,7 +109,7 @@ export function readDocument(collection: ViewModels.CollectionBase, documentId: deferred.resolve(document); }, (error: any) => { - handleError(error, `Failed to read ${entityName} ${documentId.id()}`, "ReadDocument"); + handleError(error, "ReadDocument", `Failed to read ${entityName} ${documentId.id()}`); deferred.reject(error); } ) @@ -135,7 +135,7 @@ export function updateDocument( deferred.resolve(updatedDocument); }, (error: any) => { - handleError(error, `Failed to update ${entityName} ${documentId.id()}`, "UpdateDocument"); + handleError(error, "UpdateDocument", `Failed to update ${entityName} ${documentId.id()}`); deferred.reject(error); } ) @@ -157,7 +157,7 @@ export function createDocument(collection: ViewModels.CollectionBase, newDocumen deferred.resolve(savedDocument); }, (error: any) => { - handleError(error, `Error while creating new ${entityName} for container ${collection.id()}`, "CreateDocument"); + handleError(error, "CreateDocument", `Error while creating new ${entityName} for container ${collection.id()}`); deferred.reject(error); } ) @@ -179,7 +179,7 @@ export function deleteDocument(collection: ViewModels.CollectionBase, documentId deferred.resolve(response); }, (error: any) => { - handleError(error, `Error while deleting ${entityName} ${documentId.id()}`, "DeleteDocument"); + handleError(error, "DeleteDocument", `Error while deleting ${entityName} ${documentId.id()}`); deferred.reject(error); } ) @@ -205,7 +205,7 @@ export function deleteConflict( deferred.resolve(response); }, (error: any) => { - handleError(error, `Error while deleting conflict ${conflictId.id()}`, "DeleteConflict"); + handleError(error, "DeleteConflict", `Error while deleting conflict ${conflictId.id()}`); deferred.reject(error); } ) diff --git a/src/Common/ErrorHandlingUtils.ts b/src/Common/ErrorHandlingUtils.ts index e5acc6b49..2e2f51365 100644 --- a/src/Common/ErrorHandlingUtils.ts +++ b/src/Common/ErrorHandlingUtils.ts @@ -1,3 +1,4 @@ +import { ARMError } from "../Utils/arm/request"; import { HttpStatusCodes } from "./Constants"; import { MessageTypes } from "../Contracts/ExplorerContracts"; import { SubscriptionType } from "../Contracts/ViewModels"; @@ -5,28 +6,27 @@ import { logConsoleError } from "../Utils/NotificationConsoleUtils"; import { logError } from "./Logger"; import { sendMessage } from "./MessageHandler"; -export interface CosmosError { - code: number; - message?: string; -} - -export const handleError = (error: string | CosmosError, consoleErrorPrefix: string, area: string): void => { +export const handleError = (error: string | ARMError | Error, area: string, consoleErrorPrefix?: string): void => { const errorMessage = getErrorMessage(error); - const errorCode = typeof error === "string" ? undefined : error.code; + const errorCode = error instanceof ARMError ? error.code : undefined; + // logs error to data explorer console - logConsoleError(`${consoleErrorPrefix}:\n ${errorMessage}`); + const consoleErrorMessage = consoleErrorPrefix ? `${consoleErrorPrefix}:\n ${errorMessage}` : errorMessage; + logConsoleError(consoleErrorMessage); + // logs error to both app insight and kusto logError(errorMessage, area, errorCode); + // checks for errors caused by firewall and sends them to portal to handle sendNotificationForError(errorMessage, errorCode); }; -export const getErrorMessage = (error: string | CosmosError | Error): string => { +export const getErrorMessage = (error: string | Error): string => { const errorMessage = typeof error === "string" ? error : error.message; return replaceKnownError(errorMessage); }; -const sendNotificationForError = (errorMessage: string, errorCode: number): void => { +const sendNotificationForError = (errorMessage: string, errorCode: number | string): void => { if (errorCode === HttpStatusCodes.Forbidden) { if (errorMessage?.toLowerCase().indexOf("sharedoffer is disabled for your account") > 0) { return; diff --git a/src/Common/Logger.ts b/src/Common/Logger.ts index 39b3196c5..58186d21e 100644 --- a/src/Common/Logger.ts +++ b/src/Common/Logger.ts @@ -1,4 +1,3 @@ -import { CosmosError, getErrorMessage } from "./ErrorHandlingUtils"; import { sendMessage } from "./MessageHandler"; import { Diagnostics, MessageTypes } from "../Contracts/ExplorerContracts"; import { appInsights } from "../Shared/appInsights"; @@ -22,8 +21,7 @@ export function logWarning(message: string, area: string, code?: number): void { return _logEntry(entry); } -export function logError(error: string | CosmosError | Error, area: string, code?: number): void { - const errorMessage: string = getErrorMessage(error); +export function logError(errorMessage: string, area: string, code?: number | string): void { const entry: Diagnostics.LogEntry = _generateLogEntry(Diagnostics.LogEntryLevel.Error, errorMessage, area, code); return _logEntry(entry); } @@ -55,7 +53,7 @@ function _generateLogEntry( level: Diagnostics.LogEntryLevel, message: string, area: string, - code?: number + code?: number | string ): Diagnostics.LogEntry { return { timestamp: new Date().getUTCSeconds(), diff --git a/src/Common/QueriesClient.ts b/src/Common/QueriesClient.ts index 7a3106890..fb81d1c65 100644 --- a/src/Common/QueriesClient.ts +++ b/src/Common/QueriesClient.ts @@ -14,7 +14,6 @@ import { createDocument, deleteDocument, queryDocuments, queryDocumentsPage } fr import { createCollection } from "./dataAccess/createCollection"; import { handleError } from "./ErrorHandlingUtils"; import * as ErrorParserUtility from "./ErrorParserUtility"; -import * as Logger from "./Logger"; export class QueriesClient { private static readonly PartitionKey: DataModels.PartitionKey = { @@ -54,7 +53,7 @@ export class QueriesClient { return Promise.resolve(collection); }, (error: any) => { - handleError(error, "Failed to set up account for saving queries", "setupQueriesCollection"); + handleError(error, "setupQueriesCollection", "Failed to set up account for saving queries"); return Promise.reject(error); } ) @@ -105,11 +104,7 @@ export class QueriesClient { } else { errorMessage = parsedError.message; } - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Failed to save query ${query.queryName}: ${errorMessage}` - ); - Logger.logError(JSON.stringify(parsedError), "saveQuery"); + handleError(errorMessage, "saveQuery", `Failed to save query ${query.queryName}`); return Promise.reject(errorMessage); } ) @@ -159,14 +154,14 @@ export class QueriesClient { return Promise.resolve(queries); }, (error: any) => { - handleError(error, "Failed to fetch saved queries", "getSavedQueries"); + handleError(error, "getSavedQueries", "Failed to fetch saved queries"); return Promise.reject(error); } ); }, (error: any) => { // should never get into this state but we handle this regardless - handleError(error, "Failed to fetch saved queries", "getSavedQueries"); + handleError(error, "getSavedQueries", "Failed to fetch saved queries"); return Promise.reject(error); } ) @@ -218,7 +213,7 @@ export class QueriesClient { return Promise.resolve(); }, (error: any) => { - handleError(error, `Failed to delete query ${query.queryName}`, "deleteQuery"); + handleError(error, "deleteQuery", `Failed to delete query ${query.queryName}`); return Promise.reject(error); } ) diff --git a/src/Common/dataAccess/createCollection.ts b/src/Common/dataAccess/createCollection.ts index 6209a4b86..97a0c2a62 100644 --- a/src/Common/dataAccess/createCollection.ts +++ b/src/Common/dataAccess/createCollection.ts @@ -55,7 +55,7 @@ export const createCollection = async (params: DataModels.CreateCollectionParams logConsoleInfo(`Successfully created container ${params.collectionId}`); return collection; } catch (error) { - handleError(error, `Error while creating container ${params.collectionId}`, "CreateCollection"); + handleError(error, "CreateCollection", `Error while creating container ${params.collectionId}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/createDatabase.ts b/src/Common/dataAccess/createDatabase.ts index 22162e071..6f555b324 100644 --- a/src/Common/dataAccess/createDatabase.ts +++ b/src/Common/dataAccess/createDatabase.ts @@ -41,7 +41,7 @@ export async function createDatabase(params: DataModels.CreateDatabaseParams): P logConsoleInfo(`Successfully created database ${params.databaseId}`); return database; } catch (error) { - handleError(error, `Error while creating database ${params.databaseId}`, "CreateDatabase"); + handleError(error, "CreateDatabase", `Error while creating database ${params.databaseId}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/createStoredProcedure.ts b/src/Common/dataAccess/createStoredProcedure.ts index a2281c213..d8f344ea3 100644 --- a/src/Common/dataAccess/createStoredProcedure.ts +++ b/src/Common/dataAccess/createStoredProcedure.ts @@ -70,7 +70,7 @@ export async function createStoredProcedure( .scripts.storedProcedures.create(storedProcedure); return response?.resource; } catch (error) { - handleError(error, `Error while creating stored procedure ${storedProcedure.id}`, "CreateStoredProcedure"); + handleError(error, "CreateStoredProcedure", `Error while creating stored procedure ${storedProcedure.id}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/createTrigger.ts b/src/Common/dataAccess/createTrigger.ts index 179d0103e..a8c3f448f 100644 --- a/src/Common/dataAccess/createTrigger.ts +++ b/src/Common/dataAccess/createTrigger.ts @@ -65,7 +65,7 @@ export async function createTrigger( .scripts.triggers.create(trigger); return response.resource; } catch (error) { - handleError(error, `Error while creating trigger ${trigger.id}`, "CreateTrigger"); + handleError(error, "CreateTrigger", `Error while creating trigger ${trigger.id}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/createUserDefinedFunction.ts b/src/Common/dataAccess/createUserDefinedFunction.ts index 30ff8be3a..bda4f0654 100644 --- a/src/Common/dataAccess/createUserDefinedFunction.ts +++ b/src/Common/dataAccess/createUserDefinedFunction.ts @@ -72,8 +72,8 @@ export async function createUserDefinedFunction( } catch (error) { handleError( error, - `Error while creating user defined function ${userDefinedFunction.id}`, - "CreateUserupdateUserDefinedFunction" + "CreateUserupdateUserDefinedFunction", + `Error while creating user defined function ${userDefinedFunction.id}` ); throw error; } finally { diff --git a/src/Common/dataAccess/deleteCollection.ts b/src/Common/dataAccess/deleteCollection.ts index cbe91b70f..5a5c4fd7d 100644 --- a/src/Common/dataAccess/deleteCollection.ts +++ b/src/Common/dataAccess/deleteCollection.ts @@ -23,7 +23,7 @@ export async function deleteCollection(databaseId: string, collectionId: string) } logConsoleInfo(`Successfully deleted container ${collectionId}`); } catch (error) { - handleError(error, `Error while deleting container ${collectionId}`, "DeleteCollection"); + handleError(error, "DeleteCollection", `Error while deleting container ${collectionId}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/deleteDatabase.ts b/src/Common/dataAccess/deleteDatabase.ts index e48f4ceb4..40029c0d2 100644 --- a/src/Common/dataAccess/deleteDatabase.ts +++ b/src/Common/dataAccess/deleteDatabase.ts @@ -25,7 +25,7 @@ export async function deleteDatabase(databaseId: string): Promise { } logConsoleInfo(`Successfully deleted database ${databaseId}`); } catch (error) { - handleError(error, `Error while deleting database ${databaseId}`, "DeleteDatabase"); + handleError(error, "DeleteDatabase", `Error while deleting database ${databaseId}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/deleteStoredProcedure.ts b/src/Common/dataAccess/deleteStoredProcedure.ts index 317fb3167..fac47de33 100644 --- a/src/Common/dataAccess/deleteStoredProcedure.ts +++ b/src/Common/dataAccess/deleteStoredProcedure.ts @@ -34,7 +34,7 @@ export async function deleteStoredProcedure( .delete(); } } catch (error) { - handleError(error, `Error while deleting stored procedure ${storedProcedureId}`, "DeleteStoredProcedure"); + handleError(error, "DeleteStoredProcedure", `Error while deleting stored procedure ${storedProcedureId}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/deleteTrigger.ts b/src/Common/dataAccess/deleteTrigger.ts index 0ec6ef4e1..f8a5713db 100644 --- a/src/Common/dataAccess/deleteTrigger.ts +++ b/src/Common/dataAccess/deleteTrigger.ts @@ -30,7 +30,7 @@ export async function deleteTrigger(databaseId: string, collectionId: string, tr .delete(); } } catch (error) { - handleError(error, `Error while deleting trigger ${triggerId}`, "DeleteTrigger"); + handleError(error, "DeleteTrigger", `Error while deleting trigger ${triggerId}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/deleteUserDefinedFunction.ts b/src/Common/dataAccess/deleteUserDefinedFunction.ts index 83630169e..6160ac52c 100644 --- a/src/Common/dataAccess/deleteUserDefinedFunction.ts +++ b/src/Common/dataAccess/deleteUserDefinedFunction.ts @@ -30,7 +30,7 @@ export async function deleteUserDefinedFunction(databaseId: string, collectionId .delete(); } } catch (error) { - handleError(error, `Error while deleting user defined function ${id}`, "DeleteUserDefinedFunction"); + handleError(error, "DeleteUserDefinedFunction", `Error while deleting user defined function ${id}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/getIndexTransformationProgress.ts b/src/Common/dataAccess/getIndexTransformationProgress.ts index 1c08fe847..fa0298fbc 100644 --- a/src/Common/dataAccess/getIndexTransformationProgress.ts +++ b/src/Common/dataAccess/getIndexTransformationProgress.ts @@ -20,7 +20,7 @@ export async function getIndexTransformationProgress(databaseId: string, collect response.headers[Constants.HttpHeaders.collectionIndexTransformationProgress] as string ); } catch (error) { - handleError(error, `Error while reading container ${collectionId}`, "ReadMongoDBCollection"); + handleError(error, "ReadMongoDBCollection", `Error while reading container ${collectionId}`); throw error; } clearMessage(); diff --git a/src/Common/dataAccess/readCollection.ts b/src/Common/dataAccess/readCollection.ts index 0b434ba03..ce886328d 100644 --- a/src/Common/dataAccess/readCollection.ts +++ b/src/Common/dataAccess/readCollection.ts @@ -13,7 +13,7 @@ export async function readCollection(databaseId: string, collectionId: string): .read(); collection = response.resource as DataModels.Collection; } catch (error) { - handleError(error, `Error while querying container ${collectionId}`, "ReadCollection"); + handleError(error, "ReadCollection", `Error while querying container ${collectionId}`); throw error; } clearMessage(); diff --git a/src/Common/dataAccess/readCollectionOffer.ts b/src/Common/dataAccess/readCollectionOffer.ts index ad4c8eef5..b98da68c6 100644 --- a/src/Common/dataAccess/readCollectionOffer.ts +++ b/src/Common/dataAccess/readCollectionOffer.ts @@ -56,7 +56,7 @@ export const readCollectionOffer = async ( } ); } catch (error) { - handleError(error, `Error while querying offer for collection ${params.collectionId}`, "ReadCollectionOffer"); + handleError(error, "ReadCollectionOffer", `Error while querying offer for collection ${params.collectionId}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/readCollectionQuotaInfo.ts b/src/Common/dataAccess/readCollectionQuotaInfo.ts index 574913f06..81565f821 100644 --- a/src/Common/dataAccess/readCollectionQuotaInfo.ts +++ b/src/Common/dataAccess/readCollectionQuotaInfo.ts @@ -37,7 +37,7 @@ export const readCollectionQuotaInfo = async ( return quota; } catch (error) { - handleError(error, `Error while querying quota info for container ${collection.id}`, "ReadCollectionQuotaInfo"); + handleError(error, "ReadCollectionQuotaInfo", `Error while querying quota info for container ${collection.id}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/readCollections.ts b/src/Common/dataAccess/readCollections.ts index 405232f49..a6b741d91 100644 --- a/src/Common/dataAccess/readCollections.ts +++ b/src/Common/dataAccess/readCollections.ts @@ -29,7 +29,7 @@ export async function readCollections(databaseId: string): Promise { databases = sdkResponse.resources as DataModels.Database[]; } } catch (error) { - handleError(error, `Error while querying databases`, "ReadDatabases"); + handleError(error, "ReadDatabases", `Error while querying databases`); throw error; } clearMessage(); diff --git a/src/Common/dataAccess/readMongoDBCollection.tsx b/src/Common/dataAccess/readMongoDBCollection.tsx index 80013cf94..b66f8dc9c 100644 --- a/src/Common/dataAccess/readMongoDBCollection.tsx +++ b/src/Common/dataAccess/readMongoDBCollection.tsx @@ -22,7 +22,7 @@ export async function readMongoDBCollectionThroughRP( const response = await getMongoDBCollection(subscriptionId, resourceGroup, accountName, databaseId, collectionId); collection = response.properties.resource; } catch (error) { - handleError(error, `Error while reading container ${collectionId}`, "ReadMongoDBCollection"); + handleError(error, "ReadMongoDBCollection", `Error while reading container ${collectionId}`); throw error; } clearMessage(); diff --git a/src/Common/dataAccess/readOffers.ts b/src/Common/dataAccess/readOffers.ts index 8fc743c9c..4afc452aa 100644 --- a/src/Common/dataAccess/readOffers.ts +++ b/src/Common/dataAccess/readOffers.ts @@ -17,7 +17,7 @@ export const readOffers = async (): Promise => { return []; } - handleError(error, `Error while querying offers`, "ReadOffers"); + handleError(error, "ReadOffers", `Error while querying offers`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/readStoredProcedures.ts b/src/Common/dataAccess/readStoredProcedures.ts index cb64654e6..75fb3111b 100644 --- a/src/Common/dataAccess/readStoredProcedures.ts +++ b/src/Common/dataAccess/readStoredProcedures.ts @@ -35,7 +35,7 @@ export async function readStoredProcedures( .fetchAll(); return response?.resources; } catch (error) { - handleError(error, `Failed to query stored procedures for container ${collectionId}`, "ReadStoredProcedures"); + handleError(error, "ReadStoredProcedures", `Failed to query stored procedures for container ${collectionId}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/readTriggers.ts b/src/Common/dataAccess/readTriggers.ts index d8b6f6469..85a96331f 100644 --- a/src/Common/dataAccess/readTriggers.ts +++ b/src/Common/dataAccess/readTriggers.ts @@ -35,7 +35,7 @@ export async function readTriggers( .fetchAll(); return response?.resources; } catch (error) { - handleError(error, `Failed to query triggers for container ${collectionId}`, "ReadTriggers"); + handleError(error, "ReadTriggers", `Failed to query triggers for container ${collectionId}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/readUserDefinedFunctions.ts b/src/Common/dataAccess/readUserDefinedFunctions.ts index 93d26f73a..f6990db7c 100644 --- a/src/Common/dataAccess/readUserDefinedFunctions.ts +++ b/src/Common/dataAccess/readUserDefinedFunctions.ts @@ -37,8 +37,8 @@ export async function readUserDefinedFunctions( } catch (error) { handleError( error, - `Failed to query user defined functions for container ${collectionId}`, - "ReadUserDefinedFunctions" + "ReadUserDefinedFunctions", + `Failed to query user defined functions for container ${collectionId}` ); throw error; } finally { diff --git a/src/Common/dataAccess/updateCollection.ts b/src/Common/dataAccess/updateCollection.ts index 3f317c069..3a45af694 100644 --- a/src/Common/dataAccess/updateCollection.ts +++ b/src/Common/dataAccess/updateCollection.ts @@ -59,7 +59,7 @@ export async function updateCollection( logConsoleInfo(`Successfully updated container ${collectionId}`); return collection; } catch (error) { - handleError(error, `Failed to update container ${collectionId}`, "UpdateCollection"); + handleError(error, "UpdateCollection", `Failed to update container ${collectionId}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/updateOffer.ts b/src/Common/dataAccess/updateOffer.ts index f7568abd1..24cd150c8 100644 --- a/src/Common/dataAccess/updateOffer.ts +++ b/src/Common/dataAccess/updateOffer.ts @@ -72,7 +72,7 @@ export const updateOffer = async (params: UpdateOfferParams): Promise => logConsoleInfo(`Successfully updated offer for ${offerResourceText}`); return updatedOffer; } catch (error) { - handleError(error, `Error updating offer for ${offerResourceText}`, "UpdateCollection"); + handleError(error, "UpdateCollection", `Error updating offer for ${offerResourceText}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts b/src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts index 1b713de85..93a8f8737 100644 --- a/src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts +++ b/src/Common/dataAccess/updateOfferThroughputBeyondLimit.ts @@ -49,8 +49,8 @@ export async function updateOfferThroughputBeyondLimit(request: UpdateOfferThrou const error = await response.json(); handleError( error, - `Failed to request an increase in throughput for ${request.throughput}`, - "updateOfferThroughputBeyondLimit" + "updateOfferThroughputBeyondLimit", + `Failed to request an increase in throughput for ${request.throughput}` ); clearMessage(); throw error; diff --git a/src/Common/dataAccess/updateStoredProcedure.ts b/src/Common/dataAccess/updateStoredProcedure.ts index 17c498d66..4ca900905 100644 --- a/src/Common/dataAccess/updateStoredProcedure.ts +++ b/src/Common/dataAccess/updateStoredProcedure.ts @@ -64,7 +64,7 @@ export async function updateStoredProcedure( .replace(storedProcedure); return response?.resource; } catch (error) { - handleError(error, `Error while updating stored procedure ${storedProcedure.id}`, "UpdateStoredProcedure"); + handleError(error, "UpdateStoredProcedure", `Error while updating stored procedure ${storedProcedure.id}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/updateTrigger.ts b/src/Common/dataAccess/updateTrigger.ts index 845e19274..49759bb2f 100644 --- a/src/Common/dataAccess/updateTrigger.ts +++ b/src/Common/dataAccess/updateTrigger.ts @@ -61,7 +61,7 @@ export async function updateTrigger( .replace(trigger); return response?.resource; } catch (error) { - handleError(error, `Error while updating trigger ${trigger.id}`, "UpdateTrigger"); + handleError(error, "UpdateTrigger", `Error while updating trigger ${trigger.id}`); throw error; } finally { clearMessage(); diff --git a/src/Common/dataAccess/updateUserDefinedFunction.ts b/src/Common/dataAccess/updateUserDefinedFunction.ts index 373cb1dcd..3e2ebab1b 100644 --- a/src/Common/dataAccess/updateUserDefinedFunction.ts +++ b/src/Common/dataAccess/updateUserDefinedFunction.ts @@ -66,8 +66,8 @@ export async function updateUserDefinedFunction( } catch (error) { handleError( error, - `Error while updating user defined function ${userDefinedFunction.id}`, - "UpdateUserupdateUserDefinedFunction" + "UpdateUserupdateUserDefinedFunction", + `Error while updating user defined function ${userDefinedFunction.id}` ); throw error; } finally { diff --git a/src/Contracts/Diagnostics.ts b/src/Contracts/Diagnostics.ts index 6a523bfd5..d6a54740a 100644 --- a/src/Contracts/Diagnostics.ts +++ b/src/Contracts/Diagnostics.ts @@ -46,7 +46,7 @@ export interface LogEntry { /** * The message code. */ - code?: number; + code?: number | string; /** * Any additional data to be logged. */ diff --git a/src/Explorer/Controls/Arcadia/ArcadiaMenuPicker.tsx b/src/Explorer/Controls/Arcadia/ArcadiaMenuPicker.tsx index c46dbebab..e4165421f 100644 --- a/src/Explorer/Controls/Arcadia/ArcadiaMenuPicker.tsx +++ b/src/Explorer/Controls/Arcadia/ArcadiaMenuPicker.tsx @@ -1,12 +1,9 @@ import * as React from "react"; import { ArcadiaWorkspace, SparkPool } from "../../../Contracts/DataModels"; import { DefaultButton, IButtonStyles } from "office-ui-fabric-react/lib/Button"; -import { - IContextualMenuItem, - IContextualMenuProps, - ContextualMenuItemType -} from "office-ui-fabric-react/lib/ContextualMenu"; +import { IContextualMenuItem, IContextualMenuProps } from "office-ui-fabric-react/lib/ContextualMenu"; import * as Logger from "../../../Common/Logger"; +import { getErrorMessage } from "../../../Common/ErrorHandlingUtils"; export interface ArcadiaMenuPickerProps { selectText?: string; @@ -47,7 +44,7 @@ export class ArcadiaMenuPicker extends React.Component ): string { if (!serverInfo.notebookServerEndpoint) { - const error = "Notebook server endpoint not defined. Terminal will fail to connect to jupyter server."; - Logger.logError(error, "NotebookTerminalComponent/createNotebookAppSrc"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + handleError( + "Notebook server endpoint not defined. Terminal will fail to connect to jupyter server.", + "NotebookTerminalComponent/createNotebookAppSrc" + ); return ""; } diff --git a/src/Explorer/Controls/NotebookGallery/CodeOfConductComponent.tsx b/src/Explorer/Controls/NotebookGallery/CodeOfConductComponent.tsx index 02dc407e0..90ddf7b09 100644 --- a/src/Explorer/Controls/NotebookGallery/CodeOfConductComponent.tsx +++ b/src/Explorer/Controls/NotebookGallery/CodeOfConductComponent.tsx @@ -1,9 +1,8 @@ import * as React from "react"; import { JunoClient } from "../../../Juno/JunoClient"; import { HttpStatusCodes, CodeOfConductEndpoints } from "../../../Common/Constants"; -import * as Logger from "../../../Common/Logger"; -import { logConsoleError } from "../../../Utils/NotificationConsoleUtils"; import { Stack, Text, Checkbox, PrimaryButton, Link } from "office-ui-fabric-react"; +import { handleError } from "../../../Common/ErrorHandlingUtils"; export interface CodeOfConductComponentProps { junoClient: JunoClient; @@ -45,9 +44,7 @@ export class CodeOfConductComponent extends React.Component { - Logger.logError(error, "Explorer/getArcadiaToken"); + Logger.logError(getErrorMessage(error), "Explorer/getArcadiaToken"); resolve(undefined); } ); @@ -1551,7 +1551,7 @@ export default class Explorer { workspaceItems[i] = { ...workspace, sparkPools: sparkpools }; }, error => { - Logger.logError(error, "Explorer/this._arcadiaManager.listSparkPoolsAsync"); + Logger.logError(getErrorMessage(error), "Explorer/this._arcadiaManager.listSparkPoolsAsync"); } ); sparkPromises.push(promise); @@ -1559,7 +1559,7 @@ export default class Explorer { return Promise.all(sparkPromises).then(() => workspaceItems); } catch (error) { - handleError(error, "Get Arcadia workspaces failed", "Explorer/this._arcadiaManager.listWorkspacesAsync"); + handleError(error, "Explorer/this._arcadiaManager.listWorkspacesAsync", "Get Arcadia workspaces failed"); return Promise.resolve([]); } } @@ -1596,8 +1596,8 @@ export default class Explorer { this._isInitializingNotebooks = false; handleError( error, - `Failed to get notebook workspace connection info: ${getErrorMessage(error)}`, - "initNotebooks/getNotebookConnectionInfoAsync" + "initNotebooks/getNotebookConnectionInfoAsync", + `Failed to get notebook workspace connection info: ${getErrorMessage(error)}` ); throw error; } finally { @@ -1620,9 +1620,10 @@ export default class Explorer { public resetNotebookWorkspace() { if (!this.isNotebookEnabled() || !this.notebookManager?.notebookClient) { - const error = "Attempt to reset notebook workspace, but notebook is not enabled"; - Logger.logError(error, "Explorer/resetNotebookWorkspace"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + handleError( + "Attempt to reset notebook workspace, but notebook is not enabled", + "Explorer/resetNotebookWorkspace" + ); return; } const resetConfirmationDialogProps: DialogProps = { @@ -1647,7 +1648,7 @@ export default class Explorer { const workspaces = await this.notebookWorkspaceManager.getNotebookWorkspacesAsync(databaseAccount?.id); return workspaces && workspaces.length > 0 && workspaces.some(workspace => workspace.name === "default"); } catch (error) { - Logger.logError(error, "Explorer/_containsDefaultNotebookWorkspace"); + Logger.logError(getErrorMessage(error), "Explorer/_containsDefaultNotebookWorkspace"); return false; } } @@ -1673,7 +1674,7 @@ export default class Explorer { await this.notebookWorkspaceManager.startNotebookWorkspaceAsync(this.databaseAccount().id, "default"); } } catch (error) { - handleError(error, "Failed to initialize notebook workspace", "Explorer/ensureNotebookWorkspaceRunning"); + handleError(error, "Explorer/ensureNotebookWorkspaceRunning", "Failed to initialize notebook workspace"); } finally { clearMessage && clearMessage(); } @@ -2221,8 +2222,7 @@ export default class Explorer { public uploadFile(name: string, content: string, parent: NotebookContentItem): Promise { if (!this.isNotebookEnabled() || !this.notebookManager?.notebookContentClient) { const error = "Attempt to upload notebook, but notebook is not enabled"; - Logger.logError(error, "Explorer/uploadFile"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + handleError(error, "Explorer/uploadFile"); throw new Error(error); } @@ -2403,8 +2403,7 @@ export default class Explorer { public renameNotebook(notebookFile: NotebookContentItem): Q.Promise { if (!this.isNotebookEnabled() || !this.notebookManager?.notebookContentClient) { const error = "Attempt to rename notebook, but notebook is not enabled"; - Logger.logError(error, "Explorer/renameNotebook"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + handleError(error, "Explorer/renameNotebook"); throw new Error(error); } @@ -2452,8 +2451,7 @@ export default class Explorer { public onCreateDirectory(parent: NotebookContentItem): Q.Promise { if (!this.isNotebookEnabled() || !this.notebookManager?.notebookContentClient) { const error = "Attempt to create notebook directory, but notebook is not enabled"; - Logger.logError(error, "Explorer/onCreateDirectory"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + handleError(error, "Explorer/onCreateDirectory"); throw new Error(error); } @@ -2474,8 +2472,7 @@ export default class Explorer { public readFile(notebookFile: NotebookContentItem): Promise { if (!this.isNotebookEnabled() || !this.notebookManager?.notebookContentClient) { const error = "Attempt to read file, but notebook is not enabled"; - Logger.logError(error, "Explorer/downloadFile"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + handleError(error, "Explorer/downloadFile"); throw new Error(error); } @@ -2485,8 +2482,7 @@ export default class Explorer { public downloadFile(notebookFile: NotebookContentItem): Promise { if (!this.isNotebookEnabled() || !this.notebookManager?.notebookContentClient) { const error = "Attempt to download file, but notebook is not enabled"; - Logger.logError(error, "Explorer/downloadFile"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + handleError(error, "Explorer/downloadFile"); throw new Error(error); } @@ -2567,7 +2563,7 @@ export default class Explorer { ); this.isNotebooksEnabledForAccount(isAccountInAllowedLocation); } catch (error) { - Logger.logError(error, "Explorer/isNotebooksEnabledForAccount"); + Logger.logError(getErrorMessage(error), "Explorer/isNotebooksEnabledForAccount"); this.isNotebooksEnabledForAccount(false); } } @@ -2596,7 +2592,7 @@ export default class Explorer { false; this.isSparkEnabledForAccount(isEnabled); } catch (error) { - Logger.logError(error, "Explorer/isSparkEnabledForAccount"); + Logger.logError(getErrorMessage(error), "Explorer/isSparkEnabledForAccount"); this.isSparkEnabledForAccount(false); } }; @@ -2621,7 +2617,7 @@ export default class Explorer { (featureStatus && featureStatus.properties && featureStatus.properties.state === "Registered") || false; return isEnabled; } catch (error) { - Logger.logError(error, "Explorer/isSparkEnabledForAccount"); + Logger.logError(getErrorMessage(error), "Explorer/isSparkEnabledForAccount"); return false; } }; @@ -2640,8 +2636,7 @@ export default class Explorer { public deleteNotebookFile(item: NotebookContentItem): Promise { if (!this.isNotebookEnabled() || !this.notebookManager?.notebookContentClient) { const error = "Attempt to delete notebook file, but notebook is not enabled"; - Logger.logError(error, "Explorer/deleteNotebookFile"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + handleError(error, "Explorer/deleteNotebookFile"); throw new Error(error); } @@ -2690,8 +2685,7 @@ export default class Explorer { public onNewNotebookClicked(parent?: NotebookContentItem): void { if (!this.isNotebookEnabled() || !this.notebookManager?.notebookContentClient) { const error = "Attempt to create new notebook, but notebook is not enabled"; - Logger.logError(error, "Explorer/onNewNotebookClicked"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + handleError(error, "Explorer/onNewNotebookClicked"); throw new Error(error); } @@ -2776,8 +2770,7 @@ export default class Explorer { public refreshContentItem(item: NotebookContentItem): Promise { if (!this.isNotebookEnabled() || !this.notebookManager?.notebookContentClient) { const error = "Attempt to refresh notebook list, but notebook is not enabled"; - Logger.logError(error, "Explorer/refreshContentItem"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + handleError(error, "Explorer/refreshContentItem"); return Promise.reject(new Error(error)); } @@ -2963,7 +2956,7 @@ export default class Explorer { } return tokenRefreshInterval; } catch (error) { - Logger.logError(error, "Explorer/getTokenRefreshInterval"); + Logger.logError(getErrorMessage(error), "Explorer/getTokenRefreshInterval"); return tokenRefreshInterval; } } diff --git a/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts b/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts index f5256b9d5..5947c5439 100644 --- a/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts +++ b/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts @@ -94,7 +94,7 @@ describe("Gremlin Client", () => { it("should log and display error out on unknown requestId", () => { const gremlinClient = new GremlinClient(); - const logConsoleSpy = sinon.spy(NotificationConsoleUtils, "logConsoleMessage"); + const logConsoleSpy = sinon.spy(NotificationConsoleUtils, "logConsoleError"); const logErrorSpy = sinon.spy(Logger, "logError"); gremlinClient.initialize(emptyParams); @@ -122,7 +122,7 @@ describe("Gremlin Client", () => { }); it("should not aggregate RU if not a number and reset totalRequestCharge to undefined", done => { - const logConsoleSpy = sinon.spy(NotificationConsoleUtils, "logConsoleMessage"); + const logConsoleSpy = sinon.spy(NotificationConsoleUtils, "logConsoleError"); const logErrorSpy = sinon.spy(Logger, "logError"); const gremlinClient = new GremlinClient(); @@ -165,7 +165,7 @@ describe("Gremlin Client", () => { }); it("should not aggregate RU if undefined and reset totalRequestCharge to undefined", done => { - const logConsoleSpy = sinon.spy(NotificationConsoleUtils, "logConsoleMessage"); + const logConsoleSpy = sinon.spy(NotificationConsoleUtils, "logConsoleError"); const logErrorSpy = sinon.spy(Logger, "logError"); const gremlinClient = new GremlinClient(); diff --git a/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts b/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts index 7350f71d5..e66ae5cf2 100644 --- a/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts +++ b/src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts @@ -7,8 +7,7 @@ import { GremlinSimpleClient, Result } from "./GremlinSimpleClient"; import * as NotificationConsoleUtils from "../../../Utils/NotificationConsoleUtils"; import { ConsoleDataType } from "../../Menus/NotificationConsole/NotificationConsoleComponent"; import { HashMap } from "../../../Common/HashMap"; -import * as Logger from "../../../Common/Logger"; -import { getErrorMessage } from "../../../Common/ErrorHandlingUtils"; +import { getErrorMessage, handleError } from "../../../Common/ErrorHandlingUtils"; export interface GremlinClientParameters { endpoint: string; @@ -63,10 +62,10 @@ export class GremlinClient { const requestId = result.requestId; if (!requestId || !this.pendingResults.has(requestId)) { - const msg = `Error: ${errorMessage}, unknown requestId:${requestId} ${GremlinClient.getRequestChargeString( + const errorMsg = `Error: ${errorMessage}, unknown requestId:${requestId} ${GremlinClient.getRequestChargeString( result.requestCharge )}`; - GremlinClient.reportError(msg); + handleError(errorMsg, GremlinClient.LOG_AREA); // Fail all pending requests if no request id (fatal) if (!requestId) { @@ -130,15 +129,16 @@ export class GremlinClient { deferred.reject(error); this.pendingResults.delete(requestId); - GremlinClient.reportError( - `Aborting pending request ${requestId}. Error:${error} ${GremlinClient.getRequestChargeString(requestCharge)}` - ); + const errorMsg = `Aborting pending request ${requestId}. Error:${error} ${GremlinClient.getRequestChargeString( + requestCharge + )}`; + handleError(errorMsg, GremlinClient.LOG_AREA); } private flushResult(requestId: string) { if (!this.pendingResults.has(requestId)) { - const msg = `Unknown requestId:${requestId}`; - GremlinClient.reportError(msg); + const errorMsg = `Unknown requestId:${requestId}`; + handleError(errorMsg, GremlinClient.LOG_AREA); return; } @@ -156,8 +156,8 @@ export class GremlinClient { */ private storePendingResult(result: Result): boolean { if (!this.pendingResults.has(result.requestId)) { - const msg = `Dropping result for unknown requestId:${result.requestId}`; - GremlinClient.reportError(msg); + const errorMsg = `Dropping result for unknown requestId:${result.requestId}`; + handleError(errorMsg, GremlinClient.LOG_AREA); return false; } const pendingResults = this.pendingResults.get(result.requestId).result; @@ -177,9 +177,8 @@ export class GremlinClient { if (result.requestCharge === undefined || typeof result.requestCharge !== "number") { // Clear totalRequestCharge, even if it was a valid number as the total might be incomplete therefore incorrect pendingResults.totalRequestCharge = undefined; - GremlinClient.reportError( - `Unable to perform RU aggregation calculation with non numbers. Result request charge: ${result.requestCharge}. RequestId: ${result.requestId}` - ); + const errorMsg = `Unable to perform RU aggregation calculation with non numbers. Result request charge: ${result.requestCharge}. RequestId: ${result.requestId}`; + handleError(errorMsg, GremlinClient.LOG_AREA); } else { if (pendingResults.totalRequestCharge === undefined) { pendingResults.totalRequestCharge = 0; @@ -188,9 +187,4 @@ export class GremlinClient { } return pendingResults.isIncomplete; } - - private static reportError(msg: string): void { - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, msg); - Logger.logError(msg, GremlinClient.LOG_AREA); - } } diff --git a/src/Explorer/Notebook/NotebookContainerClient.ts b/src/Explorer/Notebook/NotebookContainerClient.ts index 78cfa0fa3..90f8a9a74 100644 --- a/src/Explorer/Notebook/NotebookContainerClient.ts +++ b/src/Explorer/Notebook/NotebookContainerClient.ts @@ -6,6 +6,7 @@ import * as Constants from "../../Common/Constants"; import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent"; import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; import * as Logger from "../../Common/Logger"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export class NotebookContainerClient { private reconnectingNotificationId: string; @@ -74,7 +75,7 @@ export class NotebookContainerClient { } return undefined; } catch (error) { - Logger.logError(error, "NotebookContainerClient/getMemoryUsage"); + Logger.logError(getErrorMessage(error), "NotebookContainerClient/getMemoryUsage"); if (!this.reconnectingNotificationId) { this.reconnectingNotificationId = NotificationConsoleUtils.logConsoleMessage( ConsoleDataType.InProgress, @@ -110,7 +111,7 @@ export class NotebookContainerClient { headers: { Authorization: authToken } }); } catch (error) { - Logger.logError(error, "NotebookContainerClient/resetWorkspace"); + Logger.logError(getErrorMessage(error), "NotebookContainerClient/resetWorkspace"); await this.recreateNotebookWorkspaceAsync(); } } @@ -140,7 +141,7 @@ export class NotebookContainerClient { await notebookWorkspaceManager.deleteNotebookWorkspaceAsync(explorer.databaseAccount().id, "default"); await notebookWorkspaceManager.createNotebookWorkspaceAsync(explorer.databaseAccount().id, "default"); } catch (error) { - Logger.logError(error, "NotebookContainerClient/recreateNotebookWorkspaceAsync"); + Logger.logError(getErrorMessage(error), "NotebookContainerClient/recreateNotebookWorkspaceAsync"); return Promise.reject(error); } } diff --git a/src/Explorer/Notebook/NotebookManager.ts b/src/Explorer/Notebook/NotebookManager.ts index 2fe8748d0..932d80e13 100644 --- a/src/Explorer/Notebook/NotebookManager.ts +++ b/src/Explorer/Notebook/NotebookManager.ts @@ -26,6 +26,7 @@ import { ImmutableNotebook } from "@nteract/commutable"; import Explorer from "../Explorer"; import { ContextualPaneBase } from "../Panes/ContextualPaneBase"; import { CopyNotebookPaneAdapter } from "../Panes/CopyNotebookPane"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; export interface NotebookManagerOptions { container: Explorer; @@ -147,7 +148,7 @@ export default class NotebookManager { // Octokit's error handler uses any // eslint-disable-next-line @typescript-eslint/no-explicit-any private onGitHubClientError = (error: any): void => { - Logger.logError(error, "NotebookManager/onGitHubClientError"); + Logger.logError(getErrorMessage(error), "NotebookManager/onGitHubClientError"); if (error.status === HttpStatusCodes.Unauthorized) { this.gitHubOAuthService.resetToken(); diff --git a/src/Explorer/Panes/CopyNotebookPane.tsx b/src/Explorer/Panes/CopyNotebookPane.tsx index 586af6318..1ef61eb3a 100644 --- a/src/Explorer/Panes/CopyNotebookPane.tsx +++ b/src/Explorer/Panes/CopyNotebookPane.tsx @@ -1,7 +1,6 @@ import ko from "knockout"; import * as React from "react"; import { ReactAdapter } from "../../Bindings/ReactBindingHandler"; -import * as Logger from "../../Common/Logger"; import { JunoClient, IPinnedRepo } from "../../Juno/JunoClient"; import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; import Explorer from "../Explorer"; @@ -13,6 +12,7 @@ import { HttpStatusCodes } from "../../Common/Constants"; import * as GitHubUtils from "../../Utils/GitHubUtils"; import { NotebookContentItemType, NotebookContentItem } from "../Notebook/NotebookContentItem"; import { ResourceTreeAdapter } from "../Tree/ResourceTreeAdapter"; +import { handleError, getErrorMessage } from "../../Common/ErrorHandlingUtils"; interface Location { type: "MyNotebooks" | "GitHub"; @@ -90,9 +90,7 @@ export class CopyNotebookPaneAdapter implements ReactAdapter { if (this.gitHubOAuthService.isLoggedIn()) { const response = await this.junoClient.getPinnedRepos(this.gitHubOAuthService.getTokenObservable()()?.scope); if (response.status !== HttpStatusCodes.OK && response.status !== HttpStatusCodes.NoContent) { - const message = `Received HTTP ${response.status} when fetching pinned repos`; - Logger.logError(message, "CopyNotebookPaneAdapter/submit"); - NotificationConsoleUtils.logConsoleError(message); + handleError(`Received HTTP ${response.status} when fetching pinned repos`, "CopyNotebookPaneAdapter/submit"); } if (response.data?.length > 0) { @@ -134,12 +132,10 @@ export class CopyNotebookPaneAdapter implements ReactAdapter { NotificationConsoleUtils.logConsoleInfo(`Successfully copied ${this.name} to ${destination}`); } catch (error) { + const errorMessage = getErrorMessage(error); this.formError = `Failed to copy ${this.name} to ${destination}`; - this.formErrorDetail = `${error}`; - - const message = `${this.formError}: ${this.formErrorDetail}`; - Logger.logError(message, "CopyNotebookPaneAdapter/submit"); - NotificationConsoleUtils.logConsoleError(message); + this.formErrorDetail = `${errorMessage}`; + handleError(errorMessage, "CopyNotebookPaneAdapter/submit", this.formError); return; } finally { clearMessage && clearMessage(); diff --git a/src/Explorer/Panes/GitHubReposPane.ts b/src/Explorer/Panes/GitHubReposPane.ts index a18f7d867..403abfd75 100644 --- a/src/Explorer/Panes/GitHubReposPane.ts +++ b/src/Explorer/Panes/GitHubReposPane.ts @@ -1,6 +1,5 @@ import _ from "underscore"; import { Areas, HttpStatusCodes } from "../../Common/Constants"; -import * as Logger from "../../Common/Logger"; import * as ViewModels from "../../Contracts/ViewModels"; import { GitHubClient, IGitHubPageInfo, IGitHubRepo } from "../../GitHub/GitHubClient"; import { IPinnedRepo, JunoClient } from "../../Juno/JunoClient"; @@ -8,13 +7,12 @@ import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstan import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import * as GitHubUtils from "../../Utils/GitHubUtils"; import { JunoUtils } from "../../Utils/JunoUtils"; -import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; import { AuthorizeAccessComponent } from "../Controls/GitHub/AuthorizeAccessComponent"; import { GitHubReposComponent, GitHubReposComponentProps, RepoListItem } from "../Controls/GitHub/GitHubReposComponent"; import { GitHubReposComponentAdapter } from "../Controls/GitHub/GitHubReposComponentAdapter"; import { BranchesProps, PinnedReposProps, UnpinnedReposProps } from "../Controls/GitHub/ReposListComponent"; -import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent"; import { ContextualPaneBase } from "./ContextualPaneBase"; +import { handleError } from "../../Common/ErrorHandlingUtils"; interface GitHubReposPaneOptions extends ViewModels.PaneOptions { gitHubClient: GitHubClient; @@ -105,9 +103,7 @@ export class GitHubReposPane extends ContextualPaneBase { throw new Error(`Received HTTP ${response.status} when saving pinned repos`); } } catch (error) { - const message = `Failed to save pinned repos: ${error}`; - Logger.logError(message, "GitHubReposPane/submit"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(error, "GitHubReposPane/submit", "Failed to save pinned repos"); } } } @@ -206,9 +202,7 @@ export class GitHubReposPane extends ContextualPaneBase { branchesProps.lastPageInfo = response.pageInfo; } } catch (error) { - const message = `Failed to fetch branches: ${error}`; - Logger.logError(message, "GitHubReposPane/loadMoreBranches"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(error, "GitHubReposPane/loadMoreBranches", "Failed to fetch branches"); } branchesProps.isLoading = false; @@ -236,9 +230,7 @@ export class GitHubReposPane extends ContextualPaneBase { this.unpinnedReposProps.repos = this.calculateUnpinnedRepos(); } } catch (error) { - const message = `Failed to fetch unpinned repos: ${error}`; - Logger.logError(message, "GitHubReposPane/loadMoreUnpinnedRepos"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(error, "GitHubReposPane/loadMoreUnpinnedRepos", "Failed to fetch unpinned repos"); } this.unpinnedReposProps.isLoading = false; @@ -255,9 +247,7 @@ export class GitHubReposPane extends ContextualPaneBase { return response.data; } catch (error) { - const message = `Failed to fetch repo: ${error}`; - Logger.logError(message, "GitHubReposPane/getRepo"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(error, "GitHubReposPane/getRepo", "Failed to fetch repo"); return Promise.resolve(undefined); } } @@ -320,9 +310,7 @@ export class GitHubReposPane extends ContextualPaneBase { this.triggerRender(); } } catch (error) { - const message = `Failed to fetch pinned repos: ${error}`; - Logger.logError(message, "GitHubReposPane/refreshPinnedReposListItems"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(error, "GitHubReposPane/refreshPinnedReposListItems", "Failed to fetch pinned repos"); } } diff --git a/src/Explorer/Panes/PublishNotebookPaneAdapter.tsx b/src/Explorer/Panes/PublishNotebookPaneAdapter.tsx index c8f94f7d2..967355251 100644 --- a/src/Explorer/Panes/PublishNotebookPaneAdapter.tsx +++ b/src/Explorer/Panes/PublishNotebookPaneAdapter.tsx @@ -1,17 +1,16 @@ import ko from "knockout"; import * as React from "react"; import { ReactAdapter } from "../../Bindings/ReactBindingHandler"; -import * as Logger from "../../Common/Logger"; import Explorer from "../Explorer"; import { JunoClient } from "../../Juno/JunoClient"; import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; -import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent"; import { GenericRightPaneComponent, GenericRightPaneProps } from "./GenericRightPaneComponent"; import { PublishNotebookPaneComponent, PublishNotebookPaneProps } from "./PublishNotebookPaneComponent"; import { ImmutableNotebook } from "@nteract/commutable/src"; import { toJS } from "@nteract/commutable"; import { CodeOfConductComponent } from "../Controls/NotebookGallery/CodeOfConductComponent"; import { HttpStatusCodes } from "../../Common/Constants"; +import { handleError, getErrorMessage } from "../../Common/ErrorHandlingUtils"; export class PublishNotebookPaneAdapter implements ReactAdapter { parameters: ko.Observable; @@ -111,9 +110,11 @@ export class PublishNotebookPaneAdapter implements ReactAdapter { this.isCodeOfConductAccepted = response.data; } catch (error) { - const message = `Failed to check if code of conduct was accepted: ${error}`; - Logger.logError(message, "PublishNotebookPaneAdapter/isCodeOfConductAccepted"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError( + error, + "PublishNotebookPaneAdapter/isCodeOfConductAccepted", + "Failed to check if code of conduct was accepted" + ); } } else { this.isCodeOfConductAccepted = true; @@ -170,12 +171,10 @@ export class PublishNotebookPaneAdapter implements ReactAdapter { } } } catch (error) { + const errorMessage = getErrorMessage(error); this.formError = `Failed to publish ${this.name} to gallery`; - this.formErrorDetail = `${error}`; - - const message = `${this.formError}: ${this.formErrorDetail}`; - Logger.logError(message, "PublishNotebookPaneAdapter/submit"); - NotificationConsoleUtils.logConsoleError(message); + this.formErrorDetail = `${errorMessage}`; + handleError(errorMessage, "PublishNotebookPaneAdapter/submit", this.formError); return; } finally { clearPublishingMessage(); @@ -189,10 +188,7 @@ export class PublishNotebookPaneAdapter implements ReactAdapter { private createFormErrorForLargeImageSelection = (formError: string, formErrorDetail: string, area: string): void => { this.formError = formError; this.formErrorDetail = formErrorDetail; - - const message = `${this.formError}: ${this.formErrorDetail}`; - Logger.logError(message, area); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(formErrorDetail, area, formError); this.triggerRender(); }; diff --git a/src/Explorer/Tables/TableDataClient.ts b/src/Explorer/Tables/TableDataClient.ts index 1dda5b9b4..ba6ae246d 100644 --- a/src/Explorer/Tables/TableDataClient.ts +++ b/src/Explorer/Tables/TableDataClient.ts @@ -7,16 +7,14 @@ import { ConsoleDataType } from "../../Explorer/Menus/NotificationConsole/Notifi import * as Constants from "../../Common/Constants"; import * as Entities from "./Entities"; import * as HeadersUtility from "../../Common/HeadersUtility"; -import * as Logger from "../../Common/Logger"; import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; import * as TableConstants from "./Constants"; import * as TableEntityProcessor from "./TableEntityProcessor"; import * as ViewModels from "../../Contracts/ViewModels"; -import { MessageTypes } from "../../Contracts/ExplorerContracts"; -import { sendMessage } from "../../Common/MessageHandler"; import Explorer from "../Explorer"; import { queryDocuments, deleteDocument, updateDocument, createDocument } from "../../Common/DocumentClientUtilityBase"; import { configContext } from "../../ConfigContext"; +import { handleError } from "../../Common/ErrorHandlingUtils"; export interface CassandraTableKeys { partitionKeys: CassandraTableKey[]; @@ -188,14 +186,9 @@ export class CassandraAPIDataClient extends TableDataClient { ); deferred.resolve(entity); }, - reason => { - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Error while adding new row to table ${collection.id()}:\n ${JSON.stringify(reason)}` - ); - Logger.logError(JSON.stringify(reason), "AddRowCassandra", reason.code); - this._checkForbiddenError(reason); - deferred.reject(reason); + error => { + handleError(error, "AddRowCassandra", `Error while adding new row to table ${collection.id()}`); + deferred.reject(error); } ) .finally(() => { @@ -267,14 +260,9 @@ export class CassandraAPIDataClient extends TableDataClient { ); deferred.resolve(newEntity); }, - reason => { - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Failed to update row ${newEntity.RowKey._}: ${JSON.stringify(reason)}` - ); - Logger.logError(JSON.stringify(reason), "UpdateRowCassandra", reason.code); - this._checkForbiddenError(reason); - deferred.reject(reason); + error => { + handleError(error, "UpdateRowCassandra", `Failed to update row ${newEntity.RowKey._}`); + deferred.reject(error); } ) .finally(() => { @@ -332,16 +320,11 @@ export class CassandraAPIDataClient extends TableDataClient { ContinuationToken: data.paginationToken }); }, - reason => { + (error: any) => { if (shouldNotify) { - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Failed to query rows for table ${collection.id()}: ${JSON.stringify(reason)}` - ); - Logger.logError(JSON.stringify(reason), "QueryDocumentsCassandra", reason.status); - this._checkForbiddenError(reason); + handleError(error, "QueryDocumentsCassandra", `Failed to query rows for table ${collection.id()}`); } - deferred.reject(reason); + deferred.reject(error); } ) .done(() => { @@ -379,13 +362,8 @@ export class CassandraAPIDataClient extends TableDataClient { `Successfully deleted row ${currEntityToDelete.RowKey._}` ); }, - reason => { - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Error while deleting row ${currEntityToDelete.RowKey._}:\n ${JSON.stringify(reason)}` - ); - Logger.logError(JSON.stringify(reason), "DeleteRowCassandra", reason.code); - this._checkForbiddenError(reason); + error => { + handleError(error, "DeleteRowCassandra", `Error while deleting row ${currEntityToDelete.RowKey._}`); } ) .finally(() => { @@ -420,14 +398,13 @@ export class CassandraAPIDataClient extends TableDataClient { ); deferred.resolve(); }, - reason => { - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Error while creating a keyspace with query ${createKeyspaceQuery}:\n ${JSON.stringify(reason)}` + error => { + handleError( + error, + "CreateKeyspaceCassandra", + `Error while creating a keyspace with query ${createKeyspaceQuery}` ); - Logger.logError(JSON.stringify(reason), "CreateKeyspaceCassandra", reason.code); - this._checkForbiddenError(reason); - deferred.reject(reason); + deferred.reject(error); } ) .finally(() => { @@ -467,14 +444,9 @@ export class CassandraAPIDataClient extends TableDataClient { ); deferred.resolve(); }, - reason => { - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Error while creating a table with query ${createTableQuery}:\n ${JSON.stringify(reason)}` - ); - Logger.logError(JSON.stringify(reason), "CreateTableCassandra", reason.code); - this._checkForbiddenError(reason); - deferred.reject(reason); + error => { + handleError(error, "CreateTableCassandra", `Error while creating a table with query ${createTableQuery}`); + deferred.reject(error); } ) .finally(() => { @@ -508,14 +480,13 @@ export class CassandraAPIDataClient extends TableDataClient { ); deferred.resolve(); }, - reason => { - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Error while deleting resource with query ${deleteQuery}:\n ${JSON.stringify(reason)}` + error => { + handleError( + error, + "DeleteKeyspaceOrTableCassandra", + `Error while deleting resource with query ${deleteQuery}` ); - Logger.logError(JSON.stringify(reason), "DeleteKeyspaceOrTableCassandra", reason.code); - this._checkForbiddenError(reason); - deferred.reject(reason); + deferred.reject(error); } ) .finally(() => { @@ -563,14 +534,9 @@ export class CassandraAPIDataClient extends TableDataClient { ); deferred.resolve(data); }, - reason => { - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Error fetching keys for table ${collection.id()}:\n ${JSON.stringify(reason)}` - ); - Logger.logError(JSON.stringify(reason), "FetchKeysCassandra", reason.status); - this._checkForbiddenError(reason); - deferred.reject(reason); + (error: any) => { + handleError(error, "FetchKeysCassandra", `Error fetching keys for table ${collection.id()}`); + deferred.reject(error); } ) .done(() => { @@ -618,14 +584,9 @@ export class CassandraAPIDataClient extends TableDataClient { ); deferred.resolve(data.columns); }, - reason => { - NotificationConsoleUtils.logConsoleMessage( - ConsoleDataType.Error, - `Error fetching schema for table ${collection.id()}:\n ${JSON.stringify(reason)}` - ); - Logger.logError(JSON.stringify(reason), "FetchSchemaCassandra", reason.status); - this._checkForbiddenError(reason); - deferred.reject(reason); + (error: any) => { + handleError(error, "FetchSchemaCassandra", `Error fetching schema for table ${collection.id()}`); + deferred.reject(error); } ) .done(() => { @@ -712,13 +673,4 @@ export class CassandraAPIDataClient extends TableDataClient { displayTokenRenewalPromptForStatus(xhrObj.status); }; - - private _checkForbiddenError(reason: any) { - if (reason && reason.code === Constants.HttpStatusCodes.Forbidden) { - sendMessage({ - type: MessageTypes.ForbiddenError, - reason: typeof reason === "string" ? "reason" : JSON.stringify(reason) - }); - } - } } diff --git a/src/GitHub/GitHubClient.ts b/src/GitHub/GitHubClient.ts index 64ed9e2d1..6125836cf 100644 --- a/src/GitHub/GitHubClient.ts +++ b/src/GitHub/GitHubClient.ts @@ -3,6 +3,7 @@ import { HttpStatusCodes } from "../Common/Constants"; import * as Logger from "../Common/Logger"; import UrlUtility from "../Common/UrlUtility"; import { NotebookUtil } from "../Explorer/Notebook/NotebookUtil"; +import { getErrorMessage } from "../Common/ErrorHandlingUtils"; export interface IGitHubPageInfo { endCursor: string; @@ -244,7 +245,7 @@ export class GitHubClient { data: GitHubClient.toGitHubRepo(response.repository) }; } catch (error) { - GitHubClient.log(Logger.logError, `GitHubClient.getRepoAsync failed: ${error}`); + Logger.logError(getErrorMessage(error), "GitHubClient.Octokit", "GitHubClient.getRepoAsync failed"); return { status: GitHubClient.SelfErrorCode, data: undefined @@ -265,7 +266,7 @@ export class GitHubClient { pageInfo: GitHubClient.toGitHubPageInfo(response.viewer.repositories.pageInfo) }; } catch (error) { - GitHubClient.log(Logger.logError, `GitHubClient.getReposAsync failed: ${error}`); + Logger.logError(getErrorMessage(error), "GitHubClient.Octokit", "GitHubClient.getRepoAsync failed"); return { status: GitHubClient.SelfErrorCode, data: undefined @@ -294,7 +295,7 @@ export class GitHubClient { pageInfo: GitHubClient.toGitHubPageInfo(response.repository.refs.pageInfo) }; } catch (error) { - GitHubClient.log(Logger.logError, `GitHubClient.getBranchesAsync failed: ${error}`); + Logger.logError(getErrorMessage(error), "GitHubClient.Octokit", "GitHubClient.getBranchesAsync failed"); return { status: GitHubClient.SelfErrorCode, data: undefined @@ -359,7 +360,7 @@ export class GitHubClient { data }; } catch (error) { - GitHubClient.log(Logger.logError, `GitHubClient.getContentsAsync failed: ${error}`); + Logger.logError(getErrorMessage(error), "GitHubClient.Octokit", "GitHubClient.getContentsAsync failed"); return { status: GitHubClient.SelfErrorCode, data: undefined @@ -503,7 +504,7 @@ export class GitHubClient { debug: () => {}, info: (message?: any) => GitHubClient.log(Logger.logInfo, message), warn: (message?: any) => GitHubClient.log(Logger.logWarning, message), - error: (message?: any) => GitHubClient.log(Logger.logError, message) + error: (error?: any) => Logger.logError(getErrorMessage(error), "GitHubClient.Octokit") } }); diff --git a/src/GitHub/GitHubContentProvider.ts b/src/GitHub/GitHubContentProvider.ts index 6142b7a6f..c406be440 100644 --- a/src/GitHub/GitHubContentProvider.ts +++ b/src/GitHub/GitHubContentProvider.ts @@ -41,7 +41,7 @@ export class GitHubContentProvider implements IContentProvider { return this.createSuccessAjaxResponse(HttpStatusCodes.NoContent, undefined); } catch (error) { - Logger.logError(error, "GitHubContentProvider/remove", error.errno); + Logger.logError(getErrorMessage(error), "GitHubContentProvider/remove", error.errno); return this.createErrorAjaxResponse(error); } }) @@ -65,7 +65,7 @@ export class GitHubContentProvider implements IContentProvider { return this.createSuccessAjaxResponse(HttpStatusCodes.OK, this.createContentModel(uri, content.data, params)); } catch (error) { - Logger.logError(error, "GitHubContentProvider/get", error.errno); + Logger.logError(getErrorMessage(error), "GitHubContentProvider/get", error.errno); return this.createErrorAjaxResponse(error); } }) @@ -105,7 +105,7 @@ export class GitHubContentProvider implements IContentProvider { this.createContentModel(newUri, gitHubFile, { content: 0 }) ); } catch (error) { - Logger.logError(error, "GitHubContentProvider/update", error.errno); + Logger.logError(getErrorMessage(error), "GitHubContentProvider/update", error.errno); return this.createErrorAjaxResponse(error); } }) @@ -182,7 +182,7 @@ export class GitHubContentProvider implements IContentProvider { this.createContentModel(newUri, newGitHubFile, { content: 0 }) ); } catch (error) { - Logger.logError(error, "GitHubContentProvider/create", error.errno); + Logger.logError(getErrorMessage(error), "GitHubContentProvider/create", error.errno); return this.createErrorAjaxResponse(error); } }) @@ -260,7 +260,7 @@ export class GitHubContentProvider implements IContentProvider { this.createContentModel(uri, gitHubFile, { content: 0 }) ); } catch (error) { - Logger.logError(error, "GitHubContentProvider/update", error.errno); + Logger.logError(getErrorMessage(error), "GitHubContentProvider/update", error.errno); return this.createErrorAjaxResponse(error); } }) @@ -269,25 +269,25 @@ export class GitHubContentProvider implements IContentProvider { public listCheckpoints(_: ServerConfig, path: string): Observable { const error = new GitHubContentProviderError("Not implemented"); - Logger.logError(error, "GitHubContentProvider/listCheckpoints", error.errno); + Logger.logError(error.message, "GitHubContentProvider/listCheckpoints", error.errno); return of(this.createErrorAjaxResponse(error)); } public createCheckpoint(_: ServerConfig, path: string): Observable { const error = new GitHubContentProviderError("Not implemented"); - Logger.logError(error, "GitHubContentProvider/createCheckpoint", error.errno); + Logger.logError(error.message, "GitHubContentProvider/createCheckpoint", error.errno); return of(this.createErrorAjaxResponse(error)); } public deleteCheckpoint(_: ServerConfig, path: string, checkpointID: string): Observable { const error = new GitHubContentProviderError("Not implemented"); - Logger.logError(error, "GitHubContentProvider/deleteCheckpoint", error.errno); + Logger.logError(error.message, "GitHubContentProvider/deleteCheckpoint", error.errno); return of(this.createErrorAjaxResponse(error)); } public restoreFromCheckpoint(_: ServerConfig, path: string, checkpointID: string): Observable { const error = new GitHubContentProviderError("Not implemented"); - Logger.logError(error, "GitHubContentProvider/restoreFromCheckpoint", error.errno); + Logger.logError(error.message, "GitHubContentProvider/restoreFromCheckpoint", error.errno); return of(this.createErrorAjaxResponse(error)); } diff --git a/src/GitHub/GitHubOAuthService.ts b/src/GitHub/GitHubOAuthService.ts index 746e79152..80a6d2c42 100644 --- a/src/GitHub/GitHubOAuthService.ts +++ b/src/GitHub/GitHubOAuthService.ts @@ -1,6 +1,5 @@ import ko from "knockout"; import { HttpStatusCodes } from "../Common/Constants"; -import * as Logger from "../Common/Logger"; import { configContext } from "../ConfigContext"; import { AuthorizeAccessComponent } from "../Explorer/Controls/GitHub/AuthorizeAccessComponent"; import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent"; @@ -8,6 +7,7 @@ import { JunoClient } from "../Juno/JunoClient"; import { isInvalidParentFrameOrigin } from "../Utils/MessageValidation"; import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils"; import { GitHubConnectorMsgType, IGitHubConnectorParams } from "./GitHubConnector"; +import { handleError } from "../Common/ErrorHandlingUtils"; window.addEventListener("message", (event: MessageEvent) => { if (isInvalidParentFrameOrigin(event)) { @@ -99,9 +99,7 @@ export class GitHubOAuthService { this.resetToken(); return true; } catch (error) { - const message = `Failed to delete app authorization: ${error}`; - Logger.logError(message, "GitHubOAuthService/logout"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(error, "GitHubOAuthService/logout", "Failed to delete app authorization"); return false; } } diff --git a/src/HostedExplorer.ts b/src/HostedExplorer.ts index ac24eeaea..30e97cf74 100644 --- a/src/HostedExplorer.ts +++ b/src/HostedExplorer.ts @@ -611,7 +611,7 @@ class HostedExplorer { return loadAccountResult; } catch (error) { LocalStorageUtility.removeEntry(StorageKey.DatabaseAccountId); - Logger.logError(error, "HostedExplorer/_getAccessCached"); + Logger.logError(getErrorMessage(error), "HostedExplorer/_getAccessCached"); throw error; } } @@ -637,7 +637,7 @@ class HostedExplorer { const accountResponse = this._getAccessAfterTenantSelection(defaultTenant.tenantId); return accountResponse; } catch (error) { - Logger.logError(error, "HostedExplorer/_getAccessNew"); + Logger.logError(getErrorMessage(error), "HostedExplorer/_getAccessNew"); throw error; } } @@ -658,7 +658,7 @@ class HostedExplorer { const keys = await this._getAccountKeysHelper(defaultAccount, true); return [defaultAccount, keys, authToken]; } catch (error) { - Logger.logError(error, "HostedExplorer/_getAccessAfterTenantSelection"); + Logger.logError(getErrorMessage(error), "HostedExplorer/_getAccessAfterTenantSelection"); throw error; } } @@ -1131,7 +1131,7 @@ class HostedExplorer { }); }, error => { - Logger.logError(error, "HostedExplorer/_onNewDirectorySelected"); + Logger.logError(getErrorMessage(error), "HostedExplorer/_onNewDirectorySelected"); } ); TelemetryProcessor.trace(Action.TenantSwitch); diff --git a/src/NotebookWorkspaceManager/NotebookWorkspaceManager.ts b/src/NotebookWorkspaceManager/NotebookWorkspaceManager.ts index 6e5a5d0a9..563645f25 100644 --- a/src/NotebookWorkspaceManager/NotebookWorkspaceManager.ts +++ b/src/NotebookWorkspaceManager/NotebookWorkspaceManager.ts @@ -7,6 +7,7 @@ import { NotebookWorkspaceFeedResponse } from "../Contracts/DataModels"; import { ResourceProviderClientFactory } from "../ResourceProvider/ResourceProviderClientFactory"; +import { getErrorMessage } from "../Common/ErrorHandlingUtils"; export class NotebookWorkspaceManager { private resourceProviderClientFactory: IResourceProviderClientFactory; @@ -24,7 +25,7 @@ export class NotebookWorkspaceManager { )) as NotebookWorkspaceFeedResponse; return response && response.value; } catch (error) { - Logger.logError(error, "NotebookWorkspaceManager/getNotebookWorkspacesAsync"); + Logger.logError(getErrorMessage(error), "NotebookWorkspaceManager/getNotebookWorkspacesAsync"); throw error; } } @@ -37,7 +38,7 @@ export class NotebookWorkspaceManager { try { return (await this.rpClient(uri).getAsync(uri, ArmApiVersions.documentDB)) as NotebookWorkspace; } catch (error) { - Logger.logError(error, "NotebookWorkspaceManager/getNotebookWorkspaceAsync"); + Logger.logError(getErrorMessage(error), "NotebookWorkspaceManager/getNotebookWorkspaceAsync"); throw error; } } @@ -47,7 +48,7 @@ export class NotebookWorkspaceManager { try { await this.rpClient(uri).putAsync(uri, ArmApiVersions.documentDB, { name: notebookWorkspaceId }); } catch (error) { - Logger.logError(error, "NotebookWorkspaceManager/createNotebookWorkspaceAsync"); + Logger.logError(getErrorMessage(error), "NotebookWorkspaceManager/createNotebookWorkspaceAsync"); throw error; } } @@ -57,7 +58,7 @@ export class NotebookWorkspaceManager { try { await this.rpClient(uri).deleteAsync(uri, ArmApiVersions.documentDB); } catch (error) { - Logger.logError(error, "NotebookWorkspaceManager/deleteNotebookWorkspaceAsync"); + Logger.logError(getErrorMessage(error), "NotebookWorkspaceManager/deleteNotebookWorkspaceAsync"); throw error; } } @@ -74,7 +75,7 @@ export class NotebookWorkspaceManager { undefined ); } catch (error) { - Logger.logError(error, "NotebookWorkspaceManager/getNotebookConnectionInfoAsync"); + Logger.logError(getErrorMessage(error), "NotebookWorkspaceManager/getNotebookConnectionInfoAsync"); throw error; } } @@ -86,7 +87,7 @@ export class NotebookWorkspaceManager { skipResourceValidation: true }); } catch (error) { - Logger.logError(error, "NotebookWorkspaceManager/startNotebookWorkspaceAsync"); + Logger.logError(getErrorMessage(error), "NotebookWorkspaceManager/startNotebookWorkspaceAsync"); throw error; } } diff --git a/src/Platform/Hosted/ArmResourceUtils.ts b/src/Platform/Hosted/ArmResourceUtils.ts index 998fbe868..dbe9a5f64 100644 --- a/src/Platform/Hosted/ArmResourceUtils.ts +++ b/src/Platform/Hosted/ArmResourceUtils.ts @@ -3,6 +3,7 @@ import * as Constants from "../../Common/Constants"; import * as Logger from "../../Common/Logger"; import { Tenant, Subscription, DatabaseAccount, AccountKeys } from "../../Contracts/DataModels"; import { configContext } from "../../ConfigContext"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; // TODO: 421864 - add a fetch wrapper export abstract class ArmResourceUtils { @@ -30,7 +31,7 @@ export abstract class ArmResourceUtils { } return tenants; } catch (error) { - Logger.logError(error, "ArmResourceUtils/listTenants"); + Logger.logError(getErrorMessage(error), "ArmResourceUtils/listTenants"); throw error; } } @@ -58,7 +59,7 @@ export abstract class ArmResourceUtils { } return subscriptions; } catch (error) { - Logger.logError(error, "ArmResourceUtils/listSubscriptions"); + Logger.logError(getErrorMessage(error), "ArmResourceUtils/listSubscriptions"); throw error; } } @@ -92,7 +93,7 @@ export abstract class ArmResourceUtils { } return accounts; } catch (error) { - Logger.logError(error, "ArmResourceUtils/listAccounts"); + Logger.logError(getErrorMessage(error), "ArmResourceUtils/listAccounts"); throw error; } } @@ -140,7 +141,7 @@ export abstract class ArmResourceUtils { } return result; } catch (error) { - Logger.logError(error, "ArmResourceUtils/getAccountKeys"); + Logger.logError(getErrorMessage(error), "ArmResourceUtils/getAccountKeys"); throw error; } } @@ -150,7 +151,7 @@ export abstract class ArmResourceUtils { const token = await AuthHeadersUtil.getAccessToken(ArmResourceUtils._armAuthArea, tenantId); return token; } catch (error) { - Logger.logError(error, "ArmResourceUtils/getAuthToken"); + Logger.logError(getErrorMessage(error), "ArmResourceUtils/getAuthToken"); throw error; } } diff --git a/src/SparkClusterManager/ArcadiaResourceManager.ts b/src/SparkClusterManager/ArcadiaResourceManager.ts index 28a699f64..68fa2318b 100644 --- a/src/SparkClusterManager/ArcadiaResourceManager.ts +++ b/src/SparkClusterManager/ArcadiaResourceManager.ts @@ -1,4 +1,3 @@ -import * as ViewModels from "../Contracts/ViewModels"; import { ArcadiaWorkspace, ArcadiaWorkspaceFeedResponse, @@ -10,6 +9,7 @@ import { IResourceProviderClient, IResourceProviderClientFactory } from "../Reso import * as Logger from "../Common/Logger"; import { ResourceProviderClientFactory } from "../ResourceProvider/ResourceProviderClientFactory"; import { configContext } from "../ConfigContext"; +import { getErrorMessage } from "../Common/ErrorHandlingUtils"; export class ArcadiaResourceManager { private resourceProviderClientFactory: IResourceProviderClientFactory; @@ -27,7 +27,7 @@ export class ArcadiaResourceManager { )) as ArcadiaWorkspaceFeedResponse; return response && response.value; } catch (error) { - Logger.logError(error, "ArcadiaResourceManager/getWorkspaceAsync"); + Logger.logError(getErrorMessage(error), "ArcadiaResourceManager/getWorkspaceAsync"); throw error; } } @@ -37,7 +37,7 @@ export class ArcadiaResourceManager { try { return (await this._rpClient(uri).getAsync(uri, ArmApiVersions.arcadia)) as ArcadiaWorkspace; } catch (error) { - Logger.logError(error, "ArcadiaResourceManager/getWorkspaceAsync"); + Logger.logError(getErrorMessage(error), "ArcadiaResourceManager/getWorkspaceAsync"); throw error; } } @@ -56,7 +56,7 @@ export class ArcadiaResourceManager { )) as ArcadiaWorkspaceFeedResponse; return response && response.value; } catch (error) { - Logger.logError(error, "ArcadiaManager/listWorkspacesAsync"); + Logger.logError(getErrorMessage(error), "ArcadiaManager/listWorkspacesAsync"); throw error; } } @@ -68,7 +68,7 @@ export class ArcadiaResourceManager { const response = (await this._rpClient(uri).getAsync(uri, ArmApiVersions.arcadia)) as SparkPoolFeedResponse; return response && response.value; } catch (error) { - Logger.logError(error, "ArcadiaManager/listSparkPoolsAsync"); + Logger.logError(getErrorMessage(error), "ArcadiaManager/listSparkPoolsAsync"); throw error; } } diff --git a/src/Utils/AuthorizationUtils.ts b/src/Utils/AuthorizationUtils.ts index 73c66d0a3..48f023dc9 100644 --- a/src/Utils/AuthorizationUtils.ts +++ b/src/Utils/AuthorizationUtils.ts @@ -5,6 +5,7 @@ import { AuthType } from "../AuthType"; import * as Logger from "../Common/Logger"; import { configContext, Platform } from "../ConfigContext"; import { userContext } from "../UserContext"; +import { getErrorMessage } from "../Common/ErrorHandlingUtils"; export function getAuthorizationHeader(): ViewModels.AuthorizationTokenHeaderMetadata { if (window.authType === AuthType.EncryptedToken) { @@ -28,7 +29,7 @@ export async function getArcadiaAuthToken( const token = await AuthHeadersUtil.getAccessToken(arcadiaEndpoint, tenantId); return token; } catch (error) { - Logger.logError(error, "AuthorizationUtils/getArcadiaAuthToken"); + Logger.logError(getErrorMessage(error), "AuthorizationUtils/getArcadiaAuthToken"); throw error; } } diff --git a/src/Utils/GalleryUtils.ts b/src/Utils/GalleryUtils.ts index 723b04144..99dee0f07 100644 --- a/src/Utils/GalleryUtils.ts +++ b/src/Utils/GalleryUtils.ts @@ -1,7 +1,6 @@ import { IGalleryItem, JunoClient } from "../Juno/JunoClient"; import * as NotificationConsoleUtils from "./NotificationConsoleUtils"; import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent"; -import * as Logger from "../Common/Logger"; import { GalleryTab, SortBy, @@ -10,6 +9,7 @@ import { import Explorer from "../Explorer/Explorer"; import { IChoiceGroupOption, IChoiceGroupProps } from "office-ui-fabric-react"; import { TextFieldProps } from "../Explorer/Controls/DialogReactComponent/DialogComponent"; +import { handleError } from "../Common/ErrorHandlingUtils"; const defaultSelectedAbuseCategory = "Other"; const abuseCategories: IChoiceGroupOption[] = [ @@ -122,9 +122,11 @@ export function reportAbuse( ); onComplete(response.data); } catch (error) { - const message = `Failed to submit report on ${data.name} violating code of conduct: ${error}`; - Logger.logError(message, "GalleryUtils/reportAbuse"); - NotificationConsoleUtils.logConsoleInfo(message); + handleError( + error, + "GalleryUtils/reportAbuse", + `Failed to submit report on ${data.name} violating code of conduct` + ); } clearSubmitReportNotification(); @@ -185,9 +187,7 @@ export function downloadItem( onComplete(increaseDownloadResponse.data); } } catch (error) { - const message = `Failed to download ${data.name}: ${error}`; - Logger.logError(message, "GalleryUtils/downloadItem"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(error, "GalleryUtils/downloadItem", `Failed to download ${data.name}`); } NotificationConsoleUtils.clearInProgressMessageWithId(notificationId); @@ -212,9 +212,7 @@ export async function favoriteItem( onComplete(response.data); } catch (error) { - const message = `Failed to favorite ${data.name}: ${error}`; - Logger.logError(message, "GalleryUtils/favoriteItem"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(error, "GalleryUtils/favoriteItem", `Failed to favorite ${data.name}`); } } } @@ -234,9 +232,7 @@ export async function unfavoriteItem( onComplete(response.data); } catch (error) { - const message = `Failed to unfavorite ${data.name}: ${error}`; - Logger.logError(message, "GalleryUtils/unfavoriteItem"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(error, "GalleryUtils/unfavoriteItem", `Failed to unfavorite ${data.name}`); } } } @@ -268,9 +264,7 @@ export function deleteItem( NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Info, `Successfully removed ${name} from gallery`); onComplete(response.data); } catch (error) { - const message = `Failed to remove ${name} from gallery: ${error}`; - Logger.logError(message, "GalleryUtils/deleteItem"); - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, message); + handleError(error, "GalleryUtils/deleteItem", `Failed to remove ${name} from gallery`); } NotificationConsoleUtils.clearInProgressMessageWithId(notificationId); diff --git a/src/Utils/NotebookConfigurationUtils.ts b/src/Utils/NotebookConfigurationUtils.ts index 815fa435e..20a10fc76 100644 --- a/src/Utils/NotebookConfigurationUtils.ts +++ b/src/Utils/NotebookConfigurationUtils.ts @@ -1,5 +1,6 @@ import * as DataModels from "../Contracts/DataModels"; import * as Logger from "../Common/Logger"; +import { getErrorMessage } from "../Common/ErrorHandlingUtils"; interface KernelConnectionMetadata { name: string; @@ -78,13 +79,13 @@ export class NotebookConfigurationUtils { if (!response.ok) { const responseMessage = await response.json(); Logger.logError( - JSON.stringify(responseMessage), + getErrorMessage(responseMessage), "NotebookConfigurationUtils/configureServiceEndpoints", response.status ); } } catch (error) { - Logger.logError(error, "NotebookConfigurationUtils/configureServiceEndpoints"); + Logger.logError(getErrorMessage(error), "NotebookConfigurationUtils/configureServiceEndpoints"); } } } From 53a8cea95e5ded17525895cc5ca1aa0c1d1555d3 Mon Sep 17 00:00:00 2001 From: Tanuj Mittal Date: Wed, 4 Nov 2020 16:11:36 -0800 Subject: [PATCH 07/13] Hide Settings for Cassandra Serverless accounts (#311) In case of Serverless Cassandra accounts we don't have any Settings to tweak in the Settings Tab. So this change hides the option to open Settings tab in those cases. --- src/Explorer/Tree/ResourceTreeAdapter.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Explorer/Tree/ResourceTreeAdapter.tsx b/src/Explorer/Tree/ResourceTreeAdapter.tsx index 6ef9f5623..b5bf40448 100644 --- a/src/Explorer/Tree/ResourceTreeAdapter.tsx +++ b/src/Explorer/Tree/ResourceTreeAdapter.tsx @@ -280,12 +280,14 @@ export class ResourceTreeAdapter implements ReactAdapter { contextMenu: ResourceTreeContextMenuButtonFactory.createCollectionContextMenuButton(this.container, collection) }); - children.push({ - label: database.isDatabaseShared() || this.container.isServerlessEnabled() ? "Settings" : "Scale & Settings", - onClick: collection.onSettingsClick.bind(collection), - isSelected: () => - this.isDataNodeSelected(collection.databaseId, collection.id(), [ViewModels.CollectionTabKind.Settings]) - }); + if (!this.container.isPreferredApiCassandra() || !this.container.isServerlessEnabled()) { + children.push({ + label: database.isDatabaseShared() || this.container.isServerlessEnabled() ? "Settings" : "Scale & Settings", + onClick: collection.onSettingsClick.bind(collection), + isSelected: () => + this.isDataNodeSelected(collection.databaseId, collection.id(), [ViewModels.CollectionTabKind.Settings]) + }); + } if (ResourceTreeAdapter.showScriptNodes(this.container)) { children.push(this.buildStoredProcedureNode(collection)); From 79dec6a8a8ac9da17ff80bf50cd95f61579c952c Mon Sep 17 00:00:00 2001 From: victor-meng <56978073+victor-meng@users.noreply.github.com> Date: Thu, 5 Nov 2020 20:02:57 -0800 Subject: [PATCH 08/13] Refactor error handling in data explorer Part 3 (#315) - Make sure we pass the error message string instead of an error object when we call `TelemetryProcessor.traceFailure` since TelemetryProcessor will call `JSON.stringify` on the error object which would result in an empty object - Removed ErrorParserUtility since it only works on specific error types. We can just log the full error message and manually derive information we need from the message. - Added option to include stack trace in `getErrorMessage`. This is useful for figuring out where the client side script errors are coming from. - Some minor refactors --- .eslintignore | 2 - src/Common/ErrorHandlingUtils.ts | 4 ++ src/Common/ErrorParserUtility.test.ts | 24 -------- src/Common/ErrorParserUtility.ts | 55 ------------------- src/Common/QueriesClient.ts | 13 ++--- src/Contracts/DataModels.ts | 12 ---- .../QueriesGridComponent.tsx | 5 +- .../Controls/Settings/SettingsComponent.tsx | 12 ++-- src/Explorer/Explorer.ts | 31 +++++++---- src/Explorer/Panes/AddCollectionPane.ts | 6 +- src/Explorer/Panes/AddDatabasePane.ts | 17 +++--- src/Explorer/Panes/BrowseQueriesPane.ts | 5 +- .../Panes/CassandraAddCollectionPane.ts | 9 ++- .../Panes/DeleteCollectionConfirmationPane.ts | 14 +++-- .../Panes/DeleteDatabaseConfirmationPane.ts | 15 ++--- src/Explorer/Panes/SaveQueryPane.ts | 8 ++- src/Explorer/Panes/SetupNotebooksPane.ts | 5 +- src/Explorer/Panes/UploadItemsPane.ts | 8 +-- src/Explorer/Panes/UploadItemsPaneAdapter.tsx | 8 +-- .../DataTable/TableEntityListViewModel.ts | 18 ++---- src/Explorer/Tabs/ConflictsTab.ts | 33 ++++++----- src/Explorer/Tabs/DatabaseSettingsTab.ts | 8 ++- src/Explorer/Tabs/DocumentsTab.ts | 42 ++++++++------ src/Explorer/Tabs/MongoDocumentsTab.ts | 28 ++++++---- src/Explorer/Tabs/QueryTab.html | 18 +++--- src/Explorer/Tabs/QueryTab.ts | 28 ++++------ src/Explorer/Tabs/SettingsTab.ts | 5 +- src/Explorer/Tabs/SettingsTabV2.tsx | 9 +-- src/Explorer/Tabs/StoredProcedureTab.ts | 11 +++- src/Explorer/Tabs/TriggerTab.ts | 9 ++- src/Explorer/Tabs/UserDefinedFunctionTab.ts | 9 ++- src/Explorer/Tree/Collection.ts | 9 ++- src/Explorer/Tree/Database.ts | 5 +- 33 files changed, 218 insertions(+), 267 deletions(-) delete mode 100644 src/Common/ErrorParserUtility.test.ts delete mode 100644 src/Common/ErrorParserUtility.ts diff --git a/.eslintignore b/.eslintignore index 65d47bd0e..5d9d08948 100644 --- a/.eslintignore +++ b/.eslintignore @@ -15,8 +15,6 @@ src/Common/DeleteFeedback.ts src/Common/DocumentClientUtilityBase.ts src/Common/EditableUtility.ts src/Common/EnvironmentUtility.ts -src/Common/ErrorParserUtility.test.ts -src/Common/ErrorParserUtility.ts src/Common/HashMap.test.ts src/Common/HashMap.ts src/Common/HeadersUtility.test.ts diff --git a/src/Common/ErrorHandlingUtils.ts b/src/Common/ErrorHandlingUtils.ts index 2e2f51365..f384f6b73 100644 --- a/src/Common/ErrorHandlingUtils.ts +++ b/src/Common/ErrorHandlingUtils.ts @@ -26,6 +26,10 @@ export const getErrorMessage = (error: string | Error): string => { return replaceKnownError(errorMessage); }; +export const getErrorStack = (error: string | Error): string => { + return typeof error === "string" ? undefined : error.stack; +}; + const sendNotificationForError = (errorMessage: string, errorCode: number | string): void => { if (errorCode === HttpStatusCodes.Forbidden) { if (errorMessage?.toLowerCase().indexOf("sharedoffer is disabled for your account") > 0) { diff --git a/src/Common/ErrorParserUtility.test.ts b/src/Common/ErrorParserUtility.test.ts deleted file mode 100644 index a08c5f575..000000000 --- a/src/Common/ErrorParserUtility.test.ts +++ /dev/null @@ -1,24 +0,0 @@ -import * as ErrorParserUtility from "./ErrorParserUtility"; - -describe("Error Parser Utility", () => { - describe("shouldEnableCrossPartitionKeyForResourceWithPartitionKey()", () => { - it("should parse a backend error correctly", () => { - // A fake error matching what is thrown by the SDK on a bad collection create request - const innerMessage = - "The partition key component definition path '/asdwqr31 @#$#$WRadf' could not be accepted, failed near position '10'. Partition key paths must contain only valid characters and not contain a trailing slash or wildcard character."; - const message = `Message: {\"Errors\":[\"${innerMessage}\"]}\r\nActivityId: 97b2e684-7505-4921-85f6-2513b9b28220, Request URI: /apps/89fdcf25-2a0b-4d2a-aab6-e161e565b26f/services/54911149-7bb1-4e7d-a1fa-22c8b36a4bb9/partitions/cc2a7a04-5f5a-4709-bcf7-8509b264963f/replicas/132304018743619218p, RequestStats: , SDK: Microsoft.Azure.Documents.Common/2.10.0`; - const err = new Error(message) as any; - err.code = 400; - err.body = { - code: "BadRequest", - message - }; - err.headers = {}; - err.activityId = "97b2e684-7505-4921-85f6-2513b9b28220"; - - const parsedError = ErrorParserUtility.parse(err); - expect(parsedError.length).toBe(1); - expect(parsedError[0].message).toBe(innerMessage); - }); - }); -}); diff --git a/src/Common/ErrorParserUtility.ts b/src/Common/ErrorParserUtility.ts deleted file mode 100644 index 968737f5c..000000000 --- a/src/Common/ErrorParserUtility.ts +++ /dev/null @@ -1,55 +0,0 @@ -import * as DataModels from "../Contracts/DataModels"; - -export function parse(err: any): DataModels.ErrorDataModel[] { - try { - return _parse(err); - } catch (e) { - return [{ message: JSON.stringify(err) }]; - } -} - -function _parse(err: any): DataModels.ErrorDataModel[] { - var normalizedErrors: DataModels.ErrorDataModel[] = []; - if (err.message && !err.code) { - normalizedErrors.push(err); - } else { - const innerErrors: any[] = _getInnerErrors(err.message); - normalizedErrors = innerErrors.map(innerError => - typeof innerError === "string" ? { message: innerError } : innerError - ); - } - - return normalizedErrors; -} - -function _getInnerErrors(message: string): any[] { - /* - The backend error message has an inner-message which is a stringified object. - - For SQL errors, the "errors" property is an array of SqlErrorDataModel. - Example: - "Message: {"Errors":["Resource with specified id or name already exists"]}\r\nActivityId: 80005000008d40b6a, Request URI: /apps/19000c000c0a0005/services/mctestdocdbprod-MasterService-0-00066ab9937/partitions/900005f9000e676fb8/replicas/13000000000955p" - For non-SQL errors the "Errors" propery is an array of string. - Example: - "Message: {"errors":[{"severity":"Error","location":{"start":7,"end":8},"code":"SC1001","message":"Syntax error, incorrect syntax near '.'."}]}\r\nActivityId: d3300016d4084e310a, Request URI: /apps/12401f9e1df77/services/dc100232b1f44545/partitions/f86f3bc0001a2f78/replicas/13085003638s" - */ - - let innerMessage: any = null; - - const singleLineMessage = message.replace(/[\r\n]|\r|\n/g, ""); - try { - // Multi-Partition error flavor - const regExp = /^(.*)ActivityId: (.*)/g; - const regString = regExp.exec(singleLineMessage); - const innerMessageString = regString[1]; - innerMessage = JSON.parse(innerMessageString); - } catch (e) { - // Single-partition error flavor - const regExp = /^Message: (.*)ActivityId: (.*), Request URI: (.*)/g; - const regString = regExp.exec(singleLineMessage); - const innerMessageString = regString[1]; - innerMessage = JSON.parse(innerMessageString); - } - - return innerMessage.errors ? innerMessage.errors : innerMessage.Errors; -} diff --git a/src/Common/QueriesClient.ts b/src/Common/QueriesClient.ts index fb81d1c65..a7f28f7b7 100644 --- a/src/Common/QueriesClient.ts +++ b/src/Common/QueriesClient.ts @@ -13,7 +13,6 @@ import { userContext } from "../UserContext"; import { createDocument, deleteDocument, queryDocuments, queryDocumentsPage } from "./DocumentClientUtilityBase"; import { createCollection } from "./dataAccess/createCollection"; import { handleError } from "./ErrorHandlingUtils"; -import * as ErrorParserUtility from "./ErrorParserUtility"; export class QueriesClient { private static readonly PartitionKey: DataModels.PartitionKey = { @@ -97,15 +96,11 @@ export class QueriesClient { return Promise.resolve(); }, (error: any) => { - let errorMessage: string; - const parsedError: DataModels.ErrorDataModel = ErrorParserUtility.parse(error)[0]; - if (parsedError.code === HttpStatusCodes.Conflict.toString()) { - errorMessage = `Query ${query.queryName} already exists`; - } else { - errorMessage = parsedError.message; + if (error.code === HttpStatusCodes.Conflict.toString()) { + error = `Query ${query.queryName} already exists`; } - handleError(errorMessage, "saveQuery", `Failed to save query ${query.queryName}`); - return Promise.reject(errorMessage); + handleError(error, "saveQuery", `Failed to save query ${query.queryName}`); + return Promise.reject(error); } ) .finally(() => NotificationConsoleUtils.clearInProgressMessageWithId(id)); diff --git a/src/Contracts/DataModels.ts b/src/Contracts/DataModels.ts index b1a467b63..3aadf14cd 100644 --- a/src/Contracts/DataModels.ts +++ b/src/Contracts/DataModels.ts @@ -216,18 +216,6 @@ export interface UniqueKey { paths: string[]; } -// Returned by DocumentDb client proxy -// Inner errors in BackendErrorDataModel when error is in SQL syntax -export interface ErrorDataModel { - message: string; - severity?: string; - location?: { - start: string; - end: string; - }; - code?: string; -} - export interface CreateDatabaseAndCollectionRequest { databaseId: string; collectionId: string; diff --git a/src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx b/src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx index 636736577..2b732ce89 100644 --- a/src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx +++ b/src/Explorer/Controls/QueriesGridReactComponent/QueriesGridComponent.tsx @@ -28,6 +28,7 @@ import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcesso import SaveQueryBannerIcon from "../../../../images/save_query_banner.png"; import { QueriesClient } from "../../../Common/QueriesClient"; +import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils"; export interface QueriesGridComponentProps { queriesClient: QueriesClient; @@ -244,7 +245,9 @@ export class QueriesGridComponent extends React.Component { + error => { if (resourceTreeStartKey != null) { TelemetryProcessor.traceFailure( Action.LoadResourceTree, @@ -1484,7 +1485,8 @@ export default class Explorer { databaseAccountName: this.databaseAccount() && this.databaseAccount().name, defaultExperience: this.defaultExperience && this.defaultExperience(), dataExplorerArea: Constants.Areas.ResourceTree, - error: reason + error: getErrorMessage(error), + errorStack: getErrorStack(error) }, resourceTreeStartKey ); @@ -1689,7 +1691,10 @@ export default class Explorer { TelemetryProcessor.traceSuccess(Action.ResetNotebookWorkspace); } catch (error) { NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, `Failed to reset notebook workspace: ${error}`); - TelemetryProcessor.traceFailure(Action.ResetNotebookWorkspace, error); + TelemetryProcessor.traceFailure(Action.ResetNotebookWorkspace, { + error: getErrorMessage(error), + errorStack: getErrorStack(error) + }); throw error; } finally { NotificationConsoleUtils.clearInProgressMessageWithId(id); @@ -2056,7 +2061,8 @@ export default class Explorer { databaseAccountName: this.databaseAccount() && this.databaseAccount().name, defaultExperience: this.defaultExperience && this.defaultExperience(), dataExplorerArea: Constants.Areas.ResourceTree, - trace: getErrorMessage(error) + error: getErrorMessage(error), + errorStack: getErrorStack(error) }, startKey ); @@ -2718,16 +2724,17 @@ export default class Explorer { return this.openNotebook(newFile); }) .then(() => this.resourceTree.triggerRender()) - .catch((reason: any) => { - const error = `Failed to create a new notebook: ${reason}`; - NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error); + .catch((error: any) => { + const errorMessage = `Failed to create a new notebook: ${getErrorMessage(error)}`; + NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, errorMessage); TelemetryProcessor.traceFailure( Action.CreateNewNotebook, { databaseAccountName: this.databaseAccount().name, defaultExperience: this.defaultExperience(), dataExplorerArea: Constants.Areas.Notebook, - error + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); diff --git a/src/Explorer/Panes/AddCollectionPane.ts b/src/Explorer/Panes/AddCollectionPane.ts index 8c38a7809..204435904 100644 --- a/src/Explorer/Panes/AddCollectionPane.ts +++ b/src/Explorer/Panes/AddCollectionPane.ts @@ -3,7 +3,6 @@ import * as AddCollectionUtility from "../../Shared/AddCollectionUtility"; import * as AutoPilotUtils from "../../Utils/AutoPilotUtils"; import * as Constants from "../../Common/Constants"; import * as DataModels from "../../Contracts/DataModels"; -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import * as ko from "knockout"; import * as PricingUtils from "../../Utils/PricingUtils"; import * as SharedConstants from "../../Shared/Constants"; @@ -15,7 +14,7 @@ import { configContext, Platform } from "../../ConfigContext"; import { ContextualPaneBase } from "./ContextualPaneBase"; import { DynamicListItem } from "../Controls/DynamicList/DynamicListComponent"; import { createCollection } from "../../Common/dataAccess/createCollection"; -import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export interface AddCollectionPaneOptions extends ViewModels.PaneOptions { isPreferredApiTable: ko.Computed; @@ -912,7 +911,8 @@ export default class AddCollectionPane extends ContextualPaneBase { flight: this.container.flight() }, dataExplorerArea: Constants.Areas.ContextualPane, - error: errorMessage + error: errorMessage, + errorStack: getErrorStack(error) }; TelemetryProcessor.traceFailure(Action.CreateCollection, addCollectionPaneFailedMessage, startKey); } diff --git a/src/Explorer/Panes/AddDatabasePane.ts b/src/Explorer/Panes/AddDatabasePane.ts index b91496161..2010a1c60 100644 --- a/src/Explorer/Panes/AddDatabasePane.ts +++ b/src/Explorer/Panes/AddDatabasePane.ts @@ -1,7 +1,6 @@ import * as AutoPilotUtils from "../../Utils/AutoPilotUtils"; import * as Constants from "../../Common/Constants"; import * as DataModels from "../../Contracts/DataModels"; -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import * as ko from "knockout"; import * as PricingUtils from "../../Utils/PricingUtils"; import * as SharedConstants from "../../Shared/Constants"; @@ -12,6 +11,7 @@ import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstan import { ContextualPaneBase } from "./ContextualPaneBase"; import { createDatabase } from "../../Common/dataAccess/createDatabase"; import { configContext, Platform } from "../../ConfigContext"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class AddDatabasePane extends ContextualPaneBase { public defaultExperience: ko.Computed; @@ -306,8 +306,8 @@ export default class AddDatabasePane extends ContextualPaneBase { (database: DataModels.Database) => { this._onCreateDatabaseSuccess(offerThroughput, startKey); }, - (reason: any) => { - this._onCreateDatabaseFailure(reason, offerThroughput, reason); + (error: any) => { + this._onCreateDatabaseFailure(error, offerThroughput, startKey); } ); } @@ -356,11 +356,11 @@ export default class AddDatabasePane extends ContextualPaneBase { this.resetData(); } - private _onCreateDatabaseFailure(reason: any, offerThroughput: number, startKey: number): void { + private _onCreateDatabaseFailure(error: any, offerThroughput: number, startKey: number): void { this.isExecuting(false); - const message = ErrorParserUtility.parse(reason); - this.formErrors(message[0].message); - this.formErrorsDetails(message[0].message); + const errorMessage = getErrorMessage(error); + this.formErrors(errorMessage); + this.formErrorsDetails(errorMessage); const addDatabasePaneFailedMessage = { databaseAccountName: this.container.databaseAccount().name, defaultExperience: this.container.defaultExperience(), @@ -375,7 +375,8 @@ export default class AddDatabasePane extends ContextualPaneBase { flight: this.container.flight() }, dataExplorerArea: Constants.Areas.ContextualPane, - error: reason + error: errorMessage, + errorStack: getErrorStack(error) }; TelemetryProcessor.traceFailure(Action.CreateDatabase, addDatabasePaneFailedMessage, startKey); } diff --git a/src/Explorer/Panes/BrowseQueriesPane.ts b/src/Explorer/Panes/BrowseQueriesPane.ts index af3ef0a15..06ad64eef 100644 --- a/src/Explorer/Panes/BrowseQueriesPane.ts +++ b/src/Explorer/Panes/BrowseQueriesPane.ts @@ -7,7 +7,7 @@ import * as Logger from "../../Common/Logger"; import { QueriesGridComponentAdapter } from "../Controls/QueriesGridReactComponent/QueriesGridComponentAdapter"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import QueryTab from "../Tabs/QueryTab"; -import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export class BrowseQueriesPane extends ContextualPaneBase { public queriesGridComponentAdapter: QueriesGridComponentAdapter; @@ -69,7 +69,8 @@ export class BrowseQueriesPane extends ContextualPaneBase { defaultExperience: this.container && this.container.defaultExperience(), dataExplorerArea: Areas.ContextualPane, paneTitle: this.title(), - error: errorMessage + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); diff --git a/src/Explorer/Panes/CassandraAddCollectionPane.ts b/src/Explorer/Panes/CassandraAddCollectionPane.ts index 5ba82c627..1fa823a75 100644 --- a/src/Explorer/Panes/CassandraAddCollectionPane.ts +++ b/src/Explorer/Panes/CassandraAddCollectionPane.ts @@ -13,6 +13,7 @@ import { CassandraAPIDataClient } from "../Tables/TableDataClient"; import { ContextualPaneBase } from "./ContextualPaneBase"; import { HashMap } from "../../Common/HashMap"; import { configContext, Platform } from "../../ConfigContext"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class CassandraAddCollectionPane extends ContextualPaneBase { public createTableQuery: ko.Observable; @@ -429,8 +430,9 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase { }; TelemetryProcessor.traceSuccess(Action.CreateCollection, addCollectionPaneSuccessMessage, startKey); }, - reason => { - this.formErrors(reason.exceptionMessage); + error => { + const errorMessage = getErrorMessage(error); + this.formErrors(errorMessage); this.isExecuting(false); const addCollectionPaneFailedMessage = { databaseAccountName: this.container.databaseAccount().name, @@ -456,7 +458,8 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase { toCreateKeyspace: toCreateKeyspace, createKeyspaceQuery: createKeyspaceQuery, createTableQuery: createTableQuery, - error: reason + error: errorMessage, + errorStack: getErrorStack(error) }; TelemetryProcessor.traceFailure(Action.CreateCollection, addCollectionPaneFailedMessage, startKey); } diff --git a/src/Explorer/Panes/DeleteCollectionConfirmationPane.ts b/src/Explorer/Panes/DeleteCollectionConfirmationPane.ts index 5af4cd9d4..2c5e67e1e 100644 --- a/src/Explorer/Panes/DeleteCollectionConfirmationPane.ts +++ b/src/Explorer/Panes/DeleteCollectionConfirmationPane.ts @@ -3,7 +3,6 @@ import Q from "q"; import * as ViewModels from "../../Contracts/ViewModels"; import * as Constants from "../../Common/Constants"; import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants"; -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import { CassandraAPIDataClient } from "../Tables/TableDataClient"; import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent"; import { ContextualPaneBase } from "./ContextualPaneBase"; @@ -12,6 +11,7 @@ import DeleteFeedback from "../../Common/DeleteFeedback"; import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import { deleteCollection } from "../../Common/dataAccess/deleteCollection"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class DeleteCollectionConfirmationPane extends ContextualPaneBase { public collectionIdConfirmationText: ko.Observable; @@ -99,11 +99,11 @@ export default class DeleteCollectionConfirmationPane extends ContextualPaneBase this.containerDeleteFeedback(""); } }, - (reason: any) => { + (error: any) => { this.isExecuting(false); - const message = ErrorParserUtility.parse(reason); - this.formErrors(message[0].message); - this.formErrorsDetails(message[0].message); + const errorMessage = getErrorMessage(error); + this.formErrors(errorMessage); + this.formErrorsDetails(errorMessage); TelemetryProcessor.traceFailure( Action.DeleteCollection, { @@ -111,7 +111,9 @@ export default class DeleteCollectionConfirmationPane extends ContextualPaneBase defaultExperience: this.container.defaultExperience(), collectionId: selectedCollection.id(), dataExplorerArea: Constants.Areas.ContextualPane, - paneTitle: this.title() + paneTitle: this.title(), + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); diff --git a/src/Explorer/Panes/DeleteDatabaseConfirmationPane.ts b/src/Explorer/Panes/DeleteDatabaseConfirmationPane.ts index 980d41ee8..4ec595601 100644 --- a/src/Explorer/Panes/DeleteDatabaseConfirmationPane.ts +++ b/src/Explorer/Panes/DeleteDatabaseConfirmationPane.ts @@ -3,7 +3,6 @@ import Q from "q"; import * as Constants from "../../Common/Constants"; import * as ViewModels from "../../Contracts/ViewModels"; import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants"; -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import { CassandraAPIDataClient } from "../Tables/TableDataClient"; import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent"; import { ContextualPaneBase } from "./ContextualPaneBase"; @@ -14,6 +13,7 @@ import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils" import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import { deleteDatabase } from "../../Common/dataAccess/deleteDatabase"; import { ARMError } from "../../Utils/arm/request"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class DeleteDatabaseConfirmationPane extends ContextualPaneBase { public databaseIdConfirmationText: ko.Observable; @@ -108,12 +108,11 @@ export default class DeleteDatabaseConfirmationPane extends ContextualPaneBase { this.databaseDeleteFeedback(""); } }, - (reason: unknown) => { + (error: any) => { this.isExecuting(false); - - const message = reason instanceof ARMError ? reason.message : ErrorParserUtility.parse(reason)[0].message; - this.formErrors(message); - this.formErrorsDetails(message); + const errorMessage = getErrorMessage(error); + this.formErrors(errorMessage); + this.formErrorsDetails(errorMessage); TelemetryProcessor.traceFailure( Action.DeleteDatabase, { @@ -121,7 +120,9 @@ export default class DeleteDatabaseConfirmationPane extends ContextualPaneBase { defaultExperience: this.container.defaultExperience(), databaseId: selectedDatabase.id(), dataExplorerArea: Constants.Areas.ContextualPane, - paneTitle: this.title() + paneTitle: this.title(), + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); diff --git a/src/Explorer/Panes/SaveQueryPane.ts b/src/Explorer/Panes/SaveQueryPane.ts index b379f6d3a..3ddc6756d 100644 --- a/src/Explorer/Panes/SaveQueryPane.ts +++ b/src/Explorer/Panes/SaveQueryPane.ts @@ -8,7 +8,7 @@ import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsol import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import QueryTab from "../Tabs/QueryTab"; -import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export class SaveQueryPane extends ContextualPaneBase { public queryName: ko.Observable; @@ -98,7 +98,8 @@ export class SaveQueryPane extends ContextualPaneBase { defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.ContextualPane, paneTitle: this.title(), - error: errorMessage + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); @@ -140,7 +141,8 @@ export class SaveQueryPane extends ContextualPaneBase { defaultExperience: this.container && this.container.defaultExperience(), dataExplorerArea: Constants.Areas.ContextualPane, paneTitle: this.title(), - error: errorMessage + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); diff --git a/src/Explorer/Panes/SetupNotebooksPane.ts b/src/Explorer/Panes/SetupNotebooksPane.ts index a95bcb667..8f00572ea 100644 --- a/src/Explorer/Panes/SetupNotebooksPane.ts +++ b/src/Explorer/Panes/SetupNotebooksPane.ts @@ -6,7 +6,7 @@ import { ContextualPaneBase } from "./ContextualPaneBase"; import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import * as ko from "knockout"; -import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export class SetupNotebooksPane extends ContextualPaneBase { private description: ko.Observable; @@ -94,7 +94,8 @@ export class SetupNotebooksPane extends ContextualPaneBase { defaultExperience: this.container && this.container.defaultExperience(), dataExplorerArea: Areas.ContextualPane, paneTitle: this.title(), - error: errorMessage + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); diff --git a/src/Explorer/Panes/UploadItemsPane.ts b/src/Explorer/Panes/UploadItemsPane.ts index 7b1f227a9..a1d4255eb 100644 --- a/src/Explorer/Panes/UploadItemsPane.ts +++ b/src/Explorer/Panes/UploadItemsPane.ts @@ -4,8 +4,8 @@ import * as ViewModels from "../../Contracts/ViewModels"; import { ContextualPaneBase } from "./ContextualPaneBase"; import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent"; import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import { UploadDetailsRecord, UploadDetails } from "../../workers/upload/definitions"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; const UPLOAD_FILE_SIZE_LIMIT = 2097152; @@ -61,9 +61,9 @@ export class UploadItemsPane extends ContextualPaneBase { this._resetFileInput(); }, (error: any) => { - const message = ErrorParserUtility.parse(error); - this.formErrors(message[0].message); - this.formErrorsDetails(message[0].message); + const errorMessage = getErrorMessage(error); + this.formErrors(errorMessage); + this.formErrorsDetails(errorMessage); } ) .finally(() => { diff --git a/src/Explorer/Panes/UploadItemsPaneAdapter.tsx b/src/Explorer/Panes/UploadItemsPaneAdapter.tsx index 4c78501cc..37e514c61 100644 --- a/src/Explorer/Panes/UploadItemsPaneAdapter.tsx +++ b/src/Explorer/Panes/UploadItemsPaneAdapter.tsx @@ -1,4 +1,3 @@ -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import * as ko from "knockout"; import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils"; import * as React from "react"; @@ -9,6 +8,7 @@ import { ReactAdapter } from "../../Bindings/ReactBindingHandler"; import { UploadDetailsRecord, UploadDetails } from "../../workers/upload/definitions"; import { UploadItemsPaneComponent, UploadItemsPaneProps } from "./UploadItemsPaneComponent"; import Explorer from "../Explorer"; +import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; const UPLOAD_FILE_SIZE_LIMIT = 2097152; @@ -107,9 +107,9 @@ export class UploadItemsPaneAdapter implements ReactAdapter { this.selectedFilesTitle = ""; }, error => { - const message = ErrorParserUtility.parse(error); - this.formError = message[0].message; - this.formErrorDetail = message[0].message; + const errorMessage = getErrorMessage(error); + this.formError = errorMessage; + this.formErrorDetail = errorMessage; } ) .finally(() => { diff --git a/src/Explorer/Tables/DataTable/TableEntityListViewModel.ts b/src/Explorer/Tables/DataTable/TableEntityListViewModel.ts index 0ae172404..1991d7012 100644 --- a/src/Explorer/Tables/DataTable/TableEntityListViewModel.ts +++ b/src/Explorer/Tables/DataTable/TableEntityListViewModel.ts @@ -16,9 +16,9 @@ import * as Entities from "../Entities"; import QueryTablesTab from "../../Tabs/QueryTablesTab"; import * as TableEntityProcessor from "../TableEntityProcessor"; import * as TelemetryProcessor from "../../../Shared/Telemetry/TelemetryProcessor"; -import * as ErrorParserUtility from "../../../Common/ErrorParserUtility"; import * as DataModels from "../../../Contracts/DataModels"; import * as ViewModels from "../../../Contracts/ViewModels"; +import { getErrorMessage, getErrorStack } from "../../../Common/ErrorHandlingUtils"; interface IListTableEntitiesSegmentedResult extends Entities.IListTableEntitiesResult { ExceedMaximumRetries?: boolean; @@ -387,17 +387,8 @@ export default class TableEntityListViewModel extends DataTableViewModel { } }) .catch((error: any) => { - const parsedErrors = ErrorParserUtility.parse(error); - var errors = parsedErrors.map((error: DataModels.ErrorDataModel) => { - return { - message: error.message, - start: error.location ? error.location.start : undefined, - end: error.location ? error.location.end : undefined, - code: error.code, - severity: error.severity - }; - }); - this.queryErrorMessage(errors[0].message); + const errorMessage = getErrorMessage(error); + this.queryErrorMessage(errorMessage); if (this.queryTablesTab.onLoadStartKey != null && this.queryTablesTab.onLoadStartKey != undefined) { TelemetryProcessor.traceFailure( Action.Tab, @@ -408,7 +399,8 @@ export default class TableEntityListViewModel extends DataTableViewModel { defaultExperience: this.queryTablesTab.collection.container.defaultExperience(), dataExplorerArea: Areas.Tab, tabTitle: this.queryTablesTab.tabTitle(), - error: error + error: errorMessage, + errorStack: getErrorStack(error) }, this.queryTablesTab.onLoadStartKey ); diff --git a/src/Explorer/Tabs/ConflictsTab.ts b/src/Explorer/Tabs/ConflictsTab.ts index a5c188805..bbe5370c0 100644 --- a/src/Explorer/Tabs/ConflictsTab.ts +++ b/src/Explorer/Tabs/ConflictsTab.ts @@ -6,7 +6,6 @@ import * as ViewModels from "../../Contracts/ViewModels"; import { Action } from "../../Shared/Telemetry/TelemetryConstants"; import { AccessibleVerticalList } from "../Tree/AccessibleVerticalList"; import { KeyCodes } from "../../Common/Constants"; -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import ConflictId from "../Tree/ConflictId"; import editable from "../../Common/EditableUtility"; import * as HeadersUtility from "../../Common/HeadersUtility"; @@ -28,6 +27,7 @@ import { updateDocument } from "../../Common/DocumentClientUtilityBase"; import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class ConflictsTab extends TabsBase { public selectedConflictId: ko.Observable; @@ -241,9 +241,8 @@ export default class ConflictsTab extends TabsBase { return this.loadNextPage(); } ) - .catch(reason => { - const message = ErrorParserUtility.parse(reason)[0].message; - window.alert(message); + .catch(error => { + window.alert(getErrorMessage(error)); }); } @@ -336,10 +335,10 @@ export default class ConflictsTab extends TabsBase { ); }); }, - reason => { + error => { this.isExecutionError(true); - const message = ErrorParserUtility.parse(reason)[0].message; - window.alert(message); + const errorMessage = getErrorMessage(error); + window.alert(errorMessage); TelemetryProcessor.traceFailure( Action.ResolveConflict, { @@ -349,7 +348,9 @@ export default class ConflictsTab extends TabsBase { tabTitle: this.tabTitle(), conflictResourceType: selectedConflict.resourceType, conflictOperationType: selectedConflict.operationType, - conflictResourceId: selectedConflict.resourceId + conflictResourceId: selectedConflict.resourceId, + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); @@ -396,10 +397,10 @@ export default class ConflictsTab extends TabsBase { startKey ); }, - reason => { + error => { this.isExecutionError(true); - const message = ErrorParserUtility.parse(reason)[0].message; - window.alert(message); + const errorMessage = getErrorMessage(error); + window.alert(errorMessage); TelemetryProcessor.traceFailure( Action.DeleteConflict, { @@ -409,7 +410,9 @@ export default class ConflictsTab extends TabsBase { tabTitle: this.tabTitle(), conflictResourceType: selectedConflict.resourceType, conflictOperationType: selectedConflict.operationType, - conflictResourceId: selectedConflict.resourceId + conflictResourceId: selectedConflict.resourceId, + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); @@ -470,7 +473,8 @@ export default class ConflictsTab extends TabsBase { defaultExperience: this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: this.tabTitle(), - error: error + error: getErrorMessage(error), + errorStack: getErrorStack(error) }, this.onLoadStartKey ); @@ -545,7 +549,8 @@ export default class ConflictsTab extends TabsBase { defaultExperience: this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: this.tabTitle(), - error: error + error: getErrorMessage(error), + errorStack: getErrorStack(error) }, this.onLoadStartKey ); diff --git a/src/Explorer/Tabs/DatabaseSettingsTab.ts b/src/Explorer/Tabs/DatabaseSettingsTab.ts index cd32dc301..085d7d3be 100644 --- a/src/Explorer/Tabs/DatabaseSettingsTab.ts +++ b/src/Explorer/Tabs/DatabaseSettingsTab.ts @@ -1,7 +1,6 @@ import * as AutoPilotUtils from "../../Utils/AutoPilotUtils"; import * as Constants from "../../Common/Constants"; import * as DataModels from "../../Contracts/DataModels"; -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import * as ko from "knockout"; import * as PricingUtils from "../../Utils/PricingUtils"; import * as SharedConstants from "../../Shared/Constants"; @@ -20,6 +19,7 @@ import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandBu import { userContext } from "../../UserContext"; import { updateOfferThroughputBeyondLimit } from "../../Common/dataAccess/updateOfferThroughputBeyondLimit"; import { configContext, Platform } from "../../ConfigContext"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; const updateThroughputBeyondLimitWarningMessage: string = ` You are about to request an increase in throughput beyond the pre-allocated capacity. @@ -490,7 +490,8 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels. this.container.isRefreshingExplorer(false); this.isExecutionError(true); console.error(error); - this.displayedError(ErrorParserUtility.parse(error)[0].message); + const errorMessage = getErrorMessage(error); + this.displayedError(errorMessage); TelemetryProcessor.traceFailure( Action.UpdateSettings, { @@ -499,7 +500,8 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels. defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: this.tabTitle(), - error: error + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); diff --git a/src/Explorer/Tabs/DocumentsTab.ts b/src/Explorer/Tabs/DocumentsTab.ts index 368c85ada..03fd9777c 100644 --- a/src/Explorer/Tabs/DocumentsTab.ts +++ b/src/Explorer/Tabs/DocumentsTab.ts @@ -6,7 +6,6 @@ import * as ViewModels from "../../Contracts/ViewModels"; import { Action } from "../../Shared/Telemetry/TelemetryConstants"; import { AccessibleVerticalList } from "../Tree/AccessibleVerticalList"; import { KeyCodes } from "../../Common/Constants"; -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import DocumentId from "../Tree/DocumentId"; import editable from "../../Common/EditableUtility"; import * as HeadersUtility from "../../Common/HeadersUtility"; @@ -32,7 +31,7 @@ import { createDocument } from "../../Common/DocumentClientUtilityBase"; import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent"; -import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class DocumentsTab extends TabsBase { public selectedDocumentId: ko.Observable; @@ -393,9 +392,8 @@ export default class DocumentsTab extends TabsBase { const focusElement = document.getElementById("errorStatusIcon"); focusElement && focusElement.focus(); }) - .catch(reason => { - const message = ErrorParserUtility.parse(reason)[0].message; - window.alert(message); + .catch(error => { + window.alert(getErrorMessage(error)); }); } @@ -475,17 +473,19 @@ export default class DocumentsTab extends TabsBase { startKey ); }, - reason => { + error => { this.isExecutionError(true); - const message = ErrorParserUtility.parse(reason)[0].message; - window.alert(message); + const errorMessage = getErrorMessage(error); + window.alert(errorMessage); TelemetryProcessor.traceFailure( Action.CreateDocument, { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); @@ -542,17 +542,19 @@ export default class DocumentsTab extends TabsBase { startKey ); }, - reason => { + error => { this.isExecutionError(true); - const message = ErrorParserUtility.parse(reason)[0].message; - window.alert(message); + const errorMessage = getErrorMessage(error); + window.alert(errorMessage); TelemetryProcessor.traceFailure( Action.UpdateDocument, { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); @@ -643,7 +645,8 @@ export default class DocumentsTab extends TabsBase { defaultExperience: this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: this.tabTitle(), - error: error + error: getErrorMessage(error), + errorStack: getErrorStack(error) }, this.onLoadStartKey ); @@ -697,16 +700,18 @@ export default class DocumentsTab extends TabsBase { startKey ); }, - reason => { + error => { this.isExecutionError(true); - console.error(reason); + console.error(error); TelemetryProcessor.traceFailure( Action.DeleteDocument, { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: getErrorMessage(error), + errorStack: getErrorStack(error) }, startKey ); @@ -787,7 +792,8 @@ export default class DocumentsTab extends TabsBase { defaultExperience: this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: this.tabTitle(), - error: errorMessage + error: errorMessage, + errorStack: getErrorStack(error) }, this.onLoadStartKey ); diff --git a/src/Explorer/Tabs/MongoDocumentsTab.ts b/src/Explorer/Tabs/MongoDocumentsTab.ts index 491f3adf0..e685d5b9c 100644 --- a/src/Explorer/Tabs/MongoDocumentsTab.ts +++ b/src/Explorer/Tabs/MongoDocumentsTab.ts @@ -4,7 +4,6 @@ import * as ko from "knockout"; import * as ViewModels from "../../Contracts/ViewModels"; import DocumentId from "../Tree/DocumentId"; import DocumentsTab from "./DocumentsTab"; -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import MongoUtility from "../../Common/MongoUtility"; import ObjectId from "../Tree/ObjectId"; import Q from "q"; @@ -20,6 +19,7 @@ import { import { extractPartitionKey } from "@azure/cosmos"; import * as Logger from "../../Common/Logger"; import { PartitionKeyDefinition } from "@azure/cosmos"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class MongoDocumentsTab extends DocumentsTab { public collection: ViewModels.Collection; @@ -72,7 +72,8 @@ export default class MongoDocumentsTab extends DocumentsTab { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: message }, startKey ); @@ -114,17 +115,19 @@ export default class MongoDocumentsTab extends DocumentsTab { startKey ); }, - reason => { + error => { this.isExecutionError(true); - const message = ErrorParserUtility.parse(reason)[0].message; - window.alert(message); + const errorMessage = getErrorMessage(error); + window.alert(errorMessage); TelemetryProcessor.traceFailure( Action.CreateDocument, { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); @@ -176,17 +179,19 @@ export default class MongoDocumentsTab extends DocumentsTab { startKey ); }, - reason => { + error => { this.isExecutionError(true); - const message = ErrorParserUtility.parse(reason)[0].message; - window.alert(message); + const errorMessage = getErrorMessage(error); + window.alert(errorMessage); TelemetryProcessor.traceFailure( Action.UpdateDocument, { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); @@ -267,7 +272,8 @@ export default class MongoDocumentsTab extends DocumentsTab { defaultExperience: this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: this.tabTitle(), - error: error + error: getErrorMessage(error), + errorStack: getErrorStack(error) }, this.onLoadStartKey ); diff --git a/src/Explorer/Tabs/QueryTab.html b/src/Explorer/Tabs/QueryTab.html index 2f0483d03..0d16152da 100644 --- a/src/Explorer/Tabs/QueryTab.html +++ b/src/Explorer/Tabs/QueryTab.html @@ -47,7 +47,7 @@ -
+
Errors
@@ -56,16 +56,16 @@

Execute Query Watermark

Execute a query to see the results

-
+
@@ -308,11 +308,10 @@ id: { href: 'queryerrors' + tabId }, - visible: errors().length > 0" + visible: !!error()" > -
- +
- diff --git a/src/Explorer/Tabs/QueryTab.ts b/src/Explorer/Tabs/QueryTab.ts index c2cf92f91..4461a5d38 100644 --- a/src/Explorer/Tabs/QueryTab.ts +++ b/src/Explorer/Tabs/QueryTab.ts @@ -4,7 +4,6 @@ import * as Constants from "../../Common/Constants"; import * as DataModels from "../../Contracts/DataModels"; import * as ViewModels from "../../Contracts/ViewModels"; import { Action } from "../../Shared/Telemetry/TelemetryConstants"; -import * as ErrorParserUtility from "../../Common/ErrorParserUtility"; import TabsBase from "./TabsBase"; import { HashMap } from "../../Common/HashMap"; import * as HeadersUtility from "../../Common/HeadersUtility"; @@ -18,6 +17,7 @@ import SaveQueryIcon from "../../../images/save-cosmos.svg"; import { MinimalQueryIterator } from "../../Common/IteratorUtilities"; import { queryDocuments, queryDocumentsPage } from "../../Common/DocumentClientUtilityBase"; import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; enum ToggleState { Result, @@ -34,7 +34,7 @@ export default class QueryTab extends TabsBase implements ViewModels.WaitsForTem public selectedContent: ko.Observable; public sqlStatementToExecute: ko.Observable; public queryResults: ko.Observable; - public errors: ko.ObservableArray; + public error: ko.Observable; public statusMessge: ko.Observable; public statusIcon: ko.Observable; public allResultsMetadata: ko.ObservableArray; @@ -82,7 +82,7 @@ export default class QueryTab extends TabsBase implements ViewModels.WaitsForTem this.statusMessge = ko.observable(); this.statusIcon = ko.observable(); this.allResultsMetadata = ko.observableArray([]); - this.errors = ko.observableArray([]); + this.error = ko.observable(); this._partitionKey = options.partitionKey; this._resourceTokenPartitionKey = options.resourceTokenPartitionKey; this.splitterId = this.tabId + "_splitter"; @@ -266,7 +266,7 @@ export default class QueryTab extends TabsBase implements ViewModels.WaitsForTem }; private _executeQueryDocumentsPage(firstItemIndex: number): Q.Promise { - this.errors([]); + this.error(""); this.roundTrips(undefined); if (this._iterator == null) { const queryIteratorPromise = this._initIterator(); @@ -350,27 +350,19 @@ export default class QueryTab extends TabsBase implements ViewModels.WaitsForTem startKey ); }, - (reason: any) => { + (error: any) => { this.isExecutionError(true); - const parsedErrors = ErrorParserUtility.parse(reason); - var errors = parsedErrors.map((error: DataModels.ErrorDataModel) => { - return { - message: error.message, - start: error.location ? error.location.start : undefined, - end: error.location ? error.location.end : undefined, - code: error.code, - severity: error.severity - }; - }); - - this.errors(errors); + const errorMessage = getErrorMessage(error); + this.error(errorMessage); TelemetryProcessor.traceFailure( Action.ExecuteQuery, { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); diff --git a/src/Explorer/Tabs/SettingsTab.ts b/src/Explorer/Tabs/SettingsTab.ts index 29dfbe9fc..95088879b 100644 --- a/src/Explorer/Tabs/SettingsTab.ts +++ b/src/Explorer/Tabs/SettingsTab.ts @@ -22,7 +22,7 @@ import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandBu import { userContext } from "../../UserContext"; import { updateOfferThroughputBeyondLimit } from "../../Common/dataAccess/updateOfferThroughputBeyondLimit"; import { configContext, Platform } from "../../ConfigContext"; -import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; const ttlWarning: string = ` The system will automatically delete items based on the TTL value (in seconds) you provide, without needing a delete operation explicitly issued by a client application. @@ -1175,7 +1175,8 @@ export default class SettingsTab extends TabsBase implements ViewModels.WaitsFor defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: this.tabTitle(), - error: getErrorMessage(error) + error: getErrorMessage(error), + errorStack: getErrorStack(error) }, startKey ); diff --git a/src/Explorer/Tabs/SettingsTabV2.tsx b/src/Explorer/Tabs/SettingsTabV2.tsx index 149ccdd6d..634c0ac3b 100644 --- a/src/Explorer/Tabs/SettingsTabV2.tsx +++ b/src/Explorer/Tabs/SettingsTabV2.tsx @@ -9,6 +9,7 @@ import ko from "knockout"; import * as Constants from "../../Common/Constants"; import { Action } from "../../Shared/Telemetry/TelemetryConstants"; import { logConsoleError } from "../../Utils/NotificationConsoleUtils"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class SettingsTabV2 extends TabsBase { public settingsComponentAdapter: SettingsComponentAdapter; @@ -55,6 +56,7 @@ export default class SettingsTabV2 extends TabsBase { this.isExecuting(false); }, error => { + const errorMessage = getErrorMessage(error); this.notification = undefined; this.notificationRead(true); this.isExecuting(false); @@ -67,14 +69,13 @@ export default class SettingsTabV2 extends TabsBase { defaultExperience: this.options.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: this.tabTitle, - error: error + error: errorMessage, + errorStack: getErrorStack(error) }, this.options.onLoadStartKey ); logConsoleError( - `Error while fetching container settings for container ${this.options.collection.id()}: ${JSON.stringify( - error - )}` + `Error while fetching container settings for container ${this.options.collection.id()}: ${errorMessage}` ); throw error; } diff --git a/src/Explorer/Tabs/StoredProcedureTab.ts b/src/Explorer/Tabs/StoredProcedureTab.ts index 49065cb9e..b86400022 100644 --- a/src/Explorer/Tabs/StoredProcedureTab.ts +++ b/src/Explorer/Tabs/StoredProcedureTab.ts @@ -13,6 +13,7 @@ import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent"; import StoredProcedure from "../Tree/StoredProcedure"; import ScriptTabBase from "./ScriptTabBase"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; enum ToggleState { Result = "result", @@ -104,7 +105,7 @@ export default class StoredProcedureTab extends ScriptTabBase { startKey ); }, - (updateError: any) => { + (error: any) => { this.isExecutionError(true); TelemetryProcessor.traceFailure( Action.UpdateStoredProcedure, @@ -112,7 +113,9 @@ export default class StoredProcedureTab extends ScriptTabBase { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: getErrorMessage(error), + errorStack: getErrorStack(error) }, startKey ); @@ -274,7 +277,9 @@ export default class StoredProcedureTab extends ScriptTabBase { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: getErrorMessage(createError), + errorStack: getErrorStack(createError) }, startKey ); diff --git a/src/Explorer/Tabs/TriggerTab.ts b/src/Explorer/Tabs/TriggerTab.ts index 74e623738..2351d7e56 100644 --- a/src/Explorer/Tabs/TriggerTab.ts +++ b/src/Explorer/Tabs/TriggerTab.ts @@ -8,6 +8,7 @@ import { Action } from "../../Shared/Telemetry/TelemetryConstants"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import Trigger from "../Tree/Trigger"; import ScriptTabBase from "./ScriptTabBase"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class TriggerTab extends ScriptTabBase { public collection: ViewModels.Collection; @@ -86,7 +87,9 @@ export default class TriggerTab extends ScriptTabBase { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: getErrorMessage(createError), + errorStack: getErrorStack(createError) }, startKey ); @@ -168,7 +171,9 @@ export default class TriggerTab extends ScriptTabBase { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: getErrorMessage(createError), + errorStack: getErrorStack(createError) }, startKey ); diff --git a/src/Explorer/Tabs/UserDefinedFunctionTab.ts b/src/Explorer/Tabs/UserDefinedFunctionTab.ts index 41d803476..88e23a9fc 100644 --- a/src/Explorer/Tabs/UserDefinedFunctionTab.ts +++ b/src/Explorer/Tabs/UserDefinedFunctionTab.ts @@ -7,6 +7,7 @@ import { Action } from "../../Shared/Telemetry/TelemetryConstants"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import UserDefinedFunction from "../Tree/UserDefinedFunction"; import ScriptTabBase from "./ScriptTabBase"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class UserDefinedFunctionTab extends ScriptTabBase { public collection: ViewModels.Collection; @@ -68,7 +69,9 @@ export default class UserDefinedFunctionTab extends ScriptTabBase { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: getErrorMessage(createError), + errorStack: getErrorStack(createError) }, startKey ); @@ -143,7 +146,9 @@ export default class UserDefinedFunctionTab extends ScriptTabBase { databaseAccountName: this.collection && this.collection.container.databaseAccount().name, defaultExperience: this.collection && this.collection.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, - tabTitle: this.tabTitle() + tabTitle: this.tabTitle(), + error: getErrorMessage(createError), + errorStack: getErrorStack(createError) }, startKey ); diff --git a/src/Explorer/Tree/Collection.ts b/src/Explorer/Tree/Collection.ts index a1921cda7..c5db74aeb 100644 --- a/src/Explorer/Tree/Collection.ts +++ b/src/Explorer/Tree/Collection.ts @@ -40,7 +40,7 @@ import Explorer from "../Explorer"; import { userContext } from "../../UserContext"; import TabsBase from "../Tabs/TabsBase"; import { fetchPortalNotifications } from "../../Common/PortalNotifications"; -import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class Collection implements ViewModels.Collection { public nodeKind: string; @@ -621,7 +621,8 @@ export default class Collection implements ViewModels.Collection { defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: settingsTabOptions.title, - error: errorMessage + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); @@ -1368,7 +1369,9 @@ export default class Collection implements ViewModels.Collection { databaseAccountName: this.container.databaseAccount().name, databaseName: this.databaseId, collectionName: this.id(), - defaultExperience: this.container.defaultExperience() + defaultExperience: this.container.defaultExperience(), + error: getErrorMessage(error), + errorStack: getErrorStack(error) }, startKey ); diff --git a/src/Explorer/Tree/Database.ts b/src/Explorer/Tree/Database.ts index 83bb3c361..304774bfd 100644 --- a/src/Explorer/Tree/Database.ts +++ b/src/Explorer/Tree/Database.ts @@ -16,7 +16,7 @@ import { readCollections } from "../../Common/dataAccess/readCollections"; import { readDatabaseOffer } from "../../Common/dataAccess/readDatabaseOffer"; import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType"; import { fetchPortalNotifications } from "../../Common/PortalNotifications"; -import { getErrorMessage } from "../../Common/ErrorHandlingUtils"; +import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; export default class Database implements ViewModels.Database { public nodeKind: string; @@ -99,7 +99,8 @@ export default class Database implements ViewModels.Database { defaultExperience: this.container.defaultExperience(), dataExplorerArea: Constants.Areas.Tab, tabTitle: "Scale", - error: errorMessage + error: errorMessage, + errorStack: getErrorStack(error) }, startKey ); From a133134b8b4c6dcff7ddf8521cecdc2370cb86b6 Mon Sep 17 00:00:00 2001 From: victor-meng <56978073+victor-meng@users.noreply.github.com> Date: Mon, 9 Nov 2020 15:22:51 -0800 Subject: [PATCH 09/13] Fix create and delete database (#317) --- src/Explorer/Panes/AddDatabasePane.ts | 10 +++++++--- src/Utils/arm/request.ts | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Explorer/Panes/AddDatabasePane.ts b/src/Explorer/Panes/AddDatabasePane.ts index 2010a1c60..c47b36e7e 100644 --- a/src/Explorer/Panes/AddDatabasePane.ts +++ b/src/Explorer/Panes/AddDatabasePane.ts @@ -296,12 +296,16 @@ export default class AddDatabasePane extends ContextualPaneBase { this.isExecuting(true); const createDatabaseParams: DataModels.CreateDatabaseParams = { - autoPilotMaxThroughput: this.maxAutoPilotThroughputSet(), databaseId: addDatabasePaneStartMessage.database.id, - databaseLevelThroughput: addDatabasePaneStartMessage.database.shared, - offerThroughput: addDatabasePaneStartMessage.offerThroughput + databaseLevelThroughput: addDatabasePaneStartMessage.database.shared }; + if (this.isAutoPilotSelected()) { + createDatabaseParams.autoPilotMaxThroughput = this.maxAutoPilotThroughputSet(); + } else { + createDatabaseParams.offerThroughput = addDatabasePaneStartMessage.offerThroughput; + } + createDatabase(createDatabaseParams).then( (database: DataModels.Database) => { this._onCreateDatabaseSuccess(offerThroughput, startKey); diff --git a/src/Utils/arm/request.ts b/src/Utils/arm/request.ts index e40e38b8f..443ec9c44 100644 --- a/src/Utils/arm/request.ts +++ b/src/Utils/arm/request.ts @@ -93,6 +93,10 @@ async function getOperationStatus(operationStatusUrl: string) { throw new AbortError(error); } + if (response.status === 204) { + return; + } + const body = await response.json(); const status = body.status; if (!status && response.status === 200) { From addcfedd5e398c4db11a1074874c474291b8c77a Mon Sep 17 00:00:00 2001 From: Steve Faulkner Date: Thu, 12 Nov 2020 13:35:39 -0600 Subject: [PATCH 10/13] MinRU survey for SettingsV2 component (#320) Adds survey link to remove the RU/GB minimum on an account --- src/Common/Constants.ts | 1 + src/Common/ErrorHandlingUtils.ts | 2 +- src/Contracts/SubscriptionType.ts | 7 ++++ src/Contracts/ViewModels.ts | 9 +---- .../SettingsSubComponents/ScaleComponent.tsx | 1 + ...roughputInputAutoPilotV3Component.test.tsx | 1 + .../ThroughputInputAutoPilotV3Component.tsx | 34 ++++++++++++++++--- src/Explorer/Explorer.ts | 10 +++--- src/Explorer/Panes/AddCollectionPane.ts | 15 ++++---- src/Explorer/Panes/AddDatabasePane.test.ts | 12 +++---- src/Explorer/Panes/AddDatabasePane.ts | 14 ++++---- .../Panes/CassandraAddCollectionPane.ts | 9 ++--- src/Shared/Constants.ts | 2 +- src/UserContext.ts | 2 ++ tsconfig.strict.json | 14 ++++++++ 15 files changed, 89 insertions(+), 44 deletions(-) create mode 100644 src/Contracts/SubscriptionType.ts diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index a7b50d6f6..32b629149 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -126,6 +126,7 @@ export class Features { public static readonly ttl90Days = "ttl90days"; public static readonly enableRightPanelV2 = "enablerightpanelv2"; public static readonly enableSDKoperations = "enablesdkoperations"; + public static readonly showMinRUSurvey = "showminrusurvey"; } // flight names returned from the portal are always lowercase diff --git a/src/Common/ErrorHandlingUtils.ts b/src/Common/ErrorHandlingUtils.ts index f384f6b73..0491fab77 100644 --- a/src/Common/ErrorHandlingUtils.ts +++ b/src/Common/ErrorHandlingUtils.ts @@ -1,7 +1,7 @@ import { ARMError } from "../Utils/arm/request"; import { HttpStatusCodes } from "./Constants"; import { MessageTypes } from "../Contracts/ExplorerContracts"; -import { SubscriptionType } from "../Contracts/ViewModels"; +import { SubscriptionType } from "../Contracts/SubscriptionType"; import { logConsoleError } from "../Utils/NotificationConsoleUtils"; import { logError } from "./Logger"; import { sendMessage } from "./MessageHandler"; diff --git a/src/Contracts/SubscriptionType.ts b/src/Contracts/SubscriptionType.ts new file mode 100644 index 000000000..9768dd835 --- /dev/null +++ b/src/Contracts/SubscriptionType.ts @@ -0,0 +1,7 @@ +export enum SubscriptionType { + Benefits, + EA, + Free, + Internal, + PAYG +} diff --git a/src/Contracts/ViewModels.ts b/src/Contracts/ViewModels.ts index ea27df1f3..94f6ac2ec 100644 --- a/src/Contracts/ViewModels.ts +++ b/src/Contracts/ViewModels.ts @@ -17,6 +17,7 @@ import Trigger from "../Explorer/Tree/Trigger"; import UserDefinedFunction from "../Explorer/Tree/UserDefinedFunction"; import { UploadDetails } from "../workers/upload/definitions"; import * as DataModels from "./DataModels"; +import { SubscriptionType } from "./SubscriptionType"; export interface TokenProvider { getAuthHeader(): Promise; @@ -412,14 +413,6 @@ export interface ThroughputDefaults { shared: number; } -export enum SubscriptionType { - Benefits, - EA, - Free, - Internal, - PAYG -} - export class MonacoEditorSettings { public readonly language: string; public readonly readOnly: boolean; diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx index c25bea722..af4ee478b 100644 --- a/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx @@ -200,6 +200,7 @@ export class ScaleComponent extends React.Component { onScaleSaveableChange={this.props.onScaleSaveableChange} onScaleDiscardableChange={this.props.onScaleDiscardableChange} getThroughputWarningMessage={this.getThroughputWarningMessage} + usageSizeInKB={this.props.collection.quotaInfo().usageSizeInKB} /> ); diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.test.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.test.tsx index ab56c7d73..2ccf70079 100644 --- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.test.tsx +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.test.tsx @@ -17,6 +17,7 @@ describe("ThroughputInputAutoPilotV3Component", () => { minimum: 10000, maximum: 400, step: 100, + usageSizeInKB: 10000, isEnabled: true, isEmulator: false, spendAckChecked: false, diff --git a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx index 3dce4dddd..f3efba887 100644 --- a/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx +++ b/src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx @@ -30,6 +30,10 @@ import { getSanitizedInputValue, IsComponentDirtyResult, isDirty } from "../../S import * as SharedConstants from "../../../../../Shared/Constants"; import * as DataModels from "../../../../../Contracts/DataModels"; import { Int32 } from "../../../../Panes/Tables/Validators/EntityPropertyValidationCommon"; +import { userContext } from "../../../../../UserContext"; +import { SubscriptionType } from "../../../../../Contracts/SubscriptionType"; +import { usageInGB } from "../../../../../Utils/PricingUtils"; +import { Features } from "../../../../../Common/Constants"; export interface ThroughputInputAutoPilotV3Props { databaseAccount: DataModels.DatabaseAccount; @@ -60,6 +64,7 @@ export interface ThroughputInputAutoPilotV3Props { onScaleSaveableChange: (isScaleSaveable: boolean) => void; onScaleDiscardableChange: (isScaleDiscardable: boolean) => void; getThroughputWarningMessage: () => JSX.Element; + usageSizeInKB: number; } interface ThroughputInputAutoPilotV3State { @@ -224,6 +229,29 @@ export class ThroughputInputAutoPilotV3Component extends React.Component< option?: IChoiceGroupOption ): void => this.props.onAutoPilotSelected(option.key === "true"); + private minRUperGBSurvey = (): JSX.Element => { + const href = `https://ncv.microsoft.com/vRBTO37jmO?ctx={"AzureSubscriptionId":"${userContext.subscriptionId}","CosmosDBAccountName":"${userContext.databaseAccount?.name}"}`; + const oneTBinKB = 1000000000; + const minRUperGB = 10; + const featureFlagEnabled = window.dataExplorer?.isFeatureEnabled(Features.showMinRUSurvey); + const collectionIsEligible = + userContext.subscriptionType !== SubscriptionType.Internal && + this.props.usageSizeInKB > oneTBinKB && + this.props.minimum >= usageInGB(this.props.usageSizeInKB) * minRUperGB; + if (featureFlagEnabled || collectionIsEligible) { + return ( + + Need to scale below {this.props.minimum} RU/s? Reach out by filling{" "} + + this questionnaire + + . + + ); + } + return undefined; + }; + private renderThroughputModeChoices = (): JSX.Element => { const labelId = "settingsV2RadioButtonLabelId"; return ( @@ -275,6 +303,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component< onChange={this.onAutoPilotThroughputChange} /> {!this.overrideWithProvisionedThroughputSettings() && this.getAutoPilotUsageCost()} + {this.minRUperGBSurvey()} {this.props.spendAckVisible && ( - {this.props.getThroughputWarningMessage() && ( {this.props.getThroughputWarningMessage()} )} - {!this.props.isEmulator && this.getRequestUnitsUsageCost()} - + {this.minRUperGBSurvey()} {this.props.spendAckVisible && ( )} - {this.props.isFixed &&

When using a collection with fixed storage capacity, you can set up to 10,000 RU/s.

} ); diff --git a/src/Explorer/Explorer.ts b/src/Explorer/Explorer.ts index bb64e2a73..bb7fbce2d 100644 --- a/src/Explorer/Explorer.ts +++ b/src/Explorer/Explorer.ts @@ -87,6 +87,7 @@ import { updateUserContext, userContext } from "../UserContext"; import { stringToBlob } from "../Utils/BlobUtils"; import { IChoiceGroupProps } from "office-ui-fabric-react"; import { getErrorMessage, handleError, getErrorStack } from "../Common/ErrorHandlingUtils"; +import { SubscriptionType } from "../Contracts/SubscriptionType"; BindingHandlersRegisterer.registerBindingHandlers(); // Hold a reference to ComponentRegisterer to prevent transpiler to ignore import @@ -119,7 +120,7 @@ export default class Explorer { public databaseAccount: ko.Observable; public collectionCreationDefaults: ViewModels.CollectionCreationDefaults = SharedConstants.CollectionCreationDefaults; - public subscriptionType: ko.Observable; + public subscriptionType: ko.Observable; public quotaId: ko.Observable; public defaultExperience: ko.Observable; public isPreferredApiDocumentDB: ko.Computed; @@ -278,9 +279,7 @@ export default class Explorer { this.refreshTreeTitle = ko.observable("Refresh collections"); this.databaseAccount = ko.observable(); - this.subscriptionType = ko.observable( - SharedConstants.CollectionCreation.DefaultSubscriptionType - ); + this.subscriptionType = ko.observable(SharedConstants.CollectionCreation.DefaultSubscriptionType); this.quotaId = ko.observable(""); let firstInitialization = true; this.isRefreshingExplorer = ko.observable(true); @@ -1890,7 +1889,8 @@ export default class Explorer { masterKey, databaseAccount, resourceGroup: inputs.resourceGroup, - subscriptionId: inputs.subscriptionId + subscriptionId: inputs.subscriptionId, + subscriptionType: inputs.subscriptionType }); TelemetryProcessor.traceSuccess( Action.LoadDatabaseAccount, diff --git a/src/Explorer/Panes/AddCollectionPane.ts b/src/Explorer/Panes/AddCollectionPane.ts index 204435904..62a700d54 100644 --- a/src/Explorer/Panes/AddCollectionPane.ts +++ b/src/Explorer/Panes/AddCollectionPane.ts @@ -7,6 +7,7 @@ import * as ko from "knockout"; import * as PricingUtils from "../../Utils/PricingUtils"; import * as SharedConstants from "../../Shared/Constants"; import * as ViewModels from "../../Contracts/ViewModels"; +import { SubscriptionType } from "../../Contracts/SubscriptionType"; import editable from "../../Common/EditableUtility"; import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor"; import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants"; @@ -648,10 +649,8 @@ export default class AddCollectionPane extends ContextualPaneBase { } public getSharedThroughputDefault(): boolean { - const subscriptionType: ViewModels.SubscriptionType = - this.container.subscriptionType && this.container.subscriptionType(); - - if (subscriptionType === ViewModels.SubscriptionType.EA || this.container.isServerlessEnabled()) { + const subscriptionType = this.container.subscriptionType && this.container.subscriptionType(); + if (subscriptionType === SubscriptionType.EA || this.container.isServerlessEnabled()) { return false; } @@ -690,7 +689,7 @@ export default class AddCollectionPane extends ContextualPaneBase { databaseId: this.databaseId(), rupm: this.rupm() }), - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { storage: this.storage() === Constants.BackendDefaults.singlePartitionStorageInGb ? "f" : "u", @@ -793,7 +792,7 @@ export default class AddCollectionPane extends ContextualPaneBase { uniqueKeyPolicy, collectionWithThroughputInShared: this.collectionWithThroughputInShared() }), - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { storage: this.storage() === Constants.BackendDefaults.singlePartitionStorageInGb ? "f" : "u", @@ -868,7 +867,7 @@ export default class AddCollectionPane extends ContextualPaneBase { uniqueKeyPolicy, collectionWithThroughputInShared: this.collectionWithThroughputInShared() }), - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { storage: this.storage() === Constants.BackendDefaults.singlePartitionStorageInGb ? "f" : "u", @@ -903,7 +902,7 @@ export default class AddCollectionPane extends ContextualPaneBase { uniqueKeyPolicy, collectionWithThroughputInShared: this.collectionWithThroughputInShared() }, - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { storage: this.storage() === Constants.BackendDefaults.singlePartitionStorageInGb ? "f" : "u", diff --git a/src/Explorer/Panes/AddDatabasePane.test.ts b/src/Explorer/Panes/AddDatabasePane.test.ts index 1a78b5326..d5844eedf 100644 --- a/src/Explorer/Panes/AddDatabasePane.test.ts +++ b/src/Explorer/Panes/AddDatabasePane.test.ts @@ -1,5 +1,5 @@ import * as Constants from "../../Common/Constants"; -import * as ViewModels from "../../Contracts/ViewModels"; +import { SubscriptionType } from "../../Contracts/SubscriptionType"; import Explorer from "../Explorer"; import AddDatabasePane from "./AddDatabasePane"; import { DatabaseAccount } from "../../Contracts/DataModels"; @@ -44,31 +44,31 @@ describe("Add Database Pane", () => { }); it("should be true if subscription type is Benefits", () => { - explorer.subscriptionType(ViewModels.SubscriptionType.Benefits); + explorer.subscriptionType(SubscriptionType.Benefits); const addDatabasePane = explorer.addDatabasePane as AddDatabasePane; expect(addDatabasePane.getSharedThroughputDefault()).toBe(true); }); it("should be false if subscription type is EA", () => { - explorer.subscriptionType(ViewModels.SubscriptionType.EA); + explorer.subscriptionType(SubscriptionType.EA); const addDatabasePane = explorer.addDatabasePane as AddDatabasePane; expect(addDatabasePane.getSharedThroughputDefault()).toBe(false); }); it("should be true if subscription type is Free", () => { - explorer.subscriptionType(ViewModels.SubscriptionType.Free); + explorer.subscriptionType(SubscriptionType.Free); const addDatabasePane = explorer.addDatabasePane as AddDatabasePane; expect(addDatabasePane.getSharedThroughputDefault()).toBe(true); }); it("should be true if subscription type is Internal", () => { - explorer.subscriptionType(ViewModels.SubscriptionType.Internal); + explorer.subscriptionType(SubscriptionType.Internal); const addDatabasePane = explorer.addDatabasePane as AddDatabasePane; expect(addDatabasePane.getSharedThroughputDefault()).toBe(true); }); it("should be true if subscription type is PAYG", () => { - explorer.subscriptionType(ViewModels.SubscriptionType.PAYG); + explorer.subscriptionType(SubscriptionType.PAYG); const addDatabasePane = explorer.addDatabasePane as AddDatabasePane; expect(addDatabasePane.getSharedThroughputDefault()).toBe(true); }); diff --git a/src/Explorer/Panes/AddDatabasePane.ts b/src/Explorer/Panes/AddDatabasePane.ts index c47b36e7e..8081c7cc8 100644 --- a/src/Explorer/Panes/AddDatabasePane.ts +++ b/src/Explorer/Panes/AddDatabasePane.ts @@ -12,6 +12,7 @@ import { ContextualPaneBase } from "./ContextualPaneBase"; import { createDatabase } from "../../Common/dataAccess/createDatabase"; import { configContext, Platform } from "../../ConfigContext"; import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; +import { SubscriptionType } from "../../Contracts/SubscriptionType"; export default class AddDatabasePane extends ContextualPaneBase { public defaultExperience: ko.Computed; @@ -256,7 +257,7 @@ export default class AddDatabasePane extends ContextualPaneBase { const addDatabasePaneOpenMessage = { databaseAccountName: this.container.databaseAccount().name, defaultExperience: this.container.defaultExperience(), - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { throughput: this.throughput(), @@ -284,7 +285,7 @@ export default class AddDatabasePane extends ContextualPaneBase { shared: this.databaseCreateNewShared() }), offerThroughput, - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { flight: this.container.flight() @@ -327,10 +328,9 @@ export default class AddDatabasePane extends ContextualPaneBase { } public getSharedThroughputDefault(): boolean { - const subscriptionType: ViewModels.SubscriptionType = - this.container.subscriptionType && this.container.subscriptionType(); + const subscriptionType = this.container.subscriptionType && this.container.subscriptionType(); - if (subscriptionType === ViewModels.SubscriptionType.EA || this.container.isServerlessEnabled()) { + if (subscriptionType === SubscriptionType.EA || this.container.isServerlessEnabled()) { return false; } @@ -349,7 +349,7 @@ export default class AddDatabasePane extends ContextualPaneBase { shared: this.databaseCreateNewShared() }), offerThroughput: offerThroughput, - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { flight: this.container.flight() @@ -373,7 +373,7 @@ export default class AddDatabasePane extends ContextualPaneBase { shared: this.databaseCreateNewShared() }), offerThroughput: offerThroughput, - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { flight: this.container.flight() diff --git a/src/Explorer/Panes/CassandraAddCollectionPane.ts b/src/Explorer/Panes/CassandraAddCollectionPane.ts index 1fa823a75..864f4c386 100644 --- a/src/Explorer/Panes/CassandraAddCollectionPane.ts +++ b/src/Explorer/Panes/CassandraAddCollectionPane.ts @@ -14,6 +14,7 @@ import { ContextualPaneBase } from "./ContextualPaneBase"; import { HashMap } from "../../Common/HashMap"; import { configContext, Platform } from "../../ConfigContext"; import { getErrorMessage, getErrorStack } from "../../Common/ErrorHandlingUtils"; +import { SubscriptionType } from "../../Contracts/SubscriptionType"; export default class CassandraAddCollectionPane extends ContextualPaneBase { public createTableQuery: ko.Observable; @@ -314,7 +315,7 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase { databaseId: this.keyspaceId(), rupm: false }), - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { storage: "u", @@ -369,7 +370,7 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase { hasDedicatedThroughput: this.dedicateTableThroughput() }), keyspaceHasSharedOffer: this.keyspaceHasSharedOffer(), - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { storage: "u", @@ -416,7 +417,7 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase { hasDedicatedThroughput: this.dedicateTableThroughput() }), keyspaceHasSharedOffer: this.keyspaceHasSharedOffer(), - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { storage: "u", @@ -447,7 +448,7 @@ export default class CassandraAddCollectionPane extends ContextualPaneBase { hasDedicatedThroughput: this.dedicateTableThroughput() }, keyspaceHasSharedOffer: this.keyspaceHasSharedOffer(), - subscriptionType: ViewModels.SubscriptionType[this.container.subscriptionType()], + subscriptionType: SubscriptionType[this.container.subscriptionType()], subscriptionQuotaId: this.container.quotaId(), defaultsCheck: { storage: "u", diff --git a/src/Shared/Constants.ts b/src/Shared/Constants.ts index 9cf5cb402..303217a59 100644 --- a/src/Shared/Constants.ts +++ b/src/Shared/Constants.ts @@ -1,4 +1,4 @@ -import { SubscriptionType } from "../Contracts/ViewModels"; +import { SubscriptionType } from "../Contracts/SubscriptionType"; export const hoursInAMonth = 730; export class AutoscalePricing { diff --git a/src/UserContext.ts b/src/UserContext.ts index 2cba6a417..d7ef737f2 100644 --- a/src/UserContext.ts +++ b/src/UserContext.ts @@ -1,4 +1,5 @@ import { DatabaseAccount } from "./Contracts/DataModels"; +import { SubscriptionType } from "./Contracts/SubscriptionType"; import { DefaultAccountExperienceType } from "./DefaultAccountExperienceType"; interface UserContext { @@ -12,6 +13,7 @@ interface UserContext { resourceToken?: string; defaultExperience?: DefaultAccountExperienceType; useSDKOperations?: boolean; + subscriptionType?: SubscriptionType; } const userContext: Readonly = {} as const; diff --git a/tsconfig.strict.json b/tsconfig.strict.json index 89cfd09a2..c59b7391e 100644 --- a/tsconfig.strict.json +++ b/tsconfig.strict.json @@ -13,8 +13,10 @@ "./src/Common/ArrayHashMap.ts", "./src/Common/Constants.ts", "./src/Common/DeleteFeedback.ts", + "./src/Common/EnvironmentUtility.ts", "./src/Common/HashMap.ts", "./src/Common/HeadersUtility.ts", + "./src/Common/Logger.ts", "./src/Common/MessageHandler.ts", "./src/Common/MongoUtility.ts", "./src/Common/ObjectCache.ts", @@ -25,9 +27,11 @@ "./src/Contracts/DataModels.ts", "./src/Contracts/Diagnostics.ts", "./src/Contracts/ExplorerContracts.ts", + "./src/Contracts/SubscriptionType.ts", "./src/Contracts/Versions.ts", "./src/Controls/Heatmap/Heatmap.ts", "./src/Controls/Heatmap/HeatmapDatatypes.ts", + "./src/DefaultAccountExperienceType.ts", "./src/Definitions/globals.d.ts", "./src/Definitions/html.d.ts", "./src/Definitions/jquery-ui.d.ts", @@ -37,6 +41,7 @@ "./src/Explorer/Controls/ErrorDisplayComponent/ErrorDisplayComponent.ts", "./src/Explorer/Controls/GitHub/GitHubStyleConstants.ts", "./src/Explorer/Controls/SmartUi/InputUtils.ts", + "./src/Explorer/Graph/GraphExplorerComponent/__mocks__/GremlinClient.ts", "./src/Explorer/Notebook/FileSystemUtil.ts", "./src/Explorer/Notebook/NTeractUtil.ts", "./src/Explorer/Notebook/NotebookComponent/actions.ts", @@ -49,6 +54,7 @@ "./src/Explorer/Panes/Tables/Validators/EntityPropertyNameValidator.ts", "./src/Explorer/Panes/Tables/Validators/EntityPropertyValidationCommon.ts", "./src/Explorer/Tables/Constants.ts", + "./src/Explorer/Tables/CqlUtilities.ts", "./src/Explorer/Tables/QueryBuilder/DateTimeUtilities.ts", "./src/Explorer/Tabs/TabComponents.ts", "./src/GitHub/GitHubConnector.ts", @@ -56,15 +62,23 @@ "./src/NotebookWorkspaceManager/NotebookWorkspaceResourceProviderMockClients.ts", "./src/ReactDevTools.ts", "./src/ResourceProvider/IResourceProviderClient.ts", + "./src/Shared/Constants.ts", "./src/Shared/ExplorerSettings.ts", + "./src/Shared/PriceEstimateCalculator.ts", "./src/Shared/StorageUtility.ts", "./src/Shared/StringUtility.ts", + "./src/Shared/Telemetry/TelemetryConstants.ts", + "./src/Shared/Telemetry/TelemetryProcessor.ts", "./src/Shared/appInsights.ts", + "./src/Terminal/JupyterLabAppFactory.ts", "./src/UserContext.ts", + "./src/Utils/Base64Utils.ts", + "./src/Utils/BlobUtils.ts", "./src/Utils/GitHubUtils.ts", "./src/Utils/MessageValidation.ts", "./src/Utils/OfferUtils.ts", "./src/Utils/StringUtils.ts", + "./src/Utils/WindowUtils.ts", "./src/Utils/arm/generatedClients/2020-04-01/types.ts", "./src/quickstart.ts", "./src/setupTests.ts", From 4ce9dcc0243cd881e8e71e5d861d230c1ab7e2d8 Mon Sep 17 00:00:00 2001 From: Garrett Ausfeldt Date: Thu, 12 Nov 2020 13:33:37 -0800 Subject: [PATCH 11/13] Add analytical store schema POC (#164) * add schema APIs to JunoClient * start implementing buildSchemaNode * finish getSchemaNodes * finish implementing addSchema * cleanup * make schema optional * handle undefined/null schema and fields. Also don't retry on gettting schema failures. * fix request schema and get schema endpoints * add feature flag * try to get most recent schema when refreshed or initialized. * add tests * cleanup * cleanup * cleanup * fix merge conflict typos * fix lint errors * fix tests and update snapshot Co-authored-by: REDMOND\gaausfel --- src/Common/Constants.ts | 1 + src/Contracts/DataModels.ts | 34 +++ src/Contracts/ViewModels.ts | 3 + .../SettingsComponent.test.tsx.snap | 4 + src/Explorer/Explorer.ts | 2 + src/Explorer/Tree/Collection.ts | 4 + src/Explorer/Tree/Database.test.ts | 82 ++++++ src/Explorer/Tree/Database.ts | 46 ++++ .../Tree/ResourceTreeAdapter.test.tsx | 253 ++++++++++++++++++ src/Explorer/Tree/ResourceTreeAdapter.tsx | 77 +++++- .../ResourceTreeAdapter.test.tsx.snap | 172 ++++++++++++ src/Juno/JunoClient.ts | 50 ++++ 12 files changed, 727 insertions(+), 1 deletion(-) create mode 100644 src/Explorer/Tree/Database.test.ts create mode 100644 src/Explorer/Tree/ResourceTreeAdapter.test.tsx create mode 100644 src/Explorer/Tree/__snapshots__/ResourceTreeAdapter.test.tsx.snap diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index 32b629149..2142a530e 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -125,6 +125,7 @@ export class Features { public static readonly enableFixedCollectionWithSharedThroughput = "enablefixedcollectionwithsharedthroughput"; public static readonly ttl90Days = "ttl90days"; public static readonly enableRightPanelV2 = "enablerightpanelv2"; + public static readonly enableSchema = "enableschema"; public static readonly enableSDKoperations = "enablesdkoperations"; public static readonly showMinRUSurvey = "showminrusurvey"; } diff --git a/src/Contracts/DataModels.ts b/src/Contracts/DataModels.ts index 3aadf14cd..82779e428 100644 --- a/src/Contracts/DataModels.ts +++ b/src/Contracts/DataModels.ts @@ -88,6 +88,38 @@ export interface Resource { id: string; } +export interface IType { + name: string; + code: number; +} + +export interface IDataField { + dataType: IType; + hasNulls: boolean; + isArray: boolean; + schemaType: IType; + name: string; + path: string; + maxRepetitionLevel: number; + maxDefinitionLevel: number; +} + +export interface ISchema { + id: string; + accountName: string; + resource: string; + fields: IDataField[]; +} + +export interface ISchemaRequest { + id: string; + subscriptionId: string; + resourceGroup: string; + accountName: string; + resource: string; + status: string; +} + export interface Collection extends Resource { defaultTtl?: number; indexingPolicy?: IndexingPolicy; @@ -98,6 +130,8 @@ export interface Collection extends Resource { changeFeedPolicy?: ChangeFeedPolicy; analyticalStorageTtl?: number; geospatialConfig?: GeospatialConfig; + schema?: ISchema; + requestSchema?: () => void; } export interface Database extends Resource { diff --git a/src/Contracts/ViewModels.ts b/src/Contracts/ViewModels.ts index 94f6ac2ec..f0a0e45e5 100644 --- a/src/Contracts/ViewModels.ts +++ b/src/Contracts/ViewModels.ts @@ -116,6 +116,8 @@ export interface CollectionBase extends TreeNode { export interface Collection extends CollectionBase { defaultTtl: ko.Observable; analyticalStorageTtl: ko.Observable; + schema?: DataModels.ISchema; + requestSchema?: () => void; indexingPolicy: ko.Observable; uniqueKeyPolicy: DataModels.UniqueKeyPolicy; quotaInfo: ko.Observable; @@ -359,6 +361,7 @@ export enum CollectionTabKind { SparkMasterTab = 16, Gallery = 17, NotebookViewer = 18, + Schema = 19, SettingsV2 = 19 } diff --git a/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap b/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap index db28fa5a8..428808056 100644 --- a/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap +++ b/src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap @@ -971,6 +971,7 @@ exports[`SettingsComponent renders 1`] = ` "isRefreshingExplorer": [Function], "isResourceTokenCollectionNodeSelected": [Function], "isRightPanelV2Enabled": [Function], + "isSchemaEnabled": [Function], "isServerlessEnabled": [Function], "isSettingsV2Enabled": [Function], "isSparkEnabled": [Function], @@ -2251,6 +2252,7 @@ exports[`SettingsComponent renders 1`] = ` "isRefreshingExplorer": [Function], "isResourceTokenCollectionNodeSelected": [Function], "isRightPanelV2Enabled": [Function], + "isSchemaEnabled": [Function], "isServerlessEnabled": [Function], "isSettingsV2Enabled": [Function], "isSparkEnabled": [Function], @@ -3544,6 +3546,7 @@ exports[`SettingsComponent renders 1`] = ` "isRefreshingExplorer": [Function], "isResourceTokenCollectionNodeSelected": [Function], "isRightPanelV2Enabled": [Function], + "isSchemaEnabled": [Function], "isServerlessEnabled": [Function], "isSettingsV2Enabled": [Function], "isSparkEnabled": [Function], @@ -4824,6 +4827,7 @@ exports[`SettingsComponent renders 1`] = ` "isRefreshingExplorer": [Function], "isResourceTokenCollectionNodeSelected": [Function], "isRightPanelV2Enabled": [Function], + "isSchemaEnabled": [Function], "isServerlessEnabled": [Function], "isSettingsV2Enabled": [Function], "isSparkEnabled": [Function], diff --git a/src/Explorer/Explorer.ts b/src/Explorer/Explorer.ts index bb7fbce2d..bef261953 100644 --- a/src/Explorer/Explorer.ts +++ b/src/Explorer/Explorer.ts @@ -226,6 +226,7 @@ export default class Explorer { public shareTokenCopyHelperText: ko.Observable; public shouldShowDataAccessExpiryDialog: ko.Observable; public shouldShowContextSwitchPrompt: ko.Observable; + public isSchemaEnabled: ko.Computed; // Notebooks public isNotebookEnabled: ko.Observable; @@ -421,6 +422,7 @@ export default class Explorer { this.isFeatureEnabled(Constants.Features.canExceedMaximumValue) ); + this.isSchemaEnabled = ko.computed(() => this.isFeatureEnabled(Constants.Features.enableSchema)); this.isNotificationConsoleExpanded = ko.observable(false); this.databases = ko.observableArray(); diff --git a/src/Explorer/Tree/Collection.ts b/src/Explorer/Tree/Collection.ts index c5db74aeb..897752b92 100644 --- a/src/Explorer/Tree/Collection.ts +++ b/src/Explorer/Tree/Collection.ts @@ -63,6 +63,8 @@ export default class Collection implements ViewModels.Collection { public throughput: ko.Computed; public rawDataModel: DataModels.Collection; public analyticalStorageTtl: ko.Observable; + public schema: DataModels.ISchema; + public requestSchema: () => void; public geospatialConfig: ko.Observable; // TODO move this to API customization class @@ -117,6 +119,8 @@ export default class Collection implements ViewModels.Collection { this.conflictResolutionPolicy = ko.observable(data.conflictResolutionPolicy); this.changeFeedPolicy = ko.observable(data.changeFeedPolicy); this.analyticalStorageTtl = ko.observable(data.analyticalStorageTtl); + this.schema = data.schema; + this.requestSchema = data.requestSchema; this.geospatialConfig = ko.observable(data.geospatialConfig); // TODO fix this to only replace non-excaped single quotes diff --git a/src/Explorer/Tree/Database.test.ts b/src/Explorer/Tree/Database.test.ts new file mode 100644 index 000000000..a067f6747 --- /dev/null +++ b/src/Explorer/Tree/Database.test.ts @@ -0,0 +1,82 @@ +import * as DataModels from "../../Contracts/DataModels"; +import * as ko from "knockout"; +import Database from "./Database"; +import Explorer from "../Explorer"; +import { HttpStatusCodes } from "../../Common/Constants"; +import { JunoClient } from "../../Juno/JunoClient"; +import { userContext, updateUserContext } from "../../UserContext"; + +const createMockContainer = (): Explorer => { + const mockContainer = new Explorer(); + return mockContainer; +}; + +updateUserContext({ + subscriptionId: "fakeSubscriptionId", + resourceGroup: "fakeResourceGroup", + databaseAccount: { + id: "id", + name: "fakeName", + location: "fakeLocation", + type: "fakeType", + tags: undefined, + kind: "fakeKind", + properties: { + documentEndpoint: "fakeEndpoint", + tableEndpoint: "fakeEndpoint", + gremlinEndpoint: "fakeEndpoint", + cassandraEndpoint: "fakeEndpoint" + } + } +}); + +describe("Add Schema", () => { + it("should not call requestSchema or getSchema if analyticalStorageTtl is undefined", () => { + const collection: DataModels.Collection = {} as DataModels.Collection; + collection.analyticalStorageTtl = undefined; + const database = new Database(createMockContainer(), { id: "fakeId" }); + database.container = createMockContainer(); + database.container.isSchemaEnabled = ko.computed(() => false); + + database.junoClient = new JunoClient(); + database.junoClient.requestSchema = jest.fn(); + database.junoClient.getSchema = jest.fn(); + + database.addSchema(collection); + + expect(database.junoClient.requestSchema).toBeCalledTimes(0); + }); + + it("should call requestSchema or getSchema if analyticalStorageTtl is not undefined", () => { + const collection: DataModels.Collection = { id: "fakeId" } as DataModels.Collection; + collection.analyticalStorageTtl = 0; + + const database = new Database(createMockContainer(), {}); + database.container = createMockContainer(); + database.container.isSchemaEnabled = ko.computed(() => true); + + database.junoClient = new JunoClient(); + database.junoClient.requestSchema = jest.fn(); + database.junoClient.getSchema = jest.fn().mockResolvedValue({ status: HttpStatusCodes.OK, data: {} }); + + jest.useFakeTimers(); + const interval = 5000; + const checkForSchema: NodeJS.Timeout = database.addSchema(collection, interval); + jest.advanceTimersByTime(interval + 1000); + + expect(database.junoClient.requestSchema).toBeCalledWith({ + id: undefined, + subscriptionId: userContext.subscriptionId, + resourceGroup: userContext.resourceGroup, + accountName: userContext.databaseAccount.name, + resource: `dbs/${database.id}/colls/${collection.id}`, + status: "new" + }); + expect(checkForSchema).not.toBeNull(); + expect(database.junoClient.getSchema).toBeCalledWith( + userContext.databaseAccount.name, + database.id(), + collection.id + ); + }); +}); diff --git a/src/Explorer/Tree/Database.ts b/src/Explorer/Tree/Database.ts index 304774bfd..cf6c48c08 100644 --- a/src/Explorer/Tree/Database.ts +++ b/src/Explorer/Tree/Database.ts @@ -13,6 +13,8 @@ import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsol import * as Logger from "../../Common/Logger"; import Explorer from "../Explorer"; import { readCollections } from "../../Common/dataAccess/readCollections"; +import { JunoClient, IJunoResponse } from "../../Juno/JunoClient"; +import { userContext } from "../../UserContext"; import { readDatabaseOffer } from "../../Common/dataAccess/readDatabaseOffer"; import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType"; import { fetchPortalNotifications } from "../../Common/PortalNotifications"; @@ -29,6 +31,7 @@ export default class Database implements ViewModels.Database { public isDatabaseExpanded: ko.Observable; public isDatabaseShared: ko.Computed; public selectedSubnodeKind: ko.Observable; + public junoClient: JunoClient; constructor(container: Explorer, data: any) { this.nodeKind = "Database"; @@ -43,6 +46,7 @@ export default class Database implements ViewModels.Database { this.isDatabaseShared = ko.pureComputed(() => { return this.offer && !!this.offer(); }); + this.junoClient = new JunoClient(); } public onSettingsClick = () => { @@ -184,6 +188,10 @@ export default class Database implements ViewModels.Database { const collections: DataModels.Collection[] = await readCollections(this.id()); const deltaCollections = this.getDeltaCollections(collections); + collections.forEach((collection: DataModels.Collection) => { + this.addSchema(collection); + }); + deltaCollections.toAdd.forEach((collection: DataModels.Collection) => { const collectionVM: Collection = new Collection(this.container, this.id(), collection, null, null); collectionVMs.push(collectionVM); @@ -308,4 +316,42 @@ export default class Database implements ViewModels.Database { this.collections(collectionsToKeep); } + + public addSchema(collection: DataModels.Collection, interval?: number): NodeJS.Timeout { + let checkForSchema: NodeJS.Timeout = null; + interval = interval || 5000; + + if (collection.analyticalStorageTtl !== undefined && this.container.isSchemaEnabled()) { + collection.requestSchema = () => { + this.junoClient.requestSchema({ + id: undefined, + subscriptionId: userContext.subscriptionId, + resourceGroup: userContext.resourceGroup, + accountName: userContext.databaseAccount.name, + resource: `dbs/${this.id}/colls/${collection.id}`, + status: "new" + }); + checkForSchema = setInterval(async () => { + const response: IJunoResponse = await this.junoClient.getSchema( + userContext.databaseAccount.name, + this.id(), + collection.id + ); + + if (response.status >= 404) { + clearInterval(checkForSchema); + } + + if (response.data !== null) { + clearInterval(checkForSchema); + collection.schema = response.data; + } + }, interval); + }; + + collection.requestSchema(); + } + + return checkForSchema; + } } diff --git a/src/Explorer/Tree/ResourceTreeAdapter.test.tsx b/src/Explorer/Tree/ResourceTreeAdapter.test.tsx new file mode 100644 index 000000000..790f1b3e1 --- /dev/null +++ b/src/Explorer/Tree/ResourceTreeAdapter.test.tsx @@ -0,0 +1,253 @@ +import * as ko from "knockout"; +import * as DataModels from "../../Contracts/DataModels"; +import * as ViewModels from "../../Contracts/ViewModels"; +import React from "react"; +import { ResourceTreeAdapter } from "./ResourceTreeAdapter"; +import { shallow } from "enzyme"; +import { TreeComponent, TreeNode, TreeComponentProps } from "../Controls/TreeComponent/TreeComponent"; +import Explorer from "../Explorer"; +import Collection from "./Collection"; + +const schema: DataModels.ISchema = { + id: "fakeSchemaId", + accountName: "fakeAccountName", + resource: "dbs/FakeDbName/colls/FakeCollectionName", + fields: [ + { + dataType: { + code: 15, + name: "String" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "_rid", + path: "_rid", + maxRepetitionLevel: 0, + maxDefinitionLevel: 1 + }, + { + dataType: { + code: 11, + name: "Int64" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "_ts", + path: "_ts", + maxRepetitionLevel: 0, + maxDefinitionLevel: 1 + }, + { + dataType: { + code: 15, + name: "String" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "id", + path: "id", + maxRepetitionLevel: 0, + maxDefinitionLevel: 1 + }, + { + dataType: { + code: 15, + name: "String" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "pk", + path: "pk", + maxRepetitionLevel: 0, + maxDefinitionLevel: 1 + }, + { + dataType: { + code: 15, + name: "String" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "other", + path: "other", + maxRepetitionLevel: 0, + maxDefinitionLevel: 1 + }, + { + dataType: { + code: 15, + name: "String" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "name", + path: "nested.name", + maxRepetitionLevel: 0, + maxDefinitionLevel: 1 + }, + { + dataType: { + code: 11, + name: "Int64" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "someNumber", + path: "nested.someNumber", + maxRepetitionLevel: 0, + maxDefinitionLevel: 1 + }, + { + dataType: { + code: 17, + name: "Double" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "anotherNumber", + path: "nested.anotherNumber", + maxRepetitionLevel: 0, + maxDefinitionLevel: 1 + }, + { + dataType: { + code: 15, + name: "String" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "name", + path: "items.list.items.name", + maxRepetitionLevel: 1, + maxDefinitionLevel: 3 + }, + { + dataType: { + code: 11, + name: "Int64" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "someNumber", + path: "items.list.items.someNumber", + maxRepetitionLevel: 1, + maxDefinitionLevel: 3 + }, + { + dataType: { + code: 17, + name: "Double" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "anotherNumber", + path: "items.list.items.anotherNumber", + maxRepetitionLevel: 1, + maxDefinitionLevel: 3 + }, + { + dataType: { + code: 15, + name: "String" + }, + hasNulls: true, + isArray: false, + schemaType: { + code: 0, + name: "Data" + }, + name: "_etag", + path: "_etag", + maxRepetitionLevel: 0, + maxDefinitionLevel: 1 + } + ] +}; + +const createMockContainer = (): Explorer => { + const mockContainer = new Explorer(); + mockContainer.selectedNode = ko.observable(); + mockContainer.onUpdateTabsButtons = () => { + return; + }; + + return mockContainer; +}; + +const createMockCollection = (): ViewModels.Collection => { + const mockCollection = {} as DataModels.Collection; + mockCollection._rid = "fakeRid"; + mockCollection._self = "fakeSelf"; + mockCollection.id = "fakeId"; + mockCollection.analyticalStorageTtl = 0; + mockCollection.schema = schema; + + const mockCollectionVM: ViewModels.Collection = new Collection( + createMockContainer(), + "fakeDatabaseId", + mockCollection, + undefined, + undefined + ); + + return mockCollectionVM; +}; + +describe("Resource tree for schema", () => { + const mockContainer: Explorer = createMockContainer(); + const resourceTree = new ResourceTreeAdapter(mockContainer); + + it("should render", () => { + const rootNode: TreeNode = resourceTree.buildSchemaNode(createMockCollection()); + const props: TreeComponentProps = { + rootNode, + className: "dataResourceTree" + }; + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/src/Explorer/Tree/ResourceTreeAdapter.tsx b/src/Explorer/Tree/ResourceTreeAdapter.tsx index b5bf40448..db00e691c 100644 --- a/src/Explorer/Tree/ResourceTreeAdapter.tsx +++ b/src/Explorer/Tree/ResourceTreeAdapter.tsx @@ -2,7 +2,7 @@ import * as ko from "knockout"; import * as React from "react"; import { ReactAdapter } from "../../Bindings/ReactBindingHandler"; import { AccordionComponent, AccordionItemComponent } from "../Controls/Accordion/AccordionComponent"; -import { TreeComponent, TreeNode, TreeNodeMenuItem } from "../Controls/TreeComponent/TreeComponent"; +import { TreeComponent, TreeNode, TreeNodeMenuItem, TreeNodeComponent } from "../Controls/TreeComponent/TreeComponent"; import * as ViewModels from "../../Contracts/ViewModels"; import { NotebookContentItem, NotebookContentItemType } from "../Notebook/NotebookContentItem"; import { ResourceTreeContextMenuButtonFactory } from "../ContextMenuButtonFactory"; @@ -32,6 +32,7 @@ import StoredProcedure from "./StoredProcedure"; import Trigger from "./Trigger"; import TabsBase from "../Tabs/TabsBase"; import { userContext } from "../../UserContext"; +import * as DataModels from "../../Contracts/DataModels"; export class ResourceTreeAdapter implements ReactAdapter { public static readonly MyNotebooksTitle = "My Notebooks"; @@ -289,6 +290,11 @@ export class ResourceTreeAdapter implements ReactAdapter { }); } + const schemaNode: TreeNode = this.buildSchemaNode(collection); + if (schemaNode) { + children.push(schemaNode); + } + if (ResourceTreeAdapter.showScriptNodes(this.container)) { children.push(this.buildStoredProcedureNode(collection)); children.push(this.buildUserDefinedFunctionsNode(collection)); @@ -405,6 +411,75 @@ export class ResourceTreeAdapter implements ReactAdapter { }; } + public buildSchemaNode(collection: ViewModels.Collection): TreeNode { + if (collection.analyticalStorageTtl() == undefined) { + return undefined; + } + + if (!collection.schema || !collection.schema.fields) { + return undefined; + } + + return { + label: "Schema", + children: this.getSchemaNodes(collection.schema.fields), + onClick: () => { + collection.selectedSubnodeKind(ViewModels.CollectionTabKind.Schema); + this.container.tabsManager.refreshActiveTab( + (tab: TabsBase) => tab.collection && tab.collection.rid === collection.rid + ); + } + }; + } + + private getSchemaNodes(fields: DataModels.IDataField[]): TreeNode[] { + const schema: any = {}; + + //unflatten + fields.forEach((field: DataModels.IDataField, fieldIndex: number) => { + const path: string[] = field.path.split("."); + const fieldProperties = [field.dataType.name, `HasNulls: ${field.hasNulls}`]; + let current: any = {}; + path.forEach((name: string, pathIndex: number) => { + if (pathIndex === 0) { + if (schema[name] === undefined) { + if (pathIndex === path.length - 1) { + schema[name] = fieldProperties; + } else { + schema[name] = {}; + } + } + current = schema[name]; + } else { + if (current[name] === undefined) { + if (pathIndex === path.length - 1) { + current[name] = fieldProperties; + } else { + current[name] = {}; + } + } + current = current[name]; + } + }); + }); + + const traverse = (obj: any): TreeNode[] => { + const children: TreeNode[] = []; + + if (obj !== null && !Array.isArray(obj) && typeof obj === "object") { + Object.entries(obj).forEach(([key, value]) => { + children.push({ label: key, children: traverse(value) }); + }); + } else if (Array.isArray(obj)) { + return [{ label: obj[0] }, { label: obj[1] }]; + } + + return children; + }; + + return traverse(schema); + } + private buildNotebooksTrees(): TreeNode { let notebooksTree: TreeNode = { label: undefined, diff --git a/src/Explorer/Tree/__snapshots__/ResourceTreeAdapter.test.tsx.snap b/src/Explorer/Tree/__snapshots__/ResourceTreeAdapter.test.tsx.snap new file mode 100644 index 000000000..e769c8764 --- /dev/null +++ b/src/Explorer/Tree/__snapshots__/ResourceTreeAdapter.test.tsx.snap @@ -0,0 +1,172 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Resource tree for schema should render 1`] = ` +
+ +
+`; diff --git a/src/Juno/JunoClient.ts b/src/Juno/JunoClient.ts index 76db63602..b4724002d 100644 --- a/src/Juno/JunoClient.ts +++ b/src/Juno/JunoClient.ts @@ -7,6 +7,7 @@ import { IGitHubResponse } from "../GitHub/GitHubClient"; import { IGitHubOAuthToken } from "../GitHub/GitHubOAuthService"; import { userContext } from "../UserContext"; import { getAuthorizationHeader } from "../Utils/AuthorizationUtils"; +import { number } from "prop-types"; export interface IJunoResponse { status: number; @@ -427,6 +428,51 @@ export class JunoClient { }; } + public async requestSchema( + schemaRequest: DataModels.ISchemaRequest + ): Promise> { + const response = await window.fetch(`${this.getAnalyticsUrl()}/${schemaRequest.accountName}/schema/request`, { + method: "POST", + body: JSON.stringify(schemaRequest), + headers: JunoClient.getHeaders() + }); + + let data: DataModels.ISchemaRequest; + if (response.status === HttpStatusCodes.OK) { + data = await response.json(); + } + + return { + status: response.status, + data + }; + } + + public async getSchema( + accountName: string, + databaseName: string, + containerName: string + ): Promise> { + const response = await window.fetch( + `${this.getAnalyticsUrl()}/${accountName}/schema/${databaseName}/${containerName}`, + { + method: "GET", + headers: JunoClient.getHeaders() + } + ); + + let data: DataModels.ISchema; + + if (response.status === HttpStatusCodes.OK) { + data = await response.json(); + } + + return { + status: response.status, + data + }; + } + private async getNotebooks(input: RequestInfo, init?: RequestInit): Promise> { const response = await window.fetch(input, init); @@ -457,6 +503,10 @@ export class JunoClient { return `${this.getNotebooksUrl()}/${this.getAccount()}`; } + private getAnalyticsUrl(): string { + return `${configContext.JUNO_ENDPOINT}/api/analytics`; + } + private static getHeaders(): HeadersInit { const authorizationHeader = getAuthorizationHeader(); return { From d880723be901627c81a70c6b0310f0769e478847 Mon Sep 17 00:00:00 2001 From: Steve Faulkner Date: Thu, 12 Nov 2020 20:10:59 -0600 Subject: [PATCH 12/13] React Wrapper Take 2 (#310) --- src/Main.ts | 117 --------- src/Main.tsx | 452 +++++++++++++++++++++++++++++++++++ src/applyExplorerBindings.ts | 2 +- src/explorer.html | 326 +------------------------ src/koComment.tsx | 20 ++ webpack.config.js | 2 +- 6 files changed, 475 insertions(+), 444 deletions(-) delete mode 100644 src/Main.ts create mode 100644 src/Main.tsx create mode 100644 src/koComment.tsx diff --git a/src/Main.ts b/src/Main.ts deleted file mode 100644 index 4845fc4e0..000000000 --- a/src/Main.ts +++ /dev/null @@ -1,117 +0,0 @@ -// CSS Dependencies -import "bootstrap/dist/css/bootstrap.css"; -import "../less/documentDB.less"; -import "../less/tree.less"; -import "../less/forms.less"; -import "../less/menus.less"; -import "../less/infobox.less"; -import "../less/messagebox.less"; -import "./Explorer/Controls/ErrorDisplayComponent/ErrorDisplayComponent.less"; -import "./Explorer/Menus/NotificationConsole/NotificationConsole.less"; -import "./Explorer/Menus/CommandBar/CommandBarComponent.less"; -import "./Explorer/Menus/CommandBar/MemoryTrackerComponent.less"; -import "./Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.less"; -import "./Explorer/Controls/DynamicList/DynamicListComponent.less"; -import "./Explorer/Controls/JsonEditor/JsonEditorComponent.less"; -import "./Explorer/Graph/GraphExplorerComponent/graphExplorer.less"; -import "../less/TableStyles/queryBuilder.less"; -import "../externals/jquery.dataTables.min.css"; -import "../less/TableStyles/fulldatatables.less"; -import "../less/TableStyles/EntityEditor.less"; -import "../less/TableStyles/CustomizeColumns.less"; -import "../less/resourceTree.less"; -import "../externals/jquery.typeahead.min.css"; -import "../externals/jquery-ui.min.css"; -import "../externals/jquery-ui.structure.min.css"; -import "../externals/jquery-ui.theme.min.css"; -import "./Explorer/Graph/NewVertexComponent/newVertexComponent.less"; -import "./Explorer/Panes/GraphNewVertexPane.less"; -import "./Explorer/Tabs/QueryTab.less"; -import "./Explorer/Controls/TreeComponent/treeComponent.less"; -import "./Explorer/Controls/Accordion/AccordionComponent.less"; -import "./Explorer/SplashScreen/SplashScreenComponent.less"; -import "./Explorer/Controls/Notebook/NotebookTerminalComponent.less"; - -// Image Dependencies -import "../images/CosmosDB_rgb_ui_lighttheme.ico"; -import "../images/favicon.ico"; - -import "./Shared/appInsights"; -import "babel-polyfill"; -import "es6-symbol/implement"; -import "webcrypto-liner/build/webcrypto-liner.shim.min"; -import "./Libs/jquery"; -import "bootstrap/dist/js/npm"; -import "../externals/jquery.typeahead.min.js"; -import "../externals/jquery-ui.min.js"; -import "../externals/adal.js"; -import "promise-polyfill/src/polyfill"; -import "abort-controller/polyfill"; -import "whatwg-fetch"; -import "es6-object-assign/auto"; -import "promise.prototype.finally/auto"; -import "object.entries/auto"; -import "./Libs/is-integer-polyfill"; -import "url-polyfill/url-polyfill.min"; - -// TODO: Enable ReactDevTools after fixing the portal CORS issue -// import "./ReactDevTools" - -import * as ko from "knockout"; -import * as TelemetryProcessor from "./Shared/Telemetry/TelemetryProcessor"; -import { Action, ActionModifiers } from "./Shared/Telemetry/TelemetryConstants"; - -import { BindingHandlersRegisterer } from "./Bindings/BindingHandlersRegisterer"; -import * as Emulator from "./Platform/Emulator/Main"; -import Hosted from "./Platform/Hosted/Main"; -import * as Portal from "./Platform/Portal/Main"; -import { AuthType } from "./AuthType"; - -import { initializeIcons } from "office-ui-fabric-react/lib/Icons"; -import { applyExplorerBindings } from "./applyExplorerBindings"; -import { initializeConfiguration, Platform } from "./ConfigContext"; -import Explorer from "./Explorer/Explorer"; - -initializeIcons(/* optional base url */); - -// TODO: Encapsulate and reuse all global variables as environment variables -window.authType = AuthType.AAD; - -initializeConfiguration().then(config => { - if (config.platform === Platform.Hosted) { - try { - Hosted.initializeExplorer().then( - (explorer: Explorer) => { - applyExplorerBindings(explorer); - Hosted.configureTokenValidationDisplayPrompt(explorer); - }, - (error: any) => { - try { - const uninitializedExplorer: Explorer = Hosted.getUninitializedExplorerForGuestAccess(); - window.dataExplorer = uninitializedExplorer; - ko.applyBindings(uninitializedExplorer); - BindingHandlersRegisterer.registerBindingHandlers(); - if (window.authType !== AuthType.AAD) { - uninitializedExplorer.isRefreshingExplorer(false); - uninitializedExplorer.displayConnectExplorerForm(); - } - } catch (e) { - console.log(e); - } - console.error(error); - } - ); - } catch (e) { - console.log(e); - } - } else if (config.platform === Platform.Emulator) { - window.authType = AuthType.MasterKey; - const explorer = Emulator.initializeExplorer(); - applyExplorerBindings(explorer); - } else if (config.platform === Platform.Portal) { - TelemetryProcessor.trace(Action.InitializeDataExplorer, ActionModifiers.Open, {}); - const explorer = Portal.initializeExplorer(); - TelemetryProcessor.trace(Action.InitializeDataExplorer, ActionModifiers.IFrameReady, {}); - applyExplorerBindings(explorer); - } -}); diff --git a/src/Main.tsx b/src/Main.tsx new file mode 100644 index 000000000..92e1619c4 --- /dev/null +++ b/src/Main.tsx @@ -0,0 +1,452 @@ +// CSS Dependencies +import "bootstrap/dist/css/bootstrap.css"; +import "../less/documentDB.less"; +import "../less/tree.less"; +import "../less/forms.less"; +import "../less/menus.less"; +import "../less/infobox.less"; +import "../less/messagebox.less"; +import "./Explorer/Controls/ErrorDisplayComponent/ErrorDisplayComponent.less"; +import "./Explorer/Menus/NotificationConsole/NotificationConsole.less"; +import "./Explorer/Menus/CommandBar/CommandBarComponent.less"; +import "./Explorer/Menus/CommandBar/MemoryTrackerComponent.less"; +import "./Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.less"; +import "./Explorer/Controls/DynamicList/DynamicListComponent.less"; +import "./Explorer/Controls/JsonEditor/JsonEditorComponent.less"; +import "./Explorer/Graph/GraphExplorerComponent/graphExplorer.less"; +import "../less/TableStyles/queryBuilder.less"; +import "../externals/jquery.dataTables.min.css"; +import "../less/TableStyles/fulldatatables.less"; +import "../less/TableStyles/EntityEditor.less"; +import "../less/TableStyles/CustomizeColumns.less"; +import "../less/resourceTree.less"; +import "../externals/jquery.typeahead.min.css"; +import "../externals/jquery-ui.min.css"; +import "../externals/jquery-ui.structure.min.css"; +import "../externals/jquery-ui.theme.min.css"; +import "./Explorer/Graph/NewVertexComponent/newVertexComponent.less"; +import "./Explorer/Panes/GraphNewVertexPane.less"; +import "./Explorer/Tabs/QueryTab.less"; +import "./Explorer/Controls/TreeComponent/treeComponent.less"; +import "./Explorer/Controls/Accordion/AccordionComponent.less"; +import "./Explorer/SplashScreen/SplashScreenComponent.less"; +import "./Explorer/Controls/Notebook/NotebookTerminalComponent.less"; + +// Image Dependencies +import "../images/CosmosDB_rgb_ui_lighttheme.ico"; +import "../images/favicon.ico"; + +import "./Shared/appInsights"; +import "babel-polyfill"; +import "es6-symbol/implement"; +import "webcrypto-liner/build/webcrypto-liner.shim.min"; +import "./Libs/jquery"; +import "bootstrap/dist/js/npm"; +import "../externals/jquery.typeahead.min.js"; +import "../externals/jquery-ui.min.js"; +import "../externals/adal.js"; +import "promise-polyfill/src/polyfill"; +import "abort-controller/polyfill"; +import "whatwg-fetch"; +import "es6-object-assign/auto"; +import "promise.prototype.finally/auto"; +import "object.entries/auto"; +import "./Libs/is-integer-polyfill"; +import "url-polyfill/url-polyfill.min"; + +initializeIcons(); + +import * as ko from "knockout"; +import * as TelemetryProcessor from "./Shared/Telemetry/TelemetryProcessor"; +import { Action, ActionModifiers } from "./Shared/Telemetry/TelemetryConstants"; + +import { BindingHandlersRegisterer } from "./Bindings/BindingHandlersRegisterer"; +import * as Emulator from "./Platform/Emulator/Main"; +import Hosted from "./Platform/Hosted/Main"; +import * as Portal from "./Platform/Portal/Main"; +import { AuthType } from "./AuthType"; + +import { initializeIcons } from "office-ui-fabric-react/lib/Icons"; +import { applyExplorerBindings } from "./applyExplorerBindings"; +import { initializeConfiguration, Platform } from "./ConfigContext"; +import Explorer from "./Explorer/Explorer"; +import React, { useEffect } from "react"; +import ReactDOM from "react-dom"; +import errorImage from "../images/error.svg"; +import copyImage from "../images/Copy.svg"; +import hdeConnectImage from "../images/HdeConnectCosmosDB.svg"; +import refreshImg from "../images/refresh-cosmos.svg"; +import arrowLeftImg from "../images/imgarrowlefticon.svg"; +import { KOCommentEnd, KOCommentIfStart } from "./koComment"; + +// TODO: Encapsulate and reuse all global variables as environment variables +window.authType = AuthType.AAD; + +const App: React.FunctionComponent = () => { + useEffect(() => { + initializeConfiguration().then(config => { + if (config.platform === Platform.Hosted) { + try { + Hosted.initializeExplorer().then( + (explorer: Explorer) => { + applyExplorerBindings(explorer); + Hosted.configureTokenValidationDisplayPrompt(explorer); + }, + (error: unknown) => { + try { + const uninitializedExplorer: Explorer = Hosted.getUninitializedExplorerForGuestAccess(); + window.dataExplorer = uninitializedExplorer; + ko.applyBindings(uninitializedExplorer); + BindingHandlersRegisterer.registerBindingHandlers(); + if (window.authType !== AuthType.AAD) { + uninitializedExplorer.isRefreshingExplorer(false); + uninitializedExplorer.displayConnectExplorerForm(); + } + } catch (e) { + console.log(e); + } + console.error(error); + } + ); + } catch (e) { + console.log(e); + } + } else if (config.platform === Platform.Emulator) { + window.authType = AuthType.MasterKey; + const explorer = Emulator.initializeExplorer(); + applyExplorerBindings(explorer); + } else if (config.platform === Platform.Portal) { + TelemetryProcessor.trace(Action.InitializeDataExplorer, ActionModifiers.Open, {}); + const explorer = Portal.initializeExplorer(); + TelemetryProcessor.trace(Action.InitializeDataExplorer, ActionModifiers.IFrameReady, {}); + applyExplorerBindings(explorer); + } + }); + }, []); + + return ( +
+
+ {/* Main Command Bar - Start */} +
+ {/* Main Command Bar - End */} + {/* Share url flyout - Start */} +
+
+
+ + Open this database account in a new browser tab with Cosmos DB Explorer. Or copy the read-write or read + only access urls below to share with others. For security purposes, the URLs grant time-bound access to + the account. When access expires, you can reconnect, using a valid connection string for the account. + +
+
+
+ + + Read-Write + +
+
+ + + Read + +
+
+
+ + + Copy link + + +
+
+
+
+ {/* Share url flyout - End */} + {/* Collections Tree and Tabs - Begin */} +
+ {/* Collections Tree - Start */} +
+
+ {/* Collections Tree Expanded - Start */} +
+ {/* Collections Window - - Start */} +
+ {/* Collections Window Title/Command Bar - Start */} +
+
+ +
+ + + + + Hide + +
+
+
+ {/* Collections Window Title/Command Bar - End */} + + {!window.dataExplorer?.isAuthWithResourceToken() && ( +
+ )} + {window.dataExplorer?.isAuthWithResourceToken() && ( +
+ )} +
+ {/* Collections Window - End */} +
+ {/* Collections Tree Expanded - End */} + {/* Collections Tree Collapsed - Start */} +
+
+
    +
  • + + Expand + + + + +
    • +
+
+
+ {/* Collections Tree Collapsed - End */} +
+ {/* Splitter - Start */} +
+ {/* Splitter - End */} +
+ {/* Collections Tree - End */} +
+
+
+ +
+
+
+ {/* Collections Tree and Tabs - End */} + + {/* Explorer Connection - Encryption Token / AAD - Start */} +
+
+
+

+ Azure Cosmos DB +

+

Welcome to Azure Cosmos DB

+
+ +

+ Connect to your account with connection string +

+
+
+

Connect to your account with connection string

+

+ + + Error notification + + +

+

+ +

+

+ Sign In with Azure Account +

+
+
+
+
+ {/* Explorer Connection - Encryption Token / AAD - End */} + {/* Global loader - Start */} +
+
+

+ Azure Cosmos DB +

+

+ Welcome to Azure Cosmos DB +

+ +
+
+ {/* Global loader - End */} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+ + +
+ + +
+ + {/* Global access token expiration dialog - Start */} +
+
+

Please reconnect to the account using the connection string.

+
+
+ {/* Global access token expiration dialog - End */} + {/* Context switch prompt - Start */} +
+
+

+ Please save your work before you switch! When you switch to a different Azure Cosmos DB account, current + Data Explorer tabs will be closed. +

+

Proceed anyway?

+
+
+
+
+
+ ); +}; + +ReactDOM.render(, document.body); diff --git a/src/applyExplorerBindings.ts b/src/applyExplorerBindings.ts index 1bed350f7..570a65aa6 100644 --- a/src/applyExplorerBindings.ts +++ b/src/applyExplorerBindings.ts @@ -5,12 +5,12 @@ import Explorer from "./Explorer/Explorer"; export const applyExplorerBindings = (explorer: Explorer) => { if (!!explorer) { - ko.applyBindings(explorer); // This message should ideally be sent immediately after explorer has been initialized for optimal data explorer load times. // TODO: Send another message to describe that the bindings have been applied, and handle message transfers accordingly in the portal sendMessage("ready"); window.dataExplorer = explorer; BindingHandlersRegisterer.registerBindingHandlers(); + ko.applyBindings(explorer); $("#divExplorer").show(); } }; diff --git a/src/explorer.html b/src/explorer.html index 79e6bc738..5b3fb8c1b 100644 --- a/src/explorer.html +++ b/src/explorer.html @@ -8,329 +8,5 @@ - -
- - - - - - - -
-
-

Azure Cosmos DB

-

Welcome to Azure Cosmos DB

- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - -
-
-
- + diff --git a/src/koComment.tsx b/src/koComment.tsx new file mode 100644 index 000000000..670ca5aea --- /dev/null +++ b/src/koComment.tsx @@ -0,0 +1,20 @@ +/* eslint-disable react/prop-types */ +import React, { useEffect, useRef } from "react"; + +export const KOCommentIfStart: React.FunctionComponent<{ if: string }> = props => { + const el = useRef(); + useEffect(() => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (el.current as any).outerHTML = ``; + }, []); + return
; +}; + +export const KOCommentEnd: React.FunctionComponent = () => { + const el = useRef(); + useEffect(() => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (el.current as any).outerHTML = ``; + }, []); + return
; +}; diff --git a/webpack.config.js b/webpack.config.js index f2c5cef4d..41eb0b920 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -174,7 +174,7 @@ module.exports = function(env = {}, argv = {}) { return { mode: mode, entry: { - main: "./src/Main.ts", + main: "./src/Main.tsx", index: "./src/Index.ts", quickstart: "./src/quickstart.ts", hostedExplorer: "./src/HostedExplorer.ts", From 84b6075ee87090182402c561f70833b477b5c8d2 Mon Sep 17 00:00:00 2001 From: Steve Faulkner Date: Fri, 13 Nov 2020 10:58:38 -0600 Subject: [PATCH 13/13] Use Puppeteer for Emulator Test (#321) * Use Puppeteer for Emulator Test * Fix yaml * more fixes * Cleanup * README Co-authored-by: Steve Faulkner --- .eslintignore | 14 - .github/workflows/ci.yml | 33 +- .gitignore | 3 - README.md | 12 +- cypress/.gitignore | 4 - cypress/cleanup.js | 51 - cypress/cypress.json | 15 - .../CASSANDRA/addCollection.spec.ts | 66 - .../dataexplorer/GRAPH/addCollection.spec.ts | 81 - .../dataexplorer/MONGO/addCollection.spec.ts | 80 - .../MONGO/addCollectionAutopilot.spec.ts | 96 - .../addCollectionExistingDatabase.spec.ts | 67 - .../MONGO/provisionDatabaseThroughput.spec.ts | 203 -- .../dataexplorer/SQL/addCollection.spec.ts | 79 - .../dataexplorer/TABLE/addCollection.spec.ts | 60 - .../ci-tests/addCollectionPane.spec.ts | 55 - .../ci-tests/createDatabase.spec.ts | 65 - .../ci-tests/deleteCollection.spec.ts | 46 - .../ci-tests/deleteDatabase.spec.ts | 83 - cypress/integration/notebook/README.md | 35 - .../integration/notebook/newNotebook.spec.ts | 93 - .../integration/notebook/resourceTree.spec.ts | 172 - cypress/package-lock.json | 3066 ----------------- cypress/package.json | 25 - cypress/support/index.js | 23 - cypress/tsconfig.json | 11 - cypress/utilities/connectionString.js | 41 - cypress/utilities/cosmosClient.js | 6 - package.json | 4 +- test/index.spec.ts | 58 - test/utils/shared.ts | 5 +- 31 files changed, 23 insertions(+), 4629 deletions(-) delete mode 100644 cypress/.gitignore delete mode 100644 cypress/cleanup.js delete mode 100644 cypress/cypress.json delete mode 100644 cypress/integration/dataexplorer/CASSANDRA/addCollection.spec.ts delete mode 100644 cypress/integration/dataexplorer/GRAPH/addCollection.spec.ts delete mode 100644 cypress/integration/dataexplorer/MONGO/addCollection.spec.ts delete mode 100644 cypress/integration/dataexplorer/MONGO/addCollectionAutopilot.spec.ts delete mode 100644 cypress/integration/dataexplorer/MONGO/addCollectionExistingDatabase.spec.ts delete mode 100644 cypress/integration/dataexplorer/MONGO/provisionDatabaseThroughput.spec.ts delete mode 100644 cypress/integration/dataexplorer/SQL/addCollection.spec.ts delete mode 100644 cypress/integration/dataexplorer/TABLE/addCollection.spec.ts delete mode 100644 cypress/integration/dataexplorer/ci-tests/addCollectionPane.spec.ts delete mode 100644 cypress/integration/dataexplorer/ci-tests/createDatabase.spec.ts delete mode 100644 cypress/integration/dataexplorer/ci-tests/deleteCollection.spec.ts delete mode 100644 cypress/integration/dataexplorer/ci-tests/deleteDatabase.spec.ts delete mode 100644 cypress/integration/notebook/README.md delete mode 100644 cypress/integration/notebook/newNotebook.spec.ts delete mode 100644 cypress/integration/notebook/resourceTree.spec.ts delete mode 100644 cypress/package-lock.json delete mode 100644 cypress/package.json delete mode 100644 cypress/support/index.js delete mode 100644 cypress/tsconfig.json delete mode 100644 cypress/utilities/connectionString.js delete mode 100644 cypress/utilities/cosmosClient.js delete mode 100644 test/index.spec.ts diff --git a/.eslintignore b/.eslintignore index 5d9d08948..48ae531a2 100644 --- a/.eslintignore +++ b/.eslintignore @@ -396,19 +396,5 @@ src/Explorer/Tree/ResourceTreeAdapterForResourceToken.tsx src/GalleryViewer/Cards/GalleryCardComponent.tsx src/GalleryViewer/GalleryViewer.tsx src/GalleryViewer/GalleryViewerComponent.tsx -cypress/integration/dataexplorer/CASSANDRA/addCollection.spec.ts -cypress/integration/dataexplorer/GRAPH/addCollection.spec.ts -cypress/integration/dataexplorer/ci-tests/addCollectionPane.spec.ts -cypress/integration/dataexplorer/ci-tests/createDatabase.spec.ts -cypress/integration/dataexplorer/ci-tests/deleteCollection.spec.ts -cypress/integration/dataexplorer/ci-tests/deleteDatabase.spec.ts -cypress/integration/dataexplorer/MONGO/addCollection.spec.ts -cypress/integration/dataexplorer/MONGO/addCollectionAutopilot.spec.ts -cypress/integration/dataexplorer/MONGO/addCollectionExistingDatabase.spec.ts -cypress/integration/dataexplorer/MONGO/provisionDatabaseThroughput.spec.ts -cypress/integration/dataexplorer/SQL/addCollection.spec.ts -cypress/integration/dataexplorer/TABLE/addCollection.spec.ts -cypress/integration/notebook/newNotebook.spec.ts -cypress/integration/notebook/resourceTree.spec.ts __mocks__/monaco-editor.ts src/Explorer/Tree/ResourceTreeAdapterForResourceToken.test.tsx \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b04588330..bee4b01cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,32 +79,31 @@ jobs: name: dist path: dist/ endtoendemulator: - name: "End To End Tests | Emulator | SQL" + name: "End To End Emulator Tests" needs: [lint, format, compile, unittest] runs-on: windows-latest steps: - uses: actions/checkout@v2 - - uses: southpolesteve/cosmos-emulator-github-action@v1 - name: Use Node.js 12.x uses: actions/setup-node@v1 with: node-version: 12.x - - name: Restore Cypress Binary Cache - uses: actions/cache@v2 - with: - path: ~/.cache/Cypress - key: ${{ runner.os }}-cypress-binary-cache + - uses: southpolesteve/cosmos-emulator-github-action@v1 - name: End to End Tests run: | npm ci npm start & - npm ci --prefix ./cypress - npm run test:ci --prefix ./cypress -- --spec ./integration/dataexplorer/ci-tests/createDatabase.spec.ts + npm run wait-for-server + npx jest -c ./jest.config.e2e.js --detectOpenHandles sql shell: bash env: - EMULATOR_ENDPOINT: https://0.0.0.0:8081/ + DATA_EXPLORER_ENDPOINT: "https://localhost:1234/explorer.html?platform=Emulator" + PLATFORM: "Emulator" NODE_TLS_REJECT_UNAUTHORIZED: 0 - CYPRESS_CACHE_FOLDER: ~/.cache/Cypress + - uses: actions/upload-artifact@v2 + with: + name: screenshots + path: failed-* accessibility: name: "Accessibility | Hosted" needs: [lint, format, compile, unittest] @@ -123,13 +122,13 @@ jobs: sudo sysctl -p npm ci npm start & - npx wait-on -i 5000 https-get://0.0.0.0:1234/ + npx wait-on -i 5000 https-get://0.0.0.0:1234/ node utils/accesibilityCheck.js shell: bash env: NODE_TLS_REJECT_UNAUTHORIZED: 0 - endtoendpuppeteer: - name: "End to end puppeteer tests" + endtoendhosted: + name: "End to End Hosted Tests" needs: [lint, format, compile, unittest] runs-on: ubuntu-latest steps: @@ -138,7 +137,7 @@ jobs: uses: actions/setup-node@v1 with: node-version: 12.x - - name: End to End Puppeteer Tests + - name: End to End Hosted Tests run: | npm ci npm start & @@ -159,7 +158,7 @@ jobs: nuget: name: Publish Nuget if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/') - needs: [lint, format, compile, build, unittest, endtoendemulator, endtoendpuppeteer] + needs: [lint, format, compile, build, unittest, endtoendemulator, endtoendhosted] runs-on: ubuntu-latest env: NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }} @@ -183,7 +182,7 @@ jobs: nugetmpac: name: Publish Nuget MPAC if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/') - needs: [lint, format, compile, build, unittest, endtoendemulator, endtoendpuppeteer] + needs: [lint, format, compile, build, unittest, endtoendemulator, endtoendhosted] runs-on: ubuntu-latest env: NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }} diff --git a/.gitignore b/.gitignore index ba806feab..109e6c4d2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,9 +9,6 @@ pkg/DataExplorer/* test/out/* workers/**/*.js *.trx -cypress/videos -cypress/screenshots -cypress/fixtures notebookapp/* Contracts/* .DS_Store diff --git a/README.md b/README.md index f9a05488f..316975238 100644 --- a/README.md +++ b/README.md @@ -76,17 +76,7 @@ Unit tests are located adjacent to the code under test and run with [Jest](https #### End to End CI Tests -[Cypress](https://www.cypress.io/) is used for end to end tests and are contained in `cypress/`. Currently, it operates as sub project with its own typescript config and dependencies. It also only operates against the emulator. To run cypress tests: - -1. Ensure the emulator is running -2. Start cosmos explorer in emulator mode: `PLATFORM=Emulator npm run watch` -3. Move into `cypress/` folder: `cd cypress` -4. Install dependencies: `npm install` -5. Run cypress headless(`npm run test`) or in interactive mode(`npm run test:debug`) - -#### End to End Production Tests - -Jest and Puppeteer are used for end to end production runners and are contained in `test/`. To run these tests locally: +Jest and Puppeteer are used for end to end browser based tests and are contained in `test/`. To run these tests locally: 1. Copy .env.example to .env 2. Update the values in .env including your local data explorer endpoint (ask a teammate/codeowner for help with .env values) diff --git a/cypress/.gitignore b/cypress/.gitignore deleted file mode 100644 index 741e4121e..000000000 --- a/cypress/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -cypress.env.json -cypress/report -cypress/screenshots -cypress/videos \ No newline at end of file diff --git a/cypress/cleanup.js b/cypress/cleanup.js deleted file mode 100644 index 771529aa7..000000000 --- a/cypress/cleanup.js +++ /dev/null @@ -1,51 +0,0 @@ -// Cleans up old databases from previous test runs -const { CosmosClient } = require("@azure/cosmos"); - -// TODO: Add support for other API connection strings -const mongoRegex = RegExp("mongodb://.*:(.*)@(.*).mongo.cosmos.azure.com"); - -async function cleanup() { - const connectionString = process.env.CYPRESS_CONNECTION_STRING; - if (!connectionString) { - throw new Error("Connection string not provided"); - } - - let client; - switch (true) { - case connectionString.includes("mongodb://"): { - const [, key, accountName] = connectionString.match(mongoRegex); - client = new CosmosClient({ - key, - endpoint: `https://${accountName}.documents.azure.com:443/` - }); - break; - } - // TODO: Add support for other API connection strings - default: - client = new CosmosClient(connectionString); - break; - } - - const response = await client.databases.readAll().fetchAll(); - return Promise.all( - response.resources.map(async db => { - const dbTimestamp = new Date(db._ts * 1000); - const twentyMinutesAgo = new Date(Date.now() - 1000 * 60 * 20); - if (dbTimestamp < twentyMinutesAgo) { - await client.database(db.id).delete(); - console.log(`DELETED: ${db.id} | Timestamp: ${dbTimestamp}`); - } else { - console.log(`SKIPPED: ${db.id} | Timestamp: ${dbTimestamp}`); - } - }) - ); -} - -cleanup() - .then(() => { - process.exit(0); - }) - .catch(error => { - console.error(error); - process.exit(1); - }); diff --git a/cypress/cypress.json b/cypress/cypress.json deleted file mode 100644 index 81ece3f2b..000000000 --- a/cypress/cypress.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "integrationFolder": "./integration", - "pluginsFile": false, - "fixturesFolder": false, - "supportFile": "./support/index.js", - "defaultCommandTimeout": 90000, - "chromeWebSecurity": false, - "reporter": "mochawesome", - "reporterOptions": { - "reportDir": "cypress/report", - "json": true, - "overwrite": false, - "html": false - } -} diff --git a/cypress/integration/dataexplorer/CASSANDRA/addCollection.spec.ts b/cypress/integration/dataexplorer/CASSANDRA/addCollection.spec.ts deleted file mode 100644 index d063da6f0..000000000 --- a/cypress/integration/dataexplorer/CASSANDRA/addCollection.spec.ts +++ /dev/null @@ -1,66 +0,0 @@ -// 1. Click on "New Container" on the command bar. -// 2. Pane with the title "Add Container" should appear on the right side of the screen -// 3. It includes an input box for the database Id. -// 4. It includes a checkbox called "Create now". -// 5. When the checkbox is marked, enter new database id. -// 3. Create a database WITH "Provision throughput" checked. -// 4. Enter minimum throughput value of 400. -// 5. Enter container id to the container id text box. -// 6. Enter partition key to the partition key text box. -// 7. Click "OK" to create a new container. -// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen. - -const connectionString = require("../../../utilities/connectionString"); - -let crypt = require("crypto"); - -context("Cassandra API Test - createDatabase", () => { - beforeEach(() => { - connectionString.loginUsingConnectionString(connectionString.constants.cassandra); - }); - - it("Create a new table in Cassandra API", () => { - const keyspaceId = `KeyspaceId${crypt.randomBytes(8).toString("hex")}`; - const tableId = `TableId112`; - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - cy.wrap($body) - .find('div[class="commandBarContainer"]') - .should("be.visible") - .find('button[data-test="New Table"]') - .should("be.visible") - .click(); - - cy.wrap($body) - .find('div[class="contextual-pane-in"]') - .should("be.visible") - .find('span[id="containerTitle"]'); - - cy.wrap($body) - .find('input[id="keyspace-id"]') - .should("be.visible") - .type(keyspaceId); - - cy.wrap($body) - .find('input[class="textfontclr"]') - .type(tableId); - - cy.wrap($body) - .find('input[data-test="databaseThroughputValue"]') - .should("have.value", "400"); - - cy.wrap($body) - .find('data-test="addCollection-createCollection"') - .click(); - - cy.wait(10000); - - cy.wrap($body) - .find('div[data-test="resourceTreeId"]') - .should("exist") - .find('div[class="treeComponent dataResourceTree"]') - .should("contain", tableId); - }); - }); -}); diff --git a/cypress/integration/dataexplorer/GRAPH/addCollection.spec.ts b/cypress/integration/dataexplorer/GRAPH/addCollection.spec.ts deleted file mode 100644 index a212f3a67..000000000 --- a/cypress/integration/dataexplorer/GRAPH/addCollection.spec.ts +++ /dev/null @@ -1,81 +0,0 @@ -// 1. Click on "New Graph" on the command bar. -// 2. Pane with the title "Add Container" should appear on the right side of the screen -// 3. It includes an input box for the database Id. -// 4. It includes a checkbox called "Create now". -// 5. When the checkbox is marked, enter new database id. -// 3. Create a database WITH "Provision throughput" checked. -// 4. Enter minimum throughput value of 400. -// 5. Enter container id to the container id text box. -// 6. Enter partition key to the partition key text box. -// 7. Click "OK" to create a new container. -// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen. - -const connectionString = require("../../../utilities/connectionString"); - -let crypt = require("crypto"); - -context("Graph API Test", () => { - beforeEach(() => { - connectionString.loginUsingConnectionString(connectionString.constants.graph); - }); - - it("Create a new graph in Graph API", () => { - const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`; - const graphId = `TestGraph${crypt.randomBytes(8).toString("hex")}`; - const partitionKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`; - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - cy.wrap($body) - .find('div[class="commandBarContainer"]') - .should("be.visible") - .find('button[data-test="New Graph"]') - .should("be.visible") - .click(); - - cy.wrap($body) - .find('div[class="contextual-pane-in"]') - .should("be.visible") - .find('span[id="containerTitle"]'); - - cy.wrap($body) - .find('input[data-test="addCollection-createNewDatabase"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollection-newDatabaseId"]') - .should("be.visible") - .type(dbId); - - cy.wrap($body) - .find('input[data-test="addCollectionPane-databaseSharedThroughput"]') - .check(); - - cy.wrap($body) - .find('input[data-test="databaseThroughputValue"]') - .should("have.value", "400"); - - cy.wrap($body) - .find('input[data-test="addCollection-collectionId"]') - .type(graphId); - - cy.wrap($body) - .find('input[data-test="addCollection-partitionKeyValue"]') - .type(partitionKey); - - cy.wrap($body) - .find('input[data-test="addCollection-createCollection"]') - .click(); - - cy.wait(10000); - - cy.wrap($body) - .find('div[data-test="resourceTreeId"]') - .should("exist") - .find('div[class="treeComponent dataResourceTree"]') - .should("contain", dbId) - .click() - .should("contain", graphId); - }); - }); -}); diff --git a/cypress/integration/dataexplorer/MONGO/addCollection.spec.ts b/cypress/integration/dataexplorer/MONGO/addCollection.spec.ts deleted file mode 100644 index ea06e5472..000000000 --- a/cypress/integration/dataexplorer/MONGO/addCollection.spec.ts +++ /dev/null @@ -1,80 +0,0 @@ -// 1. Click on "New Container" on the command bar. -// 2. Pane with the title "Add Container" should appear on the right side of the screen -// 3. It includes an input box for the database Id. -// 4. It includes a checkbox called "Create now". -// 5. When the checkbox is marked, enter new database id. -// 3. Create a database WITH "Provision throughput" checked. -// 4. Enter minimum throughput value of 400. -// 5. Enter container id to the container id text box. -// 6. Enter partition key to the partition key text box. -// 7. Click "OK" to create a new container. -// // 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen. - -const connectionString = require("../../../utilities/connectionString"); - -let crypt = require("crypto"); - -context("Mongo API Test - createDatabase", () => { - beforeEach(() => { - connectionString.loginUsingConnectionString(); - }); - - it("Create a new collection in Mongo API", () => { - const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`; - const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`; - const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`; - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - cy.wrap($body) - .find('div[class="commandBarContainer"]') - .should("be.visible") - .find('button[data-test="New Collection"]') - .should("be.visible") - .click(); - - cy.wrap($body) - .find('div[class="contextual-pane-in"]') - .should("be.visible") - .find('span[id="containerTitle"]'); - - cy.wrap($body) - .find('input[data-test="addCollection-createNewDatabase"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollection-newDatabaseId"]') - .type(dbId); - - cy.wrap($body) - .find('input[data-test="addCollectionPane-databaseSharedThroughput"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollection-collectionId"]') - .type(collectionId); - - cy.wrap($body) - .find('input[data-test="databaseThroughputValue"]') - .should("have.value", "400"); - - cy.wrap($body) - .find('input[data-test="addCollection-partitionKeyValue"]') - .type(sharedKey); - - cy.wrap($body) - .find("#submitBtnAddCollection") - .click(); - - cy.wait(10000); - - cy.wrap($body) - .find('div[data-test="resourceTreeId"]') - .should("exist") - .find('div[class="treeComponent dataResourceTree"]') - .should("contain", dbId) - .click() - .should("contain", collectionId); - }); - }); -}); diff --git a/cypress/integration/dataexplorer/MONGO/addCollectionAutopilot.spec.ts b/cypress/integration/dataexplorer/MONGO/addCollectionAutopilot.spec.ts deleted file mode 100644 index d9b064578..000000000 --- a/cypress/integration/dataexplorer/MONGO/addCollectionAutopilot.spec.ts +++ /dev/null @@ -1,96 +0,0 @@ -// 1. Click on "New Container" on the command bar. -// 2. Pane with the title "Add Container" should appear on the right side of the screen -// 3. It includes an input box for the database Id. -// 4. It includes a checkbox called "Create now". -// 5. When the checkbox is marked, enter new database id. -// 3. Create a database WITH "Provision throughput" checked. -// 4. Enter minimum throughput value of 400. -// 5. Enter container id to the container id text box. -// 6. Enter partition key to the partition key text box. -// 7. Click "OK" to create a new container. -// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen. - -const connectionString = require("../../../utilities/connectionString"); - -let crypt = require("crypto"); - -context("Mongo API Test", () => { - beforeEach(() => { - connectionString.loginUsingConnectionString(); - }); - - it.skip("Create a new collection in Mongo API - Autopilot", () => { - const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`; - const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`; - const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`; - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - cy.wrap($body) - .find('div[class="commandBarContainer"]') - .should("be.visible") - .find('button[data-test="New Collection"]') - .should("be.visible") - .click(); - - cy.wrap($body) - .find('div[class="contextual-pane-in"]') - .should("be.visible") - .find('span[id="containerTitle"]'); - - cy.wrap($body) - .find('input[data-test="addCollection-createNewDatabase"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollection-newDatabaseId"]') - .type(dbId); - - cy.wrap($body) - .find('input[data-test="addCollectionPane-databaseSharedThroughput"]') - .check(); - - cy.wrap($body) - .find('div[class="throughputModeContainer"]') - .should("be.visible") - .and(input => { - expect(input.get(0).textContent, "first item").contains("Autopilot (preview)"); - expect(input.get(1).textContent, "second item").contains("Manual"); - }); - - cy.wrap($body) - .find('input[id="newContainer-databaseThroughput-autoPilotRadio"]') - .check(); - - cy.wrap($body) - .find('select[name="autoPilotTiers"]') - // .eq(1).should('contain', '4,000 RU/s'); - // // .select('4,000 RU/s').should('have.value', '1'); - - .find('option[value="2"]') - .then($element => $element.get(1).setAttribute("selected", "selected")); - - cy.wrap($body) - .find('input[data-test="addCollection-collectionId"]') - .type(collectionId); - - cy.wrap($body) - .find('input[data-test="addCollection-partitionKeyValue"]') - .type(sharedKey); - - cy.wrap($body) - .find('input[data-test="addCollection-createCollection"]') - .click(); - - cy.wait(10000); - - cy.wrap($body) - .find('div[data-test="resourceTreeId"]') - .should("exist") - .find('div[class="treeComponent dataResourceTree"]') - .should("contain", dbId) - .click() - .should("contain", collectionId); - }); - }); -}); diff --git a/cypress/integration/dataexplorer/MONGO/addCollectionExistingDatabase.spec.ts b/cypress/integration/dataexplorer/MONGO/addCollectionExistingDatabase.spec.ts deleted file mode 100644 index 8661cbdce..000000000 --- a/cypress/integration/dataexplorer/MONGO/addCollectionExistingDatabase.spec.ts +++ /dev/null @@ -1,67 +0,0 @@ -const connectionString = require("../../../utilities/connectionString"); - -let crypt = require("crypto"); - -context("Mongo API Test", () => { - beforeEach(() => { - connectionString.loginUsingConnectionString(); - }); - - it.skip("Create a new collection in existing database in Mongo API", () => { - const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`; - const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`; - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - - cy.wrap($body) - .find('span[class="nodeLabel"]') - .should("be.visible") - .then($span => { - const dbId1 = $span.text(); - cy.log("DBBB", dbId1); - - cy.wrap($body) - .find('div[class="commandBarContainer"]') - .should("be.visible") - .find('button[data-test="New Collection"]') - .should("be.visible") - .click(); - - cy.wrap($body) - .find('div[class="contextual-pane-in"]') - .should("be.visible") - .find('span[id="containerTitle"]'); - - cy.wrap($body) - .find('input[data-test="addCollection-existingDatabase"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollection-existingDatabase"]') - .type(dbId1); - - cy.wrap($body) - .find('input[data-test="addCollection-collectionId"]') - .type(collectionId); - - cy.wrap($body) - .find('input[data-test="addCollection-partitionKeyValue"]') - .type(sharedKey); - - cy.wrap($body) - .find('input[data-test="addCollection-createCollection"]') - .click(); - - cy.wait(10000); - - cy.wrap($body) - .find('div[data-test="resourceTreeId"]') - .should("exist") - .find('div[class="treeComponent dataResourceTree"]') - .click() - .should("contain", collectionId); - }); - }); - }); -}); diff --git a/cypress/integration/dataexplorer/MONGO/provisionDatabaseThroughput.spec.ts b/cypress/integration/dataexplorer/MONGO/provisionDatabaseThroughput.spec.ts deleted file mode 100644 index d6bc4d0e3..000000000 --- a/cypress/integration/dataexplorer/MONGO/provisionDatabaseThroughput.spec.ts +++ /dev/null @@ -1,203 +0,0 @@ -const connectionString = require("../../../utilities/connectionString"); - -let crypt = require("crypto"); - -context.skip("Mongo API Test", () => { - beforeEach(() => { - connectionString.loginUsingConnectionString(); - }); - - it("Create a new collection in Mongo API - Provision database throughput", () => { - const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`; - const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`; - const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`; - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - cy.wrap($body) - .find('div[class="commandBarContainer"]') - .should("be.visible") - .find('button[data-test="New Collection"]') - .should("be.visible") - .click(); - - cy.wrap($body) - .find('div[class="contextual-pane-in"]') - .should("be.visible") - .find('span[id="containerTitle"]'); - - cy.wrap($body) - .find(".createNewDatabaseOrUseExisting") - .should("have.length", 2) - .and(input => { - expect(input.get(0).textContent, "first item").contains("Create new"); - expect(input.get(1).textContent, "second item").contains("Use existing"); - }); - - cy.wrap($body) - .find('input[data-test="addCollection-createNewDatabase"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollectionPane-databaseSharedThroughput"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollection-newDatabaseId"]') - .type(dbId); - - cy.wrap($body) - .find('input[data-test="addCollectionPane-databaseSharedThroughput"]') - .check(); - - cy.wrap($body) - .find('input[data-test="databaseThroughputValue"]') - .should("have.value", "400"); - - cy.wrap($body) - .find('input[data-test="addCollection-collectionId"]') - .type(collectionId); - - cy.wrap($body) - .find('input[data-test="addCollection-partitionKeyValue"]') - .type(sharedKey); - - cy.wrap($body) - .find('input[data-test="addCollection-createCollection"]') - .click(); - - cy.wait(10000); - - cy.wrap($body) - .find('div[data-test="resourceTreeId"]') - .should("exist") - .find('div[class="treeComponent dataResourceTree"]') - .should("contain", dbId) - .click() - .should("contain", collectionId); - }); - }); - - it("Create a new collection - without provision database throughput", () => { - const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`; - const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`; - const collectionIdTitle = `Add Collection`; - const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`; - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - cy.wrap($body) - .find('div[class="commandBarContainer"]') - .should("be.visible") - .find('button[data-test="New Collection"]') - .should("be.visible") - .click(); - - cy.wrap($body) - .find('div[class="contextual-pane-in"]') - .should("be.visible") - .find('span[id="containerTitle"]'); - - cy.wrap($body) - .find('input[data-test="addCollection-createNewDatabase"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollection-newDatabaseId"]') - .type(dbId); - - cy.wrap($body) - .find('input[data-test="addCollectionPane-databaseSharedThroughput"]') - .uncheck(); - - cy.wrap($body) - .find('input[data-test="addCollection-collectionId"]') - .type(collectionId); - - cy.wrap($body) - .find('input[id="tab2"]') - .check({ force: true }); - - cy.wrap($body) - .find('input[data-test="addCollection-partitionKeyValue"]') - .type(sharedKey); - - cy.wrap($body) - .find('input[data-test="databaseThroughputValue"]') - .should("have.value", "400"); - - cy.wrap($body) - .find('input[data-test="addCollection-createCollection"]') - .click(); - - cy.wait(10000); - - cy.wrap($body) - .find('div[data-test="resourceTreeId"]') - .should("exist") - .find('div[class="treeComponent dataResourceTree"]') - .should("contain", dbId) - .click() - .should("contain", collectionId); - }); - }); - - it("Create a new collection - without provision database throughput Fixed Storage Capacity", () => { - const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`; - const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`; - const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`; - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - cy.wrap($body) - .find('div[class="commandBarContainer"]') - .should("be.visible") - .find('button[data-test="New Collection"]') - .should("be.visible") - .click(); - - cy.wrap($body) - .find('div[class="contextual-pane-in"]') - .should("be.visible") - .find('span[id="containerTitle"]'); - - cy.wrap($body) - .find('input[data-test="addCollection-createNewDatabase"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollection-newDatabaseId"]') - .type(dbId); - - cy.wrap($body) - .find('input[data-test="addCollectionPane-databaseSharedThroughput"]') - .uncheck(); - - cy.wrap($body) - .find('input[data-test="addCollection-collectionId"]') - .type(collectionId); - - cy.wrap($body) - .find('input[id="tab1"]') - .check({ force: true }); - - cy.wrap($body) - .find('input[data-test="databaseThroughputValue"]') - .should("have.value", "400"); - - cy.wrap($body) - .find('input[data-test="addCollection-createCollection"]') - .click(); - - cy.wait(10000); - - cy.wrap($body) - .find('div[data-test="resourceTreeId"]') - .should("exist") - .find('div[class="treeComponent dataResourceTree"]') - .should("contain", dbId) - .click() - .should("contain", collectionId); - }); - }); -}); diff --git a/cypress/integration/dataexplorer/SQL/addCollection.spec.ts b/cypress/integration/dataexplorer/SQL/addCollection.spec.ts deleted file mode 100644 index a3259a80e..000000000 --- a/cypress/integration/dataexplorer/SQL/addCollection.spec.ts +++ /dev/null @@ -1,79 +0,0 @@ -// 1. Click on "New Container" on the command bar. -// 2. Pane with the title "Add Container" should appear on the right side of the screen -// 3. It includes an input box for the database Id. -// 4. It includes a checkbox called "Create now". -// 5. When the checkbox is marked, enter new database id. -// 3. Create a database WITH "Provision throughput" checked. -// 4. Enter minimum throughput value of 400. -// 5. Enter container id to the container id text box. -// 6. Enter partition key to the partition key text box. -// 7. Click "OK" to create a new container. -// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen. - -const connectionString = require("../../../utilities/connectionString"); - -let crypt = require("crypto"); - -context("SQL API Test", () => { - beforeEach(() => { - connectionString.loginUsingConnectionString(); - }); - - it("Create a new container in SQL API", () => { - const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`; - const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`; - const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`; - connectionString.loginUsingConnectionString(); - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - cy.wrap($body) - .find('div[class="commandBarContainer"]') - .should("be.visible") - .find('button[data-test="New Container"]') - .should("be.visible") - .click(); - - cy.wrap($body) - .find('div[class="contextual-pane-in"]') - .should("be.visible") - .find('span[id="containerTitle"]'); - - cy.wrap($body) - .find('input[data-test="addCollection-createNewDatabase"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollectionPane-databaseSharedThroughput"]') - .check(); - - cy.wrap($body) - .find('input[data-test="addCollection-newDatabaseId"]') - .type(dbId); - - cy.wrap($body) - .find('input[data-test="addCollection-collectionId"]') - .type(collectionId); - - cy.wrap($body) - .find('input[data-test="databaseThroughputValue"]') - .should("have.value", "400"); - - cy.wrap($body) - .find('input[data-test="addCollection-partitionKeyValue"]') - .type(sharedKey); - - cy.wrap($body) - .find("#submitBtnAddCollection") - .click(); - - cy.wait(10000); - - cy.wrap($body) - .find('div[data-test="resourceTreeId"]') - .should("exist") - .find('div[class="treeComponent dataResourceTree"]') - .should("contain", dbId); - }); - }); -}); diff --git a/cypress/integration/dataexplorer/TABLE/addCollection.spec.ts b/cypress/integration/dataexplorer/TABLE/addCollection.spec.ts deleted file mode 100644 index 4f65e0b2c..000000000 --- a/cypress/integration/dataexplorer/TABLE/addCollection.spec.ts +++ /dev/null @@ -1,60 +0,0 @@ -// 1. Click on "New Container" on the command bar. -// 2. Pane with the title "Add Container" should appear on the right side of the screen -// 3. It includes an input box for the database Id. -// 4. It includes a checkbox called "Create now". -// 5. When the checkbox is marked, enter new database id. -// 3. Create a database WITH "Provision throughput" checked. -// 4. Enter minimum throughput value of 400. -// 5. Enter container id to the container id text box. -// 6. Enter partition key to the partition key text box. -// 7. Click "OK" to create a new container. -// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen. - -const connectionString = require("../../../utilities/connectionString"); - -let crypt = require("crypto"); - -context("Table API Test", () => { - beforeEach(() => { - connectionString.loginUsingConnectionString(connectionString.constants.table); - }); - - it("Create a new table in Table API", () => { - const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`; - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - cy.wrap($body) - .find('div[class="commandBarContainer"]') - .should("be.visible") - .find('button[data-test="New Table"]') - .should("be.visible") - .click(); - - cy.wrap($body) - .find('div[class="contextual-pane-in"]') - .should("be.visible") - .find('span[id="containerTitle"]'); - - cy.wrap($body) - .find('input[data-test="addCollection-collectionId"]') - .type(collectionId); - - cy.wrap($body) - .find('input[data-test="databaseThroughputValue"]') - .should("have.value", "400"); - - cy.wrap($body) - .find('input[data-test="addCollection-createCollection"]') - .click(); - - cy.wait(10000); - - cy.wrap($body) - .find('div[data-test="resourceTreeId"]') - .should("exist") - .find('div[class="treeComponent dataResourceTree"]') - .should("contain", collectionId); - }); - }); -}); diff --git a/cypress/integration/dataexplorer/ci-tests/addCollectionPane.spec.ts b/cypress/integration/dataexplorer/ci-tests/addCollectionPane.spec.ts deleted file mode 100644 index aa13709ea..000000000 --- a/cypress/integration/dataexplorer/ci-tests/addCollectionPane.spec.ts +++ /dev/null @@ -1,55 +0,0 @@ -// 1. Click on "New Container" on the command bar. -// 2. Pane with the title "Add Container" should appear on the right side of the screen -// 3. It includes an input box for the database Id. -// 4. It includes a checkbox called "Create now". -// 5. When the checkbox is marked, enter new database id. -// 3. Create a database WITH "Provision throughput" checked. -// 4. Enter minimum throughput value of 400. -// 5. Enter container id to the container id text box. -// 6. Enter partition key to the partition key text box. -// 7. Click "OK" to create a new container. -// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen. - -let crypt = require("crypto"); - -context("Emulator - createDatabase", () => { - beforeEach(() => { - cy.visit("http://localhost:1234/explorer.html"); - }); - - const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`; - const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`; - const collectionIdTitle = `Add Collection`; - const partitionKey = `PartitionKey${crypt.randomBytes(8).toString("hex")}`; - - it("Create a new collection", () => { - cy.contains("New Container").click(); - - // cy.contains(collectionIdTitle); - - cy.get(".createNewDatabaseOrUseExisting") - .should("have.length", 2) - .and(input => { - expect(input.get(0).textContent, "first item").contains("Create new"); - expect(input.get(1).textContent, "second item").contains("Use existing"); - }); - - cy.get('input[data-test="addCollection-createNewDatabase"]').check(); - - cy.get('input[data-test="addCollection-newDatabaseId"]').type(dbId); - - cy.get('input[data-test="addCollection-collectionId"]').type(collectionId); - - cy.get('input[data-test="databaseThroughputValue"]').should("have.value", "400"); - - cy.get('input[data-test="addCollection-partitionKeyValue"]').type(partitionKey); - - cy.get('input[data-test="addCollection-createCollection"]').click(); - - cy.get('div[data-test="resourceTreeId"]').should("exist"); - - cy.get('div[data-test="resourceTree-collectionsTree"]').should("contain", dbId); - - cy.get('div[data-test="databaseList"]').should("contain", collectionId); - }); -}); diff --git a/cypress/integration/dataexplorer/ci-tests/createDatabase.spec.ts b/cypress/integration/dataexplorer/ci-tests/createDatabase.spec.ts deleted file mode 100644 index 58f90aff8..000000000 --- a/cypress/integration/dataexplorer/ci-tests/createDatabase.spec.ts +++ /dev/null @@ -1,65 +0,0 @@ -// 1. Click on "New Database" on the command bar -// 2. a Pane with the title "Add Database" should appear on the right side of the screen -// i. It includes an input box for the database Id. -// ii. It includes a checkbox called "Provision throughput". -// iii. Whe the checkbox is marked, a new input with a throughput control let's you customize RU at the database level -// 3. Create a database WITHOUT "Provision throughput" checked. -// 4. It should appear in the Data Explorer list. -// 5. Repeat steps 1-3 but create a database WITH "Provision throughput" with the default RU value. -// 6. It should appear in the Data Explorer list. -// 7. If expanded, it should have the list item called "Scale", that once clicked, it should show the "Scale" tab. -// 8. Inside that tab, a throughput control will let you change the RU value within the permited range. -// 9. If you change the value, it should enable the "Save" button. -// 10. Click "Save" and verify that the process completes without error. -// 11. Close the tab and reopen it and verify that the input contains the last saved value.% - -const crypto = require("crypto"); -const client = require("../../../utilities/cosmosClient"); -const randomString = crypto.randomBytes(2).toString("hex"); -const databaseId = `TestDB-${randomString}`; -const collectionId = `TestColl-${randomString}`; - -context("Emulator - Create database -> container -> item", () => { - beforeEach(async () => { - const { resources } = await client.databases.readAll().fetchAll(); - for (const database of resources) { - await client.database(database.id).delete(); - } - }); - - it("creates a new database", () => { - cy.visit("https://0.0.0.0:1234/explorer.html?platform=Emulator"); - cy.contains("New Container").click(); - cy.get("[data-test=addCollection-newDatabaseId]").click(); - cy.get("[data-test=addCollection-newDatabaseId]").type(databaseId); - cy.get("[data-test=addCollection-collectionId]").click(); - cy.get("[data-test=addCollection-collectionId]").type(collectionId); - cy.get("[data-test=addCollection-partitionKeyValue]").click(); - cy.get("[data-test=addCollection-partitionKeyValue]").type("/pk"); - cy.get('input[name="createCollection"]').click(); - cy.get(".dataResourceTree").should("contain", databaseId); - cy.get(".dataResourceTree") - .contains(databaseId) - .click(); - cy.get(".dataResourceTree").should("contain", collectionId); - cy.get(".dataResourceTree") - .contains(collectionId) - .click(); - cy.get(".dataResourceTree") - .contains("Items") - .click(); - cy.get(".dataResourceTree") - .contains("Items") - .click(); - cy.wait(1000); // React rendering inside KO causes some weird async rendering that makes this test flaky without waiting - cy.get(".commandBarContainer") - .contains("New Item") - .click(); - cy.wait(1000); // React rendering inside KO causes some weird async rendering that makes this test flaky without waiting - cy.get(".commandBarContainer") - .contains("Save") - .click(); - cy.wait(1000); // React rendering inside KO causes some weird async rendering that makes this test flaky without waiting - cy.get(".documentsGridHeaderContainer").should("contain", "replace_with_new_document_id"); - }); -}); diff --git a/cypress/integration/dataexplorer/ci-tests/deleteCollection.spec.ts b/cypress/integration/dataexplorer/ci-tests/deleteCollection.spec.ts deleted file mode 100644 index a5516a551..000000000 --- a/cypress/integration/dataexplorer/ci-tests/deleteCollection.spec.ts +++ /dev/null @@ -1,46 +0,0 @@ -// 1. Click last database in the resource tree -// 2. Click the last collection within the database -// 3. Select the context menu within the collection -// 4. Select "Delete Container" option in the dropdown -// 5. On Selection, Delete Container pane opens on the right side -// 6. Enter the same collection id that is to be deleted and click ok -// 7. Now, the resource tree refreshes, the deleted collection should not appear under the database - -let crypt = require("crypto"); - -context("Emulator - deleteCollection", () => { - beforeEach(() => { - cy.visit("http://localhost:1234/explorer.html"); - }); - - it("Delete a collection", () => { - cy.get(".databaseId") - .last() - .click(); - - cy.get(".collectionList") - .last() - .then($id => { - const collectionId = $id.text(); - - cy.get('span[data-test="collectionEllipsisMenu"]').should("exist"); - - cy.get('span[data-test="collectionEllipsisMenu"]') - .invoke("show") - .last() - .click(); - - cy.get('div[data-test="collectionContextMenu"]') - .contains("Delete Container") - .click({ force: true }); - - cy.get('input[data-test="confirmCollectionId"]').type(collectionId.trim()); - - cy.get('input[data-test="deleteCollection"]').click(); - - cy.get('div[data-test="databaseList"]').should("not.contain", collectionId); - - cy.get('div[data-test="databaseMenu"]').should("not.contain", collectionId); - }); - }); -}); diff --git a/cypress/integration/dataexplorer/ci-tests/deleteDatabase.spec.ts b/cypress/integration/dataexplorer/ci-tests/deleteDatabase.spec.ts deleted file mode 100644 index 152bc3aaf..000000000 --- a/cypress/integration/dataexplorer/ci-tests/deleteDatabase.spec.ts +++ /dev/null @@ -1,83 +0,0 @@ -// 1. Click last database in the resource tree -// 2. Select the context menu within the database -// 4. Select "Delete Database" option in the dropdown -// 5. On Selection, Delete Database pane opens on the right side -// 6. Enter the same database id that is to be deleted and click ok -// 7. Now, the resource tree refreshes, the deleted database should not appear in the resource tree - -let crypt = require("crypto"); - -context("Emulator - deleteDatabase", () => { - beforeEach(() => { - const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`; - const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`; - let db_rid = ""; - const date = new Date().toUTCString(); - let authToken = ""; - cy.visit("http://localhost:1234/explorer.html"); - - // Creating auth token for collection creation - cy.request({ - method: "GET", - url: "https://localhost:8081/_explorer/authorization/post/dbs/", - headers: { - "x-ms-date": date, - authorization: "-" - } - }) - .then(response => { - authToken = response.body.Token; // Getting auth token for collection creation - return new Cypress.Promise((resolve, reject) => { - return resolve(); - }); - }) - .then(() => { - cy.request({ - method: "POST", - url: "https://localhost:8081/dbs", - headers: { - "x-ms-date": date, - authorization: authToken, - "x-ms-version": "2018-12-31" - }, - body: { - id: dbId - } - }).then(response => { - cy.log("Response", response); - db_rid = response.body._rid; - return new Cypress.Promise((resolve, reject) => { - cy.log("Rid", db_rid); - return resolve(); - }); - }); - }); - }); - - it("Delete a database", () => { - cy.get('span[data-test="refreshTree"]').click(); - - cy.get(".databaseId") - .last() - .then($id => { - const dbId = $id.text(); - - cy.get('span[data-test="databaseEllipsisMenu"]').should("exist"); - - cy.get('span[data-test="databaseEllipsisMenu"]') - .invoke("show") - .last() - .click(); - - cy.get('div[data-test="databaseContextMenu"]') - .contains("Delete Database") - .click({ force: true }); - - cy.get('input[data-test="confirmDatabaseId"]').type(dbId.trim()); - - cy.get('input[data-test="deleteDatabase"]').click(); - - cy.get('div[data-test="databaseList"]').should("not.contain", dbId); - }); - }); -}); diff --git a/cypress/integration/notebook/README.md b/cypress/integration/notebook/README.md deleted file mode 100644 index 23a2b85d4..000000000 --- a/cypress/integration/notebook/README.md +++ /dev/null @@ -1,35 +0,0 @@ -# Notebook end-to-end tests -This describes how to run the tests locally - -## Stand up a local notebook container instance: -Instructions on how to build and run the container [here](https://microsoft.sharepoint.com/teams/DocDB/_layouts/OneNote.aspx?id=%2Fteams%2FDocDB%2FSiteAssets%2FDocDB%20Team%20Notebook&wd=target%28Tools%20_%20SDK%2FPortal%2FDevelopment.one%7CF800BE8E-1E31-48FE-90D7-EF698EF88112%2FHow%20to%20build%20notebook%20service%7C4BAA153B-422C-41E2-B997-F3FCE02CD743%2F%29) - -## Run a local data explorer -Instructions are in [`DataExplorer/README.md`](https://msdata.visualstudio.com/CosmosDB/_git/cosmosdb-dataexplorer?path=%2FProduct%2FPortal%2FDataExplorer%2FREADME.md&_a=preview). - -Make sure you can run Data Explorer locally from the web browser. - -## Run cypress tests -1. Edit the URL for your DataExplorer in the `.spec.ts` file -2. Run the test: -```bash -cd DataExplorer/cypress -npm i - npm t -- --spec 'integration/notebook/newNotebook.spec.ts' -``` - -To run in Debug mode: -``` -npm run test:debug -``` -This opens Cypress UI - -## Troubleshooting -* The tests are recorded in the `videos` folder. -* Cypress does not support hover: workarounds [here](https://docs.cypress.io/api/commands/hover.html#Workarounds). - - -## References -* [Cypress API](https://docs.cypress.io/api/api/table-of-contents.html) -* [Cypress cookbook](https://docs.cypress.io/faq/questions/using-cypress-faq.html#How-do-I-get-an-element%E2%80%99s-text-contents) -* [Cypress best practices](https://docs.cypress.io/guides/references/best-practices.html#Selecting-Elements) \ No newline at end of file diff --git a/cypress/integration/notebook/newNotebook.spec.ts b/cypress/integration/notebook/newNotebook.spec.ts deleted file mode 100644 index 329ff801c..000000000 --- a/cypress/integration/notebook/newNotebook.spec.ts +++ /dev/null @@ -1,93 +0,0 @@ -// THIS ADDS A NEW NOTEBOOK TO YOUR NOTEBOOKS -context("New Notebook smoke test", () => { - const timeout = 15000; // in ms - const explorerUrl = - "https://localhost:1234/explorer.html?feature.notebookserverurl=https%3A%2F%2Flocalhost%3A10001%2F12345%2Fnotebook&feature.notebookServerToken=token&feature.enablenotebooks=true"; - - /** - * Wait for UI to be ready - */ - const waitForReady = () => { - cy.get(".splashScreenContainer", { timeout }).should("be.visible"); - }; - - beforeEach(() => { - cy.visit(explorerUrl); - waitForReady(); - }); - - it("Create a new notebook and run some code", () => { - // Create new notebook - cy.contains("New Notebook").click(); - - // Check tab name - cy.get("li.tabList .tabNavText").should($span => { - const text = $span.text(); - expect(text).to.match(/^Untitled.*\.ipynb$/); - }); - - // Wait for python3 | idle status - cy.get('[data-test="notebookStatusBar"] [data-test="kernelStatus"]', { timeout }).should($p => { - const text = $p.text(); - expect(text).to.match(/^python3.*idle$/); - }); - - // Click on a cell - cy.get(".cell-container") - .as("cellContainer") - .click(); - - // Type in some code - cy.get("@cellContainer").type("2+4"); - - // Execute - cy.get('[data-test="Run"]') - .first() - .click(); - - // Verify results - cy.get("@cellContainer").within(() => { - cy.get("pre code span").should("contain", "6"); - }); - - // Restart kernel - cy.get('[data-test="Run"] button') - .eq(-1) - .click(); - cy.get("li") - .contains("Restart Kernel") - .click(); - - // Wait for python3 | restarting status - cy.get('[data-test="notebookStatusBar"] [data-test="kernelStatus"]', { timeout }).should($p => { - const text = $p.text(); - expect(text).to.match(/^python3.*restarting$/); - }); - - // Wait for python3 | idle status - cy.get('[data-test="notebookStatusBar"] [data-test="kernelStatus"]', { timeout }).should($p => { - const text = $p.text(); - expect(text).to.match(/^python3.*idle$/); - }); - - // Click on a cell - cy.get(".cell-container") - .as("cellContainer") - .find(".input") - .as("codeInput") - .click(); - - // Type in some code - cy.get("@codeInput").type("{backspace}{backspace}{backspace}4+5"); - - // Execute - cy.get('[data-test="Run"]') - .first() - .click(); - - // Verify results - cy.get("@cellContainer").within(() => { - cy.get("pre code span").should("contain", "9"); - }); - }); -}); diff --git a/cypress/integration/notebook/resourceTree.spec.ts b/cypress/integration/notebook/resourceTree.spec.ts deleted file mode 100644 index 46af2d23e..000000000 --- a/cypress/integration/notebook/resourceTree.spec.ts +++ /dev/null @@ -1,172 +0,0 @@ -context("Resource tree notebook file manipulation", () => { - const timeout = 15000; // in ms - const explorerUrl = - "https://localhost:1234/explorer.html?feature.notebookserverurl=https%3A%2F%2Flocalhost%3A10001%2F12345%2Fnotebook&feature.notebookServerToken=token&feature.enablenotebooks=true"; - - /** - * Wait for UI to be ready - */ - const waitForReady = () => { - cy.get(".splashScreenContainer", { timeout }).should("be.visible"); - }; - - const clickContextMenuAndSelectOption = (nodeLabel, option) => { - cy.get(`.treeNodeHeader[data-test="${nodeLabel}"]`) - .find("button.treeMenuEllipsis") - .click(); - cy.get('[data-test="treeComponentMenuItemContainer"]') - .contains(option) - .click(); - }; - - const createFolder = folder => { - clickContextMenuAndSelectOption("My Notebooks/", "New Directory"); - - cy.get("#stringInputPane").within(() => { - cy.get('input[name="collectionIdConfirmation"]').type(folder); - cy.get("form").submit(); - }); - }; - - const deleteItem = nodeName => { - clickContextMenuAndSelectOption(`${nodeName}`, "Delete"); - cy.get(".ms-Dialog-main") - .contains("Delete") - .click(); - }; - - beforeEach(() => { - cy.visit(explorerUrl); - waitForReady(); - }); - - it("Create and remove a directory", () => { - const folder = "e2etest_folder1"; - createFolder(folder); - cy.get(`.treeNodeHeader[data-test="${folder}/"]`).should("exist"); - deleteItem(`${folder}/`); - cy.get(`.treeNodeHeader[data-test="${folder}/"]`).should("not.exist"); - }); - - it("Create and rename a directory", () => { - const folder = "e2etest_folder2"; - const renamedFolder = "e2etest_folder2_renamed"; - createFolder(folder); - - // Rename - clickContextMenuAndSelectOption(`${folder}/`, "Rename"); - cy.get("#stringInputPane").within(() => { - cy.get('input[name="collectionIdConfirmation"]') - .clear() - .type(renamedFolder); - cy.get("form").submit(); - }); - cy.get(`.treeNodeHeader[data-test="${renamedFolder}/"]`).should("exist"); - cy.get(`.treeNodeHeader[data-test="${folder}/"]`).should("not.exist"); - - deleteItem(`${renamedFolder}/`); - cy.get(`.treeNodeHeader[data-test="${renamedFolder}/"]`).should("not.exist"); - }); - - it("Create a notebook inside a directory", () => { - const folder = "e2etest_folder3"; - const newNotebookName = "Untitled.ipynb"; - createFolder(folder); - clickContextMenuAndSelectOption(`${folder}/`, "New Notebook"); - - // Verify tab is open - cy.get(".tabList") - .contains(newNotebookName) - .should("exist"); - - // Close tab - cy.get(`.tabList[title="notebooks/${folder}/${newNotebookName}"]`) - .find(".cancelButton") - .click(); - // When running from command line, closing the tab is too fast - cy.get("body").then($body => { - if ($body.find(".ms-Dialog-main").length) { - // For some reason, this does not work - // cy.get(".ms-Dialog-main").contains("Close").click(); - cy.get(".ms-Dialog-main .ms-Button--primary").click(); - } - }); - - // Expand folder node - cy.get(`.treeNodeHeader[data-test="${folder}/"]`).click(); - cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`).should("exist"); - - // Delete notebook - cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`) - .find("button.treeMenuEllipsis") - .click(); - cy.get('[data-test="treeComponentMenuItemContainer"]') - .contains("Delete") - .click(); - - // Confirm - cy.get(".ms-Dialog-main") - .contains("Delete") - .click(); - cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`).should("not.exist"); - - deleteItem(`${folder}/`); - }); - - it("Create and rename a notebook inside a directory", () => { - const folder = "e2etest_folder4"; - const newNotebookName = "Untitled.ipynb"; - const renamedNotebookName = "mynotebook.ipynb"; - createFolder(folder); - clickContextMenuAndSelectOption(`${folder}/`, "New Notebook"); - - // Close tab - cy.get(`.tabList[title="notebooks/${folder}/${newNotebookName}"]`) - .find(".cancelButton") - .click(); - cy.get("body").then($body => { - if ($body.find(".ms-Dialog-main").length) { - // For some reason, this does not work - // cy.get(".ms-Dialog-main").contains("Close").click(); - cy.get(".ms-Dialog-main .ms-Button--primary").click(); - } - }); - - // Expand folder node - cy.get(`.treeNodeHeader[data-test="${folder}/"]`).click(); - cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`).should("exist"); - - // Rename notebook - cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`) - .find("button.treeMenuEllipsis") - .click(); - cy.get('[data-test="treeComponentMenuItemContainer"]') - .contains("Rename") - .click(); - - cy.get("#stringInputPane").within(() => { - cy.get('input[name="collectionIdConfirmation"]') - .clear() - .type(renamedNotebookName); - cy.get("form").submit(); - }); - cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`).should("not.exist"); - cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${renamedNotebookName}"]`).should("exist"); - - // Delete notebook - cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${renamedNotebookName}"]`) - .find("button.treeMenuEllipsis") - .click(); - cy.get('[data-test="treeComponentMenuItemContainer"]') - .contains("Delete") - .click(); - - // Confirm - cy.get(".ms-Dialog-main") - .contains("Delete") - .click(); - // Give it time to settle - cy.wait(1000); - deleteItem(`${folder}/`); - }); -}); diff --git a/cypress/package-lock.json b/cypress/package-lock.json deleted file mode 100644 index 8f8a5a665..000000000 --- a/cypress/package-lock.json +++ /dev/null @@ -1,3066 +0,0 @@ -{ - "name": "cosmos-explorer-cypress", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@cypress/listr-verbose-renderer": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz", - "integrity": "sha1-p3SS9LEdzHxEajSz4ochr9M8ZCo=", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "cli-cursor": "^1.0.2", - "date-fns": "^1.27.2", - "figures": "^1.7.0" - }, - "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "@cypress/request": { - "version": "2.88.5", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz", - "integrity": "sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - } - }, - "@cypress/xvfb": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz", - "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==", - "dev": true, - "requires": { - "debug": "^3.1.0", - "lodash.once": "^4.1.1" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "@hapi/address": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-4.0.1.tgz", - "integrity": "sha512-0oEP5UiyV4f3d6cBL8F3Z5S7iWSX39Knnl0lY8i+6gfmmIBj44JCBNtcMgwyS+5v7j3VYavNay0NFHDS+UGQcw==", - "dev": true, - "requires": { - "@hapi/hoek": "^9.0.0" - } - }, - "@hapi/formula": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@hapi/formula/-/formula-2.0.0.tgz", - "integrity": "sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A==", - "dev": true - }, - "@hapi/hoek": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.0.4.tgz", - "integrity": "sha512-EwaJS7RjoXUZ2cXXKZZxZqieGtc7RbvQhUy8FwDoMQtxWVi14tFjeFCYPZAM1mBCpOpiBpyaZbb9NeHc7eGKgw==", - "dev": true - }, - "@hapi/joi": { - "version": "17.1.1", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-17.1.1.tgz", - "integrity": "sha512-p4DKeZAoeZW4g3u7ZeRo+vCDuSDgSvtsB/NpfjXEHTUjSeINAi/RrVOWiVQ1isaoLzMvFEhe8n5065mQq1AdQg==", - "dev": true, - "requires": { - "@hapi/address": "^4.0.1", - "@hapi/formula": "^2.0.0", - "@hapi/hoek": "^9.0.0", - "@hapi/pinpoint": "^2.0.0", - "@hapi/topo": "^5.0.0" - } - }, - "@hapi/pinpoint": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-2.0.0.tgz", - "integrity": "sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw==", - "dev": true - }, - "@hapi/topo": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz", - "integrity": "sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw==", - "dev": true, - "requires": { - "@hapi/hoek": "^9.0.0" - } - }, - "@microsoft/applicationinsights-analytics-js": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-analytics-js/-/applicationinsights-analytics-js-2.5.2.tgz", - "integrity": "sha512-Y/lG/7NkZtRJN4s5NWD5W8sulx8aYJ9mO7Q6kJRNVyvNvj3Le3b4EL57H5FIPjBkn/rRRZOSu9kCMc/S3UnHKA==", - "requires": { - "@microsoft/applicationinsights-common": "2.5.2", - "@microsoft/applicationinsights-core-js": "2.5.2", - "@microsoft/dynamicproto-js": "^0.5.1", - "tslib": "1.10.0" - }, - "dependencies": { - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" - } - } - }, - "@microsoft/applicationinsights-channel-js": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-channel-js/-/applicationinsights-channel-js-2.5.2.tgz", - "integrity": "sha512-j+/2Cuht5yVMeaJ4XGc+itpLTMtsC3AMjIVrIbmnMo/QZxuHElA2DkqWgx+3XPDcWSZ562NNqrU2jxFsU9bnBQ==", - "requires": { - "@microsoft/applicationinsights-common": "2.5.2", - "@microsoft/applicationinsights-core-js": "2.5.2", - "tslib": "1.10.0" - }, - "dependencies": { - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" - } - } - }, - "@microsoft/applicationinsights-common": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-common/-/applicationinsights-common-2.5.2.tgz", - "integrity": "sha512-92hFZSO/QJ9+hfwfn9z9ZHfOZrQhUG46Y1uQL0yC5jYoYbV5o80SH3ZGMEPnTFmkW3Hynlov0JY+HB9pNjZJ6w==", - "requires": { - "@microsoft/applicationinsights-core-js": "2.5.2", - "tslib": "1.10.0" - }, - "dependencies": { - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" - } - } - }, - "@microsoft/applicationinsights-core-js": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-core-js/-/applicationinsights-core-js-2.5.2.tgz", - "integrity": "sha512-gWqrUXuwiRzerA2cNDngEak9OjWNZ+mDcQmRh1OIMJhIHc+DVnqFPURmlD0EDsZpEoHi8K3Rk0P6xef4TzVtVQ==", - "requires": { - "@microsoft/dynamicproto-js": "^0.5.1", - "tslib": "1.10.0" - }, - "dependencies": { - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" - } - } - }, - "@microsoft/applicationinsights-dependencies-js": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-dependencies-js/-/applicationinsights-dependencies-js-2.5.2.tgz", - "integrity": "sha512-P5ozKgZpbIZOwLBG00Fav3UwfCrKMI9jxo6VtZimaAtdEgAx3kSCmIrNNVuO2VREcCJY9rJYVpS+8ofLIcgeag==", - "requires": { - "@microsoft/applicationinsights-common": "2.5.2", - "@microsoft/applicationinsights-core-js": "2.5.2", - "@microsoft/dynamicproto-js": "^0.5.1", - "tslib": "1.10.0" - }, - "dependencies": { - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" - } - } - }, - "@microsoft/applicationinsights-properties-js": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-properties-js/-/applicationinsights-properties-js-2.5.2.tgz", - "integrity": "sha512-FnNenvQ8UCFFuECnzPGIm06CMW5azgFLYrvnFgo518vfJJc5lTsGjmTgunyOBNA+yb75BKkoKSL8gFY6YjQMng==", - "requires": { - "@microsoft/applicationinsights-common": "2.5.2", - "@microsoft/applicationinsights-core-js": "2.5.2", - "tslib": "1.10.0" - }, - "dependencies": { - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" - } - } - }, - "@microsoft/applicationinsights-web": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/@microsoft/applicationinsights-web/-/applicationinsights-web-2.5.2.tgz", - "integrity": "sha512-EMwkdqL1X4t4vGx/j3XTrcu0z0twtdrfni4LsvVNFFKdhrQFhCbGGFbGik5AoUv4xjzKFM1LcatwUNHqlXSYMg==", - "requires": { - "@microsoft/applicationinsights-analytics-js": "2.5.2", - "@microsoft/applicationinsights-channel-js": "2.5.2", - "@microsoft/applicationinsights-common": "2.5.2", - "@microsoft/applicationinsights-core-js": "2.5.2", - "@microsoft/applicationinsights-dependencies-js": "2.5.2", - "@microsoft/applicationinsights-properties-js": "2.5.2", - "@microsoft/dynamicproto-js": "^0.5.1", - "tslib": "1.10.0" - }, - "dependencies": { - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" - } - } - }, - "@microsoft/dynamicproto-js": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@microsoft/dynamicproto-js/-/dynamicproto-js-0.5.1.tgz", - "integrity": "sha512-Umt5dUMnycNOFMdu0yZUAtFRVH2I31IjBKivEw3ancVE09rACrHsUVqJnPxYjTFH28QxHQKg/PBv3sPS1a748A==" - }, - "@samverschueren/stream-to-observable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz", - "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==", - "dev": true, - "requires": { - "any-observable": "^0.3.0" - } - }, - "@types/sinonjs__fake-timers": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz", - "integrity": "sha512-yYezQwGWty8ziyYLdZjwxyMb0CZR49h8JALHGrxjQHWlqGgc8kLdHEgWrgL0uZ29DMvEVBDnHU2Wg36zKSIUtA==", - "dev": true - }, - "@types/sizzle": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz", - "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==", - "dev": true - }, - "ajv": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz", - "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-colors": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", - "dev": true - }, - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "any-observable": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz", - "integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==", - "dev": true - }, - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "arch": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz", - "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==", - "dev": true - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, - "async": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", - "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", - "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", - "dev": true - }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", - "dev": true - }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true - }, - "cachedir": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", - "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "check-more-types": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz", - "integrity": "sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=", - "dev": true - }, - "chokidar": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz", - "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==", - "dev": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.1", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.2.0" - } - }, - "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true - }, - "cli-cursor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", - "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", - "dev": true, - "requires": { - "restore-cursor": "^1.0.1" - } - }, - "cli-table3": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", - "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", - "dev": true, - "requires": { - "colors": "^1.1.2", - "object-assign": "^4.1.0", - "string-width": "^2.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "cli-truncate": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz", - "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=", - "dev": true, - "requires": { - "slice-ansi": "0.0.4", - "string-width": "^1.0.1" - } - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } - } - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==", - "dev": true, - "optional": true - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "commander": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz", - "integrity": "sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==", - "dev": true - }, - "common-tags": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", - "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "cypress": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-4.8.0.tgz", - "integrity": "sha512-Lsff8lF8pq6k/ioNua783tCsxGSLp6gqGXecdIfqCkqjYiOA53XKuEf1CaQJLUVs1dHSf49eDUp/sb620oJjVQ==", - "dev": true, - "requires": { - "@cypress/listr-verbose-renderer": "0.4.1", - "@cypress/request": "2.88.5", - "@cypress/xvfb": "1.2.4", - "@types/sinonjs__fake-timers": "6.0.1", - "@types/sizzle": "2.3.2", - "arch": "2.1.1", - "bluebird": "3.7.2", - "cachedir": "2.3.0", - "chalk": "2.4.2", - "check-more-types": "2.24.0", - "cli-table3": "0.5.1", - "commander": "4.1.0", - "common-tags": "1.8.0", - "debug": "4.1.1", - "eventemitter2": "4.1.2", - "execa": "1.0.0", - "executable": "4.1.1", - "extract-zip": "1.7.0", - "fs-extra": "8.1.0", - "getos": "3.1.4", - "is-ci": "2.0.0", - "is-installed-globally": "0.1.0", - "lazy-ass": "1.6.0", - "listr": "0.14.3", - "lodash": "4.17.15", - "log-symbols": "3.0.0", - "minimist": "1.2.5", - "moment": "2.24.0", - "ospath": "1.2.2", - "pretty-bytes": "5.3.0", - "ramda": "0.26.1", - "request-progress": "3.0.0", - "supports-color": "7.1.0", - "tmp": "0.1.0", - "untildify": "4.0.0", - "url": "0.11.0", - "yauzl": "2.10.0" - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "date-fns": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", - "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==", - "dev": true - }, - "dateformat": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz", - "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", - "dev": true - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "requires": { - "object-keys": "^1.0.12" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "elegant-spinner": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz", - "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=", - "dev": true - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "requires": { - "once": "^1.4.0" - } - }, - "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.1.5", - "is-regex": "^1.0.5", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.1", - "string.prototype.trimright": "^2.1.1" - } - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "eventemitter2": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-4.1.2.tgz", - "integrity": "sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU=", - "dev": true - }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "executable": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz", - "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==", - "dev": true, - "requires": { - "pify": "^2.2.0" - } - }, - "exit-hook": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", - "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=", - "dev": true - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "extract-zip": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", - "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", - "dev": true, - "requires": { - "concat-stream": "^1.6.2", - "debug": "^2.6.9", - "mkdirp": "^0.5.4", - "yauzl": "^2.10.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, - "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", - "dev": true - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "dev": true, - "requires": { - "pend": "~1.2.0" - } - }, - "figures": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", - "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5", - "object-assign": "^4.1.0" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "flat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", - "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", - "dev": true, - "requires": { - "is-buffer": "~2.0.3" - } - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fsevents": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", - "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", - "dev": true, - "optional": true - }, - "fsu": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fsu/-/fsu-1.1.1.tgz", - "integrity": "sha512-xQVsnjJ/5pQtcKh+KjUoZGzVWn4uNkchxTF6Lwjr4Gf7nQr8fmUfhKJ62zE77+xQg9xnxi5KUps7XGs+VC986A==", - "dev": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "getos": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/getos/-/getos-3.1.4.tgz", - "integrity": "sha512-UORPzguEB/7UG5hqiZai8f0vQ7hzynMQyJLxStoQ8dPGAcmgsfXOPA4iE/fGtweHYkK+z4zc9V0g+CIFRf5HYw==", - "dev": true, - "requires": { - "async": "^3.1.0" - } - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "global-dirs": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", - "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", - "dev": true, - "requires": { - "ini": "^1.3.4" - } - }, - "graceful-fs": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", - "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==", - "dev": true - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "dev": true, - "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "indent-string": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", - "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", - "dev": true - }, - "is-callable": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", - "dev": true - }, - "is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "requires": { - "ci-info": "^2.0.0" - } - }, - "is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-installed-globally": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", - "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", - "dev": true, - "requires": { - "global-dirs": "^0.1.0", - "is-path-inside": "^1.0.0" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-observable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", - "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", - "dev": true, - "requires": { - "symbol-observable": "^1.1.0" - } - }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "^1.0.1" - } - }, - "is-promise": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", - "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==", - "dev": true - }, - "is-regex": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", - "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", - "dev": true, - "requires": { - "has": "^1.0.3" - } - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, - "is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", - "dev": true, - "requires": { - "has-symbols": "^1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true - }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "lazy-ass": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", - "integrity": "sha1-eZllXoZGwX8In90YfRUNMyTVRRM=", - "dev": true - }, - "listr": { - "version": "0.14.3", - "resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz", - "integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==", - "dev": true, - "requires": { - "@samverschueren/stream-to-observable": "^0.3.0", - "is-observable": "^1.1.0", - "is-promise": "^2.1.0", - "is-stream": "^1.1.0", - "listr-silent-renderer": "^1.1.1", - "listr-update-renderer": "^0.5.0", - "listr-verbose-renderer": "^0.5.0", - "p-map": "^2.0.0", - "rxjs": "^6.3.3" - } - }, - "listr-silent-renderer": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz", - "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=", - "dev": true - }, - "listr-update-renderer": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz", - "integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "cli-truncate": "^0.2.1", - "elegant-spinner": "^1.0.1", - "figures": "^1.7.0", - "indent-string": "^3.0.0", - "log-symbols": "^1.0.2", - "log-update": "^2.3.0", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "log-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", - "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", - "dev": true, - "requires": { - "chalk": "^1.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "listr-verbose-renderer": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz", - "integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "cli-cursor": "^2.1.0", - "date-fns": "^1.27.2", - "figures": "^2.0.0" - }, - "dependencies": { - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - } - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", - "dev": true - }, - "lodash.isempty": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz", - "integrity": "sha1-b4bL7di+TsmHvpqvM8loTbGzHn4=", - "dev": true - }, - "lodash.isfunction": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz", - "integrity": "sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==", - "dev": true - }, - "lodash.isobject": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz", - "integrity": "sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0=", - "dev": true - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=", - "dev": true - }, - "lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=", - "dev": true - }, - "log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", - "dev": true, - "requires": { - "chalk": "^2.4.2" - } - }, - "log-update": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz", - "integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=", - "dev": true, - "requires": { - "ansi-escapes": "^3.0.0", - "cli-cursor": "^2.0.0", - "wrap-ansi": "^3.0.1" - }, - "dependencies": { - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - } - } - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "mime-db": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", - "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", - "dev": true - }, - "mime-types": { - "version": "2.1.27", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", - "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", - "dev": true, - "requires": { - "mime-db": "1.44.0" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - } - } - }, - "mocha": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.0.1.tgz", - "integrity": "sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==", - "dev": true, - "requires": { - "ansi-colors": "3.2.3", - "browser-stdout": "1.3.1", - "chokidar": "3.3.0", - "debug": "3.2.6", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "find-up": "3.0.0", - "glob": "7.1.3", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "3.13.1", - "log-symbols": "2.2.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "ms": "2.1.1", - "node-environment-flags": "1.0.6", - "object.assign": "4.1.0", - "strip-json-comments": "2.0.1", - "supports-color": "6.0.0", - "which": "1.3.1", - "wide-align": "1.1.3", - "yargs": "13.3.0", - "yargs-parser": "13.1.1", - "yargs-unparser": "1.6.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", - "dev": true, - "requires": { - "chalk": "^2.0.1" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - }, - "supports-color": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", - "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "mochawesome": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mochawesome/-/mochawesome-4.1.0.tgz", - "integrity": "sha512-U23K19mLqmuBqFyIBl7FVkcIuG/2JYStCj+91WmxK1/psLgHlWBEZsNe25U0x4t1Eqgu55aHv+0utLwzfhnupw==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "diff": "^4.0.1", - "json-stringify-safe": "^5.0.1", - "lodash.isempty": "^4.4.0", - "lodash.isfunction": "^3.0.9", - "lodash.isobject": "^3.0.2", - "lodash.isstring": "^4.0.1", - "mochawesome-report-generator": "^4.0.0", - "strip-ansi": "^5.0.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "mochawesome-merge": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/mochawesome-merge/-/mochawesome-merge-4.0.1.tgz", - "integrity": "sha512-ABQm41lq2Gnyg616P7g5MYi3u2e2GhF+soqMVhP/hnGLAu68q0i+fNawLNb9wW9M73AiQ1ST+kr2XWuEMqb7iw==", - "dev": true, - "requires": { - "fs-extra": "^7.0.1", - "glob": "^7.1.6", - "uuid": "^3.3.2" - }, - "dependencies": { - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - } - } - }, - "mochawesome-report-generator": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/mochawesome-report-generator/-/mochawesome-report-generator-4.1.0.tgz", - "integrity": "sha512-8diUnfzLqMPybIsq3aw3Zc4Npw9W2ZCx8/fMR0ShAXfDTtPH4t2mRykXEWBhsBA5+jM74mjWpwEqY6Pmz+pCsw==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "dateformat": "^3.0.2", - "fs-extra": "^7.0.0", - "fsu": "^1.0.2", - "lodash.isfunction": "^3.0.8", - "opener": "^1.4.2", - "prop-types": "^15.7.2", - "react": "^16.8.5", - "react-dom": "^16.8.5", - "tcomb": "^3.2.17", - "tcomb-validation": "^3.3.0", - "validator": "^10.11.0", - "yargs": "^13.2.2" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, - "node-environment-flags": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz", - "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==", - "dev": true, - "requires": { - "object.getownpropertydescriptors": "^2.0.3", - "semver": "^5.7.0" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, - "object-inspect": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", - "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", - "dev": true - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true - }, - "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - } - }, - "object.getownpropertydescriptors": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", - "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", - "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", - "dev": true - }, - "opener": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz", - "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==", - "dev": true - }, - "ospath": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz", - "integrity": "sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=", - "dev": true - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-limit": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", - "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", - "dev": true - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", - "dev": true - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, - "picomatch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", - "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==", - "dev": true - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "pretty-bytes": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz", - "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "dev": true, - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - } - }, - "psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true - }, - "ramda": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz", - "integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==", - "dev": true - }, - "react": { - "version": "16.12.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.12.0.tgz", - "integrity": "sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2" - } - }, - "react-dom": { - "version": "16.12.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.12.0.tgz", - "integrity": "sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.18.0" - } - }, - "react-is": { - "version": "16.12.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", - "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==", - "dev": true - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "readdirp": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", - "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", - "dev": true, - "requires": { - "picomatch": "^2.0.4" - } - }, - "request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - } - }, - "request-progress": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz", - "integrity": "sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=", - "dev": true, - "requires": { - "throttleit": "^1.0.0" - } - }, - "request-promise-core": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", - "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", - "dev": true, - "requires": { - "lodash": "^4.17.15" - } - }, - "request-promise-native": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz", - "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==", - "dev": true, - "requires": { - "request-promise-core": "1.1.3", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "restore-cursor": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", - "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", - "dev": true, - "requires": { - "exit-hook": "^1.0.0", - "onetime": "^1.0.0" - } - }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "rxjs": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", - "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "scheduler": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz", - "integrity": "sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", - "dev": true - }, - "slice-ansi": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", - "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", - "dev": true - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, - "stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "dev": true - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - } - }, - "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "function-bind": "^1.1.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - } - } - }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", - "dev": true - }, - "tcomb": { - "version": "3.2.29", - "resolved": "https://registry.npmjs.org/tcomb/-/tcomb-3.2.29.tgz", - "integrity": "sha512-di2Hd1DB2Zfw6StGv861JoAF5h/uQVu/QJp2g8KVbtfKnoHdBQl5M32YWq6mnSYBQ1vFFrns5B1haWJL7rKaOQ==", - "dev": true - }, - "tcomb-validation": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/tcomb-validation/-/tcomb-validation-3.4.1.tgz", - "integrity": "sha512-urVVMQOma4RXwiVCa2nM2eqrAomHROHvWPuj6UkDGz/eb5kcy0x6P0dVt6kzpUZtYMNoAqJLWmz1BPtxrtjtrA==", - "dev": true, - "requires": { - "tcomb": "^3.0.0" - } - }, - "throttleit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", - "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=", - "dev": true - }, - "tmp": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", - "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", - "dev": true, - "requires": { - "rimraf": "^2.6.3" - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, - "tslib": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz", - "integrity": "sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg==", - "dev": true - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true - }, - "typescript": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.3.tgz", - "integrity": "sha512-FFgHdPt4T/duxx6Ndf7hwgMZZjZpB+U0nMNGVCYPq0rEzWKjEDobm4J6yb3CS7naZ0yURFqdw9Gwc7UOh/P9oQ==", - "dev": true - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - }, - "untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "dev": true - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "dev": true - }, - "validator": { - "version": "10.11.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", - "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==", - "dev": true - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "wait-on": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-4.0.2.tgz", - "integrity": "sha512-Qpmgm3Hw/sXm7xK68FBsYy5r+Uid94/QymwnEjn9GTpfiWTUVYm0bccivVwY/BXGYO2r+5Cd8S/DzrRZqHK/9w==", - "dev": true, - "requires": { - "@hapi/joi": "^17.1.1", - "lodash": "^4.17.15", - "minimist": "^1.2.5", - "request": "^2.88.2", - "request-promise-native": "^1.0.8", - "rxjs": "^6.5.5" - }, - "dependencies": { - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - } - } - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrap-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", - "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=", - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true - }, - "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "yargs-unparser": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz", - "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==", - "dev": true, - "requires": { - "flat": "^4.1.0", - "lodash": "^4.17.15", - "yargs": "^13.3.0" - } - }, - "yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", - "dev": true, - "requires": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - } - } -} diff --git a/cypress/package.json b/cypress/package.json deleted file mode 100644 index cfc442439..000000000 --- a/cypress/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "cosmos-explorer-cypress", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "cypress run", - "wait-for-server": "wait-on -t 240000 -i 5000 -v https-get://0.0.0.0:1234/", - "test:sql": "cypress run --browser chrome --spec \"./integration/dataexplorer/SQL/*\"", - "test:ci": "wait-on -t 240000 -i 5000 -v https-get://0.0.0.0:1234/ https-get://0.0.0.0:8081/_explorer/index.html && cypress run --browser edge --headless", - "test:debug": "cypress open" - }, - "devDependencies": { - "cypress": "^4.8.0", - "mocha": "^7.0.1", - "mochawesome": "^4.1.0", - "mochawesome-merge": "^4.0.1", - "mochawesome-report-generator": "^4.1.0", - "typescript": "3.4.3", - "wait-on": "^4.0.2" - }, - "dependencies": { - "@microsoft/applicationinsights-web": "^2.5.2" - } -} diff --git a/cypress/support/index.js b/cypress/support/index.js deleted file mode 100644 index 55845109d..000000000 --- a/cypress/support/index.js +++ /dev/null @@ -1,23 +0,0 @@ -let appInsightsLib = require("@microsoft/applicationinsights-web"); - -const appInsights = new appInsightsLib.ApplicationInsights({ - config: { - instrumentationKey: "fe61c39f-7d32-4488-a191-b13621965315" - /* ...Other Configuration Options... */ - } -}); - -appInsights.loadAppInsights(); - -Cypress.on("fail", (error, runnable) => { - // App Insights will record the fail tests for Create Collection - let message = JSON.stringify(runnable.title); - appInsights.trackTrace({ - message: `${message}`, - properties: { - passed: false, - error: error - } - }); - throw error; // throw error to have test still fail -}); \ No newline at end of file diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json deleted file mode 100644 index 30cdfa6a6..000000000 --- a/cypress/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "compilerOptions": { - "strict": true, - "noEmit": true, - "module": "commonjs", - "target": "es5", - "lib": ["es5", "dom", "es6"], - "types": ["cypress", "node"] - }, - "include": ["**/*.ts", "**/*.spec.ts"] -} diff --git a/cypress/utilities/connectionString.js b/cypress/utilities/connectionString.js deleted file mode 100644 index 496f70111..000000000 --- a/cypress/utilities/connectionString.js +++ /dev/null @@ -1,41 +0,0 @@ -module.exports = { - loginUsingConnectionString: function() { - const prodUrl = Cypress.env("TEST_ENDPOINT") || "https://localhost:1234/hostedExplorer.html"; - const timeout = 15000; - - cy.visit(prodUrl); - cy.get('iframe[id="explorerMenu"]').should("be.visible"); - - cy.get("iframe").then($element => { - const $body = $element.contents().find("body"); - - cy.wrap($body) - .find("#connectExplorer") - .should("exist") - .find("div[class='connectExplorer']") - .should("exist") - .find("p[class='welcomeText']") - .should("exist"); - - cy.wrap($body.find("div > p.switchConnectTypeText")) - .should("exist") - .last() - .click({ force: true }); - - const secret = Cypress.env("CONNECTION_STRING"); - - cy.wrap($body) - .find("input[class='inputToken']") - .should("exist") - .type(secret, { - force: true - }); - - cy.wrap($body.find("input[value='Connect']"), { timeout }) - .first() - .click({ force: true }); - - cy.wait(15000); - }); - } -}; diff --git a/cypress/utilities/cosmosClient.js b/cypress/utilities/cosmosClient.js deleted file mode 100644 index 47b353f24..000000000 --- a/cypress/utilities/cosmosClient.js +++ /dev/null @@ -1,6 +0,0 @@ -const { CosmosClient } = require("@azure/cosmos"); - -module.exports = new CosmosClient({ - endpoint: "https://0.0.0.0:8081", - key: "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==" -}); diff --git a/package.json b/package.json index 76cd0da5e..ea0378b45 100644 --- a/package.json +++ b/package.json @@ -194,8 +194,8 @@ "compile": "tsc", "compile:contracts": "tsc -p ./tsconfig.contracts.json", "compile:strict": "tsc -p ./tsconfig.strict.json", - "format": "prettier --write \"{src,cypress,test}/**/*.{ts,tsx,html}\" \"*.{js,html}\"", - "format:check": "prettier --check \"{src,cypress,test}/**/*.{ts,tsx,html}\" \"*.{js,html}\"", + "format": "prettier --write \"{src,test}/**/*.{ts,tsx,html}\" \"*.{js,html}\"", + "format:check": "prettier --check \"{src,test}/**/*.{ts,tsx,html}\" \"*.{js,html}\"", "lint": "tslint --project tsconfig.json && eslint \"**/*.{ts,tsx}\"", "build:contracts": "npm run compile:contracts", "strictEligibleFiles": "node ./strict-migration-tools/index.js", diff --git a/test/index.spec.ts b/test/index.spec.ts deleted file mode 100644 index 6c227768e..000000000 --- a/test/index.spec.ts +++ /dev/null @@ -1,58 +0,0 @@ -import "expect-puppeteer"; -import { trackEvent, trackException } from "./utils"; - -jest.setTimeout(300000); - -describe.skip("Collection CRUD", () => { - it("should complete collection crud", async () => { - try { - // Login to Azure Portal - await page.goto("https://portal.azure.com"); - await page.waitFor("input[name=loginfmt]"); - await page.type("input[name=loginfmt]", process.env.PORTAL_RUNNER_USERNAME); - await page.click("input[type=submit]"); - await page.waitFor(3000); - await page.waitFor("input[name=loginfmt]"); - await page.type("input[name=passwd]", process.env.PORTAL_RUNNER_PASSWORD); - await page.click("input[type=submit]"); - await page.waitFor(3000); - await page.waitForNavigation(); - await page.goto( - `https://ms.portal.azure.com/#@microsoft.onmicrosoft.com/resource/subscriptions/${process.env.PORTAL_RUNNER_SUBSCRIPTION}/resourceGroups/${process.env.PORTAL_RUNNER_RESOURCE_GROUP}/providers/Microsoft.DocumentDb/databaseAccounts/${process.env.PORTAL_RUNNER_DATABASE_ACCOUNT}/dataExplorer` - ); - // Wait for page to settle - await page.waitFor(10000); - // Find Data Explorer iFrame - const frames = page.frames(); - const dataExplorer = frames.find(frame => frame.url().includes("cosmos.azure.com")); - // Click "New Container" - const newContainerButton = await dataExplorer.$('button[data-test="New Container"]'); - await newContainerButton.click(); - // Wait for side pane to appear - await dataExplorer.waitFor(".contextual-pane-in"); - // Fill out New Container form - const databaseIdInput = await dataExplorer.$("#databaseId"); - await databaseIdInput.type("foo"); - const collectionIdInput = await dataExplorer.$("#containerId"); - await collectionIdInput.type("foo"); - const partitionKeyInput = await dataExplorer.$('input[data-test="addCollection-partitionKeyValue"]'); - await partitionKeyInput.type("/partitionKey"); - trackEvent({ name: "ProductionRunnerSuccess" }); - - // TODO: Submit form and assert results - // cy.wrap($body) - // .find("#submitBtnAddCollection") - // .click(); - // cy.wait(10000); - // cy.wrap($body) - // .find('div[data-test="resourceTreeId"]') - // .should("exist") - // .find('div[class="treeComponent dataResourceTree"]') - // .should("contain", dbId); - } catch (error) { - await page.screenshot({ path: "failure.png" }); - trackException(error); - throw error; - } - }); -}); diff --git a/test/utils/shared.ts b/test/utils/shared.ts index 352d14a6c..1bc87bbef 100644 --- a/test/utils/shared.ts +++ b/test/utils/shared.ts @@ -3,8 +3,11 @@ import { Frame } from "puppeteer"; export async function login(connectionString: string): Promise { const prodUrl = process.env.DATA_EXPLORER_ENDPOINT; - page.goto(prodUrl, { waitUntil: "networkidle2" }); + await page.goto(prodUrl); + if (process.env.PLATFORM === "Emulator") { + return page.mainFrame(); + } // log in with connection string const handle = await page.waitForSelector("iframe"); const frame = await handle.contentFrame();