@lilaquadrat/studio 10.0.0-beta.52 → 10.0.0-beta.54
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.
- package/lib/src/models/mailFrom.model.js +2 -4
- package/lib/src/models/mailFrom.model.js.map +1 -1
- package/lib/src/services/mailFrom.service.d.ts +1 -1
- package/lib/src/services/structures.service.js +3 -1
- package/lib/src/services/structures.service.js.map +1 -1
- package/lib/tests/groupStructuresByModel.spec.d.ts +1 -0
- package/lib/tests/groupStructuresByModel.spec.js +33 -0
- package/lib/tests/groupStructuresByModel.spec.js.map +1 -0
- package/package.json +1 -1
|
@@ -58,13 +58,11 @@ model.setSchema({
|
|
|
58
58
|
dns: {
|
|
59
59
|
type: 'object',
|
|
60
60
|
properties: {
|
|
61
|
-
|
|
62
|
-
spf: { type: 'string' },
|
|
61
|
+
serverIp: { type: 'string' },
|
|
63
62
|
dkim: { type: 'string' },
|
|
64
|
-
dmarc: { type: 'string' },
|
|
65
63
|
txt: { type: 'string' },
|
|
66
64
|
},
|
|
67
|
-
required: ['
|
|
65
|
+
required: ['serverIp', 'dkim', 'txt'],
|
|
68
66
|
additionalProperties: false,
|
|
69
67
|
},
|
|
70
68
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mailFrom.model.js","sourceRoot":"","sources":["../../../src/models/mailFrom.model.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,6BAA6B,CAAC;AAElD,MAAM,KAAK,GAAG,IAAI,OAAO,CAAW,UAAU,EAAE,UAAU,CAAC,CAAC;AAE5D,KAAK,CAAC,eAAe,GAAG,CAAC,cAAc,CAAC,CAAC;AAEzC,KAAK,CAAC,QAAQ,CACZ;IACE,GAAG,EAAE;QACH,MAAM,EAAE,CAAC;KACV;IACD,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,QAAQ;CACf,EACD,CAAC,CACF,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,iCAAiC,EAAE;QACtE,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qBAAqB,EAAE;QAC3D,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE;QAC7C,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE;QACxD,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC7B,YAAY,EAAE;YACZ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC1B;KACF;IACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,CAAC;IACxE,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CACT,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE;QAC7C,YAAY,EAAE;YACZ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC1B;KACF;IACD,QAAQ,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC;IACzC,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CACT,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAC9B;IACD,QAAQ,EAAE,CAAC,UAAU,CAAC;IACtB,oBAAoB,EAAE,KAAK;CAC5B,EACD,UAAU,CACX,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE;KACzD;IACD,QAAQ,EAAE,CAAC,QAAQ,CAAC;IACpB,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CACT,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,GAAG,EAAE;YACH,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,
|
|
1
|
+
{"version":3,"file":"mailFrom.model.js","sourceRoot":"","sources":["../../../src/models/mailFrom.model.ts"],"names":[],"mappings":"AACA,OAAO,OAAO,MAAM,6BAA6B,CAAC;AAElD,MAAM,KAAK,GAAG,IAAI,OAAO,CAAW,UAAU,EAAE,UAAU,CAAC,CAAC;AAE5D,KAAK,CAAC,eAAe,GAAG,CAAC,cAAc,CAAC,CAAC;AAEzC,KAAK,CAAC,QAAQ,CACZ;IACE,GAAG,EAAE;QACH,MAAM,EAAE,CAAC;KACV;IACD,MAAM,EAAE,IAAI;IACZ,IAAI,EAAE,QAAQ;CACf,EACD,CAAC,CACF,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,iCAAiC,EAAE;QACtE,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,qBAAqB,EAAE;QAC3D,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE;QAC7C,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE;QACxD,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC7B,YAAY,EAAE;YACZ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC1B;KACF;IACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,CAAC;IACxE,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CACT,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE;QAC7C,YAAY,EAAE;YACZ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC1B;KACF;IACD,QAAQ,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC;IACzC,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CACT,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAC9B;IACD,QAAQ,EAAE,CAAC,UAAU,CAAC;IACtB,oBAAoB,EAAE,KAAK;CAC5B,EACD,UAAU,CACX,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAE;KACzD;IACD,QAAQ,EAAE,CAAC,QAAQ,CAAC;IACpB,oBAAoB,EAAE,KAAK;CAC5B,EACD,QAAQ,CACT,CAAC;AAEF,KAAK,CAAC,SAAS,CACb;IACE,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,GAAG,EAAE;YACH,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC5B,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gBACxB,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;aACxB;YACD,QAAQ,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC;YACrC,oBAAoB,EAAE,KAAK;SAC5B;KACF;IACD,QAAQ,EAAE,CAAC,KAAK,CAAC;IACjB,oBAAoB,EAAE,KAAK;CAC5B,EACD,YAAY,CACb,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
|
@@ -11,7 +11,7 @@ export declare class MailFromService extends Immutable<MailFrom> {
|
|
|
11
11
|
fetchAndFlattenDnsTxt(domain: string): Promise<string[]>;
|
|
12
12
|
checkDns(internalId: ObjectId): Promise<{
|
|
13
13
|
domain: string;
|
|
14
|
-
dns: Record<"
|
|
14
|
+
dns: Record<"dkim" | "txt" | "spf", {
|
|
15
15
|
expected: string;
|
|
16
16
|
actual: string;
|
|
17
17
|
matches: boolean;
|
|
@@ -240,7 +240,9 @@ export class StructureService extends Immutable {
|
|
|
240
240
|
if (!structuresInputByModel[structure.model])
|
|
241
241
|
structuresInputByModel[structure.model] = {};
|
|
242
242
|
structuresByModel[structure.model].push(structure);
|
|
243
|
-
|
|
243
|
+
if (data[structure.id] !== undefined) {
|
|
244
|
+
structuresInputByModel[structure.model][structure.id] = data[structure.id];
|
|
245
|
+
}
|
|
244
246
|
}
|
|
245
247
|
});
|
|
246
248
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structures.service.js","sourceRoot":"","sources":["../../../src/services/structures.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAC9C,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAG1D,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAEtD,MAAM,OAAO,gBAAiB,SAAQ,SAAoB;IAA1D;;QAEE,UAAK,GAAG,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"structures.service.js","sourceRoot":"","sources":["../../../src/services/structures.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { StructureService } from '../src/services/structures.service';
|
|
2
|
+
const service = new StructureService();
|
|
3
|
+
const structures = [
|
|
4
|
+
{ id: 'fieldA', model: 'customers', type: 'string' },
|
|
5
|
+
{ id: 'fieldB', model: 'customers', type: 'string' },
|
|
6
|
+
];
|
|
7
|
+
describe('groupStructuresByModel', () => {
|
|
8
|
+
it('only includes fields that are present in the input data', () => {
|
|
9
|
+
/**
|
|
10
|
+
* simulate a join where the user only filled fieldA and left fieldB blank
|
|
11
|
+
* (fieldB key is absent from the submitted form data)
|
|
12
|
+
*/
|
|
13
|
+
const inputData = { fieldA: 'hello' };
|
|
14
|
+
const { structuresInputByModel } = service.groupStructuresByModel(structures, inputData);
|
|
15
|
+
expect(Object.keys(structuresInputByModel.customers)).toEqual(['fieldA']);
|
|
16
|
+
expect(structuresInputByModel.customers).not.toHaveProperty('fieldB');
|
|
17
|
+
});
|
|
18
|
+
it('does not overwrite existing customer data when a field is absent from input', () => {
|
|
19
|
+
const existingCustomer = { fieldA: 'old', fieldB: 'existing value' };
|
|
20
|
+
const inputData = { fieldA: 'new' };
|
|
21
|
+
const { structuresInputByModel } = service.groupStructuresByModel(structures, inputData);
|
|
22
|
+
/**
|
|
23
|
+
* this spread mirrors what membersJoin and getOrCreateByEmail do:
|
|
24
|
+
* { ...customer, ...structuresInputByModel.customers }
|
|
25
|
+
*
|
|
26
|
+
* BUG: structuresInputByModel.customers currently contains { fieldA: 'new', fieldB: undefined }
|
|
27
|
+
* so fieldB gets silently wiped from the merged object
|
|
28
|
+
*/
|
|
29
|
+
const merged = { ...existingCustomer, ...structuresInputByModel.customers };
|
|
30
|
+
expect(merged.fieldB).toBe('existing value');
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
//# sourceMappingURL=groupStructuresByModel.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"groupStructuresByModel.spec.js","sourceRoot":"","sources":["../../tests/groupStructuresByModel.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAGtE,MAAM,OAAO,GAAG,IAAI,gBAAgB,EAAE,CAAC;AAEvC,MAAM,UAAU,GAA2B;IACzC,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAA0B;IAC5E,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAA0B;CAC7E,CAAC;AAEF,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAEtC,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QAEjE;;;WAGG;QACH,MAAM,SAAS,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;QAEtC,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEzF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC1E,MAAM,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAExE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6EAA6E,EAAE,GAAG,EAAE;QAErF,MAAM,gBAAgB,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;QACrE,MAAM,SAAS,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAEpC,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEzF;;;;;;WAMG;QACH,MAAM,MAAM,GAAG,EAAE,GAAG,gBAAgB,EAAE,GAAG,sBAAsB,CAAC,SAAS,EAAE,CAAC;QAE5E,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAE/C,CAAC,CAAC,CAAC;AAEL,CAAC,CAAC,CAAC"}
|