diff --git a/src/Explorer/Explorer.tsx b/src/Explorer/Explorer.tsx index 57583483c..19fb0419f 100644 --- a/src/Explorer/Explorer.tsx +++ b/src/Explorer/Explorer.tsx @@ -1,19 +1,21 @@ +import * as msal from "@azure/msal-browser"; import { Link } from "@fluentui/react/lib/Link"; import { isPublicInternetAccessAllowed } from "Common/DatabaseAccountUtility"; import { sendMessage } from "Common/MessageHandler"; import { Platform, configContext } from "ConfigContext"; import { MessageTypes } from "Contracts/ExplorerContracts"; +import { useDataPlaneRbac } from "Explorer/Panes/SettingsPane/SettingsPane"; import { getCopilotEnabled, isCopilotFeatureRegistered } from "Explorer/QueryCopilot/Shared/QueryCopilotClient"; import { IGalleryItem } from "Juno/JunoClient"; import { scheduleRefreshDatabaseResourceToken } from "Platform/Fabric/FabricUtil"; import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility"; import { acquireTokenWithMsal, getMsalInstance } from "Utils/AuthorizationUtils"; import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointUtils"; +import { update } from "Utils/arm/generatedClients/cosmos/databaseAccounts"; import { useQueryCopilot } from "hooks/useQueryCopilot"; import * as ko from "knockout"; import React from "react"; import _ from "underscore"; -import * as msal from "@azure/msal-browser"; import shallow from "zustand/shallow"; import { AuthType } from "../AuthType"; import { BindingHandlersRegisterer } from "../Bindings/BindingHandlersRegisterer"; @@ -67,8 +69,6 @@ import { ResourceTreeAdapter } from "./Tree/ResourceTreeAdapter"; import StoredProcedure from "./Tree/StoredProcedure"; import { useDatabases } from "./useDatabases"; import { useSelectedNode } from "./useSelectedNode"; -import { update } from "Utils/arm/generatedClients/cosmos/databaseAccounts"; -import { useDataPlaneRbac } from "Explorer/Panes/SettingsPane/SettingsPane"; BindingHandlersRegisterer.registerBindingHandlers(); @@ -1119,7 +1119,7 @@ export default class Explorer { } } - public openUploadItemsPanePane(): void { + public openUploadItemsPane(): void { useSidePanel.getState().openSidePanel("Upload " + getUploadName(), ); } public openExecuteSprocParamsPanel(storedProcedure: StoredProcedure): void { diff --git a/src/Explorer/Panes/TableColumnSelectionPane/TableColumnSelectionPane.tsx b/src/Explorer/Panes/TableColumnSelectionPane/TableColumnSelectionPane.tsx index 8796b572f..1e13efb11 100644 --- a/src/Explorer/Panes/TableColumnSelectionPane/TableColumnSelectionPane.tsx +++ b/src/Explorer/Panes/TableColumnSelectionPane/TableColumnSelectionPane.tsx @@ -18,12 +18,14 @@ export interface TableColumnSelectionPaneProps { columnDefinitions: ColumnDefinition[]; selectedColumnIds: string[]; onSelectionChange: (newSelectedColumnIds: string[]) => void; + defaultSelection: string[]; } export const TableColumnSelectionPane: React.FC = ({ columnDefinitions, selectedColumnIds, onSelectionChange, + defaultSelection, }: TableColumnSelectionPaneProps): JSX.Element => { const closeSidePanel = useSidePanel((state) => state.closeSidePanel); const originalSelectedColumnIds = React.useMemo(() => selectedColumnIds, []); @@ -88,15 +90,20 @@ export const TableColumnSelectionPane: React.FC = /> - {columnDefinitionList.map((columnDefinition) => ( - onCheckedValueChange(columnDefinition.id, checked)} - /> - ))} +
+ {columnDefinitionList.map((columnDefinition) => ( + onCheckedValueChange(columnDefinition.id, checked)} + /> + ))} +
+
diff --git a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTableComponent.tsx b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTableComponent.tsx index de39e8791..649e975aa 100644 --- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTableComponent.tsx +++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTableComponent.tsx @@ -68,6 +68,7 @@ export interface IDocumentsTableComponentProps { isSelectionDisabled?: boolean; onColumnResize?: (columnId: string, width: number) => void; onColumnSelectionChange?: (newSelectedColumnIds: string[]) => void; + defaultColumnSelection?: string[]; } interface TableRowData extends RowStateBase { @@ -96,6 +97,7 @@ export const DocumentsTableComponent: React.FC = isSelectionDisabled, onColumnResize: _onColumnResize, onColumnSelectionChange, + defaultColumnSelection, }: IDocumentsTableComponentProps) => { const styles = useDocumentsTabStyles(); @@ -392,11 +394,12 @@ export const DocumentsTableComponent: React.FC = useSidePanel .getState() .openSidePanel( - "Save Query", + "Select columns", , ); };