From f97cd9ea5b56b4e9443854f46c79da9aed903686 Mon Sep 17 00:00:00 2001 From: Aditya Soni <54634472+adityasoni2019@users.noreply.github.com> Date: Fri, 27 Sep 2024 20:47:30 +0530 Subject: [PATCH] MM-51091: Fixed the checkmarks bug (#28287) * Fixed the checkmarks bug * Fixed indentation * Fixing the snapshots * resolving the comments * check-lint issues * react fragment removal * Fixing the .snap files --- .../sidebar_category_sorting_menu.test.tsx.snap | 14 ++++++++++++++ .../__snapshots__/index.test.tsx.snap | 7 +++++++ .../sidebar_category_menu/index.tsx | 5 ++++- .../sidebar_category_sorting_menu.tsx | 4 ++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category_sorting_menu.test.tsx.snap b/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category_sorting_menu.test.tsx.snap index 192edeb8a6..168253624a 100644 --- a/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category_sorting_menu.test.tsx.snap +++ b/webapp/channels/src/components/sidebar/sidebar_category/__snapshots__/sidebar_category_sorting_menu.test.tsx.snap @@ -65,6 +65,11 @@ exports[`components/sidebar/sidebar_category/sidebar_category_sorting_menu shoul /> } onClick={[Function]} + trailingElements={ + + } /> } onClick={[Function]} + trailingElements={null} /> } onClick={[Function]} + trailingElements={ + + } /> } onClick={[Function]} + trailingElements={null} /> } onClick={[Function]} + trailingElements={null} /> } onClick={[Function]} + trailingElements={null} /> diff --git a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/__snapshots__/index.test.tsx.snap b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/__snapshots__/index.test.tsx.snap index 4dc2534e27..373ffcb4aa 100644 --- a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/__snapshots__/index.test.tsx.snap +++ b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/__snapshots__/index.test.tsx.snap @@ -95,6 +95,11 @@ exports[`components/sidebar/sidebar_category/sidebar_category_menu should match /> } onClick={[Function]} + trailingElements={ + + } /> } onClick={[Function]} + trailingElements={null} /> } onClick={[Function]} + trailingElements={null} /> diff --git a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/index.tsx b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/index.tsx index bd3641dda5..8fd3f1b768 100644 --- a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/index.tsx +++ b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_menu/index.tsx @@ -13,6 +13,7 @@ import { SortAlphabeticalAscendingIcon, ClockOutlineIcon, ChevronRightIcon, + CheckIcon, } from '@mattermost/compass-icons/components'; import type {ChannelCategory} from '@mattermost/types/channel_categories'; import {CategorySorting} from '@mattermost/types/channel_categories'; @@ -49,7 +50,6 @@ const SidebarCategoryMenu = ({ const showUnreadsCategory = useSelector(shouldShowUnreadsCategory); const getUnreadsIdsForCategory = useMemo(makeGetUnreadIdsForCategory, [category]); const unreadsIds = useSelector((state: GlobalState) => getUnreadsIdsForCategory(state, category)); - const {formatMessage} = useIntl(); let muteUnmuteCategoryMenuItem: JSX.Element | null = null; @@ -194,6 +194,7 @@ const SidebarCategoryMenu = ({ /> )} onClick={() => handleSortChannels(CategorySorting.Alphabetical)} + trailingElements={category.sorting === CategorySorting.Alphabetical ? : null} /> )} onClick={() => handleSortChannels(CategorySorting.Recency)} + trailingElements={category.sorting === CategorySorting.Recency ? : null} /> )} onClick={() => handleSortChannels(CategorySorting.Manual)} + trailingElements={category.sorting === CategorySorting.Manual ? : null} /> ); diff --git a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_sorting_menu.tsx b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_sorting_menu.tsx index 44e8f99b2a..5ca3ad11f7 100644 --- a/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_sorting_menu.tsx +++ b/webapp/channels/src/components/sidebar/sidebar_category/sidebar_category_sorting_menu.tsx @@ -14,6 +14,7 @@ import { AccountPlusOutlineIcon, DotsVerticalIcon, ChevronRightIcon, + CheckIcon, } from '@mattermost/compass-icons/components'; import type {ChannelCategory} from '@mattermost/types/channel_categories'; import {CategorySorting} from '@mattermost/types/channel_categories'; @@ -95,6 +96,7 @@ const SidebarCategorySortingMenu = ({ /> )} onClick={() => handleSortDirectMessages(CategorySorting.Alphabetical)} + trailingElements={category.sorting === CategorySorting.Alphabetical ? : null} /> )} onClick={() => handleSortDirectMessages(CategorySorting.Recency)} + trailingElements={category.sorting === CategorySorting.Recency ? : null} /> @@ -153,6 +156,7 @@ const SidebarCategorySortingMenu = ({ key={`showDmCount-${category.id}-${dmGmShowCount}`} labels={{dmGmShowCount}} onClick={() => handlelimitVisibleDMsGMs(dmGmShowCount)} + trailingElements={selectedDmNumber === dmGmShowCount ? : null} /> ))}