Skip to content

OU-1017: feat: enable tenant selector despite query being empty #343

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

Open
jgbernalp wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −8
Open

OU-1017: feat: enable tenant selector despite query being empty #343

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
2 changes: 0 additions & 2 deletions web/cypress/e2e/integration/logs-page.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,6 @@ describe('Logs Page', () => {
cy.getByTestId(TestIds.SeverityDropdown).within(() => {
cy.get('button').should('be.disabled');
});

cy.getByTestId(TestIds.TenantToggle).should('be.disabled');
});

it('updates the query when selecting filters', () => {
Expand Down
6 changes: 5 additions & 1 deletion web/src/components/logs-query-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ interface LogsQueryInputProps {
onRun?: () => void;
isDisabled?: boolean;
invalidQueryErrorMessage?: string | null;
tenant?: string;
}

export const LogsQueryInput: React.FC<LogsQueryInputProps> = ({
Expand All @@ -20,6 +21,7 @@ export const LogsQueryInput: React.FC<LogsQueryInputProps> = ({
onRun,
isDisabled,
invalidQueryErrorMessage,
tenant,
}) => {
const { t } = useTranslation('plugin__logging-view-plugin');

Expand All @@ -39,7 +41,9 @@ export const LogsQueryInput: React.FC<LogsQueryInputProps> = ({
setInternalValue(value);
const parsedQuery = new LogQLQuery(value);

setIsValid(parsedQuery.streamSelector.length > 0);
// show invalid message only when query is empty for application tenant,
// audit and infrastructure don't necessarily need a stream selector
setIsValid(tenant === 'application' && parsedQuery.streamSelector.length > 0);
}, [value]);

const handleOnChange = (text: string) => {
Expand Down
7 changes: 2 additions & 5 deletions web/src/components/logs-toolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,7 @@ export const LogsToolbar: React.FC<LogsToolbarProps> = ({

{enableTenantDropdown && (
<ToolbarGroup>
<TenantDropdown
onTenantSelected={onTenantSelect}
selectedTenant={tenant}
isDisabled={isDisabled}
/>
<TenantDropdown onTenantSelected={onTenantSelect} selectedTenant={tenant} />
</ToolbarGroup>
)}

Expand Down Expand Up @@ -322,6 +318,7 @@ export const LogsToolbar: React.FC<LogsToolbarProps> = ({
onChange={onQueryChange}
invalidQueryErrorMessage={invalidQueryErrorMessage}
isDisabled={isDisabled}
tenant={tenant}
/>
)}
</Toolbar>
Expand Down