random-mirrors/cosmos-explorer
1
0
Fork 0
mirror of https://github.com/Azure/cosmos-explorer.git synced 2025-12-20 01:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove route handlers (#909)

Browse Source 
* Remove tab handlers

* Fix tests
This commit is contained in:
victor-meng
2021-06-23 21:54:37 -07:00
committed by GitHub
parent 6b35ab03f2
commit 59655eed5f
20 changed files with 5 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Explorer/Controls/Settings/SettingsComponent.test.tsx
View File

@@ -38,7 +38,6 @@ describe("SettingsComponent", () => {
title: "Scale & Settings",
tabPath: "",
node: undefined,
hashLocation: "settings",
}),
};

19
src/Explorer/Explorer.tsx
View File

@@ -18,7 +18,6 @@ import * as ViewModels from "../Contracts/ViewModels";
import { GitHubOAuthService } from "../GitHub/GitHubOAuthService";
import { useSidePanel } from "../hooks/useSidePanel";
import { IGalleryItem, JunoClient } from "../Juno/JunoClient";
import { RouteHandler } from "../RouteHandlers/RouteHandler";
import { ExplorerSettings } from "../Shared/ExplorerSettings";
import { Action, ActionModifiers } from "../Shared/Telemetry/TelemetryConstants";
import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
@@ -138,7 +137,6 @@ export default class Explorer {
userContext.authType === AuthType.ResourceToken
? this.refreshDatabaseForResourceToken()
: this.refreshAllDatabases(true);
RouteHandler.getInstance().initHandler();
await this._refreshNotebooksEnabledStateForAccount();
this.isNotebookEnabled(
userContext.authType !== AuthType.ResourceToken &&
@@ -899,7 +897,6 @@ export default class Explorer {
tabPath: notebookContentItem.path,
collection: null,
masterKey: userContext.masterKey || "",
hashLocation: "notebooks",
isTabsContentExpanded: ko.observable(true),
onLoadStartKey: null,
container: this,
@@ -1199,30 +1196,27 @@ export default class Explorer {
public openNotebookTerminal(kind: ViewModels.TerminalKind) {
let title: string;
let hashLocation: string;
switch (kind) {
case ViewModels.TerminalKind.Default:
title = "Terminal";
hashLocation = "terminal";
break;
case ViewModels.TerminalKind.Mongo:
title = "Mongo Shell";
hashLocation = "mongo-shell";
break;
case ViewModels.TerminalKind.Cassandra:
title = "Cassandra Shell";
hashLocation = "cassandra-shell";
break;
default:
throw new Error("Terminal kind: ${kind} not supported");
}
const terminalTabs: TerminalTab[] = this.tabsManager.getTabs(ViewModels.CollectionTabKind.Terminal, (tab) =>
tab.hashLocation().startsWith(hashLocation)
const terminalTabs: TerminalTab[] = this.tabsManager.getTabs(
ViewModels.CollectionTabKind.Terminal,
(tab) => tab.tabTitle() === title
) as TerminalTab[];
let index = 1;
@@ -1237,7 +1231,6 @@ export default class Explorer {
title: `${title} ${index}`,
tabPath: `${title} ${index}`,
collection: null,
hashLocation: `${hashLocation} ${index}`,
isTabsContentExpanded: ko.observable(true),
onLoadStartKey: null,
container: this,
@@ -1255,11 +1248,10 @@ export default class Explorer {
isFavorite?: boolean
) {
const title = "Gallery";
const hashLocation = "gallery";
const GalleryTab = await (await import(/* webpackChunkName: "GalleryTab" */ "./Tabs/GalleryTab")).default;
const galleryTab = this.tabsManager
.getTabs(ViewModels.CollectionTabKind.Gallery)
.find((tab) => tab.hashLocation() == hashLocation);
.find((tab) => tab.tabTitle() == title);
if (galleryTab instanceof GalleryTab) {
this.tabsManager.activateTab(galleryTab);
@@ -1268,9 +1260,8 @@ export default class Explorer {
new GalleryTab(
{
tabKind: ViewModels.CollectionTabKind.Gallery,
title: title,
title,
tabPath: title,
hashLocation: hashLocation,
onLoadStartKey: null,
isTabsContentExpanded: ko.observable(true),
},

6
src/Explorer/Tabs/DocumentsTab.test.ts
View File

@@ -15,7 +15,6 @@ describe("Documents tab", () => {
tabKind: ViewModels.CollectionTabKind.Documents,
title: "",
tabPath: "",
hashLocation: "",
});
expect(documentsTab.buildQuery("")).toContain("select");
@@ -90,7 +89,6 @@ describe("Documents tab", () => {
tabKind: ViewModels.CollectionTabKind.Documents,
title: "",
tabPath: "",
hashLocation: "",
});
expect(documentsTab.showPartitionKey).toBe(false);
@@ -104,7 +102,6 @@ describe("Documents tab", () => {
tabKind: ViewModels.CollectionTabKind.Documents,
title: "",
tabPath: "",
hashLocation: "",
});
expect(documentsTab.showPartitionKey).toBe(false);
@@ -118,7 +115,6 @@ describe("Documents tab", () => {
tabKind: ViewModels.CollectionTabKind.Documents,
title: "",
tabPath: "",
hashLocation: "",
});
expect(documentsTab.showPartitionKey).toBe(true);
@@ -135,7 +131,6 @@ describe("Documents tab", () => {
tabKind: ViewModels.CollectionTabKind.Documents,
title: "",
tabPath: "",
hashLocation: "",
});
expect(documentsTab.showPartitionKey).toBe(false);
@@ -149,7 +144,6 @@ describe("Documents tab", () => {
tabKind: ViewModels.CollectionTabKind.Documents,
title: "",
tabPath: "",
hashLocation: "",
});
expect(documentsTab.showPartitionKey).toBe(true);

1
src/Explorer/Tabs/StoredProcedureTab/StoredProcedureTab.tsx
View File

@@ -37,7 +37,6 @@ export class NewStoredProcedureTab extends ScriptTabBase {
tabPath: options.tabPath,
collectionBase: options.collection,
node: options.node,
hasLocation: options.hashLocation,
scriptTabBaseInstance: this,
collection: props.collection,
iStorProcTabComponentAccessor: (instance: IStorProcTabComponentAccessor) => {

8
src/Explorer/Tabs/StoredProcedureTab/StoredProcedureTabComponent.tsx
View File

@@ -4,7 +4,6 @@ import React from "react";
import DiscardIcon from "../../../../images/discard.svg";
import ExecuteQueryIcon from "../../../../images/ExecuteQuery.svg";
import SaveIcon from "../../../../images/save-cosmos.svg";
import * as Constants from "../../../Common/Constants";
import { NormalizedEventKey } from "../../../Common/Constants";
import { createStoredProcedure } from "../../../Common/dataAccess/createStoredProcedure";
import { ExecuteSprocResult } from "../../../Common/dataAccess/executeStoredProcedure";
@@ -55,7 +54,6 @@ export interface IStoredProcTabComponentProps {
collectionBase: ViewModels.CollectionBase;
//eslint-disable-next-line
node?: any;
hasLocation: string;
scriptTabBaseInstance: ScriptTabBase;
collection: ViewModels.Collection;
iStorProcTabComponentAccessor: (instance: IStorProcTabComponentAccessor) => void;
@@ -389,12 +387,6 @@ export default class StoredProcedureTabComponent extends React.Component<
this.props.scriptTabBaseInstance.tabTitle(createdResource.id);
this.props.scriptTabBaseInstance.isNew(false);
this.props.scriptTabBaseInstance.resource(createdResource);
this.props.scriptTabBaseInstance.hashLocation(
`${Constants.HashRoutePrefixes.collectionsWithIds(
this.props.collectionBase.databaseId,
this.props.collectionBase.id()
)}/sprocs/${createdResource.id}`
);
this.props.scriptTabBaseInstance.setBaselines();
const editorModel =

9
src/Explorer/Tabs/TabsBase.ts
View File

@@ -4,7 +4,6 @@ import * as ThemeUtility from "../../Common/ThemeUtility";
import * as DataModels from "../../Contracts/DataModels";
import * as ViewModels from "../../Contracts/ViewModels";
import { useNotificationConsole } from "../../hooks/useNotificationConsole";
import { RouteHandler } from "../../RouteHandlers/RouteHandler";
import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
@@ -25,7 +24,6 @@ export default class TabsBase extends WaitsForTemplateViewModel {
public tabKind: ViewModels.CollectionTabKind;
public tabTitle: ko.Observable<string>;
public tabPath: ko.Observable<string>;
public hashLocation: ko.Observable<string>;
public isExecutionError = ko.observable(false);
public isExecuting = ko.observable(false);
public pendingNotification?: ko.Observable<DataModels.Notification>;
@@ -49,8 +47,6 @@ export default class TabsBase extends WaitsForTemplateViewModel {
ko.observable<string>(`${this.collection.databaseId}>${this.collection.id()}>${this.tabTitle()}`));
this.pendingNotification = ko.observable<DataModels.Notification>(undefined);
this.onLoadStartKey = options.onLoadStartKey;
this.hashLocation = ko.observable<string>(options.hashLocation || "");
this.hashLocation.subscribe((newLocation: string) => this.updateGlobalHash(newLocation));
this.closeTabButton = {
enabled: ko.computed<boolean>(() => {
return true;
@@ -114,7 +110,6 @@ export default class TabsBase extends WaitsForTemplateViewModel {
this.updateSelectedNode();
this.collection?.selectedSubnodeKind(this.tabKind);
this.database?.selectedSubnodeKind(this.tabKind);
this.updateGlobalHash(this.hashLocation());
this.updateNavbarWithTabsButtons();
TelemetryProcessor.trace(Action.Tab, ActionModifiers.Open, {
tabName: this.constructor.name,
@@ -152,10 +147,6 @@ export default class TabsBase extends WaitsForTemplateViewModel {
return JSON.stringify(value, replacer, space);
}
private updateGlobalHash(newHash: string): void {
RouteHandler.getInstance().updateRouteHashLocation(newHash);
}
/**
* @return buttons that are displayed in the navbar
*/

2
src/Explorer/Tabs/TabsManager.test.ts
View File

@@ -53,7 +53,6 @@ describe("Tabs manager tests", () => {
database,
title: "",
tabPath: "",
hashLocation: "",
queryText: "",
partitionKey: collection.partitionKey,
onLoadStartKey: 1,
@@ -70,7 +69,6 @@ describe("Tabs manager tests", () => {
collection,
title: "",
tabPath: "",
hashLocation: "",
});
// make sure tabs have different tabId

6
src/Explorer/Tabs/TriggerTabContent.tsx
View File

@@ -100,12 +100,6 @@ export class TriggerTabContent extends Component<TriggerTab, ITriggerTabContentS
this.props.tabTitle(createdResource.id);
this.props.isNew(false);
this.props.resource(createdResource);
this.props.hashLocation(
`${Constants.HashRoutePrefixes.collectionsWithIds(
this.props.collection.databaseId,
this.props.collection.id()
)}/triggers/${createdResource.id}`
);
this.props.editorContent.setBaseline(createdResource.body as string);
this.props.addNodeInCollection(createdResource);
this.saveButton.visible = false;

6
src/Explorer/Tabs/UserDefinedFunctionTabContent.tsx
View File

@@ -145,12 +145,6 @@ export default class UserDefinedFunctionTabContent extends Component<
this.updateButton.visible = true;
this.saveButton.visible = false;
this.props.resource(createdResource);
this.props.hashLocation(
`${Constants.HashRoutePrefixes.collectionsWithIds(
this.props.collection.databaseId,
this.props.collection.id()
)}/udfs/${createdResource.id}`
);
this.props.addNodeInCollection(createdResource);
this.setState({ isUdfIdEditable: false });
this.props.isExecuting(false);

11
src/Explorer/Tree/Collection.ts
View File

@@ -313,7 +313,6 @@ export default class Collection implements ViewModels.Collection {
collection: this,
node: this,
tabPath: `${this.databaseId}>${this.id()}>Documents`,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/documents`,
onLoadStartKey: startKey,
});
@@ -359,7 +358,6 @@ export default class Collection implements ViewModels.Collection {
collection: this,
node: this,
tabPath: `${this.databaseId}>${this.id()}>Conflicts`,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/conflicts`,
onLoadStartKey: startKey,
});
@@ -413,7 +411,6 @@ export default class Collection implements ViewModels.Collection {
tabPath: "",
collection: this,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/entities`,
onLoadStartKey: startKey,
});
@@ -462,7 +459,6 @@ export default class Collection implements ViewModels.Collection {
collection: this,
masterKey: userContext.masterKey || "",
collectionPartitionKeyProperty: this.partitionKeyProperty,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/graphs`,
collectionId: this.id(),
databaseId: this.databaseId,
isTabsContentExpanded: this.container.isTabsContentExpanded,
@@ -511,7 +507,6 @@ export default class Collection implements ViewModels.Collection {
tabPath: "",
collection: this,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/mongoDocuments`,
onLoadStartKey: startKey,
});
this.container.tabsManager.activateNewTab(mongoDocumentsTab);
@@ -556,7 +551,6 @@ export default class Collection implements ViewModels.Collection {
tabPath: "",
collection: this,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/schemaAnalyzer`,
onLoadStartKey: startKey,
})
);
@@ -596,7 +590,6 @@ export default class Collection implements ViewModels.Collection {
tabPath: "",
collection: this,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/settings`,
};
let settingsTabV2 = matchingTabs && (matchingTabs[0] as CollectionSettingsTabV2);
@@ -639,7 +632,6 @@ export default class Collection implements ViewModels.Collection {
tabPath: "",
collection: this,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/query`,
queryText: queryText,
partitionKey: collection.partitionKey,
onLoadStartKey: startKey,
@@ -669,7 +661,6 @@ export default class Collection implements ViewModels.Collection {
tabPath: "",
collection: this,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/mongoQuery`,
partitionKey: collection.partitionKey,
onLoadStartKey: startKey,
},
@@ -703,7 +694,6 @@ export default class Collection implements ViewModels.Collection {
collection: this,
masterKey: userContext.masterKey || "",
collectionPartitionKeyProperty: this.partitionKeyProperty,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/graphs`,
collectionId: this.id(),
databaseId: this.databaseId,
isTabsContentExpanded: this.container.isTabsContentExpanded,
@@ -730,7 +720,6 @@ export default class Collection implements ViewModels.Collection {
tabPath: "",
collection: this,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/mongoShell`,
index: index,
},
{

1
src/Explorer/Tree/Database.ts
View File

@@ -82,7 +82,6 @@ export default class Database implements ViewModels.Database {
node: this,
rid: this.rid,
database: this,
hashLocation: `${Constants.HashRoutePrefixes.databasesWithId(this.id())}/settings`,
onLoadStartKey: startKey,
};
settingsTab = new DatabaseSettingsTabV2(tabOptions);

2
src/Explorer/Tree/ResourceTokenCollection.ts
View File

@@ -94,7 +94,6 @@ export default class ResourceTokenCollection implements ViewModels.CollectionBas
tabPath: "",
collection: this,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/query`,
queryText: queryText,
partitionKey: collection.partitionKey,
onLoadStartKey: startKey,
@@ -143,7 +142,6 @@ export default class ResourceTokenCollection implements ViewModels.CollectionBas
collection: this,
node: this,
tabPath: `${this.databaseId}>${this.id()}>Documents`,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(this.databaseId, this.id())}/documents`,
onLoadStartKey: startKey,
});

5
src/Explorer/Tree/StoredProcedure.ts
View File

@@ -76,7 +76,6 @@ export default class StoredProcedure {
tabPath: `${source.databaseId}>${source.id()}>New Stored Procedure ${id}`,
collection: source,
node: source,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(source.databaseId, source.id())}/sproc`,
},
{
collection: source,
@@ -124,10 +123,6 @@ export default class StoredProcedure {
tabPath: `${this.collection.databaseId}>${this.collection.id()}>${storedProcedureData.id}`,
collection: this.collection,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(
this.collection.databaseId,
this.collection.id()
)}/sprocs/${this.id()}`,
},
{
collection: this.collection,

5
src/Explorer/Tree/Trigger.ts
View File

@@ -57,7 +57,6 @@ export default class Trigger {
tabPath: "",
collection: source,
node: source,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(source.databaseId, source.id())}/trigger`,
});
source.container.tabsManager.activateNewTab(triggerTab);
@@ -92,10 +91,6 @@ export default class Trigger {
tabPath: "",
collection: this.collection,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(
this.collection.databaseId,
this.collection.id()
)}/triggers/${this.id()}`,
});
this.container.tabsManager.activateNewTab(triggerTab);

5
src/Explorer/Tree/UserDefinedFunction.ts
View File

@@ -43,7 +43,6 @@ export default class UserDefinedFunction {
tabPath: "",
collection: source,
node: source,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(source.databaseId, source.id())}/udf`,
});
source.container.tabsManager.activateNewTab(userDefinedFunctionTab);
@@ -76,10 +75,6 @@ export default class UserDefinedFunction {
tabPath: "",
collection: this.collection,
node: this,
hashLocation: `${Constants.HashRoutePrefixes.collectionsWithIds(
this.collection.databaseId,
this.collection.id()
)}/udfs/${this.id()}`,
});
this.container.tabsManager.activateNewTab(userDefinedFunctionTab);