fix build and merge fixes

FredrikNoren · Feb 3, 2022 · ebcab28 · ebcab28
1 parent afac3cd
commit ebcab28
Show file tree

Hide file tree

Showing 11 changed files with 769 additions and 12,284 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -13,5 +13,17 @@
     "no-unused-vars": ["error", { "args": "none" }],
     "prefer-const": "warn",
     "quotes": ["warn", "single", { "avoidEscape": true }]
-  }
+  },
+  "globals": {
+    "ungit": "readonly"
+  },
+  "overrides": [
+    {
+      "files": ["**/*.js"],
+      "env": { "browser": true, "es6": true, "node": true },
+      "extends": ["eslint:recommended", "plugin:prettier/recommended"],
+      "globals": {},
+      "parser": "@babel/eslint-parser",
+    }
+  ]
 }
diff --git a/components/branches/branches.js b/components/branches/branches.js
@@ -57,7 +57,8 @@ class BranchesViewModel extends ComponentRoot {
   async onProgramEvent(event) {
     if (
       event.event === 'request-app-content-refresh' ||
-      event.event === 'branch-updated'
+      event.event === 'branch-updated' ||
+      event.event === 'git-directory-changed'
     ) {
       await this.updateRefs();
     }

diff --git a/components/graph/graph.js b/components/graph/graph.js
@@ -272,7 +272,7 @@ class GraphViewModel extends ComponentRoot {
   }
 
   async onProgramEvent(event) {
-    if (event.event == 'working-tree-changed') {
+    if (event.event == 'git-directory-changed') {
       await Promise.all([this.loadNodesFromApi(), this.updateBranches()]);
     } else if (event.event == 'request-app-content-refresh') {
       await this.loadNodesFromApi();

diff --git a/components/remotes/remotes.js b/components/remotes/remotes.js
@@ -37,8 +37,7 @@ class RemotesViewModel {
   }
 
   async onProgramEvent(event) {
-    if (event.event === 'request-app-content-refresh' || 
-      event.event === 'request-fetch-tags') {
+    if (event.event === 'request-app-content-refresh' || event.event === 'request-fetch-tags') {
       await this.fetch({ tags: true });
     } else if (event.event === 'git-directory-changed' && this.shouldAutoFetch) {
       await this.fetch({ tags: true });

diff --git a/components/staging/staging.js b/components/staging/staging.js
@@ -124,9 +124,11 @@ class StagingViewModel extends ComponentRoot {
   }
 
   async onProgramEvent(event) {
-    if (event.event == 'request-app-content-refresh' || 
-    event.event === 'working-tree-changed' ||
-    event.event === 'git-directory-changed') {
+    if (
+      event.event == 'request-app-content-refresh' ||
+      event.event === 'working-tree-changed' ||
+      event.event === 'git-directory-changed'
+    ) {
       await this.refreshContent();
       this.invalidateFilesDiffs();
     }