Revert "feat: update default bots folder (microsoft#1548)"

This reverts commit 8f2bc2e.

Composer/packages/client/src/CreationFlow/LocationBrowser/LocationSelectContent.tsx

@@ -7,18 +7,22 @@ import path from 'path';
 import { jsx } from '@emotion/core';
 import { Fragment, useEffect, useState, useContext, useRef } from 'react';
 
+import storage from '../../utils/storage';
+
 import { FileSelector } from './FileSelector';
 import { StoreContext } from './../../store';
 import { FileTypes } from './../../constants';
 
+const NEW_BOT_LOCATION_KEY = 'newBotLocation';
+
 export function LocationSelectContent(props) {
   const { state, actions } = useContext(StoreContext);
   const { storages, focusedStorageFolder, storageFileLoadingStatus } = state;
   const { onOpen, onChange, allowOpeningBot = true } = props;
 
   const { fetchFolderItemsByPath } = actions;
   const currentStorageIndex = useRef(0);
-  const [currentPath, setCurrentPath] = useState('');
+  const [currentPath, setCurrentPath] = useState(storage.get(NEW_BOT_LOCATION_KEY, ''));
   const currentStorageId = storages[currentStorageIndex.current] ? storages[currentStorageIndex.current].id : 'default';
 
   useEffect(() => {
@@ -35,7 +39,6 @@ export function LocationSelectContent(props) {
       // const formatedPath = path.normalize(newPath.replace(/\\/g, '/'));
       const formatedPath = path.normalize(newPath);
       await fetchFolderItemsByPath(storageId, formatedPath);
-      await actions.updateCurrentPath(formatedPath);
       setCurrentPath(formatedPath);
     }
   };
@@ -45,7 +48,7 @@ export function LocationSelectContent(props) {
     let path = currentPath;
     let id = '';
     if (storages[index]) {
-      path = storages[index].path;
+      path = path || storages[index].path;
       id = storages[index].id;
     }
     updateCurrentPath(path, id);
@@ -55,6 +58,7 @@ export function LocationSelectContent(props) {
     if (onChange) {
       onChange(currentPath);
     }
+    storage.set(NEW_BOT_LOCATION_KEY, currentPath);
   }, [currentPath]);
 
   const onSelectionChanged = item => {

Composer/packages/client/src/store/action/storage.ts

@@ -93,7 +93,3 @@ export const fetchFolderItemsByPath: ActionCreator = async ({ dispatch }, id, pa
     });
   }
 };
-
-export const updateCurrentPath: ActionCreator = async ({ dispatch }, path) => {
-  await httpClient.put(`/storages/currentPath`, { path: path });
-};

Composer/packages/server/__tests__/services/project.test.ts

@@ -16,7 +16,6 @@ jest.mock('../../src/store/store', () => {
         name: 'This PC',
         type: 'LocalDisk',
         path: '.',
-        defaultPath: '.',
       },
     ],
     recentBotProjects: [] as any[],

Composer/packages/server/__tests__/services/storage.test.ts

@@ -24,7 +24,6 @@ jest.mock('../../src/store/store', () => {
       name: 'This PC',
       type: 'LocalDisk',
       path: '.',
-      defaultPath: '.',
     },
   ];
   return {

Composer/packages/server/src/controllers/storage.ts

@@ -15,11 +15,6 @@ function createStorageConnection(req: Request, res: Response) {
   res.status(200).json(StorageService.getStorageConnections());
 }
 
-function updateCurrentPath(req: Request, res: Response) {
-  StorageService.updateCurrentPath(req.body.path);
-  res.status(200).json('success');
-}
-
 async function getBlob(req: Request, res: Response) {
   const storageId = req.params.storageId;
   const reqpath = decodeURI(req.params.path);
@@ -39,5 +34,4 @@ export const StorageController = {
   getStorageConnections,
   createStorageConnection,
   getBlob,
-  updateCurrentPath,
 };

Composer/packages/server/src/router/api.ts

@@ -32,7 +32,6 @@ router.post('/projects/opened/project/saveAs', ProjectController.saveProjectAs);
 router.get('/projects/recent', ProjectController.getRecentProjects);
 
 // storages
-router.put('/storages/currentPath', StorageController.updateCurrentPath);
 router.get('/storages', StorageController.getStorageConnections);
 router.post('/storages', StorageController.createStorageConnection);
 router.get('/storages/:storageId/blobs/:path(*)', StorageController.getBlob);

Composer/packages/server/src/services/storage.ts

@@ -18,7 +18,6 @@ class StorageService {
 
   constructor() {
     this.storageConnections = Store.get(this.STORE_KEY);
-    this.ensureDefaultBotFoldersExist();
   }
 
   public getStorageClient = (storageId: string): IFileStorage => {
@@ -40,18 +39,11 @@ class StorageService {
   };
 
   public getStorageConnections = (): StorageConnection[] => {
-    const connections = this.storageConnections.map(s => {
+    return this.storageConnections.map(s => {
       const temp = Object.assign({}, s);
-      // if the last accessed path exist
-      if (fs.existsSync(s.path)) {
-        temp.path = Path.resolve(s.path); // resolve path if path is relative, and change it to unix pattern
-      } else {
-        temp.path = Path.resolve(s.defaultPath);
-      }
+      temp.path = Path.resolve(s.path); // resolve path if path is relative, and change it to unix pattern
       return temp;
     });
-    this.ensureDefaultBotFoldersExist();
-    return connections;
   };
 
   public checkBlob = async (storageId: string, filePath: string): Promise<boolean> => {
@@ -93,17 +85,6 @@ class StorageService {
     }
   };
 
-  public updateCurrentPath = (path: string) => {
-    this.storageConnections[0].path = path;
-    Store.set(this.STORE_KEY, this.storageConnections);
-  };
-
-  private ensureDefaultBotFoldersExist = () => {
-    this.storageConnections.forEach(s => {
-      this.createFolderRecurively(s.defaultPath);
-    });
-  };
-
   private isBotFolder = (path: string) => {
     // locate Main.dialog
     const mainPath = Path.join(path, 'ComposerDialogs/Main', 'Main.dialog');
@@ -138,13 +119,6 @@ class StorageService {
     const result = await Promise.all(children);
     return result.filter(item => !!item);
   };
-
-  private createFolderRecurively = (path: string) => {
-    if (!fs.existsSync(path)) {
-      this.createFolderRecurively(Path.dirname(path));
-      fs.mkdirSync(path);
-    }
-  };
 }
 
 const service = new StorageService();

Composer/packages/server/src/store/data.template.ts

@@ -2,16 +2,14 @@
 // Licensed under the MIT License.
 
 import path from 'path';
-import os from 'os';
 
 export default {
   storageConnections: [
     {
       id: 'default',
       name: 'This PC',
       type: 'LocalDisk',
-      path: '', // this is used as last accessed path, if it is invalid, use defaultPath
-      defaultPath: path.join(os.homedir(), 'Documents', 'Composer'),
+      path: path.resolve(__dirname, '../../../../../MyBots'),
     },
   ],
   recentBotProjects: [],