@luomus/laji-form 15.1.16 → 15.1.17
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/dist/laji-form.js +1 -1
- package/lib/components/fields/ScopeField.js +1 -1
- package/package.json +8 -1
- package/protractor.conf.js +0 -59
- package/test.Dockerfile +0 -11
|
@@ -303,7 +303,7 @@ class ScopeField extends React.Component {
|
|
|
303
303
|
}, this.state.additionalFields);
|
|
304
304
|
if (this._globals) {
|
|
305
305
|
const additionalsPersistenceVal = this.getAdditionalPersistenceValue(this.props, !"don't include undefined");
|
|
306
|
-
let globalsEntry = this._globals
|
|
306
|
+
let globalsEntry = this._globals ? Object.assign({}, this._globals) : {};
|
|
307
307
|
if (additionalsPersistenceField) {
|
|
308
308
|
let additionalsKeys = this.props.schema.properties[additionalsPersistenceField].type === "array"
|
|
309
309
|
? additionalsPersistenceVal
|
package/package.json
CHANGED
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@luomus/laji-form",
|
|
3
|
-
"version": "15.1.
|
|
3
|
+
"version": "15.1.17",
|
|
4
4
|
"description": "React module capable of building dynamic forms from Laji form json schemas",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
7
|
+
"files": [
|
|
8
|
+
"lib",
|
|
9
|
+
"dist",
|
|
10
|
+
"test-export",
|
|
11
|
+
"README.md",
|
|
12
|
+
"CHANGELOG.md"
|
|
13
|
+
],
|
|
7
14
|
"scripts": {
|
|
8
15
|
"start": "npx webpack serve",
|
|
9
16
|
"staging": "webpack-dev-server --content-base playground playground/app.js --host 0.0.0.0 --port 4010",
|
package/protractor.conf.js
DELETED
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
// Firefox isn't run default since it has a bug with mousemove (See https://github.com/angular/protractor/issues/4715 )
|
|
2
|
-
|
|
3
|
-
const [width, height] = [800, 1000];
|
|
4
|
-
const common = {
|
|
5
|
-
shardTestFiles: parseInt(process.env.THREADS) !== 1,
|
|
6
|
-
maxInstances: process.env.THREADS ? parseInt(process.env.THREADS) : 4
|
|
7
|
-
};
|
|
8
|
-
const chrome = {
|
|
9
|
-
...common,
|
|
10
|
-
browserName: "chrome",
|
|
11
|
-
chromeOptions: {
|
|
12
|
-
args: ["--headless", "--disable-gpu", `window-size=${width}x${height}`, "--no-sandbox", "--disable-dev-shm-usage"]
|
|
13
|
-
},
|
|
14
|
-
};
|
|
15
|
-
|
|
16
|
-
const firefox = {
|
|
17
|
-
...common,
|
|
18
|
-
browserName: "firefox",
|
|
19
|
-
"firefoxOptions": {
|
|
20
|
-
args: ["--headless", `--width=${width}', '--height=${height}`]
|
|
21
|
-
},
|
|
22
|
-
"moz:firefoxOptions": {
|
|
23
|
-
args: ["--headless", `--width=${width}', '--height=${height}`]
|
|
24
|
-
}
|
|
25
|
-
};
|
|
26
|
-
|
|
27
|
-
let multiCapabilities = [chrome];
|
|
28
|
-
if (process.env.TEST_BROWSER === "firefox") {
|
|
29
|
-
multiCapabilities = [firefox];
|
|
30
|
-
} else if (process.env.TEST_BROWSER === "multi") {
|
|
31
|
-
multiCapabilities = [chrome, firefox];
|
|
32
|
-
}
|
|
33
|
-
if (process.env.HEADLESS && process.env.HEADLESS !== "true") multiCapabilities.forEach(capabilities => {
|
|
34
|
-
const options = [capabilities["chromeOptions"], capabilities["firefoxOptions"], capabilities["moz:firefoxOptions"]];
|
|
35
|
-
options.filter(o => o).forEach(_options => {
|
|
36
|
-
_options.args = _options.args.filter(a => a !== "--headless");
|
|
37
|
-
});
|
|
38
|
-
});
|
|
39
|
-
|
|
40
|
-
exports.config = {
|
|
41
|
-
specs: ["test/*-spec.ts"],
|
|
42
|
-
multiCapabilities,
|
|
43
|
-
maxSessions: 4,
|
|
44
|
-
SELENIUM_PROMISE_MANAGER: false,
|
|
45
|
-
onPrepare: async () => {
|
|
46
|
-
require("ts-node").register({
|
|
47
|
-
project: require("path").join(__dirname, "./tsconfig.json")
|
|
48
|
-
});
|
|
49
|
-
|
|
50
|
-
browser.waitForAngularEnabled(false);
|
|
51
|
-
|
|
52
|
-
// Set manually since Firefox cli size options don't work.
|
|
53
|
-
await browser.driver.manage().window().setSize(width, height);
|
|
54
|
-
},
|
|
55
|
-
plugins: multiCapabilities.length === 1 && multiCapabilities[0] === chrome && [{
|
|
56
|
-
package: "protractor-console-plugin",
|
|
57
|
-
exclude: [/Uncaught \(in promise\)/]
|
|
58
|
-
}]
|
|
59
|
-
};
|