@dac-software/forms-pl - npm Package Compare versions

Comparing version 2.0.0 to 2.0.1-QP-944-poprawki-damage-process.0

dist/esm/components/damageForm/index.js

@@ -23,3 +23,3 @@ import React, { useCallback } from 'react';
             case DamageFormSteps.CHOOSE_CASE_TYPE: {
-                return (React.createElement(ChooseCaseType, { formik: formik, formStep: formStep, apiKey: apiKey, onHandleSwitchPage: onHandleSwitchPage, onChangeCaseType: onChangeCaseType, onSetIsLoading: onSetIsLoading, formSteps: formAllSteps, onSetApiKey: onSetApiKey, onSubmitPopupShow: onSubmitPopupShow, onSetValidationError: onSetValidationError, onResetValidationError: onResetValidationError, validationError: validationError, lastCheckedRegistrationNumber: lastCheckedRegistrationNumber, onSetLastCheckedRegistrationNumber: onSetLastCheckedRegistrationNumber }));
+                return (React.createElement(ChooseCaseType, { formik: formik, formStep: formStep, apiKey: apiKey, onHandleSwitchPage: onHandleSwitchPage, onChangeCaseType: onChangeCaseType, onSetIsLoading: onSetIsLoading, formSteps: formAllSteps, onSetApiKey: onSetApiKey, onSubmitPopupShow: onSubmitPopupShow, onSetValidationError: onSetValidationError, onResetValidationError: onResetValidationError, validationError: validationError, lastCheckedRegistrationNumber: lastCheckedRegistrationNumber, onSetLastCheckedRegistrationNumber: onSetLastCheckedRegistrationNumber, isLoading: isLoading }));
             }
@@ -36,3 +36,3 @@ case DamageFormSteps.INCIDENT_DESCRIPTION: {
             case DamageFormSteps.PERPETRATOR_DATA: {
-                return (React.createElement(PerpetratorData, { formik: formik, formStep: formStep, onHandleSwitchPage: onHandleSwitchPage, formSteps: formAllSteps, apiKey: apiKey }));
+                return (React.createElement(PerpetratorData, { formik: formik, formStep: formStep, onHandleSwitchPage: onHandleSwitchPage, formSteps: formAllSteps, apiKey: apiKey, onSetIsLoading: onSetIsLoading }));
             }
@@ -60,4 +60,19 @@ case DamageFormSteps.SUBMIT: {
         lastCheckedRegistrationNumber,
-        onSetLastCheckedRegistrationNumber
+        onSetLastCheckedRegistrationNumber,
+        isLoading
     ]);
+    const preparePopupHeaderText = useCallback(() => {
+        if (validationError && validationError === t('damage-form.error.server-error')) {
+            return 'damage-form.titles.server-error';
+        }
+        else if (validationError && validationError === t('damage-form.error.check-registration-number')) {
+            return 'damage-form.titles.validation-error';
+        }
+        else if (formResponseState && formResponseState.status === 'SUCCESS') {
+            return 'damage-form.titles.form-send-successfully';
+        }
+        else {
+            return 'damage-form.titles.form-send-failure';
+        }
+    }, [formResponseState, t, validationError]);
     return (React.createElement(React.Fragment, null,
@@ -68,3 +83,3 @@ React.createElement(FormPage, { onSubmit: onHandleContactFormSubmit, inputsContainerCustomClassName: 'form-page__inputs-container--height-inherit' },
             isLoading && React.createElement(Loader, null)),
-        React.createElement(Popup, { onShow: onSubmitPopupShow, onHide: onSubmitPopupHide, isOpen: isSubmitPopupOpen, headerTextTranslationKey: validationError ? 'damage-form.titles.validation-error' : formResponseState && formResponseState.status === 'SUCCESS' ? 'damage-form.titles.form-send-successfully' : 'damage-form.titles.form-send-failure', confirmButtonTranslationKey: 'OK', contentCustomClass: 'portal-popup__content--wider' }, validationError ? React.createElement(TextContent, { text: validationError }) : formResponseState && formResponseState.status === 'SUCCESS' ? (React.createElement(TextContent, { text: t('damage-form.text.success-info', { interpolation: { escapeValue: false } }) },
+        React.createElement(Popup, { onShow: onSubmitPopupShow, onHide: onSubmitPopupHide, isOpen: isSubmitPopupOpen, headerTextTranslationKey: preparePopupHeaderText(), confirmButtonTranslationKey: 'OK', contentCustomClass: 'portal-popup__content--wider' }, validationError ? React.createElement(TextContent, { text: validationError }) : formResponseState && formResponseState.status === 'SUCCESS' ? (React.createElement(TextContent, { text: t('damage-form.text.success-info', { interpolation: { escapeValue: false } }) },
             React.createElement("a", { href: `tel:${CONTACT_PHONE}` }, CONTACT_PHONE))) : (React.createElement(TextContent, { text: t('damage-form.text.failure-info', { interpolation: { escapeValue: false } }) },
@@ -71,0 +86,0 @@ React.createElement("a", { href: `tel:${CONTACT_PHONE}` }, CONTACT_PHONE))))));

dist/esm/components/damageForm/steps/ChooseCaseType/hook.js

@@ -43,2 +43,5 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
                     props.onHandleSwitchPage(props.formSteps[props.formSteps.indexOf(props.formStep) + 1]);
+                    if (props.validationError) {
+                        props.onResetValidationError();
+                    }
                 }
@@ -48,2 +51,5 @@ }
                 console.error(error);
+                props.onSetIsLoading(false);
+                props.onSetValidationError(t('damage-form.error.server-error'));
+                props.onSubmitPopupShow();
                 const errors = yield props.formik.validateForm(props.formik.values);
@@ -50,0 +56,0 @@ props.formik.setErrors(errors);

dist/esm/components/damageForm/steps/PerpetratorData/hook.js

@@ -45,2 +45,3 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
         else {
+            props.onSetIsLoading(true);
             const response = yield sendFiles(file, config, props.apiKey);
@@ -53,2 +54,3 @@ if (response.status === 'SUCCESS') {
             }
+            props.onSetIsLoading(false);
         }
@@ -55,0 +57,0 @@ });

dist/esm/translations/resources.js

@@ -120,2 +120,7 @@ const resources = {
             'damage-form.field.is-driver-license-indefinite': 'Prawo jazdy jest bezterminowe',
+            'damage-form.titles.server-error': 'Błąd serwera',
+            'damage-form.error.server-error': `
+        Błąd komunikacji z serwerem.
+        Spróbuj ponownie lub skontaktuj się z pomocą techniczną.
+      `,
             hour: 'Godz.',
@@ -122,0 +127,0 @@ OK: 'OK',

package.json

 {
   "name": "@dac-software/forms-pl",
-  "version": "2.0.0",
+  "version": "2.0.1-QP-944-poprawki-damage-process.0",
   "license": "UNLICENSED",
@@ -5,0 +5,0 @@ "main": "dist/forms-pl",

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1545167

increased by0.12%

Lines of code

2270

increased by1.2%

Worsened metrics

Number of low quality alerts

2

increased by100%

No dependency changes