fix: nested git repos not showing up in source control view

dendronhq · Dec 13, 2020 · 37adc5e · 37adc5e
1 parent 6da3973
commit 37adc5e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/packages/engine-server/src/workspace.ts b/packages/engine-server/src/workspace.ts
@@ -104,7 +104,7 @@ export class WorkspaceService {
 
     if (!noAddToConfig) {
       const config = this.config;
-      config.vaults.push(vault);
+      config.vaults.unshift(vault);
       await this.setConfig(config);
     }
     return;

diff --git a/packages/plugin-core/src/commands/VaultAddCommand.ts b/packages/plugin-core/src/commands/VaultAddCommand.ts
@@ -145,7 +145,7 @@ export class VaultAddCommand extends BasicCommand<CommandOpts, CommandOutput> {
       if (vault.name) {
         vault2Folder.name = vault.name;
       }
-      const folders = out.folders.concat(vault2Folder);
+      const folders = [vault2Folder].concat(out.folders);
       out = assignJSONWithComment({ folders }, out);
       writeJSONWithComments(wsPath, out);
     }

diff --git a/packages/plugin-core/src/test/suite-integ/VaultAddCommand.test.ts b/packages/plugin-core/src/test/suite-integ/VaultAddCommand.test.ts
@@ -114,7 +114,6 @@ suite("VaultAddCommand", function () {
           checkVaults({
             wsRoot,
             vaults: [
-              vault,
               {
                 fsPath: newVault.fsPath,
                 name: "dendron",
@@ -123,6 +122,7 @@ suite("VaultAddCommand", function () {
                   url: remote,
                 },
               },
+              vault,
             ],
           });
           expect(fs.existsSync(path.join(wsRoot, ".gitignore"))).toBeFalsy();
@@ -152,7 +152,6 @@ suite("VaultAddCommand", function () {
           checkVaults({
             wsRoot,
             vaults: [
-              vault,
               {
                 fsPath: newVault.fsPath,
                 name: "dendron",
@@ -161,6 +160,7 @@ suite("VaultAddCommand", function () {
                   url: remote,
                 },
               },
+              vault,
             ],
           });
           expect(fs.existsSync(gitIgnore)).toBeTruthy();
@@ -202,10 +202,10 @@ suite("VaultAddCommand", function () {
           checkVaults({
             wsRoot,
             vaults: [
-              vault,
               {
                 fsPath: "vault2",
               },
+              vault,
             ],
           });
 
@@ -231,10 +231,10 @@ suite("VaultAddCommand", function () {
           checkVaults({
             wsRoot,
             vaults: [
-              vault,
               {
                 fsPath: "vault2",
               },
+              vault,
             ],
           });
           done();
@@ -257,10 +257,10 @@ suite("VaultAddCommand", function () {
           checkVaults({
             wsRoot,
             vaults: [
-              vault,
               {
                 fsPath: "vault2",
               },
+              vault,
             ],
           });
           done();
@@ -284,10 +284,10 @@ suite("VaultAddCommand", function () {
           checkVaults({
             wsRoot,
             vaults: [
-              vault,
               {
                 fsPath: vaultRelPath,
               },
+              vault,
             ],
           });