Skip to content

Commit 178f925

Browse files
committed
fix pivot items
1 parent 0bed00a commit 178f925

File tree

3 files changed

+30
-22
lines changed

3 files changed

+30
-22
lines changed

src/app/views/App.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,10 @@ class App extends Component<IAppProps, IAppState> {
262262
return (
263263
<FluentProvider theme={fluentV9Themes[this.props.appTheme]}>
264264
<ThemeContext.Provider value={this.props.appTheme}>
265-
<Layout handleSelectVerb={this.handleSelectVerb} />
265+
<Layout
266+
handleSelectVerb={this.handleSelectVerb}
267+
graphExplorerMode={this.props.graphExplorerMode}
268+
authenticated={this.props.authenticated} />
266269
</ThemeContext.Provider>
267270
</FluentProvider>
268271
);

src/app/views/layout/Layout.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@ import { useResizeHandle } from '@fluentui-contrib/react-resize-handle';
2020
import { useLayoutResizeStyles, useLayoutStyles, SIDEBAR_SIZE_CSS_VAR } from './LayoutStyles';
2121
import { useDetectMobileScreen } from '../../utils/useDetectMobileScreen';
2222
import { Mode } from '../../../types/enums';
23+
import { createShareLink } from '../common/share';
24+
import { headerMessaging } from '../app-sections/HeaderMessaging';
2325

2426
interface LayoutProps {
2527
handleSelectVerb: (verb: string) => void;
28+
graphExplorerMode: Mode;
29+
authenticated: boolean;
2630
}
2731

2832
export const Layout = (props: LayoutProps) => {
@@ -35,6 +39,7 @@ export const Layout = (props: LayoutProps) => {
3539
const [initialSidebarWidth, setInitialSidebarWidth] = useState(456);
3640
const [sidebarElement, setSidebarElement] = useState<HTMLElement | null>(null);
3741
const mode = useAppSelector((state) => state.graphExplorerMode);
42+
const query = createShareLink(sampleQuery, props.authenticated);
3843

3944
const {
4045
handleRef: sidebarHandleRef,
@@ -123,6 +128,7 @@ export const Layout = (props: LayoutProps) => {
123128
<PopupsProvider>
124129
<div className={layoutStyles.container}>
125130
<MainHeader />
131+
{props.graphExplorerMode === Mode.TryIt && headerMessaging(query)}
126132
<div id='content-ref' className={mergeClasses(layoutStyles.content, resizeStyles)} ref={sidebarWrapperRef}>
127133
{(showSidebar && mode !== Mode.TryIt) && (
128134
<div id='sidebar-ref' className={layoutStyles.sidebar} ref={storeSidebarElement}>

src/app/views/query-response/pivot-items/pivot-item.tsx

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export const GetPivotItems = () => {
120120
setSelectedValue(data.value);
121121
};
122122

123-
const tabs = [
123+
let tabs = [
124124
{
125125
id: translateMessage('Response Preview'),
126126
name: translateMessage('Response Preview'),
@@ -130,8 +130,10 @@ export const GetPivotItems = () => {
130130
id: translateMessage('Response Headers'),
131131
name: translateMessage('Response Headers'),
132132
icon: <DocumentChevronDoubleRegular />
133-
},
134-
{
133+
}]
134+
135+
if (mode === Mode.Complete) {
136+
const newTabs = [{
135137
id: translateMessage('Snippets'),
136138
name: translateMessage('Snippets'),
137139
icon: <ClipboardCodeRegular />
@@ -145,8 +147,9 @@ export const GetPivotItems = () => {
145147
id: translateMessage('Adaptive Cards'),
146148
name: translateMessage('Adaptive Cards'),
147149
icon: <CardUiRegular />
148-
}
149-
];
150+
}];
151+
tabs = [...tabs, ...newTabs];
152+
}
150153

151154
return (
152155
<div className={styles.container}>
@@ -178,23 +181,19 @@ export const GetPivotItems = () => {
178181
<div className={styles.tabContent}>
179182
{selectedValue === translateMessage('Response Preview') && <Response />}
180183
{selectedValue === translateMessage('Response Headers') && <ResponseHeaders />}
181-
{mode === Mode.Complete && (
182-
<>
183-
{selectedValue === translateMessage('Snippets') && <Snippets />}
184-
{selectedValue === translateMessage('Graph toolkit') && <GraphToolkit />}
185-
{selectedValue === translateMessage('Adaptive Cards') && (
186-
<ThemeContext.Consumer>
187-
{(theme) => (
188-
<div id={'adaptive-cards-tab'} tabIndex={0}>
189-
<AdaptiveCards
190-
body={body as string}
191-
hostConfig={theme === 'light' ? lightThemeHostConfig : darkThemeHostConfig}
192-
/>
193-
</div>
194-
)}
195-
</ThemeContext.Consumer>
184+
{selectedValue === translateMessage('Snippets') && <Snippets />}
185+
{selectedValue === translateMessage('Graph toolkit') && <GraphToolkit />}
186+
{selectedValue === translateMessage('Adaptive Cards') && (
187+
<ThemeContext.Consumer>
188+
{(theme) => (
189+
<div id={'adaptive-cards-tab'} tabIndex={0}>
190+
<AdaptiveCards
191+
body={body as string}
192+
hostConfig={theme === 'light' ? lightThemeHostConfig : darkThemeHostConfig}
193+
/>
194+
</div>
196195
)}
197-
</>
196+
</ThemeContext.Consumer>
198197
)}
199198
</div>
200199
</div>

0 commit comments

Comments
 (0)