@awell-health/ui-library 0.1.101 → 0.1.102

package/dist/index.js

@@ -48234,10 +48234,10 @@ var     Kr=[{
 
     var AUTO_PROGRESS_DELAY = 850;
     var QuestionData = function (_a) {
-      var _b, _c, _d, _e, _f, _g, _h, _j;
-      var question = _a.question,control = _a.control,getValues = _a.getValues,labels = _a.labels,_k = _a.inputAutoFocus,inputAutoFocus = _k === void 0 ? false : _k,_l = _a.submitAndMoveToNextQuestion,submitAndMoveToNextQuestion = _l === void 0 ? lodash.exports.noop : _l,_m = _a.onAnswerChange,onAnswerChange = _m === void 0 ? lodash.exports.noop : _m,_o = _a.shouldAutoProgress,shouldAutoProgress = _o === void 0 ? function () {return false;} : _o,onFileUpload = _a.onFileUpload;
+      var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+      var question = _a.question,control = _a.control,getValues = _a.getValues,labels = _a.labels,_o = _a.inputAutoFocus,inputAutoFocus = _o === void 0 ? false : _o,_p = _a.submitAndMoveToNextQuestion,submitAndMoveToNextQuestion = _p === void 0 ? lodash.exports.noop : _p,_q = _a.onAnswerChange,onAnswerChange = _q === void 0 ? lodash.exports.noop : _q,_r = _a.shouldAutoProgress,shouldAutoProgress = _r === void 0 ? function () {return false;} : _r,onFileUpload = _a.onFileUpload;
       var config = question === null || question === void 0 ? void 0 : question.questionConfig;
-      var _p = useICDClassificationList(question.id),icdClassificationOptions = _p.options,optionsLoading = _p.loading,onIcdClassificationSearchChange = _p.onIcdClassificationSearchChange;
+      var _s = useICDClassificationList(question.id),icdClassificationOptions = _s.options,optionsLoading = _s.loading,onIcdClassificationSearchChange = _s.onIcdClassificationSearchChange;
       switch (question.userQuestionType) {
         case exports.UserQuestionType.YesNo:
           return jsxRuntime.exports.jsx(Controller, { name: question.id, control: control, defaultValue: "", rules: { required: config === null || config === void 0 ? void 0 : config.mandatory }, render: function (_a) {
@@ -48330,22 +48330,28 @@ var     Kr=[{
                   onAnswerChange();
                 }, label: question.title, id: question.id, value: value, mandatory: config === null || config === void 0 ? void 0 : config.mandatory, min: getMinValueForNumberInput(config === null || config === void 0 ? void 0 : config.number), max: getMaxValueForNumberInput(config === null || config === void 0 ? void 0 : config.number) });
             } });
-        case exports.UserQuestionType.ShortText:
-          return jsxRuntime.exports.jsx(Controller, { name: question.id, control: control, defaultValue: "", rules: __assign({ required: config === null || config === void 0 ? void 0 : config.mandatory }, ((_b = config === null || config === void 0 ? void 0 : config.input_validation) === null || _b === void 0 ? void 0 : _b.pattern) && {
-              value: new RegExp((_c = config === null || config === void 0 ? void 0 : config.input_validation) === null || _c === void 0 ? void 0 : _c.pattern),
-              message: (_d = config === null || config === void 0 ? void 0 : config.input_validation) === null || _d === void 0 ? void 0 : _d.helper_text }),
-            render: function (_a) {
-              var _b = _a.field,onChange = _b.onChange,value = _b.value;
-              return jsxRuntime.exports.jsx(InputField, { autoFocus: inputAutoFocus, type: "text", onChange: function (e) {
-                  onChange(e.target.value);
-                  onAnswerChange();
-                }, label: question.title, id: question.id, value: value, mandatory: config === null || config === void 0 ? void 0 : config.mandatory });
-            } });
+        case exports.UserQuestionType.ShortText:{
+            var hasValidInputValidation = !!(config === null || config === void 0 ? void 0 : config.input_validation) &&
+            typeof ((_b = config === null || config === void 0 ? void 0 : config.input_validation) === null || _b === void 0 ? void 0 : _b.pattern) === 'string' &&
+            ((_c = config === null || config === void 0 ? void 0 : config.input_validation) === null || _c === void 0 ? void 0 : _c.pattern.length) > 0;
+            return jsxRuntime.exports.jsx(Controller, { name: question.id, control: control, defaultValue: "", rules: __assign({ required: config === null || config === void 0 ? void 0 : config.mandatory }, hasValidInputValidation && {
+                pattern: {
+                  value: new RegExp((_e = (_d = config === null || config === void 0 ? void 0 : config.input_validation) === null || _d === void 0 ? void 0 : _d.pattern) !== null && _e !== void 0 ? _e : ''),
+                  message: (_g = (_f = config === null || config === void 0 ? void 0 : config.input_validation) === null || _f === void 0 ? void 0 : _f.helper_text) !== null && _g !== void 0 ? _g : 'The input value is invalid.' } }),
+
+              render: function (_a) {
+                var _b = _a.field,onChange = _b.onChange,value = _b.value,error = _a.fieldState.error;
+                return jsxRuntime.exports.jsxs(jsxRuntime.exports.Fragment, { children: [jsxRuntime.exports.jsx(InputField, { autoFocus: inputAutoFocus, type: "text", onChange: function (e) {
+                      onChange(e.target.value);
+                      onAnswerChange();
+                    }, label: question.title, id: question.id, value: value, mandatory: config === null || config === void 0 ? void 0 : config.mandatory }), error && jsxRuntime.exports.jsx(Text, __assign({ variant: "textSmall", color: "var(--awell-signalError100)" }, { children: error.message }))] });
+              } });
+          }
         case exports.UserQuestionType.Telephone:
-          var availableCountries_1 = ((_f = (_e = config === null || config === void 0 ? void 0 : config.phone) === null || _e === void 0 ? void 0 : _e.available_countries) !== null && _f !== void 0 ? _f : []).
+          var availableCountries_1 = ((_j = (_h = config === null || config === void 0 ? void 0 : config.phone) === null || _h === void 0 ? void 0 : _h.available_countries) !== null && _j !== void 0 ? _j : []).
           map(function (c) {return c === null || c === void 0 ? void 0 : c.toLocaleLowerCase();}).
           filter(function (x) {return !lodash.exports.isNil(x);});
-          var initialCountry_1 = (_j = (_h = (_g = config === null || config === void 0 ? void 0 : config.phone) === null || _g === void 0 ? void 0 : _g.default_country) === null || _h === void 0 ? void 0 : _h.toLocaleLowerCase()) !== null && _j !== void 0 ? _j : 'gb';
+          var initialCountry_1 = (_m = (_l = (_k = config === null || config === void 0 ? void 0 : config.phone) === null || _k === void 0 ? void 0 : _k.default_country) === null || _l === void 0 ? void 0 : _l.toLocaleLowerCase()) !== null && _m !== void 0 ? _m : 'gb';
           return jsxRuntime.exports.jsx(Controller, { name: question.id, control: control, defaultValue: "", render: function (_a) {
               var _b;
               var _c = _a.field,onChange = _c.onChange,value = _c.value;
@@ -48783,6 +48789,26 @@ var     Kr=[{
         return {
           isValid: true };
 
+      };
+      var validateInputValidationResponse = function (questionConfig, value) {
+        if (!questionConfig || !questionConfig.input_validation) {
+          return {
+            isValid: true };
+
+        }
+        var pattern = questionConfig.input_validation.pattern;
+        if (pattern) {
+          var regex = new RegExp(pattern);
+          if (!regex.test(value)) {
+            return {
+              isValid: false,
+              errorType: 'INVALID_FORMAT' };
+
+          }
+        }
+        return {
+          isValid: true };
+
       };
       return {
         isValidE164Number: isValidE164Number,
@@ -48792,7 +48818,8 @@ var     Kr=[{
         validateDateResponse: validateDateResponse,
         validateNumberResponse: validateNumberResponse,
         validateEmailResponse: validateEmailResponse,
-        validateAttachmentsResponse: validateAttachmentsResponse };
+        validateAttachmentsResponse: validateAttachmentsResponse,
+        validateInputValidationResponse: validateInputValidationResponse };
 
     };
 
@@ -48876,8 +48903,8 @@ var     Kr=[{
       }
       return Math.round((currentQuestionIndex + 1) / allQuestions.length * 100);
     };
-    var getErrorsForQuestion = function (currentQuestion, formMethods, errorLabels, isValidE164Number, validateDateResponse, validateNumberResponse, validateEmailResponse, validateAttachmentsResponse) {
-      var _a;
+    var getErrorsForQuestion = function (currentQuestion, formMethods, errorLabels, isValidE164Number, validateDateResponse, validateNumberResponse, validateEmailResponse, validateAttachmentsResponse, validateInputValidationResponse) {
+      var _a, _b, _c;
       if ((currentQuestion === null || currentQuestion === void 0 ? void 0 : currentQuestion.userQuestionType) === exports.UserQuestionType.Description) {
         return [];
       }
@@ -48980,6 +49007,20 @@ var     Kr=[{
 
 
 
+        }
+      }
+      if ((currentQuestion === null || currentQuestion === void 0 ? void 0 : currentQuestion.userQuestionType) === exports.UserQuestionType.ShortText) {
+        var error = validateInputValidationResponse(currentQuestion === null || currentQuestion === void 0 ? void 0 : currentQuestion.questionConfig, valueOfCurrentQuestion);
+        if (error.isValid === false) {
+          switch (error.errorType) {
+            case 'INVALID_FORMAT':
+              return [
+              {
+                id: currentQuestion.id,
+                error: ((_c = (_b = currentQuestion === null || currentQuestion === void 0 ? void 0 : currentQuestion.questionConfig) === null || _b === void 0 ? void 0 : _b.input_validation) === null || _c === void 0 ? void 0 : _c.helper_text) || 'The input value is invalid.' }];}
+
+
+
         }
       }
       return [];
@@ -49019,7 +49060,7 @@ var     Kr=[{
       var _d = React.useState([]),errors = _d[0],setErrors = _d[1];
       var _e = React.useState(false),formHasErrors = _e[0],setFormHasErrors = _e[1];
       var _f = React.useState(false),isSubmittingForm = _f[0],setIsSubmittingForm = _f[1];
-      var _g = useValidate(),isValidE164Number = _g.isValidE164Number,validateDateResponse = _g.validateDateResponse,validateNumberResponse = _g.validateNumberResponse,validateEmailResponse = _g.validateEmailResponse,validateAttachmentsResponse = _g.validateAttachmentsResponse;
+      var _g = useValidate(),isValidE164Number = _g.isValidE164Number,validateDateResponse = _g.validateDateResponse,validateNumberResponse = _g.validateNumberResponse,validateEmailResponse = _g.validateEmailResponse,validateAttachmentsResponse = _g.validateAttachmentsResponse,validateInputValidationResponse = _g.validateInputValidationResponse;
       var updateQuestionVisibility = React.useCallback(function () {return __awaiter(void 0, void 0, void 0, function () {
           var formValuesInput, evaluationResults, updatedQuestions;
           return __generator(this, function (_a) {
@@ -49088,7 +49129,7 @@ var     Kr=[{
               case 1:
                 _a.sent();
                 formErrors = visibleQuestions.flatMap(function (vq) {
-                  return getErrorsForQuestion(vq, formMethods, errorLabels, isValidE164Number, validateDateResponse, validateNumberResponse, validateEmailResponse, validateAttachmentsResponse);
+                  return getErrorsForQuestion(vq, formMethods, errorLabels, isValidE164Number, validateDateResponse, validateNumberResponse, validateEmailResponse, validateAttachmentsResponse, validateInputValidationResponse);
                 });
                 setErrors(formErrors);
                 if (formErrors.length === 0) {
@@ -49116,7 +49157,7 @@ var     Kr=[{
     var useConversationalForm = function (_a) {
       var questions = _a.questions,evaluateDisplayConditions = _a.evaluateDisplayConditions,onSubmit = _a.onSubmit,errorLabels = _a.errorLabels,storedAnswers = _a.storedAnswers,_b = _a.autosaveAnswers,autosaveAnswers = _b === void 0 ? true : _b,onAnswersChange = _a.onAnswersChange;
       var initialValues = convertToFormFormat(storedAnswers, questions);
-      var _c = useValidate(),isValidE164Number = _c.isValidE164Number,validateDateResponse = _c.validateDateResponse,validateNumberResponse = _c.validateNumberResponse,validateEmailResponse = _c.validateEmailResponse,validateAttachmentsResponse = _c.validateAttachmentsResponse;
+      var _c = useValidate(),isValidE164Number = _c.isValidE164Number,validateDateResponse = _c.validateDateResponse,validateNumberResponse = _c.validateNumberResponse,validateEmailResponse = _c.validateEmailResponse,validateAttachmentsResponse = _c.validateAttachmentsResponse,validateInputValidationResponse = _c.validateInputValidationResponse;
       var formMethods = useForm({
         defaultValues: getInitialValues(questions),
         shouldUnregister: false,
@@ -49185,7 +49226,7 @@ var     Kr=[{
       }, []);
       var handleCheckForErrors = function (currentQuestion) {
         var errorsWithoutCurrent = errors.filter(function (err) {return err.id !== (currentQuestion === null || currentQuestion === void 0 ? void 0 : currentQuestion.id);});
-        var existingErrors = getErrorsForQuestion(currentQuestion, formMethods, errorLabels, isValidE164Number, validateDateResponse, validateNumberResponse, validateEmailResponse, validateAttachmentsResponse);
+        var existingErrors = getErrorsForQuestion(currentQuestion, formMethods, errorLabels, isValidE164Number, validateDateResponse, validateNumberResponse, validateEmailResponse, validateAttachmentsResponse, validateInputValidationResponse);
         setErrors(__spreadArray(__spreadArray([], errorsWithoutCurrent, true), existingErrors, true));
         return existingErrors.length > 0;
       };

package/dist/types/hooks/useForm/helpers.d.ts

@@ -3,7 +3,7 @@ import { Question, QuestionWithVisibility, FormError } from '../../types';
 import { AnswerValue, ErrorLabels, QuestionRuleResult } from './types';
 import { CountryIso2 } from 'react-international-phone';
 import { Maybe, QuestionConfig } from '../../types/generated/types-orchestration';
-import { AttachmentsValidationErrorType, DateValidationErrorType, EmailValidationErrorType, NumberValidationErrorType } from '../useValidate/useValidate';
+import { AttachmentsValidationErrorType, DateValidationErrorType, EmailValidationErrorType, InputValidationErrorType, NumberValidationErrorType } from '../useValidate/useValidate';
 export declare const getDefaultValue: (question: Question) => AnswerValue;
 export declare const getInitialValues: (questions: Array<Question>) => Record<string, AnswerValue>;
 export declare const convertToAwellInput: (formResponse: any) => {
@@ -30,6 +30,9 @@ export declare const getErrorsForQuestion: (currentQuestion: QuestionWithVisibil
 }, validateAttachmentsResponse: (questionConfig: Maybe<QuestionConfig> | undefined, value: string) => {
     isValid: boolean;
     errorType?: AttachmentsValidationErrorType;
+}, validateInputValidationResponse: (questionConfig: Maybe<QuestionConfig> | undefined, value: string) => {
+    isValid: boolean;
+    errorType?: InputValidationErrorType;
 }) => Array<FormError>;
 export declare const getDirtyFieldValues: (formMethods: UseFormReturn) => Record<string, AnswerValue>;
 export declare const markInitialValuesAsDirty: ({ formMethods, defaultValues, initialValues, }: {

package/dist/types/hooks/useValidate/useValidate.d.ts

@@ -4,6 +4,7 @@ export declare type DateValidationErrorType = 'DATE_CANNOT_BE_IN_THE_FUTURE' | '
 export declare type NumberValidationErrorType = 'NOT_A_NUMBER' | 'OUT_OF_RANGE';
 export declare type EmailValidationErrorType = 'INVALID_FORMAT';
 export declare type AttachmentsValidationErrorType = 'REQUIRED' | 'INVALID_FORMAT';
+export declare type InputValidationErrorType = 'INVALID_FORMAT';
 export interface UseValidateHook {
     validatePhoneNumber: (number: string, availableCountries?: Array<CountryIso2>) => ValidatePhoneReturn;
     isValidE164Number: (number: string, availableCountries?: Array<CountryIso2>) => boolean;
@@ -25,6 +26,10 @@ export interface UseValidateHook {
         isValid: boolean;
         errorType?: AttachmentsValidationErrorType;
     };
+    validateInputValidationResponse: (questionConfig: Maybe<QuestionConfig> | undefined, value: string) => {
+        isValid: boolean;
+        errorType?: InputValidationErrorType;
+    };
 }
 export declare const handleUSException: (number: string, originalValidation: ValidatePhoneReturn) => ValidatePhoneReturn;
 export declare const useValidate: () => UseValidateHook;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awell-health/ui-library",
-  "version": "0.1.101",
+  "version": "0.1.102",
   "description": "UI components to integrate with Awell Health",
   "repository": {
     "type": "git",