From dfb05aaa2ba0f4cd96e0525e0df2a87631612664 Mon Sep 17 00:00:00 2001
From: Jonas Lukasczyk <mail@jluk.de>
Date: Mon, 14 Oct 2024 17:40:42 +0200
Subject: [PATCH] soft and hard git reset support in git commit view

---
 .../renderer/src/dialogs/GitResetDialog.vue   | 74 +++++++++++++++++++
 packages/renderer/src/views/GitCommitView.vue | 52 ++++++++-----
 2 files changed, 109 insertions(+), 17 deletions(-)
 create mode 100644 packages/renderer/src/dialogs/GitResetDialog.vue

diff --git a/packages/renderer/src/dialogs/GitResetDialog.vue b/packages/renderer/src/dialogs/GitResetDialog.vue
new file mode 100644
index 0000000..03e9732
--- /dev/null
+++ b/packages/renderer/src/dialogs/GitResetDialog.vue
@@ -0,0 +1,74 @@
+<script lang="ts" setup>
+import { onMounted, reactive } from 'vue';
+import { useDialogPluginComponent } from 'quasar';
+import ArcControlService from '../ArcControlService.ts';
+import a_btn from '../components/a_btn.vue';
+
+const iProps = reactive({
+  mode: '0',
+  items: [],
+});
+
+const { dialogRef, onDialogHide, onDialogOK, onDialogCancel } = useDialogPluginComponent();
+
+onMounted(async ()=>{
+  const response = await window.ipc.invoke('GitService.run', {
+    args: ['clean','-n','-d'],
+    cwd: ArcControlService.props.arc_root
+  });
+  iProps.items = response[1] ? response[1].split('\n').slice(0,-1).map(x=>x.replace('Would remove ','')) : [];
+});
+
+</script>
+
+<template>
+
+  <q-dialog ref="dialogRef" persistent>
+    <q-card class="q-dialog-plugin" style="width:auto;max-width:80vw;">
+      <q-card-section>
+        <div class="text-h6">Resetting ARC - Beware of data loss!</div>
+      </q-card-section>
+
+      <q-card-section class="row no-wrap items-center" style="padding:0 2em 0 0.5em;">
+
+        <q-list>
+          <q-item tag="label" v-ripple>
+            <q-item-section avatar top>
+              <q-radio v-model="iProps.mode" val='0' color='secondary' />
+            </q-item-section>
+            <q-item-section>
+              <q-item-label>Soft</q-item-label>
+              <q-item-label caption>This mode will reset all files that are tracked by git to the last commited version.</q-item-label>
+            </q-item-section>
+          </q-item>
+          <q-item tag="label" v-ripple :disable='iProps.items.length<1'>
+            <q-item-section avatar top>
+              <q-radio v-model="iProps.mode" val='1' color='secondary' :disable='iProps.items.length<1' />
+            </q-item-section>
+            <q-item-section>
+              <q-item-label>Hard</q-item-label>
+              <q-item-label caption>Same as a soft reset but this will also delete the following files and directories that are not tracked by git:
+                <q-scroll-area style="height: 90px;">
+                  <ul>
+                    <li v-for='i in iProps.items'>
+                      {{i}}
+                    </li>
+                    <li v-if='iProps.items.length<1'>
+                      No untracked files or directories
+                    </li>
+                  </ul>
+                </q-scroll-area>
+              </q-item-label>
+            </q-item-section>
+          </q-item>
+        </q-list>
+      </q-card-section>
+
+      <q-card-actions align="right" style="margin:0 1.5em 1.5em;">
+        <a_btn icon='warning' label='Reset' @click='()=>onDialogOK(parseInt(iProps.mode))' class='text-weight-bold'/>
+        <a_btn icon='cancel' label='Cancel' @click='onDialogCancel' class='text-weight-bold'/>
+      </q-card-actions>
+    </q-card>
+
+  </q-dialog>
+</template>
diff --git a/packages/renderer/src/views/GitCommitView.vue b/packages/renderer/src/views/GitCommitView.vue
index c44657f..720acac 100644
--- a/packages/renderer/src/views/GitCommitView.vue
+++ b/packages/renderer/src/views/GitCommitView.vue
@@ -15,6 +15,7 @@ import AppProperties from '../AppProperties.ts';
 import pDebounce from 'p-debounce';
 
 import GitDialog from '../dialogs/GitDialog.vue';
+import GitResetDialog from '../dialogs/GitResetDialog.vue';
 import StringDialog from '../dialogs/StringDialog.vue';
 import { useQuasar } from 'quasar'
 const $q = useQuasar();
@@ -189,26 +190,43 @@ const abortMerge = async()=>{
 };
 
 const reset = async()=>{
-  const dialogProps = reactive({
-    title: 'Resetting ARC',
-    ok_title: 'Ok',
-    cancel_title: null,
-    state: 0,
-  });
-
   $q.dialog({
-    component: GitDialog,
-    componentProps: dialogProps
-  }).onOk( async () => {
-    ArcControlService.readARC();
-    init();
-  });
+    component: GitResetDialog
+  }).onOk( async hard => {
+    const dialogProps = reactive({
+      title: `Resetting ARC (${hard?'hard':'soft'})`,
+      ok_title: 'Ok',
+      cancel_title: null,
+      state: 0,
+    });
+
+    $q.dialog({
+      component: GitDialog,
+      componentProps: dialogProps
+    }).onOk( async () => {
+      ArcControlService.readARC();
+      init();
+    });
+
+    // perform git reset
+    {
+      const response = await window.ipc.invoke('GitService.run', {
+        args: [`reset`,`--hard`],
+        cwd: ArcControlService.props.arc_root
+      });
+      if(!response[0]) return dialogProps.state = 2;
+    }
 
-  const response = await window.ipc.invoke('GitService.run', {
-    args: [`reset`,`--hard`],
-    cwd: ArcControlService.props.arc_root
+    // optionally perform git clean
+    if(hard){
+      const response = await window.ipc.invoke('GitService.run', {
+        args: [`clean`,`-d`, `-f`],
+        cwd: ArcControlService.props.arc_root
+      });
+      if(!response[0]) return dialogProps.state = 2;
+    }
+    dialogProps.state = 1;
   });
-  dialogProps.state = response[0] ? 1 : 2;
 };
 
 const init = async()=>{