From ba20698ed212cfd9cf6e5a505c3f40280263fb35 Mon Sep 17 00:00:00 2001 From: Rudraprasad Das Date: Tue, 1 Apr 2025 10:27:21 +0200 Subject: [PATCH 1/4] chore: removing logic for first commit --- .../components/OpsModal/TabDeploy/TabDeployView.tsx | 9 +-------- .../src/git/components/OpsModal/TabDeploy/index.tsx | 11 ----------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/app/client/src/git/components/OpsModal/TabDeploy/TabDeployView.tsx b/app/client/src/git/components/OpsModal/TabDeploy/TabDeployView.tsx index 7b708e267c08..fcc60eaf4244 100644 --- a/app/client/src/git/components/OpsModal/TabDeploy/TabDeployView.tsx +++ b/app/client/src/git/components/OpsModal/TabDeploy/TabDeployView.tsx @@ -67,7 +67,6 @@ const CommitLabelBranchText = styled(Text)` whitespace: nowrap; `; -const FIRST_COMMIT = "First Commit"; const NO_CHANGES_TO_COMMIT = "No changes to commit"; interface TabDeployViewProps { @@ -83,9 +82,7 @@ interface TabDeployViewProps { isFetchStatusLoading: boolean; isPullFailing: boolean; isPullLoading: boolean; - lastDeployedAt: string | null; pull: () => void; - remoteUrl: string | null; statusBehindCount: number; statusIsClean: boolean; } @@ -103,18 +100,14 @@ function TabDeployView({ isFetchStatusLoading = false, isPullFailing = false, isPullLoading = false, - lastDeployedAt = null, pull = noop, - remoteUrl = null, statusBehindCount = 0, statusIsClean = false, }: TabDeployViewProps) { const [hasSubmitted, setHasSubmitted] = useState(false); const hasChangesToCommit = !statusIsClean; const commitInputRef = useRef(null); - const [commitMessage, setCommitMessage] = useState( - remoteUrl && lastDeployedAt ? "" : FIRST_COMMIT, - ); + const [commitMessage, setCommitMessage] = useState(""); const [shouldDiscard, setShouldDiscard] = useState(false); const [isDiscarding, setIsDiscarding] = useState(isDiscardLoading); const [showDiscardWarning, setShowDiscardWarning] = useState(false); diff --git a/app/client/src/git/components/OpsModal/TabDeploy/index.tsx b/app/client/src/git/components/OpsModal/TabDeploy/index.tsx index aa4c47cf23eb..7ea10bb3e2d7 100644 --- a/app/client/src/git/components/OpsModal/TabDeploy/index.tsx +++ b/app/client/src/git/components/OpsModal/TabDeploy/index.tsx @@ -1,16 +1,12 @@ import React from "react"; import TabDeployView from "./TabDeployView"; -import { useGitContext } from "git/components/GitContextProvider"; -import useMetadata from "git/hooks/useMetadata"; import useBranches from "git/hooks/useBranches"; import useCommit from "git/hooks/useCommit"; import useDiscard from "git/hooks/useDiscard"; import usePull from "git/hooks/usePull"; import useStatus from "git/hooks/useStatus"; -import type { GitApplicationArtifact } from "git/types"; export default function TabDeploy() { - const { artifact } = useGitContext(); const { clearCommitError, commit, commitError, isCommitLoading } = useCommit(); @@ -20,15 +16,10 @@ export default function TabDeploy() { const { isPullLoading, pull, pullError } = usePull(); const { isFetchStatusLoading, status } = useStatus(); const { currentBranch } = useBranches(); - const { metadata } = useMetadata(); - // ! git tagging: need to handle last deplyed here when tagging is implemented - const lastDeployedAt = - (artifact as GitApplicationArtifact)?.lastDeployedAt ?? null; const isPullFailing = !!pullError; const statusIsClean = status?.isClean ?? false; const statusBehindCount = status?.behindCount ?? 0; - const remoteUrl = metadata?.remoteUrl ?? null; return ( From 0b64c1829ff154d193339e8ea26062cae0301171 Mon Sep 17 00:00:00 2001 From: Rudraprasad Das Date: Tue, 1 Apr 2025 13:22:59 +0200 Subject: [PATCH 2/4] chore: fixes tests --- .../Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts index aaa02225f868..4b4a42419e7b 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts @@ -51,8 +51,6 @@ describe( homePage.AssertNCloseImport(); homePage.RenameApplication(appName); PageList.assertPresence("ListingAndReviews"); - - // this logic will have to be removed after decimal issue with auto-commit is resolved assertHelper.AssertNetworkResponseData("gitStatus"); agHelper.AssertElementExist( gitSync.locators.quickActionsCommitBtn, @@ -61,8 +59,7 @@ describe( ); agHelper.GetNClick(gitSync.locators.quickActionsCommitBtn); agHelper.AssertElementVisibility(gitSync.locators.opsModal); - agHelper.GetNClick(gitSync.locators.opsCommitBtn); - assertHelper.AssertNetworkStatus("@commit", 201); + agHelper.AssertElementVisibility(gitSync.locators.opsCommitBtn); gitSync.CloseOpsModal(); }); From 7830341f5558587818fde292cbec99fe1a4de79f Mon Sep 17 00:00:00 2001 From: Rudraprasad Das Date: Tue, 1 Apr 2025 15:48:19 +0200 Subject: [PATCH 3/4] chore: fixing issues --- .../Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts index 4b4a42419e7b..023bb3d93944 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts @@ -66,7 +66,6 @@ describe( it("1. Deploy the app & Validate CRUD pages - Mongo , MySql, Postgres pages", () => { //Mongo CRUD page validation //Assert table data - cy.latestDeployPreview(); agHelper.AssertText( locators._widgetInDeployed(draggableWidgets.TEXT), "text", From 7e826594dc6c51f365f0271691c8e37a5b3e9f4b Mon Sep 17 00:00:00 2001 From: Rudraprasad Das Date: Thu, 3 Apr 2025 11:55:54 +0200 Subject: [PATCH 4/4] chore: reverting test changes --- .../Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts index 023bb3d93944..aaa02225f868 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts +++ b/app/client/cypress/e2e/Regression/ClientSide/Git/ExistingApps/v1.9.24/DSCrudAndBindings_Spec.ts @@ -51,6 +51,8 @@ describe( homePage.AssertNCloseImport(); homePage.RenameApplication(appName); PageList.assertPresence("ListingAndReviews"); + + // this logic will have to be removed after decimal issue with auto-commit is resolved assertHelper.AssertNetworkResponseData("gitStatus"); agHelper.AssertElementExist( gitSync.locators.quickActionsCommitBtn, @@ -59,13 +61,15 @@ describe( ); agHelper.GetNClick(gitSync.locators.quickActionsCommitBtn); agHelper.AssertElementVisibility(gitSync.locators.opsModal); - agHelper.AssertElementVisibility(gitSync.locators.opsCommitBtn); + agHelper.GetNClick(gitSync.locators.opsCommitBtn); + assertHelper.AssertNetworkStatus("@commit", 201); gitSync.CloseOpsModal(); }); it("1. Deploy the app & Validate CRUD pages - Mongo , MySql, Postgres pages", () => { //Mongo CRUD page validation //Assert table data + cy.latestDeployPreview(); agHelper.AssertText( locators._widgetInDeployed(draggableWidgets.TEXT), "text",