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

Correlation dot notation fix #441

Merged
merged 2 commits into from
Feb 7, 2025
Merged

Correlation dot notation fix #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f229c1
Correlation dot notation fix
praveen5959 Feb 7, 2025
eecc664
Join condition fix
praveen5959 Feb 7, 2025
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 src/pages/Correlation/components/CorrelationJoinSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ export const CorrelationJoinSection: FC<CorrelationJoinSectionProps> = ({
const handleFieldChange = (fieldValue: string | null, isFirstField: boolean) => {
if (isFirstField) {
const fieldType = fieldValue && fields[streamNames[0]]?.fieldTypeMap[fieldValue];
console.log(fieldType);

setSelect1Value({ value: fieldValue, dataType: fieldType });
} else {
setSelect2Value({ value: fieldValue });
Expand Down
28 changes: 13 additions & 15 deletions src/pages/Correlation/components/SaveCorrelationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const SaveCorrelationModal = () => {

const streamNames = Object.keys(fields);

const joins = correlationCondition.split('=');
const joins = correlationCondition.split('=').map((part) => part.replace(/"/g, '').trim());

useEffect(() => {
const timeRangeOptions = makeTimeRangeOptions({ selected: null, current: timeRange });
Expand Down Expand Up @@ -101,18 +101,16 @@ const SaveCorrelationModal = () => {
tableName: streamNames[1],
},
],
joinConfig: {
joinConditions: [
{
tableName: streamNames[0],
field: joins[0].split('.')[1].trim(),
},
{
tableName: streamNames[1],
field: joins[1].split('.')[1].trim(),
},
],
},
joinConditions: [
{
tableName: streamNames[0],
field: joins[0].split('.').slice(1).join('.').trim(),
},
{
tableName: streamNames[1],
field: joins[1].split('.').slice(1).join('.').trim(),
},
],
filter: null,
startTime: formObject?.selectedTimeRangeOption.time_filter?.from,
endTime: formObject?.selectedTimeRangeOption.time_filter?.to,
Expand Down Expand Up @@ -141,11 +139,11 @@ const SaveCorrelationModal = () => {
joinConditions: [
{
tableName: streamNames[0],
field: joins[0].split('.')[1].trim(),
field: joins[0].split('.').slice(1).join('.').trim(),
},
{
tableName: streamNames[1],
field: joins[1].split('.')[1].trim(),
field: joins[1].split('.').slice(1).join('.').trim(),
},
],
},
Expand Down
3 changes: 1 addition & 2 deletions src/pages/Correlation/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { CorrelationToolbar } from './components/CorrelationToolbar';
import CorrleationJSONView from './Views/CorrelationJSONView';
import SaveCorrelationModal from './components/SaveCorrelationModal';
import SavedCorrelationsModal from './components/SavedCorrelationsModal';
import _ from 'lodash';
import classes from './styles/Correlation.module.css';
import dayjs from 'dayjs';
import { useCorrelationFetchCount } from './hooks/useCorrelationFetchCount';
Expand Down Expand Up @@ -197,7 +196,7 @@ const Correlation = () => {

const updateCorrelationCondition = () => {
if (select1Value.value && select2Value.value) {
const condition = `"${streamNames[0]}".${select1Value.value} = "${streamNames[1]}".${select2Value.value}`;
const condition = `"${streamNames[0]}"."${select1Value.value}" = "${streamNames[1]}"."${select2Value.value}"`;
setAppStore((store) => setStreamForCorrelation(store, 'correlatedStream'));
setCorrelationData((store) => setCorrelationCondition(store, condition));
}
Expand Down
4 changes: 3 additions & 1 deletion src/utils/queryBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ export class CorrelationQueryBuilder {
/* eslint-disable no-useless-escape */
`select ${this.selectedFields
.map((field) => {
const [streamName, fieldName] = field.split('.');
const parts = field.split('.');
const streamName = parts.shift();
const fieldName = parts.join('.');
return `"${streamName}"."${fieldName}" as "${field}"`;
})
.join(', ')} from \"${this.streamNames[0]}\" join \"${this.streamNames[1]}\" on ${
Expand Down
Loading