diff --git a/src/app/services/actions/query-action-creator-util.ts b/src/app/services/actions/query-action-creator-util.ts index 42522de370..eae931a843 100644 --- a/src/app/services/actions/query-action-creator-util.ts +++ b/src/app/services/actions/query-action-creator-util.ts @@ -3,8 +3,8 @@ import { GraphRequest, ResponseType } from '@microsoft/microsoft-graph-client'; -import { - MSALAuthenticationProviderOptions +import { + MSALAuthenticationProviderOptions } from '@microsoft/microsoft-graph-client/lib/src/MSALAuthenticationProviderOptions'; import { IAction } from '../../../types/action'; diff --git a/src/app/views/sidebar/Sidebar.tsx b/src/app/views/sidebar/Sidebar.tsx index 48a9ffdd7f..d7c355134a 100644 --- a/src/app/views/sidebar/Sidebar.tsx +++ b/src/app/views/sidebar/Sidebar.tsx @@ -5,7 +5,6 @@ import { telemetry } from '../../../telemetry'; import { translateMessage } from '../../utils/translate-messages'; import History from './history/History'; import SampleQueries from './sample-queries/SampleQueries'; - export const Sidebar = () => { return (
diff --git a/src/app/views/sidebar/resource-explorer/CommandOptions.tsx b/src/app/views/sidebar/resource-explorer/CommandOptions.tsx index a06cf83888..f9b51bca97 100644 --- a/src/app/views/sidebar/resource-explorer/CommandOptions.tsx +++ b/src/app/views/sidebar/resource-explorer/CommandOptions.tsx @@ -1,9 +1,8 @@ -import { CommandBar, ICommandBarItemProps } from '@fluentui/react'; +import { CommandBar, CommandBarButton, getTheme, IButtonProps, ICommandBarItemProps } from '@fluentui/react'; import React, { useState } from 'react'; - import { translateMessage } from '../../../utils/translate-messages'; import PathsReview from './panels/PathsReview'; - +import { resourceExplorerStyles } from './resources.styles' interface ICommandOptions { version: string; } @@ -11,6 +10,10 @@ interface ICommandOptions { const CommandOptions = (props: ICommandOptions) => { const [isOpen, setIsOpen] = useState(false); const { version } = props; + const theme = getTheme(); + + const itemStyles = resourceExplorerStyles(theme).itemStyles; + const commandStyles = resourceExplorerStyles(theme).commandBarStyles; const options: ICommandBarItemProps[] = [ { key: 'preview', @@ -26,6 +29,10 @@ const CommandOptions = (props: ICommandOptions) => { setIsOpen(open); } + const CustomButton: React.FunctionComponent = (props_: any) => { + return ; + }; + return (
{ ariaLabel='Selection actions' primaryGroupAriaLabel='Selection actions' farItemsGroupAriaLabel='More selection actions' + buttonAs={CustomButton} + styles={commandStyles} /> { + return { + itemStyles: { + root: { + border: '1px solid', + borderColor: theme.palette.themePrimary, + marginLeft: '-15px' + } + }, + commandBarStyles: { + root: { + backgroundColor: theme.palette.neutralLighter + } + } + } +} \ No newline at end of file