Show a warning popup when undoing a pushed commit

Author: pol-rivero

app/src/lib/stores/app-store.ts

@@ -5641,10 +5641,22 @@ export class AppStore extends TypedBaseStore<IAppState> {
   ): Promise<void> {
     const gitStore = this.gitStoreCache.get(repository)
     const repositoryState = this.repositoryStateCache.get(repository)
-    const { changesState } = repositoryState
+    const { changesState, localCommitSHAs } = repositoryState
     const isWorkingDirectoryClean =
       changesState.workingDirectory.files.length === 0
 
+    // Check if the commit has been pushed (not a local commit)
+    const isPushedCommit = !localCommitSHAs.includes(commit.sha)
+
+    // Warn the user if they're undoing a pushed commit
+    if (showConfirmationDialog && isPushedCommit) {
+      return this._showPopup({
+        type: PopupType.WarnUndoPushedCommit,
+        repository,
+        commit,
+      })
+    }
+
     // Warn the user if there are changes in the working directory
     // This warning can be disabled, except when the user tries to undo
     // a merge commit.

app/src/models/popup.ts

@@ -82,6 +82,7 @@ export enum PopupType {
   CommitMessage = 'CommitMessage',
   MultiCommitOperation = 'MultiCommitOperation',
   WarnLocalChangesBeforeUndo = 'WarnLocalChangesBeforeUndo',
+  WarnUndoPushedCommit = 'WarnUndoPushedCommit',
   WarningBeforeReset = 'WarningBeforeReset',
   InvalidatedToken = 'InvalidatedToken',
   AddSSHHost = 'AddSSHHost',
@@ -342,6 +343,11 @@ export type PopupDetail =
       commit: Commit
       isWorkingDirectoryClean: boolean
     }
+  | {
+      type: PopupType.WarnUndoPushedCommit
+      repository: Repository
+      commit: Commit
+    }
   | {
       type: PopupType.WarningBeforeReset
       repository: Repository

app/src/ui/app.tsx

@@ -145,6 +145,7 @@ import { DragType, DropTargetSelector } from '../models/drag-drop'
 import { dragAndDropManager } from '../lib/drag-and-drop-manager'
 import { MultiCommitOperation } from './multi-commit-operation/multi-commit-operation'
 import { WarnLocalChangesBeforeUndo } from './undo/warn-local-changes-before-undo'
+import { WarnUndoPushedCommit } from './undo/warn-undo-pushed-commit'
 import { WarningBeforeReset } from './reset/warning-before-reset'
 import { InvalidatedToken } from './invalidated-token/invalidated-token'
 import { MultiCommitOperationKind } from '../models/multi-commit-operation'
@@ -2286,6 +2287,18 @@ export class App extends React.Component<IAppProps, IAppState> {
           />
         )
       }
+      case PopupType.WarnUndoPushedCommit: {
+        const { repository, commit } = popup
+        return (
+          <WarnUndoPushedCommit
+            key="warn-undo-pushed-commit"
+            dispatcher={this.props.dispatcher}
+            repository={repository}
+            commit={commit}
+            onDismissed={onPopupDismissedFn}
+          />
+        )
+      }
       case PopupType.WarningBeforeReset: {
         const { repository, commit } = popup
         return (

app/src/ui/undo/warn-undo-pushed-commit.tsx

@@ -0,0 +1,80 @@
+import * as React from 'react'
+import { Dialog, DialogContent, DialogFooter } from '../dialog'
+import { Repository } from '../../models/repository'
+import { Dispatcher } from '../dispatcher'
+import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
+import { Commit } from '../../models/commit'
+
+interface IWarnUndoPushedCommitProps {
+  readonly dispatcher: Dispatcher
+  readonly repository: Repository
+  readonly commit: Commit
+  readonly onDismissed: () => void
+}
+
+interface IWarnUndoPushedCommitState {
+  readonly isLoading: boolean
+}
+
+/**
+ * Dialog that warns user that they are about to undo a commit that has already
+ * been pushed to the remote repository.
+ */
+export class WarnUndoPushedCommit extends React.Component<
+  IWarnUndoPushedCommitProps,
+  IWarnUndoPushedCommitState
+> {
+  public constructor(props: IWarnUndoPushedCommitProps) {
+    super(props)
+    this.state = {
+      isLoading: false,
+    }
+  }
+
+  public render() {
+    const title = __DARWIN__ ? 'Undo Pushed Commit?' : 'Undo pushed commit?'
+
+    return (
+      <Dialog
+        id="warn-undo-pushed-commit"
+        type="warning"
+        title={title}
+        loading={this.state.isLoading}
+        disabled={this.state.isLoading}
+        onSubmit={this.onSubmit}
+        onDismissed={this.props.onDismissed}
+        role="alertdialog"
+        ariaDescribedBy="undo-pushed-commit-warning-message"
+      >
+        <DialogContent>
+          <p id="undo-pushed-commit-warning-message">
+            This commit has already been pushed to the remote repository.
+            Undoing it will rewrite your local history.
+          </p>
+          <p>
+            If others have pulled this commit, they may encounter issues when
+            pushing or pulling. You will need to force push to update the remote
+            repository.
+          </p>
+          <p>Are you sure you want to continue?</p>
+        </DialogContent>
+        <DialogFooter>
+          <OkCancelButtonGroup destructive={true} okButtonText="Undo Commit" />
+        </DialogFooter>
+      </Dialog>
+    )
+  }
+
+  private onSubmit = async () => {
+    const { dispatcher, repository, commit, onDismissed } = this.props
+    this.setState({ isLoading: true })
+
+    try {
+      await dispatcher.undoCommit(repository, commit, false)
+    } finally {
+      this.setState({ isLoading: false })
+    }
+
+    onDismissed()
+  }
+}