@gisce/ooui 0.3.4 → 0.3.5
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.
|
@@ -15,10 +15,17 @@ var evaluateCondition = function (_a) {
|
|
|
15
15
|
if (fields[fieldName] === undefined) {
|
|
16
16
|
return false;
|
|
17
17
|
}
|
|
18
|
-
if (values[fieldName] === undefined &&
|
|
18
|
+
if (values[fieldName] === undefined &&
|
|
19
|
+
fields[fieldName].type !== "boolean" &&
|
|
20
|
+
fields[fieldName].type !== "many2one") {
|
|
19
21
|
return false;
|
|
20
22
|
}
|
|
21
23
|
var filteredExpectedValue = expectedValue;
|
|
24
|
+
if (fields[fieldName].type === "many2one" &&
|
|
25
|
+
expectedValue === false &&
|
|
26
|
+
values[fieldName] === undefined) {
|
|
27
|
+
filteredExpectedValue = undefined;
|
|
28
|
+
}
|
|
22
29
|
if (fields[fieldName].type === "boolean" &&
|
|
23
30
|
(expectedValue === 0 || expectedValue === 1)) {
|
|
24
31
|
filteredExpectedValue = expectedValue === 0 ? false : true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attributeParser.js","sourceRoot":"","sources":["../../src/helpers/attributeParser.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,IAAM,iBAAiB,GAAG,UAAC,EAQ1B;QAPC,KAAK,WAAA,EACL,MAAM,YAAA,EACN,MAAM,YAAA;IAMC,IAAA,SAAS,GAA6B,KAAK,GAAlC,EAAE,QAAQ,GAAmB,KAAK,GAAxB,EAAE,aAAa,GAAI,KAAK,GAAT,CAAU;IAEnD,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,SAAS,EAAE;QACnC,OAAO,KAAK,CAAC;KACd;IAED,
|
|
1
|
+
{"version":3,"file":"attributeParser.js","sourceRoot":"","sources":["../../src/helpers/attributeParser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -13,12 +13,24 @@ const evaluateCondition = ({
|
|
|
13
13
|
return false;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
if (
|
|
16
|
+
if (
|
|
17
|
+
values[fieldName] === undefined &&
|
|
18
|
+
fields[fieldName].type !== "boolean" &&
|
|
19
|
+
fields[fieldName].type !== "many2one"
|
|
20
|
+
) {
|
|
17
21
|
return false;
|
|
18
22
|
}
|
|
19
23
|
|
|
20
24
|
let filteredExpectedValue = expectedValue;
|
|
21
25
|
|
|
26
|
+
if (
|
|
27
|
+
fields[fieldName].type === "many2one" &&
|
|
28
|
+
expectedValue === false &&
|
|
29
|
+
values[fieldName] === undefined
|
|
30
|
+
) {
|
|
31
|
+
filteredExpectedValue = undefined;
|
|
32
|
+
}
|
|
33
|
+
|
|
22
34
|
if (
|
|
23
35
|
fields[fieldName].type === "boolean" &&
|
|
24
36
|
(expectedValue === 0 || expectedValue === 1)
|
|
@@ -28,6 +28,9 @@ const fields = {
|
|
|
28
28
|
change_adm: {
|
|
29
29
|
type: "boolean",
|
|
30
30
|
},
|
|
31
|
+
autoconsum_id: {
|
|
32
|
+
type: "many2one",
|
|
33
|
+
},
|
|
31
34
|
};
|
|
32
35
|
|
|
33
36
|
describe("An Attribute Parser", () => {
|
|
@@ -169,5 +172,29 @@ describe("An Attribute Parser", () => {
|
|
|
169
172
|
});
|
|
170
173
|
expect(evaluatedAttrs.invisible).toBeTruthy();
|
|
171
174
|
});
|
|
175
|
+
it("should properly parse a many2one attribute with false value", () => {
|
|
176
|
+
const tagAttributes = {
|
|
177
|
+
attrs: "{'invisible': [('autoconsum_id', '=', False)]}",
|
|
178
|
+
};
|
|
179
|
+
const values = { autoconsum_id: false };
|
|
180
|
+
const evaluatedAttrs = evaluateAttributes({
|
|
181
|
+
tagAttributes,
|
|
182
|
+
values,
|
|
183
|
+
fields,
|
|
184
|
+
});
|
|
185
|
+
expect(evaluatedAttrs.invisible).toBeTruthy();
|
|
186
|
+
});
|
|
187
|
+
it.only("should properly parse a many2one attribute with undefined value", () => {
|
|
188
|
+
const tagAttributes = {
|
|
189
|
+
attrs: "{'invisible': [('autoconsum_id', '=', False)]}",
|
|
190
|
+
};
|
|
191
|
+
const values = { autoconsum_id: undefined };
|
|
192
|
+
const evaluatedAttrs = evaluateAttributes({
|
|
193
|
+
tagAttributes,
|
|
194
|
+
values,
|
|
195
|
+
fields,
|
|
196
|
+
});
|
|
197
|
+
expect(evaluatedAttrs.invisible).toBeTruthy();
|
|
198
|
+
});
|
|
172
199
|
});
|
|
173
200
|
});
|