@saltcorn/admin-models 1.1.1-beta.8 → 1.1.1-rc.2
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.
|
@@ -5,12 +5,14 @@ type SnapshotCfg = {
|
|
|
5
5
|
created: Date;
|
|
6
6
|
pack?: Pack;
|
|
7
7
|
hash: string;
|
|
8
|
+
name?: string;
|
|
8
9
|
};
|
|
9
10
|
declare class Snapshot {
|
|
10
11
|
id?: number;
|
|
11
12
|
created: Date;
|
|
12
13
|
pack?: Pack;
|
|
13
14
|
hash: string;
|
|
15
|
+
name?: string;
|
|
14
16
|
/**
|
|
15
17
|
* Library constructor
|
|
16
18
|
* @param {object} o
|
|
@@ -19,7 +21,7 @@ declare class Snapshot {
|
|
|
19
21
|
static find(where: Where, selectopts?: SelectOptions): Promise<Snapshot[]>;
|
|
20
22
|
static findOne(where: Where): Promise<Snapshot | null>;
|
|
21
23
|
static latest(): Promise<Snapshot | null>;
|
|
22
|
-
static take_if_changed(): Promise<boolean>;
|
|
24
|
+
static take_if_changed(name?: string): Promise<boolean>;
|
|
23
25
|
restore_entity(type: string, name: string): Promise<undefined>;
|
|
24
26
|
static entity_history(type: string, name: string): Promise<Snapshot[]>;
|
|
25
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../models/snapshot.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAczE,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAMlD,KAAK,WAAW,GAAG;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../models/snapshot.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAczE,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAMlD,KAAK,WAAW,GAAG;IACjB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,cAAM,QAAQ;IACZ,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,IAAI,CAAC;IACd,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;gBACS,CAAC,EAAE,WAAW,GAAG,QAAQ;WAQxB,IAAI,CACf,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,aAAa,GACzB,OAAO,CAAC,QAAQ,EAAE,CAAC;WAIT,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;WAM/C,MAAM,IAAI,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;WASlC,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBvD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;WA4BvD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;CA+B7E;AAED,SAAS,QAAQ,CAAC"}
|
package/dist/models/snapshot.js
CHANGED
|
@@ -22,6 +22,7 @@ class Snapshot {
|
|
|
22
22
|
this.created = o.created;
|
|
23
23
|
this.pack = o.pack;
|
|
24
24
|
this.hash = o.hash;
|
|
25
|
+
this.name = o.name;
|
|
25
26
|
}
|
|
26
27
|
static async find(where, selectopts) {
|
|
27
28
|
const us = await index_1.default.select("_sc_snapshots", where, selectopts);
|
|
@@ -41,7 +42,7 @@ class Snapshot {
|
|
|
41
42
|
else
|
|
42
43
|
return sns[0];
|
|
43
44
|
}
|
|
44
|
-
static async take_if_changed() {
|
|
45
|
+
static async take_if_changed(name) {
|
|
45
46
|
const latest = await Snapshot.latest();
|
|
46
47
|
const current_pack = await backup_1.default.create_pack_json(false, true);
|
|
47
48
|
//comparing objects is not accurate (too many false positives) so we hash instead
|
|
@@ -50,11 +51,12 @@ class Snapshot {
|
|
|
50
51
|
.update(JSON.stringify(current_pack))
|
|
51
52
|
.digest("hex")
|
|
52
53
|
.slice(0, 40);
|
|
53
|
-
if (!latest || latest.hash !== hash) {
|
|
54
|
+
if (!latest || latest.hash !== hash || name) {
|
|
54
55
|
await index_1.default.insert("_sc_snapshots", {
|
|
55
56
|
created: new Date(),
|
|
56
57
|
pack: current_pack,
|
|
57
58
|
hash,
|
|
59
|
+
name
|
|
58
60
|
});
|
|
59
61
|
return true;
|
|
60
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../models/snapshot.ts"],"names":[],"mappings":";;;;AAAA,oEAAyC;AACzC,kDAA0B;AAG1B,MAAM,EACJ,UAAU,EACV,SAAS,EACT,WAAW,EACX,SAAS,EACT,YAAY,EACZ,gBAAgB,GACjB,GAAG,cAAI,CAAC;AACT,sDAA8B;AAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,mCAAiC;AACjC,sEAA8C;AAE9C,sEAA8C;AAE9C,4EAAoD;AACpD,wFAA+D;
|
|
1
|
+
{"version":3,"file":"snapshot.js","sourceRoot":"","sources":["../../models/snapshot.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": "1.1.1-
|
|
3
|
+
"version": "1.1.1-rc.2",
|
|
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": {
|
|
@@ -27,10 +27,10 @@
|
|
|
27
27
|
"!dist/tsconfig.ref.tsbuildinfo"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@saltcorn/types": "1.1.1-
|
|
31
|
-
"@saltcorn/markup": "1.1.1-
|
|
32
|
-
"@saltcorn/db-common": "1.1.1-
|
|
33
|
-
"@saltcorn/data": "1.1.1-
|
|
30
|
+
"@saltcorn/types": "1.1.1-rc.2",
|
|
31
|
+
"@saltcorn/markup": "1.1.1-rc.2",
|
|
32
|
+
"@saltcorn/db-common": "1.1.1-rc.2",
|
|
33
|
+
"@saltcorn/data": "1.1.1-rc.2",
|
|
34
34
|
"adm-zip": "0.5.5",
|
|
35
35
|
"chaos-guinea-pig": "0.1.6",
|
|
36
36
|
"csv-stringify": "^5.5.0",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"access": "public"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@saltcorn/sbadmin2": "1.1.1-
|
|
51
|
+
"@saltcorn/sbadmin2": "1.1.1-rc.2",
|
|
52
52
|
"@types/adm-zip": "^0.4.34",
|
|
53
53
|
"@types/dateformat": "^5.0.0",
|
|
54
54
|
"@types/jest": "^29.5.11",
|