Save json:

Author: xusenlin

Diff for: Data.json

@@ -7,12 +7,14 @@ import (
 	"github.com/wailsapp/wails/v2/pkg/menu"
 	"github.com/wailsapp/wails/v2/pkg/menu/keys"
 	"github.com/wailsapp/wails/v2/pkg/runtime"
+	"os/user"
 )
 
 // App struct
 type App struct {
-	ctx        context.Context
-	repository *git.Repository
+	ctx          context.Context
+	repository   *git.Repository
+	dataSaveJson string
 }
 
 // NewApp creates a new App application struct
@@ -24,6 +26,11 @@ func NewApp() *App {
 // so we can call the runtime methods
 func (a *App) startup(ctx context.Context) {
 	a.ctx = ctx
+	u, err := user.Current()
+	if err != nil {
+		panic(err)
+	}
+	a.dataSaveJson = u.HomeDir + "/Git_Helper.json"
 }
 
 // Greet returns a greeting for the given name

Diff for: app.go

@@ -8,7 +8,6 @@ import (
 	"strings"
 )
 
-const JsonDataPath = "./Data.json"
 const TimeLayout = "2006-01-02 15:04:05"
 
 func (a *App) Sha256(s string) string {
@@ -23,10 +22,10 @@ func (a *App) MessageDialog(title string, message string) {
 }
 func (a *App) SaveJsonFile(t string) error {
 
-	if err := utils.RemoveFile(JsonDataPath); err != nil {
+	if err := utils.RemoveFile(a.dataSaveJson); err != nil {
 		return err
 	}
-	err := ioutil.WriteFile(JsonDataPath, []byte(t), 0666)
+	err := ioutil.WriteFile(a.dataSaveJson, []byte(t), 0666)
 
 	if err != nil {
 		return err
@@ -35,7 +34,7 @@ func (a *App) SaveJsonFile(t string) error {
 }
 func (a *App) ReadJsonFile() (string, error) {
 
-	b, err := ioutil.ReadFile(JsonDataPath)
+	b, err := ioutil.ReadFile(a.dataSaveJson)
 	if err != nil {
 		return "", err
 	}

Diff for: build/488-git.png

@@ -1,20 +1,22 @@
 import "./style.scss"
 import Item from "./Item"
 import {State} from "../../store";
-import React, {useState} from "react";
+import React, {useState,useRef} from "react";
 import {useDispatch, useSelector} from "react-redux";
 import {Button, Input, Space,Drawer,Empty} from "antd";
 import { AddBranch,GetBranch } from "../../../wailsjs/go/main/App"
 import {setOpenRepositoryBranch} from "../../store/sliceSetting";
 import {setAllBranch} from "../../store/sliceMain";
 import { warning } from "../../utils/common"
+import MergeDialog from "./mergeDialog"
+
 
 const Branch = () => {
   const dispatch = useDispatch();
   const branch = useSelector((state: State) => state.main.currentlyRepositoryAllBranch);
   const selectedRepositoryId = useSelector((state: State) => state.main.selectedRepositoryId);
   const showRepositoryBranch = useSelector((state: State) => state.setting.showRepositoryBranch);
-
+  const mergeDialogComponentRef = useRef<{OpenMergeDialog:(branchName:string)=>void}>(null);
   const [branchName,setBranchName] = useState<string>("")
 
   const addBranch = async () => {
@@ -45,12 +47,15 @@ const Branch = () => {
 
   const content = <>
     <div style={{flex:1,overflowY:"auto",padding:20}}>
-      { branch.map(r=><Item b={r} key={r.hash} />)}
+      { branch.map(r=><Item merge={()=>{mergeDialogComponentRef.current?.OpenMergeDialog(r.name)}} b={r} key={r.name} />)}
     </div>
     <div style={{padding:20}}>
       {bottom}
     </div>
   </>
+
+
+
   return (
       <Drawer
           title="Branch manage"
@@ -59,6 +64,7 @@ const Branch = () => {
           onClose={onCloseBranch}
           open={showRepositoryBranch}
       >
+        <MergeDialog ref={mergeDialogComponentRef}/>
         {selectedRepositoryId?content:<Empty style={{marginTop:200}} description="please select a git repository first" />}
       </Drawer>
   );

Diff for: build/appicon.png

@@ -13,7 +13,7 @@ import {State} from "../../store";
 dayjs.extend(relativeTime)
 
 
-const Item = (props: { b: main.Branch }) => {
+const Item = (props: { b: main.Branch,merge:()=>void }) => {
   const sledBranch = useSelector((state: State) => state.main.selectedRepositoryBranch);
 
   const dispatch = useDispatch();
@@ -41,17 +41,13 @@ const Item = (props: { b: main.Branch }) => {
   }
 
   const merge = async () => {
-    try {
-      const hash = await GetLastCommit(sledBranch)
-      console.log(hash)
-      console.log(props.b.hash)
-      const result = await PreMergeResult(hash,props.b.hash)
-      console.log(result)
-    }catch (e) {
-      console.log(e)
-      warning(JSON.stringify(e))
+    if(!sledBranch){
+      warning("please select a branch first")
+      return
     }
+    props.merge()
   }
+
   const extra = <Space>
     {
         (sledBranch != props.b.name ) && <ArrowLeftOutlined onClick={merge} style={{cursor: "pointer", opacity: 0.45}} />

Diff for: common.go

@@ -0,0 +1,137 @@
+import {Button, Modal, Result} from 'antd';
+import { LoadingOutlined } from "@ant-design/icons"
+import {useDispatch, useSelector} from "react-redux";
+import {State} from "../../store";
+import {useState, useImperativeHandle, forwardRef} from "react";
+import {success, warning} from "../../utils/common";
+import {GetLastCommit, PreMergeResult, MergeCommit, MergeRebase, MergeSquash, Log} from "../../../wailsjs/go/main/App";
+import {main} from "../../../wailsjs/go/models";
+import {warningNotification} from "../../utils/notification";
+import {setLog} from "../../store/sliceMain";
+
+
+const MergeDialog = (props: {}, ref: any) => {
+  const dispatch = useDispatch();
+  const currentBranchName = useSelector((state: State) => state.main.selectedRepositoryBranch);
+  const [openMerge, setOpenMerge] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  const [preMergeResult, setPreMergeResult] = useState<main.MergeResult | null>(null);
+
+  const [mergeContent, setMergeContent] = useState({
+    ourBranchHash: "",
+    ourBranchName: "",
+    theirBranchHash: "",
+    theirBranchName: "",
+  });
+
+  const OpenMergeDialog = async (mergeName: string) => {
+    setOpenMerge(true)
+    setLoading(true)
+    try {
+      let ourBranchHash = await GetLastCommit(currentBranchName)
+      let theirBranchHash = await GetLastCommit(mergeName)
+      setMergeContent({
+        ourBranchHash,
+        ourBranchName: currentBranchName,
+        theirBranchHash,
+        theirBranchName: mergeName,
+      })
+
+      const result = await PreMergeResult(ourBranchHash, theirBranchHash)
+      setPreMergeResult(result)
+
+    } catch (e) {
+      console.log(e)
+      warning(JSON.stringify(e))
+    }finally {
+      setTimeout(()=>{setLoading(false)},500)
+    }
+
+  }
+
+
+  useImperativeHandle(ref, () => ({OpenMergeDialog}))
+
+
+  const subTitle = () => {
+    if(preMergeResult?.kind === 1){
+      return <div>There will be <strong>{preMergeResult.count}</strong> conflicted file when merging <strong>{mergeContent.theirBranchName}</strong> into <strong>{mergeContent.ourBranchName}</strong></div>
+    }
+    if(preMergeResult?.kind === 2){
+      if(preMergeResult?.count === 0){
+        return <div>This branch is up to date with <strong>{mergeContent.theirBranchName}</strong></div>
+      }else {
+        return <div>
+          This will merge <strong>{preMergeResult?.count}</strong> commit{preMergeResult?.count >=2 ?'s':''} from <strong>{mergeContent.theirBranchName}</strong> into <strong>{mergeContent.ourBranchName}</strong></div>
+      }
+    }
+    return
+  }
+
+
+  const rebaseMerge = () => {
+    MergeRebase(mergeContent.ourBranchName,mergeContent.theirBranchName).then(out=>{
+      success(out)
+      return Log()
+    }).then(l=>{
+      dispatch(setLog(l))
+      setOpenMerge(false)
+    }).catch(e=>{
+      warningNotification(e,{width:500})
+    })
+
+  }
+  const squashMerge = () => {
+    MergeSquash(mergeContent.ourBranchName,mergeContent.theirBranchName).then(out=>{
+      success(out)
+      return Log()
+    }).then(l=>{
+      dispatch(setLog(l))
+      setOpenMerge(false)
+    }).catch(e=>{
+      warningNotification(e,{width:500})
+    })
+  }
+  const commitMerge = () => {
+    MergeCommit(mergeContent.ourBranchName,mergeContent.theirBranchName).then(out=>{
+      success(out)
+      return Log()
+    }).then(l=>{
+      dispatch(setLog(l))
+      setOpenMerge(false)
+    }).catch(e=>{
+      warningNotification(e,{width:500})
+    })
+  }
+
+  return <Modal
+      width={600}
+      open={openMerge}
+      title={`Merge branch ${mergeContent.theirBranchName} into ${mergeContent.ourBranchName}.`}
+      onCancel={() => {
+        setOpenMerge(false)
+        setPreMergeResult(null)
+      }}
+      footer={[
+        <Button key="rebase" type="primary" onClick={rebaseMerge}>
+          Rebase
+        </Button>,
+        <Button key="squash" type="primary" onClick={squashMerge}>
+          Squash and merge
+        </Button>,
+        <Button key="submit" type="primary" onClick={commitMerge}>
+          Create a merge commit
+        </Button>,
+      ]}
+  >
+    <Result
+      status={preMergeResult?.kind === 1 ? 'warning' : 'success'}
+      icon={loading ? <LoadingOutlined /> :''}
+      subTitle={subTitle()}/>
+  </Modal>
+}
+
+export default forwardRef(MergeDialog)
+
+

Diff for: frontend/src/components/branch/Index.tsx

@@ -48,6 +48,7 @@ const Changes = () => {
       success("Commit hash:"+hash)
       setCommitName("")
       setCommitMessage("")
+      setCheckedList([])
       await updateWorkZone(selectedRepositoryId)
       dispatch(resetState())
     }catch (e) {
@@ -95,7 +96,8 @@ const Changes = () => {
     </Space>
   </div>
 
-  const action = <Space direction="vertical" size="middle" style={{display: 'flex'}}>
+  const action = <Space size="middle" style={{display: 'flex'}}>
+    <div>{checkedList.length}</div>
     <Checkbox indeterminate={indeterminate} onChange={onCheckAllChange} checked={checkAll}>
       Check all
     </Checkbox>

Diff for: frontend/src/components/branch/Item.tsx

@@ -1,16 +1,16 @@
 import {useDispatch} from "react-redux";
 import {Button, message, notification, Space} from 'antd';
 import {warning} from "../../../utils/common";
+import {warningNotification,successNotification} from "../../../utils/notification";
 import {OpenFileManage, OpenTerminal, GitPull, GitPush} from "../../../../wailsjs/go/main/App"
-import {setOpenRepositoryTag, setOpenRepositoryBranch, setOpenMoreHelper} from "../../../store/sliceSetting";
+import {setOpenRepositoryTag, setOpenRepositoryBranch} from "../../../store/sliceSetting";
 import {
   ArrowUpOutlined,
   ArrowDownOutlined,
   CodeOutlined,
   FolderOpenOutlined,
   TagOutlined,
   BranchesOutlined,
-  // MoreOutlined
 } from '@ant-design/icons';
 import React, {useState} from "react";
 
@@ -41,55 +41,23 @@ const Action = () => {
     dispatch(setOpenRepositoryBranch(true))
 
   }
-  const openMoreHelper = () => {
-    dispatch(setOpenMoreHelper(true))
-  }
+  // const openMoreHelper = () => {
+  //   dispatch(setOpenMoreHelper(true))
+  // }
   const pushRepo = () => {
     setPushLoading(true)
     GitPush().then(out => {
-      notification.success({
-        message: `Out`,
-        description: <div style={{whiteSpace: "pre-wrap"}}>{out}</div>,
-        placement: "bottomRight",
-        style: {
-          width: 500,
-          top: 40,
-        },
-      });
+      successNotification(out,{width:500})
     }).catch(e => {
-      notification.warning({
-        message: `Tip`,
-        description: <div style={{whiteSpace: "pre-wrap"}}>{e}</div>,
-        placement: "bottomRight",
-        style: {
-          width: 500,
-          top: 40,
-        },
-      });
+      warningNotification(e,{width:500})
     }).finally(()=>{setPushLoading(false)})
   }
   const pullRepo = () => {
     setPullLoading(true)
     GitPull().then(out => {
-      notification.success({
-        message: `Out`,
-        description: <div style={{whiteSpace: "pre-wrap"}}>{out}</div>,
-        placement: "bottomRight",
-        style: {
-          width: 500,
-          top: 40,
-        },
-      });
+      successNotification(out,{width:500})
     }).catch(e => {
-      notification.warning({
-        message: `Tip`,
-        description: <div style={{whiteSpace: "pre-wrap"}}>{e}</div>,
-        placement: "bottomRight",
-        style: {
-          width: 500,
-          top: 40,
-        },
-      });
+      warningNotification(e,{width:500})
     }).finally(()=>{setPullLoading(false)})
   }
   return (