ULT-1 added project search, fixed master branch fetch

electron/controller/ProjectScraper.ts

@@ -53,14 +53,15 @@ module.exports = class ProjectScraper {
     return projectBranches;
   }
 
-  static open(path: Project["path"], issue: Task["key"], event?: any) {
+  static async open(path: Project["path"], issue: Task["key"], event?: any) {
     try {
       const shell = require("shelljs");
       shell.config.execPath = shell.which("node").stdout;
       shell.cd(path);
 
-      const masterBranch = GitShell.getMasterBranch(path);
-      shell.exec(`git fetch && git pull origin ${masterBranch}`, { windowsHide: true }); //update master
+      const masterBranch = (await GitShell.getMasterBranch(path)).replace('/',' ');
+      console.log("change project: ", masterBranch, issue, path, !!event);
+      shell.exec(`git fetch && git pull ${masterBranch}`, { windowsHide: true }); //update master
       shell.exec(`git stash`, { windowsHide: true }); //sash current uncommitted files
       if (
         shell.exec(`git checkout ${issue}`, { windowsHide: true }).code !== 0

electron/router/ProjectRouter.ts

@@ -7,10 +7,10 @@ const ProjectScraper = require("../controller/ProjectScraper");
 
 ipcMain.on(
   "open/project",
-  (event: any, arg: { path: string; issue: Task["key"] }) => {
+  async (event: any, arg: { path: string; issue: Task["key"] }) => {
     event.sender.send(
       "result/open/project",
-      ProjectScraper.open(arg.path, arg.issue, event)
+      await ProjectScraper.open(arg.path, arg.issue, event)
     );
   }
 );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultira",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "private": true,
   "description": "ultimate jira tool",
   "author": {

src/components/JiraProjectList.vue

@@ -1,5 +1,10 @@
 <template>
   <d-card v-if="projects.length > 0" block elevation="4" class="ma-3">
+    <d-textfield v-model="search" class="search sticky" filled solo placeholder="Search..." full-width>
+      <template v-slot:prefix>
+        <d-icon name="search" />
+      </template>
+    </d-textfield>
     <d-column
       v-for="list in lists"
       :key="list.title"
@@ -8,7 +13,7 @@
       v-show="list.projects.length > 0"
     >
       <d-card-subtitle color="primary" class="font-weight-bold px-4 sticky" glow
-        >{{ list.title }}
+      >{{ list.title }}
       </d-card-subtitle>
       <d-accordion
         v-for="(project, p) in list.projects"
@@ -82,7 +87,7 @@
 import { projects, currentIssueKey } from "../store/jira.store";
 import JiraProjectButton from "./JiraProjectButton.vue";
 import JiraController from "../controller/JiraController";
-import { computed } from "vue";
+import { computed, ref } from "vue";
 import ProjectController from "../controller/ProjectController";
 import { Project } from "../../types/Jira";
 
@@ -98,22 +103,30 @@ function issueExists(branch: string): boolean {
   );
 }
 
+const search = ref("");
+
 const lists = computed<Array<{ title: string; projects: Array<Project> }>>(
   () => {
-    console.log(recommendedProjects.value);
     return [
       {
         title: "Recommended",
-        projects: recommendedProjects.value,
+        projects: recommendedProjects.value
       },
       {
         title: "All",
-        projects: projects.value,
-      },
+        projects: !search ?
+          projects.value :
+          projects.value.filter((project) =>
+            project.project.toLowerCase().includes(search.value.toLowerCase()) ||
+            project.branch.toLowerCase().includes(search.value.toLowerCase()) ||
+            project.path.toLowerCase().includes(search.value.toLowerCase())
+          )
+      }
     ];
   }
 );
 
+
 const recommendedProjects = computed<Array<Project>>(() => {
   return projects.value.filter(
     (project) =>
@@ -147,6 +160,12 @@ function onFileClick(project: Project, file: string) {
   backdrop-filter: blur(10px);
 }
 
+.search {
+  top: 35px;
+  z-index: 2;
+
+}
+
 ::v-deep(.d-accordion .d-title) {
   padding: 0 !important;
 }