restored export from explorer after changes there

Author: daimor

src/commands/export.ts

@@ -155,7 +155,15 @@ export async function exportList(files: string[], workspaceFolder: string, names
       outputChannel.appendLine(`Items failed to export: \n${errors.join("\n")}`);
     }
   };
-  return run(files);
+  return vscode.window.withProgress(
+    {
+      title: "Export items",
+      location: vscode.ProgressLocation.Notification,
+    },
+    () => {
+      return run(files);
+    }
+  );
 }
 
 export async function exportAll(workspaceFolder?: string): Promise<any> {
@@ -198,15 +206,7 @@ Would you like to continue?`,
     }
   }
   const { workspaceFolder, namespace } = node;
-  const nodesList = node instanceof RootNode ? node.getChildren(node) : Promise.resolve([node]);
-  return nodesList
-    .then(nodes =>
-      nodes.reduce(
-        (list, subNode) => list.concat(subNode instanceof PackageNode ? subNode.getClasses() : [subNode.fullName]),
-        []
-      )
-    )
-    .then(items => {
-      return exportList(items, workspaceFolder, namespace);
-    });
+  return node.getItems4Export().then(items => {
+    return exportList(items, workspaceFolder, namespace);
+  });
 }

src/explorer/models/nodeBase.ts

@@ -42,4 +42,8 @@ export class NodeBase {
   public async getChildren(element): Promise<NodeBase[]> {
     return [];
   }
+
+  public async getItems4Export(): Promise<string[]> {
+    return [this.fullName];
+  }
 }

src/explorer/models/rootNode.ts

@@ -28,7 +28,8 @@ export class RootNode extends NodeBase {
     const path = this instanceof PackageNode ? this.fullName + "/" : "";
     return this.getItems(path, this._category);
   }
-  public getItems(path: string, category: string): Promise<NodeBase[]> {
+
+  public getList(path: string, category: string, flat: boolean) {
     const sql = "CALL %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?)";
     // const sql = "CALL %Library.RoutineMgr_StudioOpenDialog(?,,,,,,?)";
     let spec = "";
@@ -42,12 +43,14 @@ export class RootNode extends NodeBase {
       case "INC":
         spec = "*.inc";
         break;
+      case "ALL":
+        spec = "*.cls,*.mac,*.int,*.inc";
+        break;
       default:
         return;
     }
     const direction = "1";
     const orderBy = "1"; // by Name
-    const flat = "0";
     const notStudio = "0";
     const generated = this.options.generated ? "1" : "0";
 
@@ -58,29 +61,45 @@ export class RootNode extends NodeBase {
     const api = new AtelierAPI(this.workspaceFolder);
     api.setNamespace(this.namespace);
     return api
-      .actionQuery(sql, [spec, direction, orderBy, systemFiles, flat, notStudio, generated])
+      .actionQuery(sql, [spec, direction, orderBy, systemFiles, flat ? "1" : "0", notStudio, generated])
       .then(data => {
         const content = data.result.content;
         return content;
       })
       .then(data =>
-        data
-          .map(el => {
-            const fullName = (this instanceof PackageNode ? this.fullName + "." : "") + el.Name;
-            switch (el.Type) {
-              case "9":
-                return new PackageNode(el.Name, fullName, category, this.options);
-              case "4":
-                return new ClassNode(el.Name, fullName, this.options);
-              case "0":
-              case "1":
-              case "2":
-                return new RoutineNode(el.Name, fullName, this.options);
-              default:
-                return null;
-            }
-          })
-          .filter(el => el !== null)
+        data.map(el => {
+          const fullName = (this instanceof PackageNode ? this.fullName + "." : "") + el.Name;
+          return {
+            ...el,
+            fullName,
+          };
+        })
       );
   }
+
+  public getItems(path: string, category: string): Promise<NodeBase[]> {
+    return this.getList(path, category, false).then(data =>
+      data
+        .map(el => {
+          switch (el.Type) {
+            case "9":
+              return new PackageNode(el.Name, el.fullName, category, this.options);
+            case "4":
+              return new ClassNode(el.Name, el.fullName, this.options);
+            case "0":
+            case "1":
+            case "2":
+              return new RoutineNode(el.Name, el.fullName, this.options);
+            default:
+              return null;
+          }
+        })
+        .filter(el => el !== null)
+    );
+  }
+
+  public getItems4Export(): Promise<string[]> {
+    const path = this instanceof PackageNode ? this.fullName + "/" : "";
+    return this.getList(path, "ALL", true).then(data => data.map(el => el.Name));
+  }
 }