@luomus/laji-form 15.1.6 → 15.1.8

package/lib/components/fields/LocationChooserField.js

@@ -375,7 +375,7 @@ class LocationButton extends React.Component {
             this.setState({ modalMap: undefined });
         };
         this.onModalMapKeyDown = (e) => {
-            if (e.key === "Escape" && !this.modalMapRef.map.keyHandler(e.nativeEvent)) {
+            if (e.key === "Escape" && !this.modalMapRef.map.keyHandlerForType("keydown", e.nativeEvent)) {
                 this.onHide();
             }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.6",
+  "version": "15.1.8",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,12 +11,16 @@
     "build:dist": "rimraf dist && NODE_ENV=production webpack --config webpack.config.dist.js && rimraf dist/styles.js",
     "build:tests": "rimraf test-export && NODE_ENV=production tsc -p tsconfig.test.json",
     "build": "npm run build:lib && npm run build:dist && npm run build:tests",
-    "preversion": "npm run lint && npm test",
+    "preversion": "npm run lint && npm run test:lightweight",
     "version": "bin/update-changelog.sh",
     "postversion": "npm publish",
     "prepublishOnly": "npm run build && git push && git push --tags",
     "lint": "eslint -c .eslintrc.prod.json src playground",
-    "test": "npx playwright test"
+    "test": "npx playwright test",
+    "test:docker": "npm run test:docker:build && npm run test:docker:run --",
+    "test:lightweight": "npx playwright test --project chromium",
+    "test:docker:build": "docker build -t laji-form-test -f test.Dockerfile .",
+    "test:docker:run": "docker run laji-form-test"
   },
   "keywords": [
     "react-jsonschema-form",
@@ -27,7 +31,7 @@
   "repository": "https://github.com/luomus/laji-form.git",
   "license": "MIT",
   "dependencies": {
-    "@luomus/laji-map": "^4.0.3",
+    "@luomus/laji-map": "^5.0.1",
     "@luomus/laji-validate": "0.0.120",
     "@rjsf/core": "~5.1.0",
     "@rjsf/utils": "~5.1.0",
@@ -87,7 +91,7 @@
     "react-bootstrap-5": "npm:react-bootstrap@^2.5.0"
   },
   "volta": {
-    "node": "16.20.2"
+    "node": "20.10.0"
   },
   "publishConfig": {
     "access": "public"

package/test-export/test-utils.d.ts

@@ -57,8 +57,8 @@ interface DemoPageProps {
 }
 export declare class Form {
     protected page: Page;
-    protected locator: Locator;
-    constructor(page: Page, locator?: Locator);
+    protected $locator: Locator;
+    constructor(page: Page, $locator?: Locator);
     $form: Locator;
     $locate(path: string): Locator;
     $locateButton(path: string, selector: string, locateFromBody?: boolean): Locator;
@@ -252,6 +252,7 @@ export declare const mockImageMetadata: {
 };
 export declare const filterUUIDs: (any: any) => any;
 export declare const maybeJSONPointerToLocator: (pointer: string) => string;
+/** Fills value into given input and presses tab to unfocus it. Useful for inputs with debounce */
 export declare const updateValue: ($input: Locator, value: string) => Promise<void>;
 export declare const getRemoveUnit: (page: Page) => (gatheringIdx: number, unitIdx: number) => Promise<void>;
 export {};

package/test-export/test-utils.js

@@ -45,25 +45,25 @@ function getEnumWidgetForContainer($container) {
     };
 }
 class Form {
-    constructor(page, locator = page.locator(".laji-form")) {
+    constructor(page, $locator = page.locator(".laji-form")) {
         this.page = page;
-        this.locator = locator;
-        this.$form = this.page.locator(".laji-form .rjsf");
+        this.$locator = $locator;
+        this.$form = this.$locator.locator(".rjsf");
         this.getMockStr = (path, query) => `window.mockResponses[window.getMockQueryKey(${JSON.stringify(path)}, ${JSON.stringify(query)})]`;
         this.createValidatorPO = (type) => ({
-            $$all: this.page.locator(`.laji-form-error-list:not(.laji-form-failed-jobs-list) .${type}-panel .list-group button`),
-            $panel: this.page.locator(`.laji-form-error-list:not(.laji-form-failed-jobs-list) .${type}-panel`)
+            $$all: this.$locator.locator(`.laji-form-error-list:not(.laji-form-failed-jobs-list) .${type}-panel .list-group button`),
+            $panel: this.$locator.locator(`.laji-form-error-list:not(.laji-form-failed-jobs-list) .${type}-panel`)
         });
         this.errors = this.createValidatorPO("error");
         this.warnings = this.createValidatorPO("warning");
         this.failedJobs = {
-            $container: this.page.locator(".laji-form-failed-jobs-list"),
-            $$errors: this.page.locator(".laji-form-failed-jobs-list .list-group-item")
+            $container: this.$locator.locator(".laji-form-failed-jobs-list"),
+            $$errors: this.$locator.locator(".laji-form-failed-jobs-list .list-group-item")
         };
-        this.$runningJobs = this.page.locator(".running-jobs");
-        this.$acknowledgeWarnings = this.page.locator(".laji-form-warning-list .panel-footer button");
+        this.$runningJobs = this.$locator.locator(".running-jobs");
+        this.$acknowledgeWarnings = this.$locator.locator(".laji-form-warning-list .panel-footer button");
         this.$blocker = this.page.locator(".laji-form.blocking-loader");
-        this.$mapFieldFullscreenMap = this.page.locator(".laji-form.fullscreen .laji-form-map");
+        this.$mapFieldFullscreenMap = this.$locator.locator(".laji-form.fullscreen .laji-form-map");
         this.getImageArrayField = (lajiFormLocator) => {
             const $container = this.$locate(lajiFormLocator).locator(".laji-form-medias");
             const $imgContainers = this.$locate(lajiFormLocator).locator(".media-container");
@@ -92,7 +92,7 @@ class Form {
         };
         this.getTaxonAutosuggestWidget = (lajiFormLocator) => {
             const autosuggest = this.getAutosuggestWidget(lajiFormLocator);
-            return Object.assign(Object.assign({}, autosuggest), { $powerUserButton: this.page.locator(".power-user-addon"), $suggestedGlyph: this.$locate(lajiFormLocator).locator(".glyphicon-ok"), $nonsuggestedGlyph: this.$locate(lajiFormLocator).locator(".glyphicon-warning-sign") });
+            return Object.assign(Object.assign({}, autosuggest), { $powerUserButton: this.$locator.locator(".power-user-addon"), $suggestedGlyph: this.$locate(lajiFormLocator).locator(".glyphicon-ok"), $nonsuggestedGlyph: this.$locate(lajiFormLocator).locator(".glyphicon-warning-sign") });
         };
         this.getPersonAutosuggestWidget = (lajiFormLocator) => {
             const autosuggest = this.getAutosuggestWidget(lajiFormLocator);
@@ -151,10 +151,10 @@ class Form {
         };
     }
     $locate(path) {
-        return this.page.locator(exports.lajiFormLocator(path));
+        return this.$locator.locator(exports.lajiFormLocator(path));
     }
     $locateButton(path, selector, locateFromBody = false) {
-        return (locateFromBody ? this.page : this.locator).locator(`#root${typeof path === "string" && path.length > 0 ? `_${path.replace(/\./g, "_")}` : ""}-${selector}`);
+        return (locateFromBody ? this.page : this.$locator).locator(`#root${typeof path === "string" && path.length > 0 ? `_${path.replace(/\./g, "_")}` : ""}-${selector}`);
     }
     $locateAddition(path, selector, locateFromBody = false) {
         return this.$locateButton(path, selector, locateFromBody);
@@ -356,6 +356,7 @@ const filterUUIDs = (any) => {
 exports.filterUUIDs = filterUUIDs;
 const maybeJSONPointerToLocator = (pointer) => pointer[0] === "/" ? pointer.slice(1).replace(/\//g, "_") : pointer;
 exports.maybeJSONPointerToLocator = maybeJSONPointerToLocator;
+/** Fills value into given input and presses tab to unfocus it. Useful for inputs with debounce */
 const updateValue = ($input, value) => __awaiter(void 0, void 0, void 0, function* () {
     yield $input.fill(value);
     yield $input.press("Tab");

package/test.Dockerfile

@@ -0,0 +1,11 @@
+FROM mcr.microsoft.com/playwright:v1.40.1
+
+WORKDIR /app
+
+# Copy application files (see .dockerignore for what's excluded)
+COPY . .
+
+# Install dependencies
+RUN npm ci
+
+ENTRYPOINT ["npx", "playwright", "test"]

package/migrate.sh

@@ -1,32 +0,0 @@
-files="$@"
-set -e 
-
-echo "Add playwright import..."
-sed -i '1s/^/import { test, expect } from "@playwright\/test";\n/' $files
-
-echo "Removing protractor imports..."
-sed -i"" -e '/import.*protractor/d' $files
-
-#echo "Adding serial mode..."
-#sed -i"" -e '/import/,/^$/s/^$/\ntest.describe.configure\({ mode: "serial" }\);\n/g' $files
-
-echo "Replacing protractor cmds with playwright..."
-sed -i"" -E 's/\w?describe\(/test.describe\(/' $files
-sed -i"" -E 's/\w?it\(/test\(/' $files
-sed -i"" -E 's/\w?afterEach\(/test.afterEach\(/' $files
-sed -i"" -E 's/\w?beforeAll\(/test.beforeAll\(/' $files
-sed -i"" -E 's/\w?beforeEach\(/test.beforeEach\(/' $files
-sed -i"" -E 's/\w?afterAll\(/test.afterAll\(/' $files
-sed -i"" -E 's/\.\$\$\(/\.locator\(/g' $files
-sed -i"" -E 's/\.\$\(/\.locator\(/g' $files
-sed -i"" -E 's/\.get\(/\.nth\(/g' $files
-sed -i"" -E 's/ElementArrayFinder/ElementFinder/g' $files
-sed -i"" -E 's/ElementFinder/Locator/g' $files
-sed -i"" -E 's/sendKeys/fill/g' $files
-sed -i"" -E 's/protractor.Key.ENTER/"Enter"/g' $files
-sed -i"" -E 's/protractor.Key.TAB/"Tab"/g' $files
-sed -i"" -E 's/protractor.Key.DOWN/"ArrowDown"/g' $files
-
-#laji form specific
-sed -i"" -E 's/beforeAll\(async \(\)/beforeAll\(async \({browser}\)/' $files
-sed -i"" -E 's/createForm\(/createForm\(await browser.newPage(), /' $files