= ({ container }: Props) => {
},
};
+ const allButtons = staticButtons.concat(contextButtons).concat(controlButtons);
+ const keyboardHandlers = CommandBarUtil.createKeyboardHandlers(allButtons);
+ setKeyboardHandlers(keyboardHandlers);
+
return (
{
});
});
- describe("Enable notebook button", () => {
- const enableNotebookBtnLabel = "Enable Notebooks (Preview)";
- const selectedNodeState = useSelectedNode.getState();
-
- beforeAll(() => {
- mockExplorer = {} as Explorer;
- updateUserContext({
- portalEnv: "prod",
- databaseAccount: {
- properties: {
- capabilities: [{ name: "EnableTable" }],
- },
- } as DatabaseAccount,
- });
- });
-
- afterEach(() => {
- updateUserContext({
- portalEnv: "prod",
- });
- useNotebook.getState().setIsNotebookEnabled(false);
- useNotebook.getState().setIsNotebooksEnabledForAccount(false);
- });
-
- it("Notebooks is already enabled - button should be hidden", () => {
- useNotebook.getState().setIsNotebookEnabled(true);
- useNotebook.getState().setIsNotebooksEnabledForAccount(true);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
- expect(enableNotebookBtn).toBeUndefined();
- });
-
- it("Account is running on one of the national clouds - button should be hidden", () => {
- updateUserContext({
- portalEnv: "mooncake",
- });
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
- expect(enableNotebookBtn).toBeUndefined();
- });
-
- it("Notebooks is not enabled but is available - button should be shown and enabled", () => {
- useNotebook.getState().setIsNotebooksEnabledForAccount(true);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
-
- //TODO: modify once notebooks are available
- expect(enableNotebookBtn).toBeUndefined();
- //expect(enableNotebookBtn).toBeDefined();
- //expect(enableNotebookBtn.disabled).toBe(false);
- //expect(enableNotebookBtn.tooltipText).toBe("");
- });
-
- it("Notebooks is not enabled and is unavailable - button should be shown and disabled", () => {
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const enableNotebookBtn = buttons.find((button) => button.commandButtonLabel === enableNotebookBtnLabel);
-
- //TODO: modify once notebooks are available
- expect(enableNotebookBtn).toBeUndefined();
- //expect(enableNotebookBtn).toBeDefined();
- //expect(enableNotebookBtn.disabled).toBe(true);
- //expect(enableNotebookBtn.tooltipText).toBe(
- // "Notebooks are not yet available in your account's region. View supported regions here: https://aka.ms/cosmos-enable-notebooks."
- //);
- });
- });
-
- describe("Open Mongo shell button", () => {
- const openMongoShellBtnLabel = "Open Mongo shell";
- const selectedNodeState = useSelectedNode.getState();
-
- beforeAll(() => {
- mockExplorer = {} as Explorer;
- updateUserContext({
- databaseAccount: {
- properties: {
- capabilities: [{ name: "EnableTable" }],
- },
- } as DatabaseAccount,
- });
- });
-
- afterAll(() => {
- updateUserContext({
- apiType: "SQL",
- });
- useNotebook.getState().setIsShellEnabled(false);
- });
-
- beforeEach(() => {
- updateUserContext({
- apiType: "Mongo",
- });
- useNotebook.getState().setIsShellEnabled(true);
- });
-
- afterEach(() => {
- useNotebook.getState().setIsNotebookEnabled(false);
- useNotebook.getState().setIsNotebooksEnabledForAccount(false);
- });
-
- it("Mongo Api not available - button should be hidden", () => {
- updateUserContext({
- apiType: "SQL",
- });
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
- expect(openMongoShellBtn).toBeUndefined();
- });
-
- it("Running on a national cloud - button should be hidden", () => {
- updateUserContext({
- portalEnv: "mooncake",
- });
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
- expect(openMongoShellBtn).toBeUndefined();
- });
-
- it("Notebooks is not enabled and is unavailable - button should be hidden", () => {
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
- expect(openMongoShellBtn).toBeUndefined();
- });
-
- it("Notebooks is not enabled and is available - button should be hidden", () => {
- useNotebook.getState().setIsNotebooksEnabledForAccount(true);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
- expect(openMongoShellBtn).toBeUndefined();
- });
-
- it("Notebooks is enabled and is unavailable - button should be shown and enabled", () => {
- useNotebook.getState().setIsNotebookEnabled(true);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
- expect(openMongoShellBtn).toBeDefined();
-
- //TODO: modify once notebooks are available
- expect(openMongoShellBtn.disabled).toBe(true);
- //expect(openMongoShellBtn.disabled).toBe(false);
- //expect(openMongoShellBtn.tooltipText).toBe("");
- });
-
- it("Notebooks is enabled and is available - button should be shown and enabled", () => {
- useNotebook.getState().setIsNotebookEnabled(true);
- useNotebook.getState().setIsNotebooksEnabledForAccount(true);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
- expect(openMongoShellBtn).toBeDefined();
-
- //TODO: modify once notebooks are available
- expect(openMongoShellBtn.disabled).toBe(true);
- //expect(openMongoShellBtn.disabled).toBe(false);
- //expect(openMongoShellBtn.tooltipText).toBe("");
- });
-
- it("Notebooks is enabled and is available, terminal is unavailable due to ipRules - button should be hidden", () => {
- useNotebook.getState().setIsNotebookEnabled(true);
- useNotebook.getState().setIsNotebooksEnabledForAccount(true);
- useNotebook.getState().setIsShellEnabled(false);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const openMongoShellBtn = buttons.find((button) => button.commandButtonLabel === openMongoShellBtnLabel);
- expect(openMongoShellBtn).toBeUndefined();
- });
- });
-
describe("Open Cassandra shell button", () => {
const openCassandraShellBtnLabel = "Open Cassandra shell";
const selectedNodeState = useSelectedNode.getState();
@@ -305,42 +128,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
expect(openCassandraShellBtn).toBeUndefined();
});
-
- it("Notebooks is not enabled and is available - button should be shown and enabled", () => {
- useNotebook.getState().setIsNotebooksEnabledForAccount(true);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
- expect(openCassandraShellBtn).toBeUndefined();
- });
-
- it("Notebooks is enabled and is unavailable - button should be shown and enabled", () => {
- useNotebook.getState().setIsNotebookEnabled(true);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
-
- expect(openCassandraShellBtn).toBeDefined();
-
- //TODO: modify once notebooks are available
- expect(openCassandraShellBtn.disabled).toBe(true);
- //expect(openCassandraShellBtn.disabled).toBe(false);
- //expect(openCassandraShellBtn.tooltipText).toBe("");
- });
-
- it("Notebooks is enabled and is available - button should be shown and enabled", () => {
- useNotebook.getState().setIsNotebookEnabled(true);
- useNotebook.getState().setIsNotebooksEnabledForAccount(true);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const openCassandraShellBtn = buttons.find((button) => button.commandButtonLabel === openCassandraShellBtnLabel);
- expect(openCassandraShellBtn).toBeDefined();
-
- //TODO: modify once notebooks are available
- expect(openCassandraShellBtn.disabled).toBe(true);
- //expect(openCassandraShellBtn.disabled).toBe(false);
- //expect(openCassandraShellBtn.tooltipText).toBe("");
- });
});
describe("Open Postgres and vCore Mongo buttons", () => {
@@ -368,62 +155,6 @@ describe("CommandBarComponentButtonFactory tests", () => {
});
});
- describe("GitHub buttons", () => {
- const connectToGitHubBtnLabel = "Connect to GitHub";
- const manageGitHubSettingsBtnLabel = "Manage GitHub settings";
- const selectedNodeState = useSelectedNode.getState();
-
- beforeAll(() => {
- mockExplorer = {} as Explorer;
- updateUserContext({
- databaseAccount: {
- properties: {
- capabilities: [{ name: "EnableTable" }],
- },
- } as DatabaseAccount,
- });
-
- mockExplorer.notebookManager = new NotebookManager();
- mockExplorer.notebookManager.gitHubOAuthService = new GitHubOAuthService(undefined);
- });
-
- afterEach(() => {
- jest.resetAllMocks();
- useNotebook.getState().setIsNotebookEnabled(false);
- });
-
- it("Notebooks is enabled and GitHubOAuthService is not logged in - connect to github button should be visible", () => {
- useNotebook.getState().setIsNotebookEnabled(true);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const connectToGitHubBtn = buttons.find((button) => button.commandButtonLabel === connectToGitHubBtnLabel);
- expect(connectToGitHubBtn).toBeDefined();
- });
-
- it("Notebooks is enabled and GitHubOAuthService is logged in - manage github settings button should be visible", () => {
- useNotebook.getState().setIsNotebookEnabled(true);
- mockExplorer.notebookManager.gitHubOAuthService.isLoggedIn = jest.fn().mockReturnValue(true);
-
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
- const manageGitHubSettingsBtn = buttons.find(
- (button) => button.commandButtonLabel === manageGitHubSettingsBtnLabel,
- );
- expect(manageGitHubSettingsBtn).toBeDefined();
- });
-
- it("Notebooks is not enabled - connect to github and manage github settings buttons should be hidden", () => {
- const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
-
- const connectToGitHubBtn = buttons.find((button) => button.commandButtonLabel === connectToGitHubBtnLabel);
- expect(connectToGitHubBtn).toBeUndefined();
-
- const manageGitHubSettingsBtn = buttons.find(
- (button) => button.commandButtonLabel === manageGitHubSettingsBtnLabel,
- );
- expect(manageGitHubSettingsBtn).toBeUndefined();
- });
- });
-
describe("Resource token", () => {
const mockCollection = { id: ko.observable("test") } as CollectionBase;
useSelectedNode.getState().setSelectedNode(mockCollection);
diff --git a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
index ecfd3fdb9..a1aa3e49b 100644
--- a/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx
@@ -1,3 +1,5 @@
+import { KeyboardAction } from "KeyboardShortcuts";
+import { ReactTabKind, useTabs } from "hooks/useTabs";
import * as React from "react";
import AddCollectionIcon from "../../../../images/AddCollection.svg";
import AddDatabaseIcon from "../../../../images/AddDatabase.svg";
@@ -6,13 +8,10 @@ import AddStoredProcedureIcon from "../../../../images/AddStoredProcedure.svg";
import AddTriggerIcon from "../../../../images/AddTrigger.svg";
import AddUdfIcon from "../../../../images/AddUdf.svg";
import BrowseQueriesIcon from "../../../../images/BrowseQuery.svg";
-import CosmosTerminalIcon from "../../../../images/Cosmos-Terminal.svg";
import FeedbackIcon from "../../../../images/Feedback-Command.svg";
+import HomeIcon from "../../../../images/Home_16.svg";
import HostedTerminalIcon from "../../../../images/Hosted-Terminal.svg";
import OpenQueryFromDiskIcon from "../../../../images/OpenQueryFromDisk.svg";
-import GitHubIcon from "../../../../images/github.svg";
-import NewNotebookIcon from "../../../../images/notebook/Notebook-new.svg";
-import ResetWorkspaceIcon from "../../../../images/notebook/Notebook-reset-workspace.svg";
import OpenInTabIcon from "../../../../images/open-in-tab.svg";
import SettingsIcon from "../../../../images/settings_15x15.svg";
import SynapseIcon from "../../../../images/synapse-link.svg";
@@ -20,7 +19,6 @@ import { AuthType } from "../../../AuthType";
import * as Constants from "../../../Common/Constants";
import { Platform, configContext } from "../../../ConfigContext";
import * as ViewModels from "../../../Contracts/ViewModels";
-import { JunoClient } from "../../../Juno/JunoClient";
import { userContext } from "../../../UserContext";
import { getCollectionName, getDatabaseName } from "../../../Utils/APITypeUtils";
import { isRunningOnNationalCloud } from "../../../Utils/CloudUtils";
@@ -31,7 +29,6 @@ import { useNotebook } from "../../Notebook/useNotebook";
import { OpenFullScreen } from "../../OpenFullScreen";
import { AddDatabasePanel } from "../../Panes/AddDatabasePanel/AddDatabasePanel";
import { BrowseQueriesPane } from "../../Panes/BrowseQueriesPane/BrowseQueriesPane";
-import { GitHubReposPanel } from "../../Panes/GitHubReposPanel/GitHubReposPanel";
import { LoadQueryPane } from "../../Panes/LoadQueryPane/LoadQueryPane";
import { SettingsPane } from "../../Panes/SettingsPane/SettingsPane";
import { useDatabases } from "../../useDatabases";
@@ -57,7 +54,11 @@ export function createStaticCommandBarButtons(
};
if (configContext.platform !== Platform.Fabric) {
+ const homeBtn = createHomeButton();
+ buttons.push(homeBtn);
+
const newCollectionBtn = createNewCollectionGroup(container);
+ newCollectionBtn.keyboardAction = KeyboardAction.NEW_COLLECTION; // Just for the root button, not the child version we create below.
buttons.push(newCollectionBtn);
if (userContext.apiType !== "Tables" && userContext.apiType !== "Cassandra") {
const addSynapseLink = createOpenSynapseLinkDialogButton(container);
@@ -75,57 +76,6 @@ export function createStaticCommandBarButtons(
}
}
- if (useNotebook.getState().isNotebookEnabled) {
- addDivider();
- const notebookButtons: CommandButtonComponentProps[] = [];
-
- const newNotebookButton = createNewNotebookButton(container);
- newNotebookButton.children = [createNewNotebookButton(container), createuploadNotebookButton(container)];
- notebookButtons.push(newNotebookButton);
-
- if (container.notebookManager?.gitHubOAuthService) {
- notebookButtons.push(createManageGitHubAccountButton(container));
- }
- if (useNotebook.getState().isPhoenixFeatures && configContext.isTerminalEnabled) {
- notebookButtons.push(createOpenTerminalButton(container));
- }
- if (useNotebook.getState().isPhoenixNotebooks && selectedNodeState.isConnectedToContainer()) {
- notebookButtons.push(createNotebookWorkspaceResetButton(container));
- }
- if (
- (userContext.apiType === "Mongo" &&
- useNotebook.getState().isShellEnabled &&
- selectedNodeState.isDatabaseNodeOrNoneSelected()) ||
- userContext.apiType === "Cassandra"
- ) {
- notebookButtons.push(createDivider());
- if (userContext.apiType === "Cassandra") {
- notebookButtons.push(createOpenTerminalButtonByKind(container, ViewModels.TerminalKind.Cassandra));
- } else {
- notebookButtons.push(createOpenTerminalButtonByKind(container, ViewModels.TerminalKind.Mongo));
- }
- }
-
- notebookButtons.forEach((btn) => {
- if (btn.commandButtonLabel.indexOf("Cassandra") !== -1) {
- if (!useNotebook.getState().isPhoenixFeatures) {
- applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.cassandraShellTemporarilyDownMsg);
- }
- } else if (btn.commandButtonLabel.indexOf("Mongo") !== -1) {
- if (!useNotebook.getState().isPhoenixFeatures) {
- applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.mongoShellTemporarilyDownMsg);
- }
- } else if (btn.commandButtonLabel.indexOf("Open Terminal") !== -1) {
- if (!useNotebook.getState().isPhoenixFeatures) {
- applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
- }
- } else if (!useNotebook.getState().isPhoenixNotebooks) {
- applyNotebooksTemporarilyDownStyle(btn, Constants.Notebook.temporarilyDownMsg);
- }
- buttons.push(btn);
- });
- }
-
if (!selectedNodeState.isDatabaseNodeOrNoneSelected()) {
const isQuerySupported = userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
@@ -146,6 +96,7 @@ export function createStaticCommandBarButtons(
const newStoredProcedureBtn: CommandButtonComponentProps = {
iconSrc: AddStoredProcedureIcon,
iconAlt: label,
+ keyboardAction: KeyboardAction.NEW_SPROC,
onCommandClick: () => {
const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection);
@@ -235,7 +186,7 @@ export function createControlCommandBarButtons(container: Explorer): CommandButt
buttons.push(fullScreenButton);
}
- if (configContext.platform !== Platform.Emulator) {
+ if (configContext.platform === Platform.Portal) {
const label = "Feedback";
const feedbackButtonOptions: CommandButtonComponentProps = {
iconSrc: FeedbackIcon,
@@ -285,6 +236,18 @@ function createNewCollectionGroup(container: Explorer): CommandButtonComponentPr
};
}
+function createHomeButton(): CommandButtonComponentProps {
+ const label = "Home";
+ return {
+ iconSrc: HomeIcon,
+ iconAlt: label,
+ onCommandClick: () => useTabs.getState().openAndActivateReactTab(ReactTabKind.Home),
+ commandButtonLabel: label,
+ hasPopup: false,
+ ariaLabel: label,
+ };
+}
+
function createOpenSynapseLinkDialogButton(container: Explorer): CommandButtonComponentProps {
if (configContext.platform === Platform.Emulator) {
return undefined;
@@ -317,6 +280,7 @@ function createNewDatabase(container: Explorer): CommandButtonComponentProps {
return {
iconSrc: AddDatabaseIcon,
iconAlt: label,
+ keyboardAction: KeyboardAction.NEW_DATABASE,
onCommandClick: async () => {
const throughputCap = userContext.databaseAccount?.properties.capacity?.totalThroughputLimit;
if (throughputCap && throughputCap !== -1) {
@@ -337,6 +301,7 @@ function createNewSQLQueryButton(selectedNodeState: SelectedNodeState): CommandB
id: "newQueryBtn",
iconSrc: AddSqlQueryIcon,
iconAlt: label,
+ keyboardAction: KeyboardAction.NEW_QUERY,
onCommandClick: () => {
const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
selectedCollection && selectedCollection.onNewQueryClick(selectedCollection);
@@ -352,6 +317,7 @@ function createNewSQLQueryButton(selectedNodeState: SelectedNodeState): CommandB
id: "newQueryBtn",
iconSrc: AddSqlQueryIcon,
iconAlt: label,
+ keyboardAction: KeyboardAction.NEW_QUERY,
onCommandClick: () => {
const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
selectedCollection && selectedCollection.onNewMongoQueryClick(selectedCollection);
@@ -377,6 +343,7 @@ export function createScriptCommandButtons(selectedNodeState: SelectedNodeState)
const newStoredProcedureBtn: CommandButtonComponentProps = {
iconSrc: AddStoredProcedureIcon,
iconAlt: label,
+ keyboardAction: KeyboardAction.NEW_SPROC,
onCommandClick: () => {
const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
selectedCollection && selectedCollection.onNewStoredProcedureClick(selectedCollection);
@@ -396,6 +363,7 @@ export function createScriptCommandButtons(selectedNodeState: SelectedNodeState)
const newUserDefinedFunctionBtn: CommandButtonComponentProps = {
iconSrc: AddUdfIcon,
iconAlt: label,
+ keyboardAction: KeyboardAction.NEW_UDF,
onCommandClick: () => {
const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
selectedCollection && selectedCollection.onNewUserDefinedFunctionClick(selectedCollection);
@@ -415,6 +383,7 @@ export function createScriptCommandButtons(selectedNodeState: SelectedNodeState)
const newTriggerBtn: CommandButtonComponentProps = {
iconSrc: AddTriggerIcon,
iconAlt: label,
+ keyboardAction: KeyboardAction.NEW_TRIGGER,
onCommandClick: () => {
const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
selectedCollection && selectedCollection.onNewTriggerClick(selectedCollection);
@@ -432,45 +401,12 @@ export function createScriptCommandButtons(selectedNodeState: SelectedNodeState)
return buttons;
}
-function applyNotebooksTemporarilyDownStyle(buttonProps: CommandButtonComponentProps, tooltip: string): void {
- if (!buttonProps.isDivider) {
- buttonProps.disabled = true;
- buttonProps.tooltipText = tooltip;
- }
-}
-
-function createNewNotebookButton(container: Explorer): CommandButtonComponentProps {
- const label = "New Notebook";
- return {
- id: "newNotebookBtn",
- iconSrc: NewNotebookIcon,
- iconAlt: label,
- onCommandClick: () => container.onNewNotebookClicked(),
- commandButtonLabel: label,
- hasPopup: false,
- disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
- ariaLabel: label,
- };
-}
-
-function createuploadNotebookButton(container: Explorer): CommandButtonComponentProps {
- const label = "Upload to Notebook Server";
- return {
- iconSrc: NewNotebookIcon,
- iconAlt: label,
- onCommandClick: () => container.openUploadFilePanel(),
- commandButtonLabel: label,
- hasPopup: false,
- disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
- ariaLabel: label,
- };
-}
-
function createOpenQueryButton(container: Explorer): CommandButtonComponentProps {
const label = "Open Query";
return {
iconSrc: BrowseQueriesIcon,
iconAlt: label,
+ keyboardAction: KeyboardAction.OPEN_QUERY,
onCommandClick: () =>
useSidePanel.getState().openSidePanel("Open Saved Queries", ),
commandButtonLabel: label,
@@ -485,6 +421,7 @@ function createOpenQueryFromDiskButton(): CommandButtonComponentProps {
return {
iconSrc: OpenQueryFromDiskIcon,
iconAlt: label,
+ keyboardAction: KeyboardAction.OPEN_QUERY_FROM_DISK,
onCommandClick: () => useSidePanel.getState().openSidePanel("Load Query", ),
commandButtonLabel: label,
ariaLabel: label,
@@ -493,19 +430,6 @@ function createOpenQueryFromDiskButton(): CommandButtonComponentProps {
};
}
-function createOpenTerminalButton(container: Explorer): CommandButtonComponentProps {
- const label = "Open Terminal";
- return {
- iconSrc: CosmosTerminalIcon,
- iconAlt: label,
- onCommandClick: () => container.openNotebookTerminal(ViewModels.TerminalKind.Default),
- commandButtonLabel: label,
- hasPopup: false,
- disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
- ariaLabel: label,
- };
-}
-
function createOpenTerminalButtonByKind(
container: Explorer,
terminalKind: ViewModels.TerminalKind,
@@ -545,45 +469,6 @@ function createOpenTerminalButtonByKind(
};
}
-function createNotebookWorkspaceResetButton(container: Explorer): CommandButtonComponentProps {
- const label = "Reset Workspace";
- return {
- iconSrc: ResetWorkspaceIcon,
- iconAlt: label,
- onCommandClick: () => container.resetNotebookWorkspace(),
- commandButtonLabel: label,
- hasPopup: false,
- disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
- ariaLabel: label,
- };
-}
-
-function createManageGitHubAccountButton(container: Explorer): CommandButtonComponentProps {
- const connectedToGitHub: boolean = container.notebookManager?.gitHubOAuthService.isLoggedIn();
- const label = connectedToGitHub ? "Manage GitHub settings" : "Connect to GitHub";
- const junoClient = new JunoClient();
- return {
- iconSrc: GitHubIcon,
- iconAlt: label,
- onCommandClick: () => {
- useSidePanel
- .getState()
- .openSidePanel(
- label,
- ,
- );
- },
- commandButtonLabel: label,
- hasPopup: false,
- disabled: useSelectedNode.getState().isQueryCopilotCollectionSelected(),
- ariaLabel: label,
- };
-}
-
function createStaticCommandBarButtonsForResourceToken(
container: Explorer,
selectedNodeState: SelectedNodeState,
diff --git a/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx b/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
index 384bd06cd..fc67ad894 100644
--- a/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
+++ b/src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
@@ -7,6 +7,7 @@ import {
IDropdownStyles,
} from "@fluentui/react";
import { useQueryCopilot } from "hooks/useQueryCopilot";
+import { KeyboardHandlerMap } from "KeyboardShortcuts";
import * as React from "react";
import _ from "underscore";
import ChevronDownIcon from "../../../../images/Chevron_down.svg";
@@ -233,3 +234,28 @@ export const createConnectionStatus = (container: Explorer, poolId: PoolIdType,
onRender: () => ,
};
};
+
+export function createKeyboardHandlers(allButtons: CommandButtonComponentProps[]): KeyboardHandlerMap {
+ const handlers: KeyboardHandlerMap = {};
+
+ function createHandlers(buttons: CommandButtonComponentProps[]) {
+ buttons.forEach((button) => {
+ if (!button.disabled && button.keyboardAction) {
+ handlers[button.keyboardAction] = (e) => {
+ button.onCommandClick(e);
+
+ // If the handler is bound, it means the button is visible and enabled, so we should prevent the default action
+ return true;
+ };
+ }
+
+ if (button.children && button.children.length > 0) {
+ createHandlers(button.children);
+ }
+ });
+ }
+
+ createHandlers(allButtons);
+
+ return handlers;
+}
diff --git a/src/Explorer/OpenActions/OpenActions.tsx b/src/Explorer/OpenActions/OpenActions.tsx
index 876f8e391..f3ef288c8 100644
--- a/src/Explorer/OpenActions/OpenActions.tsx
+++ b/src/Explorer/OpenActions/OpenActions.tsx
@@ -1,4 +1,5 @@
// TODO convert this file to an action registry in order to have actions and their handlers be more tightly coupled.
+import { useDatabases } from "Explorer/useDatabases";
import React from "react";
import { ActionContracts } from "../../Contracts/ExplorerContracts";
import * as ViewModels from "../../Contracts/ViewModels";
@@ -40,97 +41,112 @@ function openCollectionTab(
databases: ViewModels.Database[],
initialDatabaseIndex = 0,
) {
- for (let i = initialDatabaseIndex; i < databases.length; i++) {
- const database: ViewModels.Database = databases[i];
- if (!!action.databaseResourceId && database.id() !== action.databaseResourceId) {
- continue;
- }
-
- const collectionActionHandler = (collections: ViewModels.Collection[]) => {
- if (!action.collectionResourceId && collections.length === 0) {
- subscription.dispose();
- openCollectionTab(action, databases, ++i);
- return;
- }
-
- for (let j = 0; j < collections.length; j++) {
- const collection: ViewModels.Collection = collections[j];
- if (!!action.collectionResourceId && collection.id() !== action.collectionResourceId) {
- continue;
- }
-
- // select the collection
- collection.expandCollection();
-
- if (
- action.tabKind === ActionContracts.TabKind.SQLDocuments ||
- action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.SQLDocuments]
- ) {
- collection.onDocumentDBDocumentsClick();
- break;
- }
-
- if (
- action.tabKind === ActionContracts.TabKind.MongoDocuments ||
- action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.MongoDocuments]
- ) {
- collection.onMongoDBDocumentsClick();
- break;
- }
-
- if (
- action.tabKind === ActionContracts.TabKind.SchemaAnalyzer ||
- action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.SchemaAnalyzer]
- ) {
- collection.onSchemaAnalyzerClick();
- break;
- }
-
- if (
- action.tabKind === ActionContracts.TabKind.TableEntities ||
- action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.TableEntities]
- ) {
- collection.onTableEntitiesClick();
- break;
- }
-
- if (
- action.tabKind === ActionContracts.TabKind.Graph ||
- action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.Graph]
- ) {
- collection.onGraphDocumentsClick();
- break;
- }
-
- if (
- action.tabKind === ActionContracts.TabKind.SQLQuery ||
- action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.SQLQuery]
- ) {
- collection.onNewQueryClick(
- collection,
- undefined,
- generateQueryText(action as ActionContracts.OpenQueryTab, collection.partitionKeyProperties),
- );
- break;
- }
-
- if (
- action.tabKind === ActionContracts.TabKind.ScaleSettings ||
- action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.ScaleSettings]
- ) {
- collection.onSettingsClick();
- break;
- }
- }
- subscription.dispose();
+ //if databases are not yet loaded, wait until loaded
+ if (!databases || databases.length === 0) {
+ const databaseActionHandler = (databases: ViewModels.Database[]) => {
+ databasesUnsubscription();
+ openCollectionTab(action, databases, 0);
+ return;
};
+ const databasesUnsubscription = useDatabases.subscribe(databaseActionHandler, (state) => state.databases);
+ } else {
+ for (let i = initialDatabaseIndex; i < databases.length; i++) {
+ const database: ViewModels.Database = databases[i];
+ if (!!action.databaseResourceId && database.id() !== action.databaseResourceId) {
+ continue;
+ }
- const subscription = database.collections.subscribe((collections) => collectionActionHandler(collections));
- if (database.collections && database.collections() && database.collections().length) {
- collectionActionHandler(database.collections());
+ //expand database first if not expanded to load the collections
+ if (!database.isDatabaseExpanded?.()) {
+ database.expandDatabase?.();
+ }
+
+ const collectionActionHandler = (collections: ViewModels.Collection[]) => {
+ if (!action.collectionResourceId && collections.length === 0) {
+ subscription.dispose();
+ openCollectionTab(action, databases, ++i);
+ return;
+ }
+
+ for (let j = 0; j < collections.length; j++) {
+ const collection: ViewModels.Collection = collections[j];
+ if (!!action.collectionResourceId && collection.id() !== action.collectionResourceId) {
+ continue;
+ }
+
+ // select the collection
+ collection.expandCollection();
+
+ if (
+ action.tabKind === ActionContracts.TabKind.SQLDocuments ||
+ action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.SQLDocuments]
+ ) {
+ collection.onDocumentDBDocumentsClick();
+ break;
+ }
+
+ if (
+ action.tabKind === ActionContracts.TabKind.MongoDocuments ||
+ action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.MongoDocuments]
+ ) {
+ collection.onMongoDBDocumentsClick();
+ break;
+ }
+
+ if (
+ action.tabKind === ActionContracts.TabKind.SchemaAnalyzer ||
+ action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.SchemaAnalyzer]
+ ) {
+ collection.onSchemaAnalyzerClick();
+ break;
+ }
+
+ if (
+ action.tabKind === ActionContracts.TabKind.TableEntities ||
+ action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.TableEntities]
+ ) {
+ collection.onTableEntitiesClick();
+ break;
+ }
+
+ if (
+ action.tabKind === ActionContracts.TabKind.Graph ||
+ action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.Graph]
+ ) {
+ collection.onGraphDocumentsClick();
+ break;
+ }
+
+ if (
+ action.tabKind === ActionContracts.TabKind.SQLQuery ||
+ action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.SQLQuery]
+ ) {
+ collection.onNewQueryClick(
+ collection,
+ undefined,
+ generateQueryText(action as ActionContracts.OpenQueryTab, collection.partitionKeyProperties),
+ );
+ break;
+ }
+
+ if (
+ action.tabKind === ActionContracts.TabKind.ScaleSettings ||
+ action.tabKind === ActionContracts.TabKind[ActionContracts.TabKind.ScaleSettings]
+ ) {
+ collection.onSettingsClick();
+ break;
+ }
+ }
+ subscription.dispose();
+ };
+
+ const subscription = database.collections.subscribe((collections) => collectionActionHandler(collections));
+ if (database.collections && database.collections() && database.collections().length) {
+ collectionActionHandler(database.collections());
+ }
+
+ break;
}
-
- break;
}
}
diff --git a/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx b/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
index dbef20b12..cd91a6628 100644
--- a/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
+++ b/src/Explorer/Panes/CassandraAddCollectionPane/CassandraAddCollectionPane.tsx
@@ -202,8 +202,8 @@ export const CassandraAddCollectionPane: FunctionComponent = ({
{createNewContainer ? (
+ All configurations except for unique keys will be copied from the source container
*
diff --git a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
index 1f0eda4f7..9b2412c4b 100644
--- a/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
+++ b/src/Explorer/Panes/SettingsPane/SettingsPane.tsx
@@ -630,7 +630,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
Enable sample database
This is a sample database and collection with synthetic product data you can use to explore using
- NoSQL queries and Copilot. This will appear as another database in the Data Explorer UI, and is
+ NoSQL queries and Query Advisor. This will appear as another database in the Data Explorer UI, and is
created by, and maintained by Microsoft at no cost to you.
@@ -640,7 +640,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
label: { padding: 0 },
}}
className="padding"
- ariaLabel="Enable sample db for Copilot"
+ ariaLabel="Enable sample db for Query Advisor"
checked={copilotSampleDBEnabled}
onChange={handleSampleDatabaseChange}
/>
diff --git a/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx b/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
index 1f23a60bc..9ad999aa0 100644
--- a/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
+++ b/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
@@ -124,8 +124,8 @@ export const AddTableEntityPanel: FunctionComponent =
setIsExecuting(true);
const entity: Entities.ITableEntity = entityFromAttributes(entities);
- const newEntity: Entities.ITableEntity = await tableDataClient.createDocument(queryTablesTab.collection, entity);
try {
+ const newEntity: Entities.ITableEntity = await tableDataClient.createDocument(queryTablesTab.collection, entity);
await tableEntityListViewModel.addEntityToCache(newEntity);
if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
tableEntityListViewModel.redrawTableThrottled();
diff --git a/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx b/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx
index d8d68f4cc..c96f8d179 100644
--- a/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx
+++ b/src/Explorer/QueryCopilot/Modal/QueryCopilotFeedbackModal.tsx
@@ -49,7 +49,7 @@ export const QueryCopilotFeedbackModal = ({
};
return (
-
+