Merge branch 'main' into qna-recognizer

* main: fix: allow storage implementation to determine writability (#3630) fix: fix deploy issue because botproject files structure changed (#3719) fix: loop infinitely on publish page when get publish status (#3716)
microsoft · Jul 28, 2020 · d247c5e · d247c5e
2 parents 5a59387 + 9d20afb
commit d247c5e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/Composer/packages/server/src/models/storage/interface.ts b/Composer/packages/server/src/models/storage/interface.ts
@@ -11,6 +11,7 @@ export interface StorageConnection {
 export interface Stat {
   isDir: boolean;
   isFile: boolean;
+  isWritable: boolean;
   lastModified: string;
   size: string;
 }

diff --git a/Composer/packages/server/src/models/storage/localDiskStorage.ts b/Composer/packages/server/src/models/storage/localDiskStorage.ts
@@ -25,9 +25,17 @@ const rename = promisify(fs.rename);
 export class LocalDiskStorage implements IFileStorage {
   async stat(path: string): Promise<Stat> {
     const fstat = await stat(path);
+    // test to see if this file is writable
+    let writable = true;
+    try {
+      fs.accessSync(path, fs.constants.W_OK);
+    } catch (err) {
+      writable = false;
+    }
     return {
       isDir: fstat.isDirectory(),
       isFile: fstat.isFile(),
+      isWritable: writable,
       lastModified: fstat.mtime.toString(),
       size: fstat.isFile() ? fstat.size.toString() : '',
     };

diff --git a/Composer/packages/server/src/services/storage.ts b/Composer/packages/server/src/services/storage.ts
@@ -95,17 +95,11 @@ class StorageService {
       // TODO: fix this behavior and the upper layer interface accordingly
       return JSON.parse(await storageClient.readFile(filePath));
     } else {
-      let writable = true;
-      try {
-        fs.accessSync(filePath, fs.constants.W_OK);
-      } catch (err) {
-        writable = false;
-      }
       return {
         name: Path.basename(filePath),
         parent: Path.dirname(filePath),
         children: await this.getChildren(storageClient, filePath),
-        writable: writable,
+        writable: stat.isWritable,
       };
     }
   };

diff --git a/Composer/plugins/mongoStorage/src/index.ts b/Composer/plugins/mongoStorage/src/index.ts
@@ -82,13 +82,15 @@ class MongoStorage implements IFileStorage {
               isDir: true,
               isFile: false,
               lastModified: file.lastModified,
+              isWritable: true,
               size: 1, // TODO: real size
             });
           } else {
             resolve({
               isDir: false,
               isFile: true,
               lastModified: file.lastModified,
+              isWritable: true,
               size: 1, // TODO: real size
             });
           }
@@ -103,6 +105,7 @@ class MongoStorage implements IFileStorage {
                   isDir: true,
                   isFile: false,
                   lastModified: new Date(),
+                  isWritable: true,
                   size: 0, // TODO: ??
                 });
               } else {
@@ -113,6 +116,7 @@ class MongoStorage implements IFileStorage {
                 isDir: true,
                 isFile: false,
                 lastModified: file.lastModified,
+                isWritable: true,
                 size: 0, // TODO: ??
               });
             }

diff --git a/Composer/plugins/mongoStorage/src/interface.ts b/Composer/plugins/mongoStorage/src/interface.ts
@@ -11,6 +11,7 @@ export interface StorageConnection {
 export interface Stat {
   isDir: boolean;
   isFile: boolean;
+  isWritable: boolean;
   lastModified: string;
   size: string;
 }