Update saved correlations fix

Author: praveen5959

src/hooks/useCorrelations.tsx

@@ -77,8 +77,10 @@ export const useCorrelationsQuery = () => {
 	const { mutate: saveCorrelationMutation, isLoading: isCorrelationSaving } = useMutation(
 		(data: { correlationData: any; onSuccess?: () => void }) => saveCorrelation(data.correlationData),
 		{
-			onSuccess: (_data, variables) => {
+			onSuccess: (data, variables) => {
 				variables.onSuccess && variables.onSuccess();
+				//set activeCorrelation and id
+				setCorrelatedStore((store) => setCorrelationId(store, data.data.id));
 				fetchCorrelations();
 				notifySuccess({ message: 'Correlation saved successfully' });
 			},

src/pages/Correlation/components/SaveCorrelationModal.tsx

@@ -22,8 +22,10 @@ interface FormObjectType extends Omit<Correlation, 'correlation_id' | 'version'>
 }
 
 const SaveCorrelationModal = () => {
-	const [{ isSaveCorrelationModalOpen, selectedFields, fields, correlationCondition }, setCorrelationData] =
-		useCorrelationStore((store) => store);
+	const [
+		{ isSaveCorrelationModalOpen, selectedFields, fields, correlationCondition, activeCorrelation },
+		setCorrelationData,
+	] = useCorrelationStore((store) => store);
 
 	const [formObject, setFormObject] = useState<FormObjectType | null>(null);
 	const [timeRange] = useAppStore((store) => store.timeRange);
@@ -38,23 +40,44 @@ const SaveCorrelationModal = () => {
 	useEffect(() => {
 		const timeRangeOptions = makeTimeRangeOptions({ selected: null, current: timeRange });
 		const selectedTimeRangeOption = getDefaultTimeRangeOption(timeRangeOptions);
-		setFormObject({
-			version: 'v1',
-			title: '',
-			isNew: true,
-			isError: false,
-			timeRangeOptions,
-			selectedTimeRangeOption,
-			tableConfigs: [],
-			joinConfig: {
-				joinConditions: [],
-			},
-			id: '',
-			filter: null,
-			startTime: '',
-			endTime: '',
-		});
-	}, [timeRange]);
+
+		if (activeCorrelation !== null) {
+			//Modify this after BE changes
+			setFormObject({
+				version: 'v1',
+				title: activeCorrelation.title,
+				isNew: false,
+				isError: false,
+				timeRangeOptions,
+				selectedTimeRangeOption,
+				tableConfigs: [],
+				joinConfig: {
+					joinConditions: [],
+				},
+				id: '',
+				filter: null,
+				startTime: '',
+				endTime: '',
+			});
+		} else {
+			setFormObject({
+				version: 'v1',
+				title: '',
+				isNew: true,
+				isError: false,
+				timeRangeOptions,
+				selectedTimeRangeOption,
+				tableConfigs: [],
+				joinConfig: {
+					joinConditions: [],
+				},
+				id: '',
+				filter: null,
+				startTime: '',
+				endTime: '',
+			});
+		}
+	}, [timeRange, activeCorrelation]);
 
 	const closeModal = useCallback(() => {
 		setCorrelationData((store) => toggleSaveCorrelationModal(store, false));