add loading indicator all the time

kactus-io · Mar 7, 2021 · 7d126dd · 7d126dd
1 parent 3acd970
commit 7d126dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/app/src/lib/stores/app-store.ts b/app/src/lib/stores/app-store.ts
@@ -1984,7 +1984,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
         await Promise.all(
           modifiedFiles.map(f => {
             return this.isParsing(repository, f, async () => {
-              await parseSketchFile(repository, f, kactusStatus.config)
+              await this._parseSketchFile(repository, f)
             })
           })
         )
@@ -3317,9 +3317,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
     const branch = await gitStore.createBranch(name, startPoint, noTrackOption)
 
     if (branch !== undefined) {
-      await this._checkoutBranch(repository, branch, undefined, {
-        refreshKactus: true,
-      })
+      await this._checkoutBranch(repository, branch)
     }
   }
 
@@ -3369,12 +3367,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
         }
         if (f.parsed) {
           try {
-            await importSketchFile(
-              repository,
-              this.sketchPath,
-              f,
-              kactus.config
-            )
+            await this._importSketchFile(repository, f)
             this.repositoryStateCache.updateKactusState(repository, state => ({
               files: state.files.map(file =>
                 file.id !== f.id ? { ...file, imported: true } : file
@@ -3583,7 +3576,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
   private async refreshAfterCheckout(
     repository: Repository,
     branch: Branch,
-    previousKactusState: any,
+    previousKactusState: IKactusState,
     refreshKactus?: boolean
   ) {
     this.updateCheckoutProgress(repository, {
@@ -4457,9 +4450,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
     await Promise.all(
       kactus.files
         .filter(f => f.parsed)
-        .map(f =>
-          importSketchFile(repository, this.sketchPath, f, kactus.config)
-        )
+        .map(f => this._importSketchFile(repository, f))
     )
 
     await this._refreshRepository(repository)
@@ -4760,9 +4751,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
       await Promise.all(
         kactus.files
           .filter(f => f.parsed)
-          .map(f =>
-            importSketchFile(repository, this.sketchPath, f, kactus.config)
-          )
+          .map(f => this._importSketchFile(repository, f))
       )
     } catch (err) {
       // probably conflicts

diff --git a/changelog.json b/changelog.json
@@ -2,6 +2,7 @@
   "unreleased": [],
   "releases": {
     "0.3.33": [
+      "[Improved] Add loading indicator when parsing Sketch files when ckecking out a branch",
       "[Improved] Clearer menu label for reverting commits",
       "[Fixed] Refresh branches after creating a new branch",
       "[Fixed] Pull requests no longer fail to update until the user switches repositories",