Skip to content

FE: Filters: Display CEL help when editing filter #646

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

Merged
merged 3 commits into from
Nov 24, 2024
Merged

FE: Filters: Display CEL help when editing filter #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1dc56e
Closes kafbat/kafka-ui #622
pisal-shubham Nov 5, 2024
b04d828
Merge branch 'main' into issues/622
Haarolean Nov 11, 2024
ed28ee7
Merge branch 'kafbat:main' into issues/622
pisal-shubham Nov 17, 2024
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
2 changes: 1 addition & 1 deletion frontend/src/components/Topics/Topic/Messages/Filters/AddEditFilterContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ const AddEditFilterContainer: React.FC<AddEditFilterContainerProps> = ({
</FormError>
</div>
<S.FilterButtonWrapper isEdit={isEdit}>
{!isEdit && <QuestionInfo />}
<QuestionInfo />
<Flexbox gap="10px">
<Button
buttonSize="M"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Topics/Topic/Messages/Filters/Filters.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export const SavedFilterName = styled.div`

export const FilterButtonWrapper = styled.div<{ isEdit: boolean }>`
display: flex;
justify-content: ${(props) => (props.isEdit ? 'flex-end' : 'space-between')};
justify-content: space-between;
margin-top: 10px;
gap: 10px;
padding-top: 16px;
Expand Down
12 changes: 12 additions & 0 deletions ...nd/src/components/Topics/Topic/Messages/Filters/__tests__/AddEditFilterContainer.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ describe('AddEditFilterContainer component', () => {
expect(submitButtonElem).toBeEnabled();
});

it('should display the CEL syntax help icon', async () => {
const celHelpIcon = screen.queryByLabelText('info');
expect(celHelpIcon).toBeVisible();
expect(celHelpIcon).toBeEnabled();
});

// TODO needs a rethink
// it('should view the error message after typing and clearing the input', async () => {
// const inputs = screen.getAllByRole('textbox');
Expand Down Expand Up @@ -115,6 +121,12 @@ describe('AddEditFilterContainer component', () => {
const checkbox = screen.queryByRole('checkbox');
expect(checkbox).not.toBeInTheDocument();
});

it('should display the CEL syntax help icon', async () => {
const celHelpIcon = screen.queryByLabelText('info');
expect(celHelpIcon).toBeVisible();
expect(celHelpIcon).toBeEnabled();
});
});

describe('Cancel and Submit button functionality', () => {
Expand Down
Loading