GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-12 14:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update the filter in / filter out operators (#5923)

Browse Source 
* chore: update the filter in / filter out operators

* fix: handle cases for old logs explorer
This commit is contained in:
Vikrant Gupta 2024-09-13 13:43:40 +05:30 committed by GitHub
parent 8d54e3b766
commit 6661aa7686
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/Logs/AddToQueryHOC.tsx
View File

@ -15,7 +15,7 @@ function AddToQueryHOC({
}: AddToQueryHOCProps): JSX.Element { }: AddToQueryHOCProps): JSX.Element {
const handleQueryAdd = (event: MouseEvent<HTMLDivElement>): void => { const handleQueryAdd = (event: MouseEvent<HTMLDivElement>): void => {
event.stopPropagation(); event.stopPropagation();
onAddToQuery(fieldKey, fieldValue, OPERATORS.IN); onAddToQuery(fieldKey, fieldValue, OPERATORS['=']);
}; };
const popOverContent = useMemo(() => <span>Add to query: {fieldKey}</span>, [ const popOverContent = useMemo(() => <span>Add to query: {fieldKey}</span>, [

4
frontend/src/container/LogDetailedView/TableView.tsx
View File

@ -122,10 +122,10 @@ function TableView({
fieldValue: string, fieldValue: string,
) => (): void => { ) => (): void => {
handleClick(operator, fieldKey, fieldValue); handleClick(operator, fieldKey, fieldValue);
if (operator === OPERATORS.IN) { if (operator === OPERATORS['=']) {
setIsFilterInLoading(true); setIsFilterInLoading(true);
} }
if (operator === OPERATORS.NIN) { if (operator === OPERATORS['!=']) {
setIsFilterOutLoading(true); setIsFilterOutLoading(true);
} }
}; };

8
frontend/src/container/LogDetailedView/TableView/TableViewActions.tsx
View File

@ -139,7 +139,7 @@ export function TableViewActions(
<ArrowDownToDot size={14} style={{ transform: 'rotate(90deg)' }} /> <ArrowDownToDot size={14} style={{ transform: 'rotate(90deg)' }} />
) )
} }
onClick={onClickHandler(OPERATORS.IN, fieldFilterKey, fieldData.value)} onClick={onClickHandler(OPERATORS['='], fieldFilterKey, fieldData.value)}
/> />
</Tooltip> </Tooltip>
<Tooltip title="Filter out value"> <Tooltip title="Filter out value">
@ -152,7 +152,11 @@ export function TableViewActions(
<ArrowUpFromDot size={14} style={{ transform: 'rotate(90deg)' }} /> <ArrowUpFromDot size={14} style={{ transform: 'rotate(90deg)' }} />
) )
} }
onClick={onClickHandler(OPERATORS.NIN, fieldFilterKey, fieldData.value)} onClick={onClickHandler(
OPERATORS['!='],
fieldFilterKey,
fieldData.value,
)}
/> />
</Tooltip> </Tooltip>
{!isOldLogsExplorerOrLiveLogsPage && ( {!isOldLogsExplorerOrLiveLogsPage && (

7
frontend/src/container/LogDetailedView/index.tsx
View File

@ -1,6 +1,7 @@
import LogDetail from 'components/LogDetail'; import LogDetail from 'components/LogDetail';
import { VIEW_TYPES } from 'components/LogDetail/constants'; import { VIEW_TYPES } from 'components/LogDetail/constants';
import ROUTES from 'constants/routes'; import ROUTES from 'constants/routes';
import { getOldLogsOperatorFromNew } from 'hooks/logs/useActiveLog';
import { getGeneratedFilterQueryString } from 'lib/getGeneratedFilterQueryString'; import { getGeneratedFilterQueryString } from 'lib/getGeneratedFilterQueryString';
import getStep from 'lib/getStep'; import getStep from 'lib/getStep';
import { getIdConditions } from 'pages/Logs/utils'; import { getIdConditions } from 'pages/Logs/utils';
@ -57,10 +58,11 @@ function LogDetailedView({
const handleAddToQuery = useCallback( const handleAddToQuery = useCallback(
(fieldKey: string, fieldValue: string, operator: string) => { (fieldKey: string, fieldValue: string, operator: string) => {
const newOperator = getOldLogsOperatorFromNew(operator);
const updatedQueryString = getGeneratedFilterQueryString( const updatedQueryString = getGeneratedFilterQueryString(
fieldKey, fieldKey,
fieldValue, fieldValue,
operator, newOperator,
queryString, queryString,
); );
@ -71,10 +73,11 @@ function LogDetailedView({
const handleClickActionItem = useCallback( const handleClickActionItem = useCallback(
(fieldKey: string, fieldValue: string, operator: string): void => { (fieldKey: string, fieldValue: string, operator: string): void => {
const newOperator = getOldLogsOperatorFromNew(operator);
const updatedQueryString = getGeneratedFilterQueryString( const updatedQueryString = getGeneratedFilterQueryString(
fieldKey, fieldKey,
fieldValue, fieldValue,
operator, newOperator,
queryString, queryString,
); );

15
frontend/src/hooks/logs/useActiveLog.ts
View File

@ -1,6 +1,6 @@
import { getAggregateKeys } from 'api/queryBuilder/getAttributeKeys'; import { getAggregateKeys } from 'api/queryBuilder/getAttributeKeys';
import { SOMETHING_WENT_WRONG } from 'constants/api'; import { SOMETHING_WENT_WRONG } from 'constants/api';
import { QueryBuilderKeys } from 'constants/queryBuilder'; import { OPERATORS, QueryBuilderKeys } from 'constants/queryBuilder';
import ROUTES from 'constants/routes'; import ROUTES from 'constants/routes';
import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils'; import { getOperatorValue } from 'container/QueryBuilder/filters/QueryBuilderSearch/utils';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder'; import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
@ -24,6 +24,16 @@ import { v4 as uuid } from 'uuid';
import { UseActiveLog } from './types'; import { UseActiveLog } from './types';
export function getOldLogsOperatorFromNew(operator: string): string {
switch (operator) {
case OPERATORS['=']:
return OPERATORS.IN;
case OPERATORS['!=']:
return OPERATORS.NIN;
default:
return operator;
}
}
export const useActiveLog = (): UseActiveLog => { export const useActiveLog = (): UseActiveLog => {
const dispatch = useDispatch(); const dispatch = useDispatch();
@ -178,10 +188,11 @@ export const useActiveLog = (): UseActiveLog => {
); );
const onAddToQueryLogs = useCallback( const onAddToQueryLogs = useCallback(
(fieldKey: string, fieldValue: string, operator: string) => { (fieldKey: string, fieldValue: string, operator: string) => {
const newOperator = getOldLogsOperatorFromNew(operator);
const updatedQueryString = getGeneratedFilterQueryString( const updatedQueryString = getGeneratedFilterQueryString(
fieldKey, fieldKey,
fieldValue, fieldValue,
operator, newOperator,
queryString, queryString,
); );