@saltcorn/cli 1.1.0-beta.9 → 1.1.1-beta.0

package/src/commands/restore.js

@@ -6,6 +6,7 @@ const { Command, Flags, Args } = require("@oclif/core");
 const { spawnSync } = require("child_process");
 const path = require("path");
 const { maybe_as_tenant } = require("../common");
+const fs = require("fs");
 
 /**
  * RestoreCommand Class
@@ -72,6 +73,32 @@ class RestoreCommand extends Command {
       case ".zip":
         this.zip_restore(args.file, flags.tenant);
         break;
+      case ".json":
+        if (!args.file.includes("domain_files.json")) {
+          console.error("unknown filetype: " + path.extname(args.file));
+          this.exit(1);
+        }
+        const fileConts = fs.readFileSync(args.file);
+        const domain_files = JSON.parse(fileConts);
+        const {
+          insertTenant,
+          getAllTenants,
+          switchToTenant,
+        } = require("@saltcorn/admin-models/models/tenant");
+        const { add_tenant } = require("@saltcorn/data/db/state");
+
+        let existing_tenants = new Set(await getAllTenants());
+        existing_tenants.add("public");
+        for (const [tenant, fnm] of Object.entries(domain_files)) {
+          console.log("restore", tenant, "from", fnm);
+          if (!existing_tenants.has(tenant)) {
+            const tenrow = await insertTenant(tenant);
+            add_tenant(tenant);
+            await switchToTenant(tenrow);
+          }
+          await this.zip_restore(fnm, tenant === "public" ? undefined : tenant);
+        }
+        break;
       default:
         console.error("unknown filetype: " + path.extname(args.file));
         this.exit(1);

package/src/commands/sync-upload-data.js

@@ -232,7 +232,7 @@ class SyncUploadData extends Command {
   async run() {
     let returnCode = 0,
       inTransaction = false;
-    const { flags } = await await this.parse(SyncUploadData);
+    const { flags } = await this.parse(SyncUploadData);
     if (db.is_it_multi_tenant() && flags.tenantAppName) {
       await init_multi_tenant(loadAllPlugins, true, [flags.tenantAppName]);
     }

package/src/commands/build-cordova-builder.js

@@ -1,50 +0,0 @@
-const { Command, Flags } = require("@oclif/core");
-const { join } = require("path");
-const { spawnSync } = require("child_process");
-
-/**
- * This is a oclif command to build the 'saltcorn/cordova-builder' docker image.
- * The image is used in the 'build-app' command to run the cordova commands.
- * Please make sure docker is callable without sudo (see rootless mode, or add the user to the docker group).
- */
-class BuildCordovaBuilder extends Command {
-  async run() {
-    const { flags } = await this.parse(BuildCordovaBuilder);
-    const dockerDir = join(
-      require.resolve("@saltcorn/mobile-builder"),
-      "..",
-      "..",
-      "docker"
-    );
-    const dArgs = ["build", dockerDir, "--network", "host"];
-    if (flags.buildClean) dArgs.push("--no-cache");
-    dArgs.push(
-      "-f",
-      join(dockerDir, "Dockerfile"),
-      "-t",
-      "saltcorn/cordova-builder",
-      "--progress=plain"
-    );
-    const result = spawnSync("docker", dArgs, { cwd: ".", stdio: "inherit" });
-    if (result.error) console.log(result.error.toString());
-  }
-}
-
-BuildCordovaBuilder.description =
-  "Build the 'saltcorn/cordova-builder' docker image";
-
-BuildCordovaBuilder.help =
-  "Build the 'saltcorn/cordova-builder' docker image. " +
-  "This image is used in the 'build-app' command to run the cordova commands. " +
-  "Please make sure docker is callable without using root (see rootless mode, or add the user to the docker group).";
-
-BuildCordovaBuilder.flags = {
-  buildClean: Flags.boolean({
-    name: "build clean",
-    string: "clean",
-    description: "run a clean build with --no-cache",
-    default: false,
-  }),
-};
-
-module.exports = BuildCordovaBuilder;