Skip to content

chore: git pkg - removing logic for first commit #40004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
brayn003 wants to merge 7 commits into from
Closed

chore: git pkg - removing logic for first commit #40004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba20698
chore: removing logic for first commit
Apr 1, 2025
0b64c18
chore: fixes tests
Apr 1, 2025
7830341
chore: fixing issues
Apr 1, 2025
5559295
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
Apr 2, 2025
7e82659
chore: reverting test changes
Apr 3, 2025
67c6876
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
Apr 3, 2025
766adf7
Merge branch 'release' of github.com:appsmithorg/appsmith into chore/…
Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions app/client/src/git/components/OpsModal/TabDeploy/TabDeployView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -83,9 +82,7 @@ interface TabDeployViewProps {
isFetchStatusLoading: boolean;
isPullFailing: boolean;
isPullLoading: boolean;
lastDeployedAt: string | null;
pull: () => void;
remoteUrl: string | null;
statusBehindCount: number;
statusIsClean: boolean;
}
Expand All @@ -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<HTMLInputElement>(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);
Expand Down
11 changes: 0 additions & 11 deletions app/client/src/git/components/OpsModal/TabDeploy/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();

Expand All @@ -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 (
<TabDeployView
Expand All @@ -44,9 +35,7 @@ export default function TabDeploy() {
isFetchStatusLoading={isFetchStatusLoading}
isPullFailing={isPullFailing}
isPullLoading={isPullLoading}
lastDeployedAt={lastDeployedAt}
pull={pull}
remoteUrl={remoteUrl}
statusBehindCount={statusBehindCount}
statusIsClean={statusIsClean}
/>
Expand Down
Loading