Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(JsonViewer): handle case sensitive search #1966

Merged
merged 1 commit into from
Feb 18, 2025
Merged

fix(JsonViewer): handle case sensitive search #1966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions src/components/JsonViewer/JsonViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,10 @@ export function JsonViewer({
extraTools,
collapsedInitially,
}: JsonViewerProps) {
const [caseSensitiveSearch] = useSetting(CASE_SENSITIVE_JSON_SEARCH, false);
const [caseSensitiveSearch, setCaseSensitiveSearch] = useSetting(
CASE_SENSITIVE_JSON_SEARCH,
false,
);

const [collapsedState, setCollapsedState] = React.useState<CollapsedState>(() => {
if (collapsedInitially) {
Expand Down Expand Up @@ -155,13 +158,16 @@ export function JsonViewer({
};

const updateState = (
changedState: Partial<Pick<State, 'collapsedState' | 'filter' | 'matchIndex'>>,
changedState: Partial<Pick<State, 'collapsedState' | 'filter' | 'matchIndex'>> & {
caseSensitive?: boolean;
},
cb?: () => void,
) => {
const {
collapsedState: newCollapsedState,
matchIndex: newMatchIndex,
filter: newFilter,
caseSensitive: newCaseSensitive,
} = changedState;

if (newCollapsedState !== undefined) {
Expand All @@ -173,7 +179,15 @@ export function JsonViewer({
if (newFilter !== undefined) {
setFilter(newFilter);
}
setState(calculateState(value, newCollapsedState ?? collapsedState, newFilter ?? filter));
const caseSensitive = newCaseSensitive ?? caseSensitiveSearch;
setState(
calculateState(
value,
newCollapsedState ?? collapsedState,
newFilter ?? filter,
caseSensitive,
),
);

cb?.();
};
Expand Down Expand Up @@ -254,6 +268,12 @@ export function JsonViewer({
}
};

const handleUpdateCaseSensitive = () => {
const newCaseSensitive = !caseSensitiveSearch;
setCaseSensitiveSearch(newCaseSensitive);
updateState({caseSensitive: newCaseSensitive});
};

const renderToolbar = () => {
return (
<Flex gap={2} wrap="nowrap" className={block('toolbar')}>
Expand All @@ -279,6 +299,8 @@ export function JsonViewer({
onKeyDown={onEnterKeyDown}
onNextMatch={onNextMatch}
onPrevMatch={onPrevMatch}
caseSensitive={caseSensitiveSearch}
onUpdateCaseSensitive={handleUpdateCaseSensitive}
/>
)}
<span className={block('extra-tools')}>{extraTools}</span>
Expand Down
26 changes: 16 additions & 10 deletions src/components/JsonViewer/components/Filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ import React from 'react';

import {ActionTooltip, Button, Flex, Icon, TextInput} from '@gravity-ui/uikit';

import {CASE_SENSITIVE_JSON_SEARCH} from '../../../utils/constants';
import {useSetting} from '../../../utils/hooks';
import {block} from '../constants';
import i18n from '../i18n';

Expand All @@ -19,16 +17,24 @@ interface FilterProps {
onKeyDown?: (event: React.KeyboardEvent<HTMLInputElement>) => void;
onNextMatch?: (_event: unknown, diff?: number) => void;
onPrevMatch?: (_event: unknown, diff?: number) => void;
caseSensitive?: boolean;
onUpdateCaseSensitive: VoidFunction;
}

export const Filter = React.forwardRef<HTMLInputElement, FilterProps>(function Filter(
{matchIndex, matchedRows, value, onUpdate, onKeyDown, onNextMatch, onPrevMatch},
{
matchIndex,
matchedRows,
value,
onUpdate,
onKeyDown,
onNextMatch,
onPrevMatch,
caseSensitive,
onUpdateCaseSensitive,
},
ref,
) {
const [caseSensitiveSearch, setCaseSensitiveSearch] = useSetting(
CASE_SENSITIVE_JSON_SEARCH,
false,
);
const count = matchedRows.length;
const matchPosition = count ? 1 + (matchIndex % count) : 0;
return (
Expand All @@ -47,15 +53,15 @@ export const Filter = React.forwardRef<HTMLInputElement, FilterProps>(function F
endContent={
<ActionTooltip
title={
caseSensitiveSearch
caseSensitive
? i18n('context_case-sensitive-search')
: i18n('context_case-sensitive-search-disabled')
}
>
<Button
view="flat-secondary"
onClick={() => setCaseSensitiveSearch(!caseSensitiveSearch)}
selected={caseSensitiveSearch}
onClick={onUpdateCaseSensitive}
selected={caseSensitive}
>
<Icon data={FontCaseIcon} />
</Button>
Expand Down
Loading