chore: git pkg - mod fixes

app/client/src/ce/constants/PackageConstants.ts

@@ -11,6 +11,16 @@ export interface Package {
   modifiedBy: string;
   modifiedAt: string;
   userPermissions: string[];
+  gitArtifactMetadata?: {
+    branchName: string;
+    defaultBranchName: string;
+    remoteUrl: string;
+    repoName: string;
+    browserSupportedUrl?: string;
+    isRepoPrivate?: boolean;
+    browserSupportedRemoteUrl: string;
+    defaultApplicationId: string;
+  };
 }
 
 export type PackageMetadata = Package;

app/client/src/ce/constants/messages.ts

@@ -1179,17 +1179,22 @@ export const BRANCH_PROTECTION_PROTECTED = () => "Protected";
 export const GIT_CONNECT_SUCCESS_TITLE = () => "Successfully connected to Git";
 export const GIT_CONNECT_SUCCESS_MESSAGE = () =>
   "Now you can start collaborating with your team members by committing, merging and deploying your app";
-export const GIT_CONNECT_SUCCESS_ACTION_CONTINUE = () =>
-  "Continue to edit application";
+export const GIT_CONNECT_SUCCESS_ACTION_CONTINUE = (
+  artifactType: string = "applications",
+) => `Continue to edit ${artifactType}`;
 export const GIT_CONNECT_SUCCESS_ACTION_SETTINGS = () => "Protect your branch";
 export const GIT_CONNECT_SUCCESS_PROTECTION_MSG = () =>
   "We recommend protecting your default branch to have a seamless collaboration.";
+export const GIT_CONNECT_SUCCESS_GENERIC_MESSAGE = (artifactType: string) =>
+  `You're all set! Your ${artifactType} is now connected to Git.`;
 export const GIT_CONNECT_SUCCESS_REPO_NAME = () => "Repository name";
 export const GIT_CONNECT_SUCCESS_DEFAULT_BRANCH = () => "Default branch";
 export const GIT_CONNECT_SUCCESS_DEFAULT_BRANCH_TOOLTIP = () =>
   "This is the base branch of the app. Users launching the app from the dashboard will see the deployed version from this branch.";
 export const GIT_CONNECT_SUCCESS_PROTECTION_DOC_CTA = () =>
   "Learn more about branch protection";
+export const GIT_CONNECT_SUCCESS_GENERIC_DOC_CTA = () =>
+  "Learn more about how to work with Git.";
 // Git Connection Success end
 
 export const GENERAL = () => "General";

app/client/src/ce/reducers/index.tsx

@@ -78,7 +78,10 @@ import type { ActiveField } from "reducers/uiReducers/activeFieldEditorReducer";
 import type { SelectedWorkspaceReduxState } from "ee/reducers/uiReducers/selectedWorkspaceReducer";
 import type { ConsolidatedPageLoadState } from "reducers/uiReducers/consolidatedPageLoadReducer";
 import type { BuildingBlocksReduxState } from "reducers/uiReducers/buildingBlockReducer";
