From 05354b6c6e57c8fa65b90bdc67adb6fdfbf4dd14 Mon Sep 17 00:00:00 2001 From: Elinor Date: Mon, 23 May 2022 14:33:56 +0300 Subject: [PATCH 1/3] remove unused toggle --- .../views/sidebar/sample-queries/SampleQueries.tsx | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/app/views/sidebar/sample-queries/SampleQueries.tsx b/src/app/views/sidebar/sample-queries/SampleQueries.tsx index a8a4306e3..b800df274 100644 --- a/src/app/views/sidebar/sample-queries/SampleQueries.tsx +++ b/src/app/views/sidebar/sample-queries/SampleQueries.tsx @@ -1,7 +1,7 @@ import { Announced, DetailsList, DetailsRow, FontSizes, FontWeights, getId, getTheme, - GroupHeader, IColumn, Icon, IDetailsRowStyles, MessageBar, MessageBarType, SearchBox, + GroupHeader, IColumn, Icon, IDetailsRowStyles, IGroup, MessageBar, MessageBarType, SearchBox, SelectionMode, Spinner, SpinnerSize, styled, TooltipHost } from '@fluentui/react'; import React, { useEffect, useState } from 'react'; @@ -44,7 +44,7 @@ const unstyledSampleQueries = (sampleProps?: ISampleQueriesProps): JSX.Element = const currentTheme = getTheme(); const { error, pending } = samples; - const groups = generateGroupsFromList(sampleQueries, 'category'); + const groups: IGroup[] = generateGroupsFromList(sampleQueries, 'category'); const classProps = { styles: sampleProps!.styles, @@ -276,12 +276,9 @@ const unstyledSampleQueries = (sampleProps?: ISampleQueriesProps): JSX.Element = }; const renderGroupHeader = (props: any): any => { - const onToggleSelectGroup = () => { - props.onToggleCollapse(props.group); - }; - return ( ); }; From 554bbf51a589e2ef37d0378c47d0ffcdc4b4c543 Mon Sep 17 00:00:00 2001 From: Elinor Date: Mon, 23 May 2022 16:26:25 +0300 Subject: [PATCH 2/3] fix collapse issue --- src/app/views/sidebar/sample-queries/SampleQueries.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/views/sidebar/sample-queries/SampleQueries.tsx b/src/app/views/sidebar/sample-queries/SampleQueries.tsx index b800df274..bcdb9ba5e 100644 --- a/src/app/views/sidebar/sample-queries/SampleQueries.tsx +++ b/src/app/views/sidebar/sample-queries/SampleQueries.tsx @@ -279,7 +279,7 @@ const unstyledSampleQueries = (sampleProps?: ISampleQueriesProps): JSX.Element = return ( k.key === selectedQuery.category); - if (index !== -1) { + if (index !== -1 && index !== 0 ) { groups[index].isCollapsed = false; + groups[0].isCollapsed = true; } } From 7b2d8b4a3d9938f4b40e6b1594546b8cc7a025f7 Mon Sep 17 00:00:00 2001 From: Elinor Date: Tue, 24 May 2022 12:41:27 +0300 Subject: [PATCH 3/3] make requested changes --- src/app/utils/generate-groups.ts | 2 +- src/app/views/sidebar/sample-queries/SampleQueries.tsx | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/utils/generate-groups.ts b/src/app/utils/generate-groups.ts index f26e49ade..8e078dee8 100644 --- a/src/app/utils/generate-groups.ts +++ b/src/app/utils/generate-groups.ts @@ -1,6 +1,6 @@ import { IGroup } from '@fluentui/react'; -export function generateGroupsFromList(list: any[], property: string) { +export function generateGroupsFromList(list: any[], property: string) : IGroup[]{ const map = new Map(); const groups: IGroup[] = []; diff --git a/src/app/views/sidebar/sample-queries/SampleQueries.tsx b/src/app/views/sidebar/sample-queries/SampleQueries.tsx index bcdb9ba5e..048331967 100644 --- a/src/app/views/sidebar/sample-queries/SampleQueries.tsx +++ b/src/app/views/sidebar/sample-queries/SampleQueries.tsx @@ -1,7 +1,7 @@ import { Announced, DetailsList, DetailsRow, FontSizes, FontWeights, getId, getTheme, - GroupHeader, IColumn, Icon, IDetailsRowStyles, IGroup, MessageBar, MessageBarType, SearchBox, + GroupHeader, IColumn, Icon, IDetailsRowStyles, MessageBar, MessageBarType, SearchBox, SelectionMode, Spinner, SpinnerSize, styled, TooltipHost } from '@fluentui/react'; import React, { useEffect, useState } from 'react'; @@ -44,7 +44,7 @@ const unstyledSampleQueries = (sampleProps?: ISampleQueriesProps): JSX.Element = const currentTheme = getTheme(); const { error, pending } = samples; - const groups: IGroup[] = generateGroupsFromList(sampleQueries, 'category'); + const groups = generateGroupsFromList(sampleQueries, 'category'); const classProps = { styles: sampleProps!.styles, @@ -279,7 +279,6 @@ const unstyledSampleQueries = (sampleProps?: ISampleQueriesProps): JSX.Element = return ( k.key === selectedQuery.category); - if (index !== -1 && index !== 0 ) { + if (index > 0 ) { groups[index].isCollapsed = false; groups[0].isCollapsed = true; }