Skip to content

Commit

Permalink
do not show modal if connector type is changed (#20356)
Browse files Browse the repository at this point in the history
  • Loading branch information
Joe Reuter committed Dec 16, 2022
1 parent 8f5516d commit 86b32db
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,21 @@ export const FormChangeTracker: React.FC<Props> = ({ changed, formId }) => {
const id = useUniqueFormId(formId);
const prevChanged = usePrevious(changed);

const { trackFormChange } = useFormChangeTrackerService();
const { trackFormChange, clearFormChange } = useFormChangeTrackerService();

useEffect(() => {
if (changed !== prevChanged) {
trackFormChange(id, changed);
}
}, [id, changed, trackFormChange, prevChanged]);

// when the form id changes or the change tracker gets unmounted completely,
// clear out the old form as it's not relevant anymore
useEffect(() => {
return () => {
clearFormChange(id);
};
}, [clearFormChange, id]);

return null;
};
14 changes: 8 additions & 6 deletions airbyte-webapp/src/hooks/services/FormChangeTracker/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import uniqueId from "lodash/uniqueId";
import { useCallback, useMemo } from "react";
import { useCallback, useMemo, useRef } from "react";
import { createGlobalState } from "react-use";

import { FormChangeTrackerServiceApi } from "./types";
Expand All @@ -10,6 +10,8 @@ export const useUniqueFormId = (formId?: string) => useMemo(() => formId ?? uniq

export const useFormChangeTrackerService = (): FormChangeTrackerServiceApi => {
const [changedFormsById, setChangedFormsById] = useChangedFormsById();
const changedFormsByIdRef = useRef(changedFormsById);
changedFormsByIdRef.current = changedFormsById;

const hasFormChanges = useMemo<boolean>(
() => Object.values(changedFormsById ?? {}).some((changed) => !!changed),
Expand All @@ -22,18 +24,18 @@ export const useFormChangeTrackerService = (): FormChangeTrackerServiceApi => {

const clearFormChange = useCallback(
(id: string) => {
setChangedFormsById({ ...changedFormsById, [id]: false });
setChangedFormsById({ ...changedFormsByIdRef.current, [id]: false });
},
[changedFormsById, setChangedFormsById]
[changedFormsByIdRef, setChangedFormsById]
);

const trackFormChange = useCallback(
(id: string, changed: boolean) => {
if (Boolean(changedFormsById?.[id]) !== changed) {
setChangedFormsById({ ...changedFormsById, [id]: changed });
if (Boolean(changedFormsByIdRef.current?.[id]) !== changed) {
setChangedFormsById({ ...changedFormsByIdRef.current, [id]: changed });
}
},
[changedFormsById, setChangedFormsById]
[changedFormsByIdRef, setChangedFormsById]
);

return {
Expand Down

0 comments on commit 86b32db

Please sign in to comment.