From 8fee9f1ce1905ac8e123deba093c74f0167361f5 Mon Sep 17 00:00:00 2001 From: Linh Hoang Date: Fri, 4 Oct 2024 13:50:13 +0700 Subject: [PATCH 1/3] bump version --- package-lock.json | 4 ++-- package.json | 2 +- src/@episerver/forms-react/package.json | 2 +- src/@episerver/forms-sdk/package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2855b08..f859081 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23737,7 +23737,7 @@ } }, "src/@episerver/forms-react": { - "version": "1.0.0", + "version": "1.0.1", "license": "ISC", "dependencies": { "@episerver/forms-sdk": "file:../forms-sdk" @@ -23757,7 +23757,7 @@ } }, "src/@episerver/forms-sdk": { - "version": "1.0.0", + "version": "1.0.1", "license": "ISC", "devDependencies": { "@types/jest": "^29.5.6", diff --git a/package.json b/package.json index 37f78cb..e4e3e65 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "content-headless-form-js-sdk", - "version": "1.0.0", + "version": "1.0.1", "description": "Workspace root", "workspaces": [ "src/@episerver/forms-react", diff --git a/src/@episerver/forms-react/package.json b/src/@episerver/forms-react/package.json index 98a576f..e2345bf 100644 --- a/src/@episerver/forms-react/package.json +++ b/src/@episerver/forms-react/package.json @@ -1,6 +1,6 @@ { "name": "@episerver/forms-react", - "version": "1.0.0", + "version": "1.0.1", "description": "Forms react components render a form from JSON data", "author": "Optimizely", "license": "ISC", diff --git a/src/@episerver/forms-sdk/package.json b/src/@episerver/forms-sdk/package.json index 881bbad..968f96a 100644 --- a/src/@episerver/forms-sdk/package.json +++ b/src/@episerver/forms-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@episerver/forms-sdk", - "version": "1.0.0", + "version": "1.0.1", "description": "Forms SDK with client validation, step navigation, submit form, element depends", "author": "Optimizely", "license": "ISC", From 54736a1221fbef3f8875f1f8e6c8a605445e5cc9 Mon Sep 17 00:00:00 2001 From: Thach Nguyen Date: Mon, 28 Oct 2024 11:16:29 +0700 Subject: [PATCH 2/3] Convert to string before call toLocaleUpperCase AFORM-4451 --- .../src/form-depend-conditions/ConditionFunctions.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/@episerver/forms-sdk/src/form-depend-conditions/ConditionFunctions.ts b/src/@episerver/forms-sdk/src/form-depend-conditions/ConditionFunctions.ts index 0d3cbe6..435d68d 100644 --- a/src/@episerver/forms-sdk/src/form-depend-conditions/ConditionFunctions.ts +++ b/src/@episerver/forms-sdk/src/form-depend-conditions/ConditionFunctions.ts @@ -29,7 +29,7 @@ function Equals(actualValue: any, dependencyFieldValue: string): boolean { * @returns */ function NotEquals(actualValue: any, dependencyFieldValue: string): boolean { - const _actualValue = !actualValue ? "" : getConcatString(actualValue, ",").toLocaleUpperCase(); + const _actualValue = !actualValue ? "" : getConcatString(actualValue.toString(), ",").toLocaleUpperCase(); dependencyFieldValue = !dependencyFieldValue ? "" : dependencyFieldValue.toLocaleUpperCase(); return _actualValue !== dependencyFieldValue; } @@ -40,7 +40,7 @@ function NotEquals(actualValue: any, dependencyFieldValue: string): boolean { * @returns */ function Contains(actualValue: any, dependencyFieldValue: string): boolean { - const _actualValue = isNull(actualValue) ? "" : getConcatString(actualValue, ",").toLocaleUpperCase(); + const _actualValue = isNull(actualValue) ? "" : getConcatString(actualValue.toString(), ",").toLocaleUpperCase(); dependencyFieldValue = !dependencyFieldValue ? "" : dependencyFieldValue.toLocaleUpperCase(); return _actualValue.indexOf(dependencyFieldValue) >= 0; } @@ -51,7 +51,7 @@ function Contains(actualValue: any, dependencyFieldValue: string): boolean { * @returns */ function NotContains(actualValue: any, dependencyFieldValue: string): boolean { - const _actualValue = !actualValue ? "" : getConcatString(actualValue, ",").toLocaleUpperCase(); + const _actualValue = !actualValue ? "" : getConcatString(actualValue.toString(), ",").toLocaleUpperCase(); const actualValueNull = isNullOrEmpty(_actualValue) const dependencyFieldValueNull = isNullOrEmpty(dependencyFieldValue) return (!actualValueNull && dependencyFieldValueNull) || @@ -66,6 +66,6 @@ function NotContains(actualValue: any, dependencyFieldValue: string): boolean { */ function MatchRegularExpression(actualValue: any, patternOfExpected: string): boolean { var regex = new RegExp(patternOfExpected, "igm"); - const _actualValue = !actualValue ? "" : getConcatString(actualValue, ","); + const _actualValue = !actualValue ? "" : getConcatString(actualValue.toString(), ","); return isNullOrEmpty(patternOfExpected) || (!isNullOrEmpty(patternOfExpected) && regex.test(_actualValue)); } \ No newline at end of file From 967040ed97af265d0f7742c44f0d087539cbfc9e Mon Sep 17 00:00:00 2001 From: Thach Nguyen Date: Wed, 30 Oct 2024 14:06:36 +0700 Subject: [PATCH 3/3] Check satisfiedAction when query inactive elements AFORM-4452 --- src/@episerver/forms-react/src/components/FormBody.tsx | 8 ++++++-- .../forms-react/src/context/dispatchFunctions.ts | 5 +++-- src/@episerver/forms-react/src/context/reducer.ts | 3 ++- src/@episerver/forms-react/src/hooks/useElement.ts | 2 +- src/@episerver/forms-sdk/src/helpers/initFormState.ts | 2 +- .../forms-sdk/src/models/states/ElementDependencies.ts | 1 + 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/@episerver/forms-react/src/components/FormBody.tsx b/src/@episerver/forms-react/src/components/FormBody.tsx index 87b531e..099d49a 100644 --- a/src/@episerver/forms-react/src/components/FormBody.tsx +++ b/src/@episerver/forms-react/src/components/FormBody.tsx @@ -2,7 +2,8 @@ import React, { useEffect, useRef } from "react"; import { useForms } from "../context/store"; import { StepHelper, FormContainer, FormSubmitter, IdentityInfo, isInArray, isNull, isNullOrEmpty, FormSubmitModel, FormSubmitResult, SubmitButton, FormCache, - FormConstants, ProblemDetail, StepDependCondition, getConfirmationData } from "@episerver/forms-sdk"; + FormConstants, ProblemDetail, StepDependCondition, getConfirmationData, + SatisfiedActionType} from "@episerver/forms-sdk"; import { RenderElementInStep } from "./RenderElementInStep"; import { DispatchFunctions } from "../context/dispatchFunctions"; import { FormStepNavigation } from "./FormStepNavigation"; @@ -102,7 +103,10 @@ export const FormBody = (props: FormBodyProps) => { //get inactives element let inactives = (formContext?.elementDependencies ?? []) - .filter(dependency => !dependency.isSatisfied) + .filter(dependency => + (!dependency.isSatisfied && dependency.sastisfiedAction === SatisfiedActionType.Show) + || (dependency.isSatisfied && dependency.sastisfiedAction === SatisfiedActionType.Hide) + ) .map(dependency => dependency.elementKey); //filter submissions by active elements and current step diff --git a/src/@episerver/forms-react/src/context/dispatchFunctions.ts b/src/@episerver/forms-react/src/context/dispatchFunctions.ts index 6a43b43..4148d9a 100644 --- a/src/@episerver/forms-react/src/context/dispatchFunctions.ts +++ b/src/@episerver/forms-react/src/context/dispatchFunctions.ts @@ -16,11 +16,12 @@ export class DispatchFunctions { }); } - UpdateElementDependencies = (elementKey: string, condition: boolean) => { + UpdateElementDependencies = (elementKey: string, condition: boolean, satisfiedAction: string) => { this._dispatch({ type: ActionType.UpdateElementDependencies, elementKey: elementKey, - condition + condition, + satisfiedAction }); } diff --git a/src/@episerver/forms-react/src/context/reducer.ts b/src/@episerver/forms-react/src/context/reducer.ts index 37416e9..4550a31 100644 --- a/src/@episerver/forms-react/src/context/reducer.ts +++ b/src/@episerver/forms-react/src/context/reducer.ts @@ -36,7 +36,8 @@ export function formReducer(formState: FormState, action: any) { ...formState, elementDependencies: formState.elementDependencies.map(fs => equals(fs.elementKey, action.elementKey) ? { elementKey: action.elementKey, - isSatisfied: action.condition + isSatisfied: action.condition, + sastisfiedAction: action.satisfiedAction } as ElementDependencies : fs) } as FormState; } diff --git a/src/@episerver/forms-react/src/hooks/useElement.ts b/src/@episerver/forms-react/src/hooks/useElement.ts index d4fe354..19a3d6c 100644 --- a/src/@episerver/forms-react/src/hooks/useElement.ts +++ b/src/@episerver/forms-react/src/hooks/useElement.ts @@ -107,7 +107,7 @@ export const useElement = (element: FormElementBase) => { if (currentCondition != checkConditions) { // Update element dependencies state - dispatchFuncs.UpdateElementDependencies(element.key, checkConditions); + dispatchFuncs.UpdateElementDependencies(element.key, checkConditions, conditionProps.satisfiedAction); } }, [formContext?.formSubmissions, formContext?.elementDependencies]); diff --git a/src/@episerver/forms-sdk/src/helpers/initFormState.ts b/src/@episerver/forms-sdk/src/helpers/initFormState.ts index 1d9ea6e..e8fe8b6 100644 --- a/src/@episerver/forms-sdk/src/helpers/initFormState.ts +++ b/src/@episerver/forms-sdk/src/helpers/initFormState.ts @@ -29,7 +29,7 @@ export function initFormState(formContainer: FormContainer, currentPageUrl?: str //init form submission formSubmissions = formSubmissions.concat({ elementKey: e.key, value: getDefaultValue(e) } as FormSubmission); //init form elements dependencies - elementDependencies = elementDependencies.concat({ elementKey: e.key, isSatisfied: true }); + elementDependencies = elementDependencies.concat({ elementKey: e.key, isSatisfied: true, sastisfiedAction : (e.properties as any).satisfiedAction }); } }); stepDependencies = stepDependencies.concat({ elementKey: s.formStep.key, isSatisfied: false }); diff --git a/src/@episerver/forms-sdk/src/models/states/ElementDependencies.ts b/src/@episerver/forms-sdk/src/models/states/ElementDependencies.ts index 4ec28f4..73fe0ec 100644 --- a/src/@episerver/forms-sdk/src/models/states/ElementDependencies.ts +++ b/src/@episerver/forms-sdk/src/models/states/ElementDependencies.ts @@ -1,4 +1,5 @@ export interface ElementDependencies{ elementKey: string isSatisfied: boolean + sastisfiedAction?: string } \ No newline at end of file