@saltcorn/cli 0.6.3 → 0.6.4-beta.4

package/oclif.manifest.json

@@ -1 +1 @@
-{"version":"0.6.3","commands":{"add-schema":{"id":"add-schema","description":"Add Saltcorn schema to existing database","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"backup":{"id":"backup","description":"Backup the PostgreSQL database to a file with pg_dump or zip","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"output":{"name":"output","type":"option","char":"o","description":"output filename"},"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"},"zip":{"name":"zip","type":"boolean","char":"z","description":"zip format","allowNo":false}},"args":[]},"create-tenant":{"id":"create-tenant","description":"Create a tenant","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"email":{"name":"email","type":"option","char":"e","description":"Email of owner of tenant"},"description":{"name":"description","type":"option","char":"d","description":"Description of tenant"}},"args":[{"name":"tenant","description":"Tenant subdomain to create","required":true}]},"create-user":{"id":"create-user","description":"Create a new user","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"admin":{"name":"admin","type":"boolean","char":"a","description":"Admin user","allowNo":false},"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"},"email":{"name":"email","type":"option","char":"e","description":"email"},"role":{"name":"role","type":"option","char":"r","description":"role"},"password":{"name":"password","type":"option","char":"p","description":"password"}},"args":[]},"delete-tenants":{"id":"delete-tenants","description":"Delete inactive tenants","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"fixtures":{"id":"fixtures","description":"Load fixtures for testing\n...\nThis manual step it is never required for users and rarely required for developers\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"reset":{"name":"reset","type":"boolean","char":"r","description":"Also reset schema","allowNo":false},"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"}},"args":[]},"info":{"id":"info","description":"Show paths\n...\nShow configuration and file store paths\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":["paths"],"flags":{"json":{"name":"json","type":"boolean","char":"j","description":"json format","allowNo":false}},"args":[]},"install-pack":{"id":"install-pack","description":"Install a pack","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"},"name":{"name":"name","type":"option","char":"n","description":"Pack name in store"},"file":{"name":"file","type":"option","char":"f","description":"File with pack JSON"}},"args":[]},"install-plugin":{"id":"install-plugin","description":"Install a plugin","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"},"name":{"name":"name","type":"option","char":"n","description":"Plugin name in store"},"directory":{"name":"directory","type":"option","char":"d","description":"Directory with local plugin"}},"args":[]},"list-tenants":{"id":"list-tenants","description":"List tenants in CSV format","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"localize-plugin":{"id":"localize-plugin","description":"Convert plugin to local plugin","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"}},"args":[{"name":"plugin","description":"Current plugin name","required":true},{"name":"path","description":"path to local plugin","required":true}]},"make-migration":{"id":"make-migration","description":"Create a new blank Database structure migration file.\nThese migrations update database structure.\nYou should not normally need to run this\nunless you are a developer.\n","usage":"make-migration","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"migrate":{"id":"migrate","description":"Run Database structure migrations\n...\nNOTE!\n- Please stop Saltcorn before run DB migrations.\n- Please make db backup before migration.\n- There are no way to rollback migration if you doesn't make backup.\n\nThis is not normally required as migrations will be run when the server starts.\nHowever, this command may be useful if you are running multiple application\nservers and need to control when the migrations are run.\n","usage":"saltcorn migrate","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"plugins":{"id":"plugins","description":"List and upgrade plugins for tenants\n...\nExtra documentation goes here\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"examples":["plugins -v - verbose output of commands","plugins -u -d - dry-run for plugin update","plugins -u -f - force plugin update"],"flags":{"upgrade":{"name":"upgrade","type":"boolean","char":"u","description":"Upgrade","allowNo":false},"dryRun":{"name":"dryRun","type":"boolean","char":"d","description":"Upgrade dry-run","allowNo":false},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Verbose output","allowNo":false},"force":{"name":"force","type":"boolean","char":"f","description":"Force update","allowNo":false},"name":{"name":"name","type":"option","char":"n","description":"Plugin name"}},"args":[]},"release":{"id":"release","description":"Release a new saltcorn version","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"version","description":"New version number","required":true}]},"reset-schema":{"id":"reset-schema","description":"Reset the database\n...\nThis will delete all existing information\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","char":"f","description":"force","allowNo":false},"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"}},"args":[]},"restore":{"id":"restore","description":"Restore a previously backed up database (zip or sqlc format)","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"}},"args":[{"name":"file","description":"backup file to restore","required":true}]},"rm-tenant":{"id":"rm-tenant","description":"Remove a tenant","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"tenant","description":"Tenant to remove","required":true}]},"run-benchmark":{"id":"run-benchmark","description":"Run benchmark","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"token":{"name":"token","type":"option","char":"t","description":"API Token for reporting results"},"benchmark":{"name":"benchmark","type":"option","char":"b","description":"Which benchmark to run"},"delay":{"name":"delay","type":"option","char":"d","description":"delay between runs (s)","default":30}},"args":[{"name":"baseurl","description":"Base URL","required":false}]},"run-tests":{"id":"run-tests","description":"Run test suites","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"coverage":{"name":"coverage","type":"boolean","char":"c","description":"Coverage","allowNo":false},"testFilter":{"name":"testFilter","type":"option","char":"t","description":"Filter tests by suite or test name"},"watch":{"name":"watch","type":"boolean","description":"Watch files for changes and rerun tests related to changed files.","allowNo":false},"watchAll":{"name":"watchAll","type":"boolean","description":"Watch files for changes and rerun all tests.","allowNo":false}},"args":[{"name":"package","description":"which package to run tests for"}]},"scheduler":{"id":"scheduler","description":"Run the Saltcorn scheduler","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Verbose","allowNo":false}},"args":[]},"serve":{"id":"serve","description":"Start the Saltcorn server","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"port","default":3000},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Verbose","allowNo":false},"watchReaper":{"name":"watchReaper","type":"boolean","char":"r","description":"Watch reaper","allowNo":false},"dev":{"name":"dev","type":"boolean","char":"d","description":"Run in dev mode and re-start on file changes","allowNo":false},"addschema":{"name":"addschema","type":"boolean","char":"a","description":"Add schema if missing","allowNo":false},"nomigrate":{"name":"nomigrate","type":"boolean","char":"n","description":"No migrations","allowNo":false},"noscheduler":{"name":"noscheduler","type":"boolean","char":"s","description":"No scheduler","allowNo":false}},"args":[]},"set-cfg":{"id":"set-cfg","description":"Set a configuration value","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"},"plugin":{"name":"plugin","type":"option","char":"p","description":"plugin"}},"args":[{"name":"key","description":"Configuration key","required":true},{"name":"value","description":"Configuration value (JSON or string)","required":true}]},"setup-benchmark":{"id":"setup-benchmark","description":"Setup an instance for benchmarking","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"}},"args":[]},"setup":{"id":"setup","description":"Set up a new system\n...\nThis will attempt to install or connect a database, and set up a \nconfiguration file\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"coverage":{"name":"coverage","type":"boolean","char":"c","description":"Coverage","allowNo":false}},"args":[]},"test-plugin":{"id":"test-plugin","description":"Test a plugin\n...\nExtra documentation goes here\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"path","description":"path to plugin package","required":true}]},"transform-field":{"id":"transform-field","description":"transform an existing field by applying a calculated expression","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"expression","description":"expression to calculate field","required":true},{"name":"field","description":"field name","required":true},{"name":"table","description":"table name","required":true},{"name":"tenant","description":"tenant name","required":false}]}}}
+{"version":"0.6.4-beta.4","commands":{"add-schema":{"id":"add-schema","description":"Add Saltcorn schema to existing database","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"backup":{"id":"backup","description":"Backup the PostgreSQL database to a file with pg_dump or zip","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"output":{"name":"output","type":"option","char":"o","description":"output filename"},"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"},"zip":{"name":"zip","type":"boolean","char":"z","description":"zip format","allowNo":false}},"args":[]},"create-tenant":{"id":"create-tenant","description":"Create a tenant","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"email":{"name":"email","type":"option","char":"e","description":"Email of owner of tenant"},"description":{"name":"description","type":"option","char":"d","description":"Description of tenant"}},"args":[{"name":"tenant","description":"Tenant subdomain to create","required":true}]},"create-user":{"id":"create-user","description":"Create a new user","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"admin":{"name":"admin","type":"boolean","char":"a","description":"Admin user","allowNo":false},"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"},"email":{"name":"email","type":"option","char":"e","description":"email"},"role":{"name":"role","type":"option","char":"r","description":"role"},"password":{"name":"password","type":"option","char":"p","description":"password"}},"args":[]},"delete-tenants":{"id":"delete-tenants","description":"Delete inactive tenants","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"fixtures":{"id":"fixtures","description":"Load fixtures for testing\n...\nThis manual step it is never required for users and rarely required for developers\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"reset":{"name":"reset","type":"boolean","char":"r","description":"Also reset schema","allowNo":false},"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"}},"args":[]},"info":{"id":"info","description":"Show paths\n...\nShow configuration and file store paths\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":["paths"],"flags":{"json":{"name":"json","type":"boolean","char":"j","description":"json format","allowNo":false}},"args":[]},"install-pack":{"id":"install-pack","description":"Install a pack","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"},"name":{"name":"name","type":"option","char":"n","description":"Pack name in store"},"file":{"name":"file","type":"option","char":"f","description":"File with pack JSON"}},"args":[]},"install-plugin":{"id":"install-plugin","description":"Install a plugin","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"},"name":{"name":"name","type":"option","char":"n","description":"Plugin name in store"},"directory":{"name":"directory","type":"option","char":"d","description":"Directory with local plugin"}},"args":[]},"list-tenants":{"id":"list-tenants","description":"List tenants in CSV format","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"localize-plugin":{"id":"localize-plugin","description":"Convert plugin to local plugin","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"}},"args":[{"name":"plugin","description":"Current plugin name","required":true},{"name":"path","description":"path to local plugin","required":true}]},"make-migration":{"id":"make-migration","description":"Create a new blank Database structure migration file.\nThese migrations update database structure.\nYou should not normally need to run this\nunless you are a developer.\n","usage":"make-migration","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"migrate":{"id":"migrate","description":"Run Database structure migrations\n...\nNOTE!\n- Please stop Saltcorn before run DB migrations.\n- Please make db backup before migration.\n- There are no way to rollback migration if you doesn't make backup.\n\nThis is not normally required as migrations will be run when the server starts.\nHowever, this command may be useful if you are running multiple application\nservers and need to control when the migrations are run.\n","usage":"saltcorn migrate","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[]},"plugins":{"id":"plugins","description":"List and upgrade plugins for tenants\n...\nExtra documentation goes here\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"examples":["plugins -v - verbose output of commands","plugins -u -d - dry-run for plugin update","plugins -u -f - force plugin update"],"flags":{"upgrade":{"name":"upgrade","type":"boolean","char":"u","description":"Upgrade","allowNo":false},"dryRun":{"name":"dryRun","type":"boolean","char":"d","description":"Upgrade dry-run","allowNo":false},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Verbose output","allowNo":false},"force":{"name":"force","type":"boolean","char":"f","description":"Force update","allowNo":false},"name":{"name":"name","type":"option","char":"n","description":"Plugin name"}},"args":[]},"release":{"id":"release","description":"Release a new saltcorn version","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"version","description":"New version number","required":true}]},"reset-schema":{"id":"reset-schema","description":"Reset the database\n...\nThis will delete all existing information\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","char":"f","description":"force","allowNo":false},"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"}},"args":[]},"restore":{"id":"restore","description":"Restore a previously backed up database (zip or sqlc format)","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"}},"args":[{"name":"file","description":"backup file to restore","required":true}]},"rm-tenant":{"id":"rm-tenant","description":"Remove a tenant","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"tenant","description":"Tenant to remove","required":true}]},"run-benchmark":{"id":"run-benchmark","description":"Run benchmark","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"token":{"name":"token","type":"option","char":"t","description":"API Token for reporting results"},"benchmark":{"name":"benchmark","type":"option","char":"b","description":"Which benchmark to run"},"delay":{"name":"delay","type":"option","char":"d","description":"delay between runs (s)","default":30}},"args":[{"name":"baseurl","description":"Base URL","required":false}]},"run-tests":{"id":"run-tests","description":"Run test suites","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"coverage":{"name":"coverage","type":"boolean","char":"c","description":"Coverage","allowNo":false},"testFilter":{"name":"testFilter","type":"option","char":"t","description":"Filter tests by suite or test name"},"watch":{"name":"watch","type":"boolean","description":"Watch files for changes and rerun tests related to changed files.","allowNo":false},"watchAll":{"name":"watchAll","type":"boolean","description":"Watch files for changes and rerun all tests.","allowNo":false}},"args":[{"name":"package","description":"which package to run tests for"}]},"scheduler":{"id":"scheduler","description":"Run the Saltcorn scheduler","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Verbose","allowNo":false}},"args":[]},"serve":{"id":"serve","description":"Start the Saltcorn server","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"port","default":3000},"verbose":{"name":"verbose","type":"boolean","char":"v","description":"Verbose","allowNo":false},"watchReaper":{"name":"watchReaper","type":"boolean","char":"r","description":"Watch reaper","allowNo":false},"dev":{"name":"dev","type":"boolean","char":"d","description":"Run in dev mode and re-start on file changes","allowNo":false},"addschema":{"name":"addschema","type":"boolean","char":"a","description":"Add schema if missing","allowNo":false},"nomigrate":{"name":"nomigrate","type":"boolean","char":"n","description":"No migrations","allowNo":false},"noscheduler":{"name":"noscheduler","type":"boolean","char":"s","description":"No scheduler","allowNo":false}},"args":[]},"set-cfg":{"id":"set-cfg","description":"Set a configuration value","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"},"plugin":{"name":"plugin","type":"option","char":"p","description":"plugin"}},"args":[{"name":"key","description":"Configuration key","required":true},{"name":"value","description":"Configuration value (JSON or string)","required":true}]},"setup-benchmark":{"id":"setup-benchmark","description":"Setup an instance for benchmarking","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"tenant":{"name":"tenant","type":"option","char":"t","description":"tenant"}},"args":[]},"setup":{"id":"setup","description":"Set up a new system\n...\nThis will attempt to install or connect a database, and set up a \nconfiguration file\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{"coverage":{"name":"coverage","type":"boolean","char":"c","description":"Coverage","allowNo":false}},"args":[]},"test-plugin":{"id":"test-plugin","description":"Test a plugin\n...\nExtra documentation goes here\n","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"path","description":"path to plugin package","required":true}]},"transform-field":{"id":"transform-field","description":"transform an existing field by applying a calculated expression","pluginName":"@saltcorn/cli","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"expression","description":"expression to calculate field","required":true},{"name":"field","description":"field name","required":true},{"name":"table","description":"table name","required":true},{"name":"tenant","description":"tenant name","required":false}]}}}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@saltcorn/cli",
   "description": "Command-line interface for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
