@luomus/laji-form 15.1.0 → 15.1.2

package/jsonconfig.json

@@ -0,0 +1,26 @@
+{
+	"compilerOptions": {
+		"outDir": "./build",
+		"module": "es6",
+		"target": "es6",
+		"lib": [
+			"dom",
+			"es7",
+			"es2016.array.include"
+		],
+		"allowJs": true,
+		"jsx": "react",
+		"moduleResolution": "node",
+		"noImplicitReturns": true,
+		"noImplicitThis": false,
+		"noImplicitAny": true,
+		"strictNullChecks": true,
+		"allowSyntheticDefaultImports": true,
+		"esModuleInterop": true,
+		"experimentalDecorators": true,
+		"resolveJsonModule": true
+	},
+	"include": [
+		"./src/**/*"
+	]
+}

package/migrate.sh

@@ -30,4 +30,3 @@ 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
-sed -i"" -E 's/updateValue/form.updateValue/' $files

package/package.json

@@ -1,22 +1,21 @@
 {
   "name": "@luomus/laji-form",
-  "version": "15.1.0",
+  "version": "15.1.2",
   "description": "React module capable of building dynamic forms from Laji form json schemas",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "prepare": "self-import",
     "start": "npx webpack serve",
     "staging": "webpack-dev-server --content-base playground playground/app.js --host 0.0.0.0 --port 4010",
     "build:lib": "rimraf lib && NODE_ENV=production tsc -p tsconfig.lib.json",
     "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: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 run test",
+    "preversion": "npm run lint && npm test",
     "version": "bin/update-changelog.sh",
-    "postversion": "npm run build && npm publish && git push & git push --tags",
+    "postversion": "npm run build &&  git push & git push --tags && npm publish",
     "lint": "eslint -c .eslintrc.prod.json src playground",
-    "test": "playwright test"
+    "test": "npx playwright test"
   },
   "keywords": [
     "react-jsonschema-form",
@@ -27,7 +26,7 @@
   "repository": "https://github.com/luomus/laji-form.git",
   "license": "MIT",
   "dependencies": {
-    "@luomus/laji-map": "^4.0.2",
+    "@luomus/laji-map": "^4.0.3",
     "@luomus/laji-validate": "0.0.120",
     "@rjsf/core": "~5.1.0",
     "@rjsf/utils": "~5.1.0",
@@ -56,19 +55,20 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.40.1",
+    "@types/jasmine": "^3.7.7",
     "@types/node": "^20.10.1",
     "@typescript-eslint/eslint-plugin": "^4.28.1",
     "@typescript-eslint/parser": "^4.28.1",
     "copy-webpack-plugin": "^9.0.1",
     "css-loader": "^5.2.6",
     "eslint": "^7.30.0",
+    "eslint-plugin-jasmine": "^4.1.2",
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "mini-css-extract-plugin": "^2.1.0",
     "notus": "^0.3.2",
     "querystring": "^0.2.1",
     "rimraf": "^2.5.4",
-    "self-import": "^1.0.1",
     "style-loader": "^3.0.0",
     "ts-loader": "^9.2.3",
     "typescript": "^4.3.5",

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

@@ -1,29 +1,48 @@
 import { Locator, Page } from "@playwright/test";
 import { JSONSchema7 } from "json-schema";
-import { LajiFormState } from "@luomus/laji-form/lib/components/LajiForm";
-import type { JSONSerializable } from "@luomus/laji-form/lib/utils";
 import { MapPageObject } from "@luomus/laji-map/test-export/test-utils";
 export declare const emptyForm: (page: Page, params?: string) => Promise<import("playwright-core").Response | null>;
 export declare const navigateToForm: (page: Page, formID: string, params?: string) => Promise<import("playwright-core").Response | null>;
 export declare const lajiFormLocator: (path: string) => string;
+export declare const lajiFormLocate: (page: Page, str: string) => Locator;
 export declare const getFocusedElement: (page: Page) => Locator;
+export declare const getFocusedId: (page: Page) => Promise<string | null>;
 export interface Mock {
     resolve: (response?: any, raw?: boolean) => Promise<void>;
     reject: (response?: any, raw?: boolean) => Promise<void>;
     remove: () => Promise<void>;
 }
-export declare type ImageArrayFieldPO = ReturnType<Form["getImageArrayField"]>;
-export declare type TaxonAutosuggestWidgetPO = ReturnType<Form["getTaxonAutosuggestWidget"]>;
-export declare type UnitListShorthandArrayFieldPO = ReturnType<Form["getUnitListShorthandArrayField"]>;
-export declare type EnumWidgetPO = ReturnType<typeof getEnumWidgetForContainer>;
-export declare type DateWidgetPO = ReturnType<Form["getDateWidget"]>;
-export declare type BooleanWidgetPO = ReturnType<Form["getBooleanWidget"]>;
-export declare type NamedPlaceChooserPO = ReturnType<Form["getNamedPlaceChooser"]>;
+export interface DateWidgetPO {
+    $container: Locator;
+    $input: Locator;
+    buttons: {
+        $today: Locator;
+        $yesterday: Locator;
+        $same: Locator;
+        $date: Locator;
+        $time: Locator;
+    };
+    calendar: {
+        $today: Locator;
+    };
+    clock: {
+        "$01:00": Locator;
+    };
+}
+export interface BooleanWidgetPO {
+    $container: Locator;
+    $true: Locator;
+    $false: Locator;
+    $undefined: Locator;
+    $active: Locator;
+    $nonactive: Locator;
+}
+export declare type EnumWidgetPOI = ReturnType<typeof getEnumWidgetForContainer>;
 declare function getEnumWidgetForContainer($container: Locator): {
     $container: Locator;
     openEnums: () => Promise<void>;
     $enumContainer: Locator;
-    $enums: Locator;
+    $$enums: Locator;
     $input: Locator;
 };
 interface DemoPageProps {
@@ -38,30 +57,36 @@ 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;
-    /** Locates a field with a dot separated identifier, e.g. "gatherings.0.units.1" */
     $locate(path: string): Locator;
-    /** Locates a button for a field with a dot separated identifier, e.g. "gatherings.0.units.1" */
     $locateButton(path: string, selector: string, locateFromBody?: boolean): Locator;
-    /** Locates some additional element for a field with a dot separated identifier, e.g. "gatherings.0.units.1" */
     $locateAddition(path: string, selector: string, locateFromBody?: boolean): Locator;
+    getMockStr: (path: string, query: any) => string;
+    setMockResponse(path: string, query?: any): Promise<Mock>;
+    createMockResponseQueue(path: string, query?: any): Promise<{
+        create: () => Promise<{
+            resolve: (response: any, raw?: boolean | undefined) => Promise<unknown>;
+            reject: (response: any, raw?: boolean | undefined) => Promise<unknown>;
+        }>;
+        remove: () => Promise<unknown>;
+    }>;
     createValidatorPO: (type: "error" | "warning") => {
-        $all: Locator;
+        $$all: Locator;
         $panel: Locator;
     };
     errors: {
-        $all: Locator;
+        $$all: Locator;
         $panel: Locator;
     };
     warnings: {
-        $all: Locator;
+        $$all: Locator;
         $panel: Locator;
     };
     failedJobs: {
         $container: Locator;
-        $errors: Locator;
+        $$errors: Locator;
     };
     $runningJobs: Locator;
     $acknowledgeWarnings: Locator;
@@ -81,7 +106,7 @@ export declare class Form {
         $container: Locator;
         openEnums: () => Promise<void>;
         $enumContainer: Locator;
-        $enums: Locator;
+        $$enums: Locator;
         $input: Locator;
     };
     getDateWidget(str: string): {
@@ -105,9 +130,9 @@ export declare class Form {
     getImageArrayField: (lajiFormLocator: string) => {
         $container: Locator;
         $imgContainers: Locator;
-        $imgs: Locator;
-        $imgLoading: Locator;
-        $imgRemoves: Locator;
+        $$imgs: Locator;
+        $$imgLoading: Locator;
+        $$imgRemoves: Locator;
         $imgRemoveConfirmButton: (id: string) => Locator;
         $dropzone: Locator;
         $modal: Locator;
@@ -115,24 +140,34 @@ export declare class Form {
         $modalClose: Locator;
         $addModalCancel: Locator;
     };
-    getTaxonAutosuggestWidget: (lajiFormLocator: string) => {
+    getAutosuggestWidget: (lajiFormLocator: string) => {
         $input: Locator;
         $suggestionsContainer: Locator;
         $suggestions: Locator;
-        $getGlyph: (glyph: string) => Locator;
+    };
+    getTaxonAutosuggestWidget: (lajiFormLocator: string) => {
+        $powerUserButton: Locator;
         $suggestedGlyph: Locator;
         $nonsuggestedGlyph: Locator;
-        $powerUserButton: Locator;
+        $input: Locator;
+        $suggestionsContainer: Locator;
+        $suggestions: Locator;
+    };
+    getPersonAutosuggestWidget: (lajiFormLocator: string) => {
+        $suggestedGlyph: Locator;
+        $input: Locator;
+        $suggestionsContainer: Locator;
+        $suggestions: Locator;
     };
     getScopeField: (lajiFormLocator: string) => {
         $button: Locator;
-        $listItems: Locator;
+        $$listItems: Locator;
         modal: {
             $container: Locator;
             $close: Locator;
-            $loadingGroup: Locator;
-            $groupTitles: Locator;
-            $listItems: Locator;
+            $$loadingGroups: Locator;
+            $$groupTitles: Locator;
+            $$listItems: Locator;
         };
     };
     getLocationChooser: (lajiFormLocator: string) => {
@@ -144,7 +179,7 @@ export declare class Form {
         peeker: {
             $popover: Locator;
             $map: Locator;
-            $markers: Locator;
+            $$markers: Locator;
         };
     };
     getUnitListShorthandArrayField: (lajiFormLocator: string) => {
@@ -154,9 +189,6 @@ export declare class Form {
             $addButton: Locator;
         };
     };
-    /** Draws a marker to the center of a laji-map rendered to the given locator. The locator defaults to "gatherings" */
-    putMarkerToMap(lajiFormLocator?: string): Promise<void>;
-    updateValue($input: Locator, value: string, blur?: boolean): Promise<void>;
     $getShortHandWidget: (lajiFormLocator: string) => Locator;
     getGeocoder: (lajiFormLocator?: string) => {
         $btn: Locator;
@@ -167,7 +199,7 @@ export declare class Form {
             $container: Locator;
             openEnums: () => Promise<void>;
             $enumContainer: Locator;
-            $enums: Locator;
+            $$enums: Locator;
             $input: Locator;
         };
         mapPopup: {
@@ -177,35 +209,49 @@ export declare class Form {
         $alert: Locator;
         $close: Locator;
     };
+    /** Draws a marker to the center of a laji-map rendered to the given locator. The locator defaults to "gatherings" */
+    putMarkerToMap(lajiFormLocator?: string): Promise<void>;
 }
+export declare type ImageArrayFieldPOI = ReturnType<Form["getImageArrayField"]>;
+export declare type TaxonAutosuggestWidgetPOI = ReturnType<Form["getTaxonAutosuggestWidget"]>;
+export declare type UnitListShorthandArrayFieldPOI = ReturnType<Form["getUnitListShorthandArrayField"]>;
+export declare type NamedPlaceChooserPO = ReturnType<Form["getNamedPlaceChooser"]>;
 export declare class DemoPageForm extends Form {
-    props: DemoPageProps;
-    constructor(page: Page, params?: DemoPageProps);
-    initialize(beforeInit?: (form: DemoPageForm) => Promise<void>): Promise<void>;
-    e<T>(path: string): Promise<T>;
-    setState(state: any): Promise<unknown>;
-    getState(): Promise<Pick<LajiFormState, "formData">>;
-    submit(): Promise<void>;
-    submitOnlySchemaValidations(): Promise<unknown>;
-    getSubmittedData(): Promise<JSONSerializable>;
-    getChangedData(): Promise<JSONSerializable>;
-    getPropsData(): Promise<JSONSerializable>;
-    getMockStr: (path: string, query: any) => string;
-    setMockResponse(path: string, query?: any): Promise<Mock>;
-    createMockResponseQueue(path: string, query?: any): Promise<{
-        create: () => Promise<{
-            resolve: (response: any, raw?: boolean | undefined) => Promise<unknown>;
-            reject: (response: any, raw?: boolean | undefined) => Promise<unknown>;
-        }>;
-        remove: () => Promise<unknown>;
+    private props?;
+    constructor(page: Page, props?: DemoPageProps | undefined);
+    initialize(beforeInit?: (form: Form) => Promise<void>): Promise<void>;
+    e(path: string): Promise<any>;
+    setState(state: any): Promise<any>;
+    getState(): Promise<{
+        formData: any;
     }>;
+    submit(): Promise<void>;
+    startSubmit(): void;
+    submitOnlySchemaValidations(): Promise<any>;
+    getSubmittedData(): Promise<any>;
+    getChangedData(): Promise<any>;
+    getPropsData(): Promise<any>;
     mockImageUpload: (lajiFormLocator: string) => Promise<{
         resolve: () => Promise<void>;
         remove: () => Promise<void>;
     }>;
 }
 export declare function createForm(page: Page, props?: DemoPageProps, beforeInit?: (form: Form) => Promise<void>): Promise<DemoPageForm>;
+export declare const mockImageMetadata: {
+    id: string;
+    capturerVerbatim: string[];
+    intellectualOwner: string;
+    intellectualRights: string;
+    fullURL: string;
+    largeURL: string;
+    squareThumbnailURL: string;
+    thumbnailURL: string;
+    originalURL: string;
+    uploadedBy: string;
+    "@context": string;
+};
 export declare const filterUUIDs: (any: any) => any;
 export declare const maybeJSONPointerToLocator: (pointer: string) => string;
+export declare const updateValue: ($input: Locator, value: string) => Promise<void>;
 export declare const getRemoveUnit: (page: Page) => (gatheringIdx: number, unitIdx: number) => Promise<void>;
 export {};