-import type { GitArtifactRootReduxState, GitGlobalReduxState } from "git";
+import type {
+  GitArtifactRootReduxState,
+  GitGlobalReduxState,
+} from "git/store/types";
 import { gitReducer } from "git/store";
 
 export const reducerObject = {

app/client/src/ce/reducers/uiReducers/applicationsReducer.tsx

@@ -25,8 +25,6 @@ import {
 import { create } from "mutative";
 import { isEmpty } from "lodash";
 import type { ApplicationPayload } from "entities/Application";
-import { gitConnectSuccess, type GitConnectSuccessPayload } from "git";
-import type { PayloadAction } from "@reduxjs/toolkit";
 
 export const initialState: ApplicationsReduxState = {
   isSavingAppName: false,
@@ -746,20 +744,6 @@ export const handlers = {
       isSavingNavigationSetting: false,
     };
   },
-  // git
-  [gitConnectSuccess.type]: (
-    state: ApplicationsReduxState,
-    action: PayloadAction<GitConnectSuccessPayload>,
-  ) => {
-    return {
-      ...state,
-      currentApplication: {
-        ...state.currentApplication,
-        gitApplicationMetadata:
-          action.payload.responseData.gitApplicationMetadata,
-      },
-    };
-  },
 };
 
 const applicationsReducer = createReducer(initialState, handlers);

app/client/src/ce/sagas/index.tsx

@@ -51,10 +51,11 @@ import communityTemplateSagas from "sagas/CommunityTemplatesSagas";
 import anvilSagas from "layoutSystems/anvil/integrations/sagas";
 import ideSagas from "sagas/IDESaga";
 import sendSideBySideWidgetHoverAnalyticsEventSaga from "sagas/AnalyticsSaga";
+import gitSagas from "git/sagas";
+import gitApplicationSagas from "git/artifact-helpers/application/sagas";
 
 /* Sagas that are registered by a module that is designed to be independent of the core platform */
 import ternSagas from "sagas/TernSaga";
-import gitSagas from "git/sagas";
 
 export const sagas = [
   initSagas,
@@ -111,4 +112,5 @@ export const sagas = [
   ideSagas,
   sendSideBySideWidgetHoverAnalyticsEventSaga,
   gitSagas,
+  gitApplicationSagas,
 ];

app/client/src/ce/utils/permissionHelpers.tsx

@@ -36,11 +36,11 @@ export enum PERMISSION_TYPE {
   MANAGE_ACTIONS = "manage:actions",
   DELETE_ACTIONS = "delete:actions",
   EXECUTE_ACTIONS = "execute:actions",
-  /* Git permissions */
-  CONNECT_TO_GIT = "connectToGit:applications",
-  MANAGE_PROTECTED_BRANCHES = "manageProtectedBranches:applications",
-  MANAGE_DEFAULT_BRANCH = "manageDefaultBranches:applications",
-  MANAGE_AUTO_COMMIT = "manageAutoCommit:applications",
+  /* Git application permissions */
+  GIT_APPLICATION_CONNECT = "connectToGit:applications",
+  GIT_APPLICATION_MANAGE_PROTECTED_BRANCHES = "manageProtectedBranches:applications",
+  GIT_APPLICATION_MANAGE_DEFAULT_BRANCH = "manageDefaultBranches:applications",
+  GIT_APPLICATION_MANAGE_AUTO_COMMIT = "manageAutoCommit:applications",
 }
 
 export enum LOGIC_FILTER {
@@ -119,22 +119,33 @@ export const hasManageWorkspaceEnvironmentPermission = (
   _permissions?: string[],
 ) => false;
 
-export const hasConnectToGitPermission = (permissions: string[] = []) => {
-  return isPermitted(permissions, PERMISSION_TYPE.CONNECT_TO_GIT);
+export const hasGitAppConnectPermission = (permissions: string[] = []) => {
+  return isPermitted(permissions, PERMISSION_TYPE.GIT_APPLICATION_CONNECT);
 };
 
-export const hasManageProtectedBranchesPermission = (
+export const hasGitAppManageProtectedBranchesPermission = (
   permissions: string[] = [],
 ) => {
-  return isPermitted(permissions, PERMISSION_TYPE.MANAGE_PROTECTED_BRANCHES);
+  return isPermitted(
+    permissions,
+    PERMISSION_TYPE.GIT_APPLICATION_MANAGE_PROTECTED_BRANCHES,
+  );
 };
 
-export const hasManageDefaultBranchPermission = (
+export const hasGitAppManageDefaultBranchPermission = (
   permissions: string[] = [],
 ) => {
-  return isPermitted(permissions, PERMISSION_TYPE.MANAGE_DEFAULT_BRANCH);
+  return isPermitted(
+    permissions,
+    PERMISSION_TYPE.GIT_APPLICATION_MANAGE_DEFAULT_BRANCH,
+  );
 };
 
-export const hasManageAutoCommitPermission = (permissions: string[] = []) => {
-  return isPermitted(permissions, PERMISSION_TYPE.MANAGE_AUTO_COMMIT);
+export const hasGitAppManageAutoCommitPermission = (
+  permissions: string[] = [],
+) => {
+  return isPermitted(
+    permissions,
+    PERMISSION_TYPE.GIT_APPLICATION_MANAGE_AUTO_COMMIT,
+  );
 };

app/client/src/components/common/Card.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useMemo } from "react";
 import styled from "styled-components";
 import { Card as BlueprintCard, Classes } from "@blueprintjs/core";
 import { omit } from "lodash";
@@ -8,6 +8,8 @@ import type { HTMLDivProps, ICardProps } from "@blueprintjs/core";
 import { Button, type MenuItemProps } from "@appsmith/ads";
 
 import GitConnectedBadge from "./GitConnectedBadge";
+import { GitCardBadge } from "git";
+import { useGitModEnabled } from "pages/Editor/gitSync/hooks/modHooks";
 
 type CardProps = PropsWithChildren<{
   backgroundColor: string;
@@ -330,6 +332,16 @@ function Card({
   title,
   titleTestId,
 }: CardProps) {
+  const isGitModEnabled = useGitModEnabled();
+
+  const gitBadge = useMemo(() => {
+    if (isGitModEnabled) {
+      return <GitCardBadge />;
+    }
+
+    return <GitConnectedBadge />;
+  }, [isGitModEnabled]);
+
   return (
     <Container isMobile={isMobile} onClick={primaryAction}>
       <NameWrapper
@@ -383,7 +395,7 @@ function Card({
           {Boolean(moreActionItems.length) && !isMobile && contextMenu}
         </CardFooter>
       </NameWrapper>
-      {showGitBadge && <GitConnectedBadge />}
+      {showGitBadge ? gitBadge : null}
     </Container>
   );
 }

app/client/src/components/gitContexts/GitApplicationContextProvider.tsx

@@ -1,11 +1,16 @@
-import React, { useCallback } from "react";
+import React, { useCallback, useMemo } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { GitArtifactType, GitContextProvider } from "git";
 import {
   getCurrentApplication,
   getWorkspaceIdForImport,
 } from "ee/selectors/applicationSelectors";
-import { hasCreateNewAppPermission } from "ee/utils/permissionHelpers";
+import {
+  hasGitAppConnectPermission,
+  hasGitAppManageAutoCommitPermission,
+  hasGitAppManageDefaultBranchPermission,
+  hasGitAppManageProtectedBranchesPermission,
+} from "ee/utils/permissionHelpers";
 import {
   fetchAllApplicationsOfWorkspace,
   setWorkspaceIdForImport,
@@ -26,14 +31,31 @@ export default function GitApplicationContextProvider({
   const dispatch = useDispatch();
 
   const artifactType = GitArtifactType.Application;
-  const application = useSelector(getCurrentApplication);
-  const applications = useSelector(getApplicationsOfWorkspace);
+  const artifact = useSelector(getCurrentApplication);
+  const artifacts = useSelector(getApplicationsOfWorkspace);
   const workspace = useSelector(getCurrentAppWorkspace);
   const importWorkspaceId = useSelector(getWorkspaceIdForImport);
-  const isCreateNewApplicationPermitted = hasCreateNewAppPermission(
-    workspace.userPermissions,
+
+  const isConnectPermitted = hasGitAppConnectPermission(
+    artifact?.userPermissions ?? [],
   );
 
+  const isManageAutocommitPermitted = useMemo(() => {
+    return hasGitAppManageAutoCommitPermission(artifact?.userPermissions ?? []);
+  }, [artifact]);
+
+  const isManageDefaultBranchPermitted = useMemo(() => {
+    return hasGitAppManageDefaultBranchPermission(
+      artifact?.userPermissions ?? [],
+    );
+  }, [artifact]);
+
+  const isManageProtectedBranchesPermitted = useMemo(() => {
+    return hasGitAppManageProtectedBranchesPermission(
+      artifact?.userPermissions ?? [],
+    );
+  }, [artifact]);
+
   const setImportWorkspaceId = useCallback(() => {
     dispatch(
       setWorkspaceIdForImport({ editorId: "", workspaceId: workspace.id }),
@@ -46,13 +68,16 @@ export default function GitApplicationContextProvider({
 
   return (
     <GitContextProvider
-      artifact={application ?? null}
+      artifact={artifact ?? null}
       artifactType={artifactType}
-      artifacts={applications ?? null}
-      baseArtifactId={application?.baseId ?? ""}
+      artifacts={artifacts ?? null}
+      baseArtifactId={artifact?.baseId ?? ""}
       fetchArtifacts={fetchApplications}
       importWorkspaceId={importWorkspaceId}
-      isCreateArtifactPermitted={isCreateNewApplicationPermitted}
+      isConnectPermitted={isConnectPermitted}
+      isManageAutocommitPermitted={isManageAutocommitPermitted}
+      isManageDefaultBranchPermitted={isManageDefaultBranchPermitted}
+      isManageProtectedBranchesPermitted={isManageProtectedBranchesPermitted}
       setImportWorkspaceId={setImportWorkspaceId}
       statusTransformer={applicationStatusTransformer}
       workspace={workspace ?? null}

app/client/src/entities/Engine/AppEditorEngine.ts

@@ -3,6 +3,7 @@ import { resetEditorSuccess } from "actions/initActions";
 import {
   fetchAllPageEntityCompletion,
   setupPageAction,
+  updateAppStore,
 } from "actions/pageActions";
 import {
   executePageLoadActions,
@@ -56,7 +57,6 @@ import type { Span } from "instrumentation/types";
 import { endSpan, startNestedSpan } from "instrumentation/generateTraces";
 import { getCurrentUser } from "selectors/usersSelectors";
 import type { User } from "constants/userConstants";
-import log from "loglevel";
 import { gitArtifactActions } from "git/store/gitArtifactSlice";
 import { restoreRecentEntitiesRequest } from "actions/globalSearchActions";
 import {
@@ -75,6 +75,7 @@ import {
   selectGitModEnabled,
 } from "selectors/gitModSelectors";
 import { applicationArtifact } from "git/artifact-helpers/application";
+import { getPersistentAppStore } from "constants/AppConstants";
 
 export default class AppEditorEngine extends AppEngine {
   constructor(mode: APP_MODE) {
@@ -292,9 +293,8 @@ export default class AppEditorEngine extends AppEngine {
     const currentApplication: ApplicationPayload = yield select(
       getCurrentApplication,
     );
-    const currentBranch: string | undefined = yield select(
-      selectGitApplicationCurrentBranch,
-    );
+    const currentBranch: string | undefined =
+      currentApplication?.gitApplicationMetadata?.branchName;
 
     const isGitPersistBranchEnabled: boolean = yield select(
       isGitPersistBranchEnabledSelector,
@@ -303,19 +303,23 @@ export default class AppEditorEngine extends AppEngine {
     if (isGitPersistBranchEnabled) {
       const currentUser: User = yield select(getCurrentUser);
 
-      if (currentUser?.email && currentApplication?.baseId && currentBranch) {
+      if (currentUser.email && currentApplication?.baseId && currentBranch) {
         yield setLatestGitBranchInLocal(
           currentUser.email,
           currentApplication.baseId,
           currentBranch,
         );
-      } else {
-        log.error(
-          `There was an error setting the latest git branch in local - userEmail: ${!!currentUser?.email}, applicationId: ${currentApplication?.baseId}, branch: ${currentBranch}`,
-        );
       }
     }
 
+    if (currentApplication?.id) {
+      yield put(
+        updateAppStore(
+          getPersistentAppStore(currentApplication.id, currentBranch),
+        ),
+      );
+    }
+
     const [isAnotherEditorTabOpen, currentTabs] = yield call(
       trackOpenEditorTabs,
       currentApplication.id,

app/client/src/entities/Engine/index.ts

@@ -1,11 +1,10 @@
 import { fetchApplication } from "ee/actions/applicationActions";
-import { setAppMode, updateAppStore } from "actions/pageActions";
+import { setAppMode } from "actions/pageActions";
 import type { ApplicationPayload } from "entities/Application";
 import {
   ReduxActionErrorTypes,
   ReduxActionTypes,
 } from "ee/constants/ReduxActionConstants";
-import { getPersistentAppStore } from "constants/AppConstants";
 import type { APP_MODE } from "entities/App";
 import log from "loglevel";
 import { call, put, select } from "redux-saga/effects";
@@ -20,7 +19,6 @@ import { updateBranchLocally } from "actions/gitSyncActions";
 import { restoreIDEEditorViewMode } from "actions/ideActions";
 import type { Span } from "instrumentation/types";
 import { endSpan, startNestedSpan } from "instrumentation/generateTraces";
-import { selectGitApplicationCurrentBranch } from "selectors/gitModSelectors";
 
 export interface AppEnginePayload {
   applicationId?: string;
@@ -87,7 +85,7 @@ export default abstract class AppEngine {
     rootSpan: Span,
   ) {
     const loadAppDataSpan = startNestedSpan("AppEngine.loadAppData", rootSpan);
-    const { applicationId, basePageId, branch } = payload;
+    const { applicationId, basePageId } = payload;
     const { pages } = allResponses;
     const page = pages.data?.pages?.find((page) => page.baseId === basePageId);
     const apiCalls: boolean = yield failFastApiCalls(
@@ -114,15 +112,7 @@ export default abstract class AppEngine {
     }
 
     const application: ApplicationPayload = yield select(getCurrentApplication);
-    const currentBranch: string | undefined = yield select(
-      selectGitApplicationCurrentBranch,
-    );
 
-    yield put(
-      updateAppStore(
-        getPersistentAppStore(application.id, branch || currentBranch),
-      ),
-    );
     const defaultPageId: string = yield select(getDefaultPageId);
     const defaultPageBaseId: string = yield select(getDefaultBasePageId);
     const toLoadPageId: string = page?.id || defaultPageId;

app/client/src/git/artifact-helpers/application/applicationArtifact.ts

@@ -1,5 +1,5 @@
 import { GitArtifactType } from "git/constants/enums";
-import type { GitArtifactDef } from "git/store/types";
+import type { GitArtifactDef } from "git/types";
 
 export default function applicationArtifact(
   baseApplicationId: string,