-  "version": "0.6.3",
+  "version": "0.6.4-beta.4",
   "author": "Tom Nielsen @glutamate",
   "bin": {
     "saltcorn": "./bin/saltcorn"
@@ -10,19 +10,22 @@
   "bugs": "https://github.com/saltcorn/saltcorn/issues",
   "dependencies": {
     "@oclif/command": "^1.8.16",
-    "@oclif/config": "^1.18.2",
+    "@oclif/config": "^1.18.3",
     "@oclif/plugin-help": "^3.3.1",
-    "@saltcorn/data": "0.6.3",
-    "@saltcorn/server": "0.6.3",
+    "@saltcorn/admin-models": "0.6.4-beta.4",
+    "@saltcorn/data": "0.6.4-beta.4",
+    "@saltcorn/server": "0.6.4-beta.4",
     "cli-ux": "^5.6.7",
     "contractis": "^0.1.0",
     "dateformat": "^3.0.3",
     "inquirer": "^7.3.3",
     "js-yaml": "^4.1.0",
     "node-fetch": "2.6.2",
-    "node-watch": "^0.7.2",
+    "node-sass": "^6.0.1",
+    "node-watch": "^0.7.3",
+    "source-map-support": "^0.5.21",
     "sudo": "^1.0.3",
-    "systeminformation": "^5.10.0",
+    "systeminformation": "^5.11.1",
     "tcp-port-used": "^1.0.2",
     "wrk": "^1.2.1"
   },

package/src/commands/backup.js

@@ -28,20 +28,21 @@ class BackupCommand extends Command {
     const { flags } = this.parse(BackupCommand);
 
     if (flags.tenant) {
-      const { create_backup } = require("@saltcorn/data/models/backup");
+      const { create_backup } = require("@saltcorn/admin-models/models/backup");
 
       const db = require("@saltcorn/data/db");
       const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
       const { init_multi_tenant } = require("@saltcorn/data/db/state");
-
+      const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
       await loadAllPlugins();
-      await init_multi_tenant(loadAllPlugins);
+      const tenants = await getAllTenants();
+      await init_multi_tenant(loadAllPlugins, undefined, tenants);
       await db.runWithTenant(flags.tenant, async () => {
         const fnm = await create_backup(flags.output);
         console.log(fnm);
       });
     } else if (flags.zip) {
-      const { create_backup } = require("@saltcorn/data/models/backup");
+      const { create_backup } = require("@saltcorn/admin-models/models/backup");
       const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
       await loadAllPlugins();
       const fnm = await create_backup(flags.output);

package/src/commands/create-tenant.js

@@ -13,7 +13,7 @@ const { Command, flags } = require("@oclif/command");
  * @extends oclif.Command
  * @category saltcorn-cli
  */
-class CreateTenantCommand extends Command {
+class CreateTenantCommand extends Command { 
   /**
    * @returns {Promise<void>}
    */
@@ -26,14 +26,14 @@ class CreateTenantCommand extends Command {
       this.exit(0);
       return;
     }
-    const { createTenant } = require("@saltcorn/data/models/tenant");
+    const { insertTenant, switchToTenant } = require("@saltcorn/admin-models/models/tenant");
     //const url = typeof flags.url !== `undefined`? flags.url : "";
     //const email = typeof flags.email !== `undefined`? flags.email : "";
     //const description = flags.description !==  `undefined` ? flags.description : "";
     // TODO Do we need to set default value for base url or not? And what is correct way to get domain of base_url here?
     // const base =  await db.getgetConfig("base_url");
-    await createTenant(args.tenant, flags.url, flags.email, flags.description);
-    console.log()
+    await switchToTenant(await insertTenant(args.tenant, flags.email, flags.description), flags.url);
+    console.log();
     this.exit(0);
   }
 }

package/src/commands/delete-tenants.js

@@ -17,7 +17,7 @@ class DeleteTenantsCommand extends Command {
     const {
       getAllTenantRows,
       deleteTenant,
-    } = require("@saltcorn/data/models/tenant");
+    } = require("@saltcorn/admin-models/models/tenant");
     const db = require("@saltcorn/data/db");
     const tenantList = await getAllTenantRows();
     const tensExamine = tenantList.slice(

package/src/commands/fixtures.js

@@ -20,8 +20,10 @@ class FixturesCommand extends Command {
     if (flags.tenant) {
       const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
       const { init_multi_tenant } = require("@saltcorn/data/db/state");
+      const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
       await loadAllPlugins();
-      await init_multi_tenant(loadAllPlugins);
+      const tenants = await getAllTenants();
+      await init_multi_tenant(loadAllPlugins, undefined, tenants);
     }
     await maybe_as_tenant(flags.tenant, async () => {
       if (flags.reset) {

package/src/commands/install-pack.js

@@ -20,7 +20,7 @@ class InstallPackCommand extends Command {
     const {
       fetch_pack_by_name,
       install_pack,
-    } = require("@saltcorn/data/models/pack");
+    } = require("@saltcorn/admin-models/models/pack");
     const load_plugins = require("@saltcorn/server/load_plugins");
 
     if (!flags.name && !flags.file) {
@@ -31,8 +31,10 @@ class InstallPackCommand extends Command {
     }
     const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
     const { init_multi_tenant } = require("@saltcorn/data/db/state");
+    const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
     await loadAllPlugins();
-    await init_multi_tenant(loadAllPlugins);
+    const tenants = await getAllTenants();
+    await init_multi_tenant(loadAllPlugins, undefined, tenants);
 
     await maybe_as_tenant(flags.tenant, async () => {
       if (flags.name) {

package/src/commands/install-plugin.js

@@ -21,7 +21,7 @@ class InstallPluginCommand extends Command {
     const {
       fetch_pack_by_name,
       install_pack,
-    } = require("@saltcorn/data/models/pack");
+    } = require("@saltcorn/admin-models/models/pack");
     const load_plugins = require("@saltcorn/server/load_plugins");
 
     if (!flags.name && !flags.directory) {
@@ -32,8 +32,10 @@ class InstallPluginCommand extends Command {
     }
     const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
     const { init_multi_tenant } = require("@saltcorn/data/db/state");
+    const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
     await loadAllPlugins();
-    await init_multi_tenant(loadAllPlugins);
+    const tenants = await getAllTenants();
+    await init_multi_tenant(loadAllPlugins, undefined, tenants);
 
     const Plugin = require("@saltcorn/data/models/plugin");
 

package/src/commands/list-tenants.js

@@ -4,7 +4,6 @@
  */
 const { Command, flags } = require("@oclif/command");
 
-
 /**
  * ListTenantsCommand Class
  * @extends oclif.Command
@@ -15,19 +14,22 @@ class ListTenantsCommand extends Command {
    * @returns {Promise<void>}
    */
   async run() {
-    const { getAllTenants } = require("@saltcorn/data/models/tenant");
+    const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
     const db = require("@saltcorn/data/db");
     const tenantList = await getAllTenants();
-    console.log("domain                  ,    files,    users,   tables,    views,    pages");
+    console.log(
+      "domain                  ,    files,    users,   tables,    views,    pages"
+    );
     for (const domain of tenantList)
       await db.runWithTenant(domain, async () => {
-        console.log("%s, %s, %s, %s, %s, %s",
+        console.log(
+          "%s, %s, %s, %s, %s, %s",
           domain.padEnd(24),
-          (await db.count("_sc_files" )).toString().padStart(8),
-          (await db.count("users"     )).toString().padStart(8),
+          (await db.count("_sc_files")).toString().padStart(8),
+          (await db.count("users")).toString().padStart(8),
           (await db.count("_sc_tables")).toString().padStart(8),
-          (await db.count("_sc_views" )).toString().padStart(8),
-          (await db.count("_sc_pages" )).toString().padStart(8)
+          (await db.count("_sc_views")).toString().padStart(8),
+          (await db.count("_sc_pages")).toString().padStart(8)
         );
       });
     this.exit(0);
@@ -43,6 +45,6 @@ ListTenantsCommand.description = `List tenants in CSV format`;
 /**
  * @type {string}
  */
-ListTenantsCommand.help= "Extra help here"
+ListTenantsCommand.help = "Extra help here";
 
 module.exports = ListTenantsCommand;

package/src/commands/migrate.js

@@ -4,7 +4,7 @@
  */
 const { Command, flags } = require("@oclif/command");
 const db = require("@saltcorn/data/db");
-const { eachTenant } = require("@saltcorn/data/models/tenant");
+const { eachTenant } = require("@saltcorn/admin-models/models/tenant");
 // todo add dryrun mode
 
 /**

package/src/commands/plugins.js

@@ -16,7 +16,7 @@ class PluginsCommand extends Command {
   async run() {
     const db = require("@saltcorn/data/db");
     const { requirePlugin } = require("@saltcorn/server/load_plugins");
-    const { getAllTenants } = require("@saltcorn/data/models/tenant");
+    const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
     const Plugin = require("@saltcorn/data/models/plugin");
     var plugins = [];
     const { flags } = this.parse(PluginsCommand);

package/src/commands/release.js

@@ -28,6 +28,10 @@ class ReleaseCommand extends Command {
       "@saltcorn/types": { dir: "saltcorn-types", publish: true },
       "@saltcorn/builder": { dir: "saltcorn-builder", publish: true },
       "@saltcorn/data": { dir: "saltcorn-data", publish: true },
+      "@saltcorn/admin-models": {
+        dir: "saltcorn-admin-models",
+        publish: true,
+      },
       "@saltcorn/random-tests": { dir: "saltcorn-random-tests" },
       "@saltcorn/server": { dir: "server", publish: true },
       "@saltcorn/base-plugin": { dir: "saltcorn-base-plugin", publish: true },
@@ -64,7 +68,7 @@ class ReleaseCommand extends Command {
       });
     };
     const publish = (dir) =>
-      spawnSync("npm", ["publish"], {
+      spawnSync("npm", ["publish", "--access=public"], {
         stdio: "inherit",
         cwd: `packages/${dir}/`,
       });

package/src/commands/restore.js

@@ -14,8 +14,8 @@ const { maybe_as_tenant } = require("../common");
  */
 class RestoreCommand extends Command {
   /**
-   * 
-   * @param {string} fnm 
+   *
+   * @param {string} fnm
    * @returns {Promise<void>}
    */
   async pg_restore(fnm) {
@@ -35,13 +35,13 @@ class RestoreCommand extends Command {
   }
 
   /**
-   * 
-   * @param {string} fnm 
-   * @param {object} tenant 
+   *
+   * @param {string} fnm
+   * @param {object} tenant
    * @returns {Promise<void>}
    */
   async zip_restore(fnm, tenant) {
-    const { restore } = require("@saltcorn/data/models/backup");
+    const { restore } = require("@saltcorn/admin-models/models/backup");
     const User = require("@saltcorn/data/models/user");
     const load_plugins = require("@saltcorn/server/load_plugins");
     await maybe_as_tenant(tenant, async () => {

package/src/commands/rm-tenant.js

@@ -15,7 +15,7 @@ class RmTenantCommand extends Command {
    */
   async run() {
     const { args } = this.parse(RmTenantCommand);
-    const { deleteTenant } = require("@saltcorn/data/models/tenant");
+    const { deleteTenant } = require("@saltcorn/admin-models/models/tenant");
     await deleteTenant(args.tenant);
     this.exit(0);
   }

package/src/commands/run-tests.js

@@ -94,9 +94,7 @@ class RunTestsCommand extends Command {
     spawnSync("npm", ["run", "tsc"], {
       stdio: "inherit",
     });
-
     const db = require("@saltcorn/data/db");
-
     if (db.isSQLite) {
       const testdbpath = "/tmp/sctestdb";
       await db.changeConnection({ sqlite_path: testdbpath });

package/src/commands/setup-benchmark.js

@@ -15,21 +15,20 @@ class SetupBenchmarkCommand extends Command {
    * @returns {Promise<void>}
    */
   async install_forum_pack() {
-    const {
-      fetch_pack_by_name,
-      install_pack,
-    } = require("@saltcorn/data/models/pack");
+    const { fetch_pack_by_name, install_pack } = require("@saltcorn/data/pack");
     const load_plugins = require("@saltcorn/server/load_plugins");
     const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
     const { init_multi_tenant } = require("@saltcorn/data/db/state");
+    const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
     await loadAllPlugins();
-    await init_multi_tenant(loadAllPlugins);
+    const tenants = await getAllTenants();
+    await init_multi_tenant(loadAllPlugins, undefined, tenants);
     const pack = await fetch_pack_by_name("Forum");
     await install_pack(pack.pack, flags.name, (p) =>
       load_plugins.loadAndSaveNewPlugin(p)
     );
   }
-  
+
   /**
    * @returns {Promise<void>}
    */
@@ -68,12 +67,11 @@ class SetupBenchmarkCommand extends Command {
         thread: thread_id,
       });
       // install page
-      const { install_pack } = require("@saltcorn/data/models/pack");
+      const { install_pack } = require("@saltcorn/admin-models/models/pack");
       await install_pack(simple_page_pack, flags.name, () => {});
       // install file
       const { rick_file } = require("@saltcorn/data/tests/mocks");
       await rick_file();
-
     });
   }
 }

package/src/commands/transform-field.js

@@ -8,7 +8,7 @@ const { Command, flags } = require("@oclif/command");
  * TransformFieldCommand Class
  * @extends oclif.Command
  * @category saltcorn-cli
- */    
+ */
 class TransformFieldCommand extends Command {
   /**
    * @returns {Promise<void>}
@@ -18,14 +18,17 @@ class TransformFieldCommand extends Command {
     const Table = require("@saltcorn/data/models/table");
     const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
     const { getState, init_multi_tenant } = require("@saltcorn/data/db/state");
+    const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
 
     const {
       get_async_expression_function,
     } = require("@saltcorn/data/models/expression");
     const { args } = this.parse(TransformFieldCommand);
     await loadAllPlugins();
-    if (args.tenant && db.is_it_multi_tenant())
-      await init_multi_tenant(loadAllPlugins);
+    if (args.tenant && db.is_it_multi_tenant()) {
+      const tenants = await getAllTenants();
+      await init_multi_tenant(loadAllPlugins, undefined, tenants);
+    }
     const tenant = args.tenant || db.connectObj.default_schema;
     await db.runWithTenant(tenant, async () => {
       const table = await Table.findOne({ name: args.table });