wickes-css2 2.94.0-develop.2 → 2.94.0-develop.21

package/build/js/page/personal-details.js

@@ -24,25 +24,40 @@ Wick.PersonalDetails = {
     formInvalidClass: 'form_invalid',
     notification: '.notification',
     fieldError: '.form-row.form-row_validation-error',
+    changePasswordPopup: '#change-password-popup',
+    globalMessage: '.globalMessages',
   },
-  initialFormState: {},
   errorMessages: {
     errorFirstName: 'Please enter your first name',
     errorSurname: 'Please enter your surname',
-    errorEmail: 'Please enter you email',
-  },
-  fieldToLabelMap: {
-    titleCode: 'Title',
-    firstName: 'First name',
-    lastName: 'Surname',
-    email: 'Email',
-    tradeType: 'How would you describe yourself or your main trade',
+    errorEmail: 'Please enter your email address',
   },
   defaultNotificationConfig: {
-    container: '.globalMessages .col-12',
+    container: '.personal-details .globalMessages',
     closeBtn: true,
     noScrolling: true,
   },
+  isTradeTypeLabel() {
+    return $(Wick.PersonalDetails.el.userForm).find('label:contains("Trade type")').length;
+  },
+  fieldToLabelMap(name) {
+    let currentTradeType = ''
+    if (name === 'tradeType') {
+      currentTradeType = Wick.PersonalDetails.isTradeTypeLabel()
+        ? 'Trade type'
+        : 'How would you describe yourself or your main trade';
+    }
+
+    const fieldMap = {
+      titleCode: 'Title',
+      firstName: 'First name',
+      lastName: 'Surname',
+      email: 'Email address',
+      tradeType: currentTradeType,
+    };
+
+    return fieldMap[name] || name;
+  },
   getFieldsConfigurations: function () {
     return [
       {
@@ -111,11 +126,11 @@ Wick.PersonalDetails = {
           text: response.globalMessage.message,
           type: 'success',
         });
-        Wick.PersonalDetails.initialFormState = Wick.LeaveEvent.getState(Wick.PersonalDetails.el.userForm);
-        Wick.PersonalDetails.updateUserInformationSection(Wick.PersonalDetails.initialFormState);
-        Wick.PersonalDetails.updateFormFields(Wick.PersonalDetails.initialFormState);
+        Wick.LeaveEvent.initialFormState = Wick.LeaveEvent.getState(Wick.PersonalDetails.el.userForm);
+        Wick.PersonalDetails.updateUserInformationSection(Wick.LeaveEvent.initialFormState);
+        Wick.PersonalDetails.updateFormFields(Wick.LeaveEvent.initialFormState);
         Wick.PersonalDetails.hideForm();
-        Wick.LeaveEvent.removeLeaveEvent();
+        Wick.PersonalDetails.scrollToElement(Wick.PersonalDetails.el.globalMessage);
       })
       .catch((error) => {
         Wick.Notification.show({
@@ -124,11 +139,12 @@ Wick.PersonalDetails = {
           type: 'error',
         });
         Wick.PersonalDetails.handleFieldErrors(error);
+        Wick.PersonalDetails.scrollToElement(Wick.PersonalDetails.el.globalMessage);
       });
   },
