@saltcorn/admin-models 0.8.5-beta.2 → 0.8.5-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -54,6 +54,9 @@ declare const _default: {
54
54
  target: string;
55
55
  loadAndSaveNewPlugin: (plugin: Plugin) => void;
56
56
  }) => Promise<void>;
57
+ upgrade_all_tenants_plugins: (requirePlugin: (arg0: Plugin, arg1: boolean) => {
58
+ version: string;
59
+ }) => Promise<void>;
57
60
  Tenant: typeof Tenant;
58
61
  };
59
62
  export = _default;
@@ -1 +1 @@
1
- {"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../models/tenant.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,aAAa,EAEb,KAAK,EACN,MAAM,8BAA8B,CAAC;AAItC,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAElD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AA+MxD;;GAEG;AACH,cAAM,MAAM;IAEV,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,IAAI,CAAC;IAId;;;OAGG;gBACS,CAAC,EAAE,MAAM;IAYrB;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,MAAM,EAAE,CAAC;IAKpB;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAM1D;;;;;OAKG;WACU,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAQhE;;;;;;;;;;;;;;;;;;;;;;;AAED,kBAWE"}
1
+ {"version":3,"file":"tenant.d.ts","sourceRoot":"","sources":["../../models/tenant.ts"],"names":[],"mappings":"AASA,OAAO,EACL,aAAa,EAEb,KAAK,EACN,MAAM,8BAA8B,CAAC;AAItC,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAElD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAC;AA+PxD;;GAEG;AACH,cAAM,MAAM;IAEV,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,IAAI,CAAC;IAId;;;OAGG;gBACS,CAAC,EAAE,MAAM;IAYrB;;;;OAIG;WACU,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,MAAM,EAAE,CAAC;IAKpB;;;OAGG;WACU,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAM1D;;;;;OAKG;WACU,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAQhE;;;;;;;;;;;;;;;;;;;;;;;;;;AAED,kBAYE"}
@@ -8,11 +8,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
8
8
  * @module tenant
9
9
  */
10
10
  const index_1 = __importDefault(require("@saltcorn/data/db/index"));
11
+ const { getState } = require("@saltcorn/data/db/state");
11
12
  const reset = require("@saltcorn/data/db/reset_schema");
12
13
  const internal_1 = require("@saltcorn/db-common/internal");
13
14
  const config_1 = __importDefault(require("@saltcorn/data/models/config"));
14
15
  const { setConfig } = config_1.default;
15
16
  const promises_1 = require("fs/promises");
17
+ const plugin_1 = __importDefault(require("@saltcorn/data/models/plugin"));
16
18
  const file_1 = __importDefault(require("@saltcorn/data/models/file"));
17
19
  const backup_1 = __importDefault(require("./backup"));
18
20
  const { create_backup, restore } = backup_1.default;
@@ -183,6 +185,43 @@ const create_tenant = async ({ t, plugin_loader, noSignalOrDB, loadAndSaveNewPlu
183
185
  }
184
186
  }
185
187
  };
188
+ const upgrade_all_tenants_plugins = async (requirePlugin) => {
189
+ const tenantList = [index_1.default.connectObj.default_schema, ...(await getAllTenants())];
190
+ const latest_versions = {};
191
+ for (const domain of tenantList) {
192
+ await index_1.default.runWithTenant(domain, async () => {
193
+ try {
194
+ const myplugins = await plugin_1.default.find({ source: "npm" });
195
+ for (const plugin of myplugins) {
196
+ if (latest_versions[plugin.location]) {
197
+ if (plugin.version !== latest_versions[plugin.location]) {
198
+ plugin.version = latest_versions[plugin.location];
199
+ await plugin.upsert();
200
+ }
201
+ }
202
+ else {
203
+ const prevVersion = plugin.version;
204
+ plugin.version = "latest";
205
+ const { version } = await requirePlugin(plugin, true);
206
+ getState().log(5, `Plugin ${plugin.location} latest version ${version} (previously ${prevVersion})`);
207
+ //console.log(plinfo)
208
+ if (version) {
209
+ latest_versions[plugin.location] = version;
210
+ if (prevVersion !== version) {
211
+ getState().log(3, `Upgrading plugin ${plugin.location} to version ${version}`);
212
+ plugin.version = version;
213
+ await plugin.upsert();
214
+ }
215
+ }
216
+ }
217
+ }
218
+ }
219
+ catch (e) {
220
+ getState().log(1, `Upgrading plugins error in tenant ${domain}: ${e.message}`);
221
+ }
222
+ });
223
+ }
224
+ };
186
225
  /**
187
226
  * Class Tenant
188
227
  */
@@ -247,6 +286,7 @@ module.exports = {
247
286
  deleteTenant,
248
287
  eachTenant,
249
288
  copy_tenant_template,
289
+ upgrade_all_tenants_plugins,
250
290
  Tenant,
251
291
  };
252
292
  //# sourceMappingURL=tenant.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tenant.js","sourceRoot":"","sources":["../../models/tenant.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tenant.js","sourceRoot":"","sources":["../../models/tenant.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@saltcorn/admin-models",
3
- "version": "0.8.5-beta.2",
3
+ "version": "0.8.5-beta.4",
4
4
  "description": "models only required by the admin interface for Saltcorn, open-source no-code platform",
5
5
  "homepage": "https://saltcorn.com",
6
6
  "scripts": {
@@ -26,10 +26,10 @@
26
26
  "!dist/tsconfig.ref.tsbuildinfo"
27
27
  ],
28
28
  "dependencies": {
29
- "@saltcorn/types": "0.8.5-beta.2",
30
- "@saltcorn/markup": "0.8.5-beta.2",
31
- "@saltcorn/db-common": "0.8.5-beta.2",
32
- "@saltcorn/data": "0.8.5-beta.2",
29
+ "@saltcorn/types": "0.8.5-beta.4",
30
+ "@saltcorn/markup": "0.8.5-beta.4",
31
+ "@saltcorn/db-common": "0.8.5-beta.4",
32
+ "@saltcorn/data": "0.8.5-beta.4",
33
33
  "adm-zip": "0.5.5",
34
34
  "chaos-guinea-pig": "^0.1.4",
35
35
  "csv-stringify": "^5.5.0",