feat: git: skip auto-commit and status calls for protected branches

Author: dvj1988

app/client/src/git/sagas/fetchStatusSaga.ts

@@ -7,6 +7,7 @@ import type { GitArtifactPayloadAction } from "git/store/types";
 import { call, put, select } from "redux-saga/effects";
 import { validateResponse } from "sagas/ErrorSagas";
 import handleApiErrors from "./helpers/handleApiErrors";
+import { selectProtectedMode } from "git/store/selectors/gitArtifactSelectors";
 
 export default function* fetchStatusSaga(
   action: GitArtifactPayloadAction<FetchStatusInitPayload>,
@@ -20,6 +21,22 @@ export default function* fetchStatusSaga(
       selectGitApiContractsEnabled,
     );
 
+    const isCurrentBranchProtected: boolean = yield select(
+      selectProtectedMode,
+      artifactDef,
+    );
+
+    if (isCurrentBranchProtected) {
+      // Skip status check for protected branches and set empty status
+      yield put(
+        gitArtifactActions.resetGitStatus({
+          artifactDef,
+        }),
+      );
+
+      return;
+    }
+
     response = yield call(
       fetchStatusRequest,
       artifactDef.artifactType,

app/client/src/git/sagas/initGitSaga.ts

@@ -36,22 +36,24 @@ export default function* initGitForEditorSaga(
       yield put(gitArtifactActions.fetchMetadataInit({ artifactDef }));
       yield take(gitArtifactActions.fetchMetadataSuccess.type);
 
-      if (isAutocommitEnabled(artifactDef)) {
-        yield put(
-          gitArtifactActions.triggerAutocommitInit({ artifactDef, artifactId }),
-        );
-      }
-
       yield put(
         gitArtifactActions.fetchBranchesInit({ artifactDef, artifactId }),
       );
 
+      // We skip the auto-commit and status check for protected branches
+      // Hence we need to check if the current branch is protected before triggering auto-commit and status check
       if (isProtectedBranchesEnabled(artifactDef)) {
         yield put(
           gitArtifactActions.fetchProtectedBranchesInit({ artifactDef }),
         );
       }
 
+      if (isAutocommitEnabled(artifactDef)) {
+        yield put(
+          gitArtifactActions.triggerAutocommitInit({ artifactDef, artifactId }),
+        );
+      }
+
       yield put(
         gitArtifactActions.fetchStatusInit({ artifactDef, artifactId }),
       );

app/client/src/git/sagas/triggerAutocommitSaga.ts

@@ -11,7 +11,10 @@ import type {
 } from "git/requests/triggerAutocommitRequest.types";
 import type { TriggerAutocommitInitPayload } from "git/store/actions/triggerAutocommitActions";
 import { gitArtifactActions } from "git/store/gitArtifactSlice";
-import { selectAutocommitEnabled } from "git/store/selectors/gitArtifactSelectors";
+import {
+  selectAutocommitEnabled,
+  selectProtectedMode,
+} from "git/store/selectors/gitArtifactSelectors";
 import type { GitArtifactPayloadAction } from "git/store/types";
 import {
   call,
@@ -142,8 +145,13 @@ export default function* triggerAutocommitSaga(
     selectAutocommitEnabled,
     artifactDef,
   );
+  const isCurrentBranchProtected: boolean = yield select(
+    selectProtectedMode,
+    artifactDef,
+  );
+  const shouldAutocommit = isAutocommitEnabled && !isCurrentBranchProtected;
 
-  if (isAutocommitEnabled) {
+  if (shouldAutocommit) {
     const params = { artifactDef, artifactId };
     const pollTask: Task = yield fork(pollAutocommitProgressSaga, params);
 

app/client/src/git/store/actions/fetchStatusActions.ts

@@ -13,6 +13,7 @@ export const fetchStatusInitAction =
   createArtifactAction<FetchStatusInitPayload>((state) => {
     state.apiResponses.status.loading = true;
     state.apiResponses.status.error = null;
+    state.apiResponses.status.value = null;
 
     return state;
   });
@@ -26,6 +27,15 @@ export const fetchStatusSuccessAction = createArtifactAction<
   return state;
 });
 
+export const resetGitStatusAction =
+  createArtifactAction<FetchStatusRequestParams>((state) => {
+    state.apiResponses.status.loading = false;
+    state.apiResponses.status.error = null;
+    state.apiResponses.status.value = null;
+
+    return state;
+  });
+
 export const fetchStatusErrorAction =
   createArtifactAction<GitAsyncErrorPayload>((state, action) => {
     const { error } = action.payload;

app/client/src/git/store/gitArtifactSlice.ts

@@ -21,6 +21,7 @@ import {
   fetchStatusErrorAction,
   fetchStatusInitAction,
   fetchStatusSuccessAction,
+  resetGitStatusAction,
 } from "./actions/fetchStatusActions";
 import {
   clearCommitErrorAction,
@@ -200,6 +201,7 @@ export const gitArtifactSlice = createSlice({
     clearDiscardError: clearDiscardErrorAction,
     fetchStatusInit: fetchStatusInitAction,
     fetchStatusSuccess: fetchStatusSuccessAction,
+    resetGitStatus: resetGitStatusAction,
     fetchStatusError: fetchStatusErrorAction,
     fetchMergeStatusInit: fetchMergeStatusInitAction,
     fetchMergeStatusSuccess: fetchMergeStatusSuccessAction,