Fix dialog can't be deleted and .gitignore (microsoft#1113)

* Fix dialog can't be deleted

* Delete luis.status.json

* Fix git ignore

* update comments

* clean DS_Store

* Update botProject.test.ts

.gitignore

@@ -389,11 +389,14 @@ typings/
 # Local sample bots
 SampleBots/Local*
 SampleBots/__Test*
-SampleBots/*/generated/
-SampleBots/*/settings
+SampleBots/*/*/generated
+SampleBots/*/*/settings
 
 #tmp.zip
 *.zip
 
+#DS_Store
+*.DS_Store
+
 # VsCode
 Composer/.vscode/

Composer/packages/server/__tests__/models/bot/botProject.test.ts

@@ -61,7 +61,7 @@ describe('createFromTemplate', () => {
 
   afterEach(() => {
     try {
-      fs.unlinkSync(Path.resolve(__dirname, `${botDir}/ComposerDialogs/${dialogName}.dialog`));
+      fs.unlinkSync(Path.resolve(__dirname, `${botDir}/ComposerDialogs/${dialogName}/${dialogName}.dialog`));
     } catch (err) {
       throw new Error(err);
     }
@@ -132,25 +132,24 @@ describe('modify non exist files', () => {
 describe('lg operation', () => {
   afterAll(() => {
     try {
-      fs.rmdirSync(Path.resolve(__dirname, `${botDir}/root`));
+      fs.rmdirSync(Path.resolve(__dirname, `${botDir}/ComposerDialogs/root`));
     } catch (err) {
       throw new Error(err);
     }
   });
 
   it('should create lg file and update index', async () => {
     const id = 'root';
-    const dir = 'root';
     const content = '# hello \n - hello';
-    const lgFiles = await proj.createLgFile(id, content, dir);
+    const lgFiles = await proj.createLgFile(id, content);
     const result = lgFiles.find(f => f.id === id);
 
     expect(proj.files.length).toEqual(8);
     expect(lgFiles.length).toEqual(2);
 
     expect(result).not.toBeUndefined();
     if (result !== undefined) {
-      expect(result.relativePath).toEqual('root/root.lg');
+      expect(result.relativePath).toEqual('ComposerDialogs/root/root.lg');
       expect(result.content).toEqual(content);
     }
   });
@@ -203,17 +202,16 @@ describe('lu operation', () => {
 
   it('should create lu file and update index', async () => {
     const id = 'root';
-    const dir = 'root';
     const content = '## hello \n - hello';
-    const luFiles = await proj.createLuFile(id, content, dir);
+    const luFiles = await proj.createLuFile(id, content);
     const result = luFiles.find(f => f.id === id);
 
     expect(proj.files.length).toEqual(8);
     expect(luFiles.length).toEqual(4);
 
     expect(result).not.toBeUndefined();
     if (result !== undefined) {
-      expect(result.relativePath).toEqual('root/root.lu');
+      expect(result.relativePath).toEqual('ComposerDialogs/root/root.lu');
       expect(result.content).toEqual(content);
     }
   });

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

@@ -159,8 +159,8 @@ async function createDialog(req: Request, res: Response) {
   if (currentProject !== undefined) {
     const content = JSON.stringify(req.body.content, null, 2) + '\n';
     //dir = id
-    const dialogs = await currentProject.createDialog(req.body.id, content, req.body.id);
-    const luFiles = await currentProject.createLuFile(req.body.id, '', req.body.id);
+    const dialogs = await currentProject.createDialog(req.body.id, content);
+    const luFiles = await currentProject.createLuFile(req.body.id, '');
     res.status(200).json({ dialogs, luFiles });
   } else {
     res.status(404).json({

Composer/packages/server/src/models/bot/botProject.ts

@@ -188,7 +188,7 @@ export class BotProject {
     return this.dialogIndexer.getDialogs();
   };
 
-  public createDialog = async (id: string, content = '', dir = ''): Promise<Dialog[]> => {
+  public createDialog = async (id: string, content = '', dir: string = this.defaultDir(id)): Promise<Dialog[]> => {
     const dialog = this.dialogIndexer.getDialogs().find(d => d.id === id);
     if (dialog) {
       throw new Error(`${id} dialog already exist`);
@@ -227,7 +227,7 @@ export class BotProject {
     return this.lgIndexer.getLgFiles();
   };
 
-  public createLgFile = async (id: string, content: string, dir = ''): Promise<LGFile[]> => {
+  public createLgFile = async (id: string, content: string, dir: string = this.defaultDir(id)): Promise<LGFile[]> => {
     const lgFile = this.lgIndexer.getLgFiles().find(lg => lg.id === id);
     if (lgFile) {
       throw new Error(`${id} lg file already exist`);
@@ -274,7 +274,7 @@ export class BotProject {
     return this.mergeLuStatus(this.luIndexer.getLuFiles(), this.luPublisher.status);
   };
 
-  public createLuFile = async (id: string, content: string, dir = ''): Promise<LUFile[]> => {
+  public createLuFile = async (id: string, content: string, dir: string = this.defaultDir(id)): Promise<LUFile[]> => {
     const luFile = this.luIndexer.getLuFiles().find(lu => lu.id === id);
     if (luFile) {
       throw new Error(`${id} lu file already exist`);
@@ -357,10 +357,13 @@ export class BotProject {
     return (await this.fileStorage.exists(this.dir)) && (await this.fileStorage.stat(this.dir)).isDir;
   }
 
-  // create file in this project this function will gurantee the memory cache
-  // (this.files, all indexes) also gets updated
+  private defaultDir = (id: string) => Path.join(DIALOGFOLDER, id);
+
+  // create a file with relativePath and content
+  // relativePath is a path relative to root dir instead of dataDir
+  // dataDir is not aware at this layer
   private _createFile = async (relativePath: string, content: string) => {
-    const absolutePath = Path.resolve(this.dataDir, relativePath);
+    const absolutePath = Path.resolve(this.dir, relativePath);
     await this.ensureDirExists(Path.dirname(absolutePath));
     await this.fileStorage.writeFile(absolutePath, content);