Jump to files/directories created in the Explorer

browser/src/Services/Explorer/ExplorerStore.ts

@@ -468,6 +468,11 @@ const Actions = {
             children: sortedFilesAndFolders,
         }
     },
+
+    selectFile: (filePath: string): ISelectFileAction => ({
+        type: "SELECT_FILE",
+        filePath,
+    }),
 }
 
 // Yank, Paste Delete register =============================
@@ -1004,11 +1009,10 @@ export const createNodeEpic: ExplorerEpic = (action$, store, { fileSystem }) =>
                 create: { nodeType },
             },
         } = store.getState()
-        const shouldExpand = Actions.expandDirectory(path.dirname(name))
         const createFileOrFolder =
             nodeType === "file" ? fileSystem.writeFile(name) : fileSystem.mkdir(name)
         return fromPromise(createFileOrFolder)
-            .flatMap(() => [Actions.createNode({ nodeType, name }), shouldExpand, Actions.refresh])
+            .flatMap(() => [Actions.createNode({ nodeType, name }), Actions.selectFile(name)])
             .catch(error => [Actions.createNodeFail(error.message)])
     })
 

browser/test/Services/Explorer/ExplorerStoreTests.ts

@@ -581,7 +581,7 @@ describe("ExplorerStore", () => {
                 .subscribe(actualAction => assert.deepEqual(actualAction, expected))
         })
 
-        it("Should return a create node success action if a creation is committed", () => {
+        it("Should return a create node success action if a creation is committed", async () => {
             const action$ = ActionsObservable.of({
                 type: "CREATE_NODE_COMMIT",
                 name: "/test/dir/file.txt",
@@ -604,16 +604,21 @@ describe("ExplorerStore", () => {
 
             const expected = [
                 { type: "CREATE_NODE_SUCCESS", nodeType: "file", name: "/test/dir/file.txt" },
-                { type: "EXPAND_DIRECTORY", directoryPath: "/test/dir" },
-                { type: "REFRESH" },
+                { type: "SELECT_FILE", filePath: "/test/dir/file.txt" },
             ]
 
-            ExplorerState.createNodeEpic(action$, createState, { fileSystem: fs, notifications })
+            return ExplorerState.createNodeEpic(action$, createState, {
+                fileSystem: fs,
+                notifications,
+            })
                 .toArray()
-                .subscribe(actualActions => assert.deepEqual(actualActions, expected))
+                .toPromise()
+                .then(actualActions => {
+                    assert.deepEqual(actualActions, expected)
+                })
         })
 
-        it("Should return an error action if a creation fails", () => {
+        it("Should return an error action if a creation fails", async () => {
             const action$ = ActionsObservable.of({
                 type: "CREATE_NODE_COMMIT",
                 name: "/test/dir/file.txt",
@@ -636,7 +641,7 @@ describe("ExplorerStore", () => {
 
             const expected = [{ type: "CREATE_NODE_FAIL", reason: "Duplicate" }]
 
-            ExplorerState.createNodeEpic(action$, createState, {
+            return ExplorerState.createNodeEpic(action$, createState, {
                 fileSystem: {
                     ...fs,
                     writeFile: async folderpath => {
@@ -646,7 +651,8 @@ describe("ExplorerStore", () => {
                 notifications,
             })
                 .toArray()
-                .subscribe(actualActions => {
+                .toPromise()
+                .then(actualActions => {
                     assert.deepEqual(actualActions, expected)
                 })
         })