From e20e0a29b458f62f5609f92fa1531ed35bd47f34 Mon Sep 17 00:00:00 2001
From: Rudraprasad Das <rudra@appsmith.com>
Date: Sun, 15 Dec 2024 06:39:20 +0800
Subject: [PATCH] chore: adding minor fixes

---
 .../src/git/components/DangerZone/DangerZoneView.tsx  |  6 +++---
 app/client/src/git/components/DangerZone/index.tsx    |  4 +++-
 .../git/components/LocalProfile/LocalProfileView.tsx  | 11 ++++-------
 app/client/src/git/hooks/useDisconnect.ts             |  6 +++---
 app/client/src/git/hooks/useGlobalProfile.ts          |  9 +++++----
 app/client/src/git/hooks/useLocalProfile.ts           |  8 +++++---
 app/client/src/git/hooks/useMetadata.ts               |  2 +-
 .../src/git/store/selectors/gitConfigSelectors.ts     |  3 +++
 8 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/app/client/src/git/components/DangerZone/DangerZoneView.tsx b/app/client/src/git/components/DangerZone/DangerZoneView.tsx
index 19d564bcf39d..038afe54c10c 100644
--- a/app/client/src/git/components/DangerZone/DangerZoneView.tsx
+++ b/app/client/src/git/components/DangerZone/DangerZoneView.tsx
@@ -56,7 +56,7 @@ interface DangerZoneViewProps {
   isManageAutocommitPermitted: boolean;
   isToggleAutocommitLoading: boolean;
   isAutocommitEnabled: boolean;
-  isMetadataLoading: boolean;
+  isFetchMetadataLoading: boolean;
   openDisconnectModal: () => void;
   toggleAutocommit: () => void;
   toggleDisableAutocommitModal: (open: boolean) => void;
@@ -69,8 +69,8 @@ interface DangerZoneViewProps {
 function DangerZoneView({
   isAutocommitEnabled = false,
   isConnectPermitted = false,
+  isFetchMetadataLoading = false,
   isManageAutocommitPermitted = false,
-  isMetadataLoading = false,
   isToggleAutocommitLoading = false,
   openDisconnectModal = noop,
   toggleAutocommit = noop,
@@ -122,7 +122,7 @@ function DangerZoneView({
             </BodyInnerContainer>
             <Button
               data-testid="t--git-autocommit-btn"
-              isLoading={isToggleAutocommitLoading || isMetadataLoading}
+              isLoading={isToggleAutocommitLoading || isFetchMetadataLoading}
               kind={isAutocommitEnabled ? "error" : "secondary"}
               onClick={handleToggleAutocommit}
               size="md"
diff --git a/app/client/src/git/components/DangerZone/index.tsx b/app/client/src/git/components/DangerZone/index.tsx
index 6fec7113a017..f745b0410ae7 100644
--- a/app/client/src/git/components/DangerZone/index.tsx
+++ b/app/client/src/git/components/DangerZone/index.tsx
@@ -4,6 +4,7 @@ import useGitPermissions from "git/hooks/useGitPermissions";
 import useSettings from "git/hooks/useSettings";
 import React from "react";
 import DangerZoneView from "./DangerZoneView";
+import useMetadata from "git/hooks/useMetadata";
 
 function DangerZone() {
   const { closeDisconnectModal, openDisconnectModal } = useDisconnect();
@@ -16,14 +17,15 @@ function DangerZone() {
     toggleAutocommitDisableModal,
   } = useAutocommit();
   const { toggleSettingsModal } = useSettings();
+  const { isFetchMetadataLoading } = useMetadata();
 
   return (
     <DangerZoneView
       closeDisconnectModal={closeDisconnectModal}
       isAutocommitEnabled={isAutocommitEnabled}
       isConnectPermitted={isConnectPermitted}
+      isFetchMetadataLoading={isFetchMetadataLoading}
       isManageAutocommitPermitted={isManageAutocommitPermitted}
-      isMetadataLoading={false}
       isToggleAutocommitLoading={isToggleAutocommitLoading}
       openDisconnectModal={openDisconnectModal}
       toggleAutocommit={toggleAutocommit}
diff --git a/app/client/src/git/components/LocalProfile/LocalProfileView.tsx b/app/client/src/git/components/LocalProfile/LocalProfileView.tsx
index af504bab61d7..beefbb66b29f 100644
--- a/app/client/src/git/components/LocalProfile/LocalProfileView.tsx
+++ b/app/client/src/git/components/LocalProfile/LocalProfileView.tsx
@@ -160,13 +160,10 @@ function LocalProfileView({
 
   const isLoading = isFetchGlobalProfileLoading || isFetchLocalProfileLoading;
 
-  useEffect(
-    function fetchProfilesOnInitEffect() {
-      fetchGlobalProfile();
-      fetchLocalProfile();
-    },
-    [fetchGlobalProfile, fetchLocalProfile],
-  );
+  useEffect(function fetchProfilesOnInitEffect() {
+    fetchGlobalProfile();
+    fetchLocalProfile();
+  }, []);
 
   useEffect(
     function setDefaultProfileOnInitEffect() {
diff --git a/app/client/src/git/hooks/useDisconnect.ts b/app/client/src/git/hooks/useDisconnect.ts
index 74eecb11219c..36dfd2cf8cf9 100644
--- a/app/client/src/git/hooks/useDisconnect.ts
+++ b/app/client/src/git/hooks/useDisconnect.ts
@@ -23,7 +23,7 @@ export default function useDisconnect() {
     dispatch(gitArtifactActions.disconnectInit(artifactDef));
   }, [artifactDef, dispatch]);
 
-  const diconnectBaseArtifactId = useSelector((state: GitRootState) =>
+  const disconnectBaseArtifactId = useSelector((state: GitRootState) =>
     selectDisconnectBaseArtifactId(state, artifactDef),
   );
 
@@ -45,8 +45,8 @@ export default function useDisconnect() {
     isDisconnectLoading: disconnectState?.loading ?? false,
     disconnectError: disconnectState?.error ?? null,
     disconnect,
-    isDisconnectModalOpen: !!diconnectBaseArtifactId,
-    diconnectBaseArtifactId,
+    isDisconnectModalOpen: !!disconnectBaseArtifactId,
+    disconnectBaseArtifactId,
     disconnectArtifactName,
     openDisconnectModal,
     closeDisconnectModal,
diff --git a/app/client/src/git/hooks/useGlobalProfile.ts b/app/client/src/git/hooks/useGlobalProfile.ts
index 5671c35db2a9..f319f9c1f5db 100644
--- a/app/client/src/git/hooks/useGlobalProfile.ts
+++ b/app/client/src/git/hooks/useGlobalProfile.ts
@@ -1,8 +1,9 @@
-// useGlobaProfile same as useLocalProfile but it uses global state
-
 import type { UpdateGlobalProfileRequestParams } from "git/requests/updateGlobalProfileRequest.types";
 import { gitConfigActions } from "git/store/gitConfigSlice";
-import { selectFetchGlobalProfileState } from "git/store/selectors/gitConfigSelectors";
+import {
+  selectFetchGlobalProfileState,
+  selectUpdateGlobalProfileState,
+} from "git/store/selectors/gitConfigSelectors";
 
 import type { GitRootState } from "git/store/types";
 import { useCallback } from "react";
@@ -19,7 +20,7 @@ export default function useGlobalProfile() {
   }, [dispatch]);
 
   const updateGlobalProfileState = useSelector((state: GitRootState) =>
-    selectFetchGlobalProfileState(state),
+    selectUpdateGlobalProfileState(state),
   );
 
   const updateGlobalProfile = useCallback(
diff --git a/app/client/src/git/hooks/useLocalProfile.ts b/app/client/src/git/hooks/useLocalProfile.ts
index ccac5bbcb875..e770ad6356bc 100644
--- a/app/client/src/git/hooks/useLocalProfile.ts
+++ b/app/client/src/git/hooks/useLocalProfile.ts
@@ -1,8 +1,10 @@
 import { useGitContext } from "git/components/GitContextProvider";
 import type { UpdateLocalProfileRequestParams } from "git/requests/updateLocalProfileRequest.types";
 import { gitArtifactActions } from "git/store/gitArtifactSlice";
-import { selectFetchGlobalProfileState } from "git/store/selectors/gitConfigSelectors";
-import { selectFetchLocalProfileState } from "git/store/selectors/gitSingleArtifactSelectors";
+import {
+  selectFetchLocalProfileState,
+  selectUpdateLocalProfileState,
+} from "git/store/selectors/gitSingleArtifactSelectors";
 import type { GitRootState } from "git/store/types";
 import { useCallback } from "react";
 import { useDispatch, useSelector } from "react-redux";
@@ -21,7 +23,7 @@ export default function useLocalProfile() {
   }, [artifactDef, dispatch]);
 
   const updateLocalProfileState = useSelector((state: GitRootState) =>
-    selectFetchGlobalProfileState(state),
+    selectUpdateLocalProfileState(state, artifactDef),
   );
 
   const updateLocalProfile = useCallback(
diff --git a/app/client/src/git/hooks/useMetadata.ts b/app/client/src/git/hooks/useMetadata.ts
index ae202588e37a..15ed4346dea3 100644
--- a/app/client/src/git/hooks/useMetadata.ts
+++ b/app/client/src/git/hooks/useMetadata.ts
@@ -19,7 +19,7 @@ export default function useMetadata() {
 
   return {
     metadata: metadataState.value ?? null,
-    fetchMetadataLoading: metadataState.loading ?? false,
+    isFetchMetadataLoading: metadataState.loading ?? false,
     fetchMetadataError: metadataState.error ?? null,
     isGitConnected,
   };
diff --git a/app/client/src/git/store/selectors/gitConfigSelectors.ts b/app/client/src/git/store/selectors/gitConfigSelectors.ts
index 9cdfd4799ed4..be31a23cda5e 100644
--- a/app/client/src/git/store/selectors/gitConfigSelectors.ts
+++ b/app/client/src/git/store/selectors/gitConfigSelectors.ts
@@ -7,3 +7,6 @@ export const selectGitConfig = (state: GitRootState) => {
 // global profile
 export const selectFetchGlobalProfileState = (state: GitRootState) =>
   selectGitConfig(state).globalProfile;
+
+export const selectUpdateGlobalProfileState = (state: GitRootState) =>
+  selectGitConfig(state).updateGlobalProfile;