-  handleFieldErrors(fieldErrors) {
-    if (fieldErrors && fieldErrors.length) {
-      fieldErrors.forEach((fieldError) => {
+  handleFieldErrors(error) {
+    if (error.fieldErrors && error.fieldErrors.length) {
+      error.fieldErrors.forEach((fieldError) => {
         const field = `#${fieldError.field}`;
         updateStylingError(field, false, fieldError.message);
       });
@@ -136,6 +152,15 @@ Wick.PersonalDetails = {
   },
   submitForm(event) {
     event.preventDefault();
+    Wick.PersonalDetails.trimAndRewriteInputs(Wick.PersonalDetails.el.userForm);
+
+    if (!Wick.PersonalDetails.hasUnsavedChanges()) {
+      Wick.PersonalDetails.hideForm();
+      $(Wick.PersonalDetails.el.notification).remove();
+      Wick.PersonalDetails.scrollToElement(Wick.PersonalDetails.el.globalMessage);
+      return;
+    }
+
     if (Wick.PersonalDetails.validateForm()) {
       Wick.PersonalDetails.requestToUpdateForm();
     } else {
@@ -144,6 +169,7 @@ Wick.PersonalDetails = {
         text: 'Please correct the errors below.',
         type: 'error',
       });
+      Wick.PersonalDetails.scrollToElement(Wick.PersonalDetails.el.globalMessage);
     }
   },
   updateUserInformationSection(personalDetails) {
@@ -153,27 +179,36 @@ Wick.PersonalDetails = {
 
     $userInformationList.empty();
 
-    personalDetails.forEach(({ name, value }) => {
-      const label = Wick.PersonalDetails.fieldToLabelMap[name] || name;
-
+    personalDetails.forEach(({ name, value, text }) => {
+      const label = Wick.PersonalDetails.fieldToLabelMap(name);
+      const textField = text || value
       $userInformationList.append(
         userInformationField({
           label,
-          value,
+          textField,
         })
       );
     });
+
+    Wick.PersonalDetails.hideParentListItemIfLabelExists('CSRFToken');
   },
   updateFormFields(personalDetails) {
-    personalDetails.forEach(({ name, value }) => {
+    personalDetails.forEach(({ name, value, text }) => {
       const field = document.querySelector(`#${name}`);
       if (field) {
-        field.value = value || '';
-        field.setAttribute('value', value || '');
-
-        if (field.tagName === 'SELECT' || field.tagName === 'INPUT') {
-          field.value = value || '';
-          field.setAttribute('value', value || '');
+        if (field.tagName === 'INPUT') {
+          field.value = text || value || '';
+          field.setAttribute('value', text || value || '');
+        } else {
+          const options = field.querySelectorAll('option');
+          options.forEach(option => {
+            if (option.textContent.trim() === value || option.value === value) {
+              option.setAttribute('selected', 'selected');
+              field.value = option.value;
+            } else {
+              option.removeAttribute('selected');
+            }
+          });
         }
       }
     });
@@ -182,18 +217,21 @@ Wick.PersonalDetails = {
     Wick.PersonalDetails.hideForm();
     $(Wick.PersonalDetails.el.notification).remove();
     $(Wick.LeaveEvent.el.leavePopup).modal('hide');
-    Wick.PersonalDetails.updateFormFields(Wick.PersonalDetails.initialFormState);
+    Wick.PersonalDetails.updateFormFields(Wick.LeaveEvent.initialFormState);
+  },
+  hasUnsavedChanges() {
+    const currentState = Wick.LeaveEvent.getState(Wick.PersonalDetails.el.userForm);
+
+    return !_.isEqual(currentState, Wick.LeaveEvent.initialFormState);
   },
   changePasswordHandler(event) {
     const changePasswordUrl = $(Wick.PersonalDetails.el.btnChangePassword).attr('href');
-    const currentState = Wick.LeaveEvent.getState(Wick.PersonalDetails.el.userForm);
-    const isDifferent = !_.isEqual(currentState, Wick.PersonalDetails.initialFormState);
 
-    if (isDifferent) {
+    if (Wick.PersonalDetails.hasUnsavedChanges()) {
       event.preventDefault();
-      $(Wick.LeaveEvent.el.leavePopup).modal('show');
+      $(Wick.PersonalDetails.el.changePasswordPopup).modal('show');
       Wick.LeaveEvent.proceedBrowserLeave = true;
-      $(Wick.LeaveEvent.el.leavePopup).find(Wick.PersonalDetails.el.btnContinue).off('click').on('click', function () {
+      $(Wick.PersonalDetails.el.changePasswordPopup).find(Wick.PersonalDetails.el.btnContinue).off('click').on('click', function () {
         Wick.LeaveEvent.removeLeaveEvent();
         $(Wick.LeaveEvent.el.leavePopup).modal('hide');
         window.location.href = changePasswordUrl;
@@ -202,9 +240,40 @@ Wick.PersonalDetails = {
       window.location.href = changePasswordUrl;
     }
   },
+  hideParentListItemIfLabelExists(labelText) {
+    const label = $(Wick.PersonalDetails.el.userInformationList).find(`label:contains("${labelText}")`);
+
+    if (label.length > 0) {
+      label.closest('li').hide();
+    }
+  },
+  scrollToElement(element) {
+    const globalMessage = $(element);
+
+    if (globalMessage.length > 0) {
+      $('html, body').animate({
+        scrollTop: globalMessage.offset().top - 20
+      }, 300);
+    }
+  },
+  trimAndRewriteInputs(formSelector) {
+    const $form = $(formSelector);
+
+    if (!$form.length) {
+      return;
+    }
+
+    $form.find('input[type="text"], input[type="email"]').each(function () {
+      $(this).val($.trim($(this).val()));
+    });
+  },
   init: function () {
-    Wick.LeaveEvent.bindEvent(Wick.PersonalDetails.el.userForm, Wick.PersonalDetails.el.btnCancel, Wick.PersonalDetails.el.btnContinue, Wick.PersonalDetails.resetFormToInitialState);
-    Wick.PersonalDetails.initialFormState = Wick.LeaveEvent.getState(Wick.PersonalDetails.el.userForm)
+    Wick.LeaveEvent.bindEvent(
+      Wick.PersonalDetails.el.userForm,
+      Wick.PersonalDetails.el.btnCancel,
+      Wick.PersonalDetails.el.btnContinue,
+      Wick.PersonalDetails.resetFormToInitialState
+    );
 
     $(Wick.PersonalDetails.el.btnEdit).on('click', Wick.PersonalDetails.showForm);
     $(Wick.PersonalDetails.el.btnSave).on('click', Wick.PersonalDetails.submitForm);

package/build/js/page/quiz.js

@@ -4,7 +4,7 @@ import {
   isValidInputTextField,
   updateStylingError
 } from "./utils/validation";
-import {isTouchDevice, isApp} from "./utils/helpers";
+import {isTouchDevice} from "./utils/helpers";
 
 var Wick = window.Wick || {};
 Wick.Quiz = {
@@ -209,9 +209,25 @@ Wick.Quiz = {
       };
 
       html2pdf()
-        .set(options)
-        .from(selector)
-        .save();
+          .set(options)
+          .from(selector)
+          .output('datauristring')
+          .then(function (pdfAsDataUri) {
+
+            const postMessage = {
+              event: 'matchMakertoolResultBase64',
+              data: {
+                filename: options.filename,
+                file: pdfAsDataUri
+              }
+            };
+
+            if (window.ReactNativeWebView && window.ReactNativeWebView.postMessage) {
+              window.ReactNativeWebView.postMessage(JSON.stringify(postMessage));
+            } else {
+              console.warn('ReactNativeWebView not available');
+            }
+          }).save();
     }).catch(error => console.error("Error converting SVGs:", error));
   },
 
@@ -251,12 +267,6 @@ Wick.Quiz = {
     };
   },
 
-  disablePrintButtonOnMobileApp: function() {
-    if (isApp()) {
-      Wick.Quiz.disableButton(Wick.Quiz.el.btnPrintResultQuiz);
-    }
-  },
-
   handlePrintOrPDFInteraction: function (event) {
     event.preventDefault();
 
@@ -284,7 +294,6 @@ Wick.Quiz = {
       debouncedHandleInteraction(event);
     });
 
-    Wick.Quiz.disablePrintButtonOnMobileApp();
   }
 };