A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(app): filter advanced settings in search results (#3626)
Hampus6484740d6264
diff --git a/fluxer_app/src/features/app/components/dialogs/components/AllSettingsRenderer.tsx b/fluxer_app/src/features/app/components/dialogs/components/AllSettingsRenderer.tsxindex 4a0c69b13..4b04d101e 100644--- a/fluxer_app/src/features/app/components/dialogs/components/AllSettingsRenderer.tsx+++ b/fluxer_app/src/features/app/components/dialogs/components/AllSettingsRenderer.tsx@@ -11,6 +11,7 @@ import {remFromPx} from '@app/features/theme/layout/RemFromPx';import {ThemesInlineContent} from '@app/features/theme_settings/ThemesTab';import {CaretRightIcon} from '@app/features/ui/icons/DirectionalIcons';import {AccessibilityInlineContent} from '@app/features/user/components/modals/tabs/AccessibilityTab';+import {AdvancedSettingsInlineContent} from '@app/features/user/components/modals/tabs/AdvancedSettingsTab';import {AppearanceInlineContent} from '@app/features/user/components/modals/tabs/AppearanceTab';import {AccountSecurityInlineTab} from '@app/features/user/components/modals/tabs/account_security_tab/AccountSecurityTabInline';import ApplicationsTab from '@app/features/user/components/modals/tabs/applications_tab';@@ -80,6 +81,7 @@ const INLINE_TAB_COMPONENTS: Partial<Record<UserSettingsTabType, React.Componentapplications: ApplicationsTab,keybinds: KeybindsTab,linked_accounts: LinkedAccountsTab,+ advanced_settings: AdvancedSettingsInlineContent,};const getInlineTabComponent = (tab: SettingsTab): React.ComponentType<Record<string, unknown>> | null => {const inlineComponent = INLINE_TAB_COMPONENTS[tab.type as UserSettingsTabType];@@ -101,7 +103,7 @@ function getAccountSearchTargetSection(matchedItems: Array<SearchableSettingItem}const SettingsSection: React.FC<SettingsSectionProps> = observer(- ({tab, matchedItems, initialGuildId, isExpanded, onToggleExpand}) => {+ ({tab, matchedItems, searchQuery, initialGuildId, isExpanded, onToggleExpand}) => {const contentRef = useRef<HTMLDivElement>(null);const matchCount = matchedItems.length;const currentUserCreatedAt = Users.currentUser?.createdAt ?? null;@@ -188,6 +190,7 @@ const SettingsSection: React.FC<SettingsSectionProps> = observer(<div className={styles.sectionContent} data-flx="app.all-settings-renderer.settings-section.section-content">{React.createElement(InlineComponent, {settingsTabType,+ searchQuery,...(accountTargetSection ? {initialSubtab: accountTargetSection} : {}),...(initialGuildId ? {initialGuildId} : {}),} as Record<string, unknown>)}diff --git a/fluxer_app/src/features/user/components/modals/tabs/AdvancedSettingsTab.tsx b/fluxer_app/src/features/user/components/modals/tabs/AdvancedSettingsTab.tsxindex 83a378d91..99aa7c6a2 100644--- a/fluxer_app/src/features/user/components/modals/tabs/AdvancedSettingsTab.tsx+++ b/fluxer_app/src/features/user/components/modals/tabs/AdvancedSettingsTab.tsx@@ -52,9 +52,8 @@ const NO_ADVANCED_SETTINGS_FOUND_DESCRIPTOR = msg({const EMPTY_TAGS = new Set<SettingsCategoryTag>();-const AdvancedSettingsTab = observer(() => {+const AdvancedSettingsList = observer(({query}: {query: string}) => {const {i18n} = useLingui();- const [query, setQuery] = useState('');const currentUserCreatedAt = Users.currentUser?.createdAt ?? null;const allItems = useMemo(() => getAdvancedSettingItems(), []);const tagLabels = useMemo(@@ -87,83 +86,101 @@ const AdvancedSettingsTab = observer(() => {}, []);const hasResults = filteredItems.length > 0;return (- <SettingsTabContainer data-flx="user.advanced-settings-tab.container">- <SettingsTabContent data-flx="user.advanced-settings-tab.content">- <div className={styles.toolbar} data-flx="user.advanced-settings-tab.toolbar">- <SettingsSearch- value={query}- onChange={setQuery}- placeholder={i18n._(SEARCH_ADVANCED_SETTINGS_DESCRIPTOR)}- data-flx="user.advanced-settings-tab.search"- />+ <>+ {!hasResults && (+ <div className={styles.emptyState} data-flx="user.advanced-settings-tab.empty-state">+ {i18n._(NO_ADVANCED_SETTINGS_FOUND_DESCRIPTOR)}</div>- {!hasResults && (- <div className={styles.emptyState} data-flx="user.advanced-settings-tab.empty-state">- {i18n._(NO_ADVANCED_SETTINGS_FOUND_DESCRIPTOR)}+ )}+ {featuredItems.length > 0 && (+ <section className={styles.section} data-flx="user.advanced-settings-tab.new-section">+ <div className={styles.sectionHeader} data-flx="user.advanced-settings-tab.section-header">+ <div className={styles.sectionTitleRow} data-flx="user.advanced-settings-tab.section-title-row">+ <h3 className={styles.sectionTitle} data-flx="user.advanced-settings-tab.section-title">+ {i18n._(NEW_SETTINGS_DESCRIPTOR)}+ </h3>+ <SettingsStatusBadge kind="new" data-flx="user.advanced-settings-tab.new-badge" />+ </div>+ <p className={styles.sectionDescription} data-flx="user.advanced-settings-tab.section-description">+ {i18n._(NEW_SETTINGS_DESCRIPTION_DESCRIPTOR)}+ </p></div>- )}- {featuredItems.length > 0 && (- <section className={styles.section} data-flx="user.advanced-settings-tab.new-section">- <div className={styles.sectionHeader} data-flx="user.advanced-settings-tab.section-header">- <div className={styles.sectionTitleRow} data-flx="user.advanced-settings-tab.section-title-row">- <h3 className={styles.sectionTitle} data-flx="user.advanced-settings-tab.section-title">- {i18n._(NEW_SETTINGS_DESCRIPTOR)}+ <div className={styles.itemList} data-flx="user.advanced-settings-tab.item-list.new">+ {featuredItems.map((item) => (+ <AdvancedSettingRow+ key={item.id}+ item={item}+ userCreatedAt={currentUserCreatedAt}+ onOpen={handleOpenSource}+ data-flx="user.advanced-settings-tab.advanced-setting-row"+ />+ ))}+ </div>+ </section>+ )}+ {groups.map((group) => {+ const sectionId = getAdvancedSettingsCategorySectionId(group.key);+ return (+ <section+ key={group.key}+ id={sectionId}+ className={styles.section}+ data-flx="user.advanced-settings-tab.section"+ >+ <div className={styles.sectionHeader} data-flx="user.advanced-settings-tab.section-header--2">+ <div className={styles.sectionTitleRow} data-flx="user.advanced-settings-tab.section-title-row--2">+ <h3 className={styles.sectionTitle} data-flx="user.advanced-settings-tab.section-title--2">+ {group.label}</h3>- <SettingsStatusBadge kind="new" data-flx="user.advanced-settings-tab.new-badge" />+ {showGroupLinks ? (+ <SettingsHeadingLinkButton+ href={buildUserSettingsDeepLink('advanced_settings', sectionId)}+ data-flx="user.advanced-settings-tab.heading-link-button"+ />+ ) : null}</div>- <p className={styles.sectionDescription} data-flx="user.advanced-settings-tab.section-description">- {i18n._(NEW_SETTINGS_DESCRIPTION_DESCRIPTOR)}- </p></div>- <div className={styles.itemList} data-flx="user.advanced-settings-tab.item-list.new">- {featuredItems.map((item) => (+ <div className={styles.itemList} data-flx="user.advanced-settings-tab.item-list">+ {group.items.map((item) => (<AdvancedSettingRowkey={item.id}item={item}userCreatedAt={currentUserCreatedAt}onOpen={handleOpenSource}- data-flx="user.advanced-settings-tab.advanced-setting-row"+ data-flx="user.advanced-settings-tab.advanced-setting-row--2"/>))}</div></section>- )}- {groups.map((group) => {- const sectionId = getAdvancedSettingsCategorySectionId(group.key);- return (- <section- key={group.key}- id={sectionId}- className={styles.section}- data-flx="user.advanced-settings-tab.section"- >- <div className={styles.sectionHeader} data-flx="user.advanced-settings-tab.section-header--2">- <div className={styles.sectionTitleRow} data-flx="user.advanced-settings-tab.section-title-row--2">- <h3 className={styles.sectionTitle} data-flx="user.advanced-settings-tab.section-title--2">- {group.label}- </h3>- {showGroupLinks ? (- <SettingsHeadingLinkButton- href={buildUserSettingsDeepLink('advanced_settings', sectionId)}- data-flx="user.advanced-settings-tab.heading-link-button"- />- ) : null}- </div>- </div>- <div className={styles.itemList} data-flx="user.advanced-settings-tab.item-list">- {group.items.map((item) => (- <AdvancedSettingRow- key={item.id}- item={item}- userCreatedAt={currentUserCreatedAt}- onOpen={handleOpenSource}- data-flx="user.advanced-settings-tab.advanced-setting-row--2"- />- ))}- </div>- </section>- );- })}+ );+ })}+ </>+ );+});++export const AdvancedSettingsInlineContent = observer(({searchQuery = ''}: {searchQuery?: string}) => (+ <SettingsTabContainer data-flx="user.advanced-settings-tab.inline-container">+ <SettingsTabContent data-flx="user.advanced-settings-tab.inline-content">+ <AdvancedSettingsList query={searchQuery} data-flx="user.advanced-settings-tab.inline-list" />+ </SettingsTabContent>+ </SettingsTabContainer>+));++const AdvancedSettingsTab = observer(() => {+ const {i18n} = useLingui();+ const [query, setQuery] = useState('');+ return (+ <SettingsTabContainer data-flx="user.advanced-settings-tab.container">+ <SettingsTabContent data-flx="user.advanced-settings-tab.content">+ <div className={styles.toolbar} data-flx="user.advanced-settings-tab.toolbar">+ <SettingsSearch+ value={query}+ onChange={setQuery}+ placeholder={i18n._(SEARCH_ADVANCED_SETTINGS_DESCRIPTOR)}+ data-flx="user.advanced-settings-tab.search"+ />+ </div>+ <AdvancedSettingsList query={query} data-flx="user.advanced-settings-tab.list" /></SettingsTabContent></SettingsTabContainer>);