@jetshop/core 5.13.10-0 → 5.14.0-alpha.49df897e

package/cart/useAddToCart.js

@@ -1,118 +1,118 @@
-import { useContext } from 'react';
-import { useCartId } from '../components/Cart/CartIdContext';
-import { getArticleNumber } from '../components/Mutation/AddToCart/addToCartUtils';
-import ProductConfigurationContext from '../components/ProductConfigurationProvider/ProductConfigurationContext';
-import { useDynamicPrice } from '../hooks/useDynamicPrice';
-import { useFormik } from 'formik';
-import { useIntl } from '@jetshop/intl';
-import { useStockStatus } from '../hooks/Product/useStockStatus';
-const useValidate = ({ commentValidators, articleNumber, product, variant, getMissingOptions }) => {
-    var _a, _b;
-    const t = useIntl();
-    const { status, maxOrderQuantity } = useStockStatus(variant || product);
-    const isPreOrderRequired = !!((_a = product.preOrder) === null || _a === void 0 ? void 0 : _a.fromDate) && !!((_b = product.preOrder) === null || _b === void 0 ? void 0 : _b.toDate);
-    const validate = (values) => {
-        const errors = {};
-        if (status !== 'inStock') {
-            errors.status = t('Product is not in stock');
-        }
-        if (values.quantity < 1) {
-            errors.quantity = t('Please enter a valid quantity');
-        }
-        if (maxOrderQuantity && values.quantity > maxOrderQuantity) {
-            errors.quantity = t('{maxOrderQuantity} is the maximum order quantity', {
-                maxOrderQuantity
-            });
-        }
-        Object.keys(values.comments).forEach((name) => {
-            const validator = commentValidators[name];
-            if (validator) {
-                const error = validator({ value: values.comments[name] });
-                if (error) {
-                    if (typeof errors.comments === 'undefined') {
-                        errors.comments = {};
-                    }
-                    errors.comments[name] = error;
-                }
-            }
-            if (product.customerComments.find((customerComment) => customerComment.name === name).required &&
-                values.comments[name].length === 0) {
-                if (typeof errors.comments === 'undefined') {
-                    errors.comments = {};
-                }
-                errors.comments[name] = t(`{customerCommentName} is required`, {
-                    customerCommentName: name
-                });
-            }
-        });
-        if (!articleNumber) {
-            if (typeof errors.options === 'undefined') {
-                errors.options = {};
-            }
-            const missingOptions = getMissingOptions();
-            missingOptions.forEach((option) => {
-                errors.options[option.name] = t(`{optionName} is required`, {
-                    optionName: option.name
-                });
-            });
-        }
-        if (!values.preOrder && isPreOrderRequired) {
-            errors.preOrder = t('Pre-order date is required');
-        }
-        return errors;
-    };
-    return { validate };
-};
-export function useAddToCart({ product, variant, submit, commentValidators = {}, getMissingOptions, initialValues }) {
-    var _a, _b;
-    if (!product)
-        throw new Error('No product was supplied to useAddToCart');
-    const productConfigurationContext = useContext(ProductConfigurationContext);
-    const configurationIds = productConfigurationContext === null || productConfigurationContext === void 0 ? void 0 : productConfigurationContext.ids;
-    const price = useDynamicPrice(product, variant);
-    const { cartId } = useCartId();
-    const articleNumber = getArticleNumber(product, variant);
-    const initialComments = {};
-    if (product.customerComments) {
-        product.customerComments.forEach(({ name }) => (initialComments[name] = ''));
-    }
-    const initialOptions = {};
-    (_b = (_a = product === null || product === void 0 ? void 0 : product.variants) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.forEach((option) => {
-        initialOptions[option.name] = '';
-    });
-    const { validate } = useValidate({
-        commentValidators,
-        articleNumber,
-        product,
-        variant,
-        getMissingOptions
-    });
-    const formik = useFormik({
-        validateOnChange: false,
-        validate,
-        initialValues: Object.assign({ quantity: 1, comments: initialComments, options: initialOptions }, initialValues),
-        onSubmit: (values) => {
-            const comments = Object.keys(values.comments).map((name) => ({
-                name,
-                value: values.comments[name]
-            }));
-            const preOrderDate = values.preOrder ? new Date(values.preOrder) : null;
-            submit({
-                input: {
-                    quantity: values.quantity,
-                    preOrderDate,
-                    comments,
-                    articleNumber,
-                    cartId,
-                    configurationIds
-                },
-                optimistic: Object.assign(Object.assign({}, price), { quantity: values.quantity, product,
-                    variant })
-            });
-        }
-    });
-    return {
-        form: formik
-    };
-}
+import { useContext } from 'react';
+import { useCartId } from '../components/Cart/CartIdContext';
+import { getArticleNumber } from '../components/Mutation/AddToCart/addToCartUtils';
+import ProductConfigurationContext from '../components/ProductConfigurationProvider/ProductConfigurationContext';
+import { useDynamicPrice } from '../hooks/useDynamicPrice';
+import { useFormik } from 'formik';
+import { useIntl } from '@jetshop/intl';
+import { useStockStatus } from '../hooks/Product/useStockStatus';
+const useValidate = ({ commentValidators, articleNumber, product, variant, getMissingOptions }) => {
+    var _a, _b;
+    const t = useIntl();
+    const { status, maxOrderQuantity } = useStockStatus(variant || product);
+    const isPreOrderRequired = !!((_a = product.preOrder) === null || _a === void 0 ? void 0 : _a.fromDate) && !!((_b = product.preOrder) === null || _b === void 0 ? void 0 : _b.toDate);
+    const validate = (values) => {
+        const errors = {};
+        if (status !== 'inStock') {
+            errors.status = t('Product is not in stock');
+        }
+        if (values.quantity < 1) {
+            errors.quantity = t('Please enter a valid quantity');
+        }
+        if (maxOrderQuantity && values.quantity > maxOrderQuantity) {
+            errors.quantity = t('{maxOrderQuantity} is the maximum order quantity', {
+                maxOrderQuantity
+            });
+        }
+        Object.keys(values.comments).forEach((name) => {
+            const validator = commentValidators[name];
+            if (validator) {
+                const error = validator({ value: values.comments[name] });
+                if (error) {
+                    if (typeof errors.comments === 'undefined') {
+                        errors.comments = {};
+                    }
+                    errors.comments[name] = error;
+                }
+            }
+            if (product.customerComments.find((customerComment) => customerComment.name === name).required &&
+                values.comments[name].length === 0) {
+                if (typeof errors.comments === 'undefined') {
+                    errors.comments = {};
+                }
+                errors.comments[name] = t(`{customerCommentName} is required`, {
+                    customerCommentName: name
+                });
+            }
+        });
+        if (!articleNumber) {
+            if (typeof errors.options === 'undefined') {
+                errors.options = {};
+            }
+            const missingOptions = getMissingOptions();
+            missingOptions.forEach((option) => {
+                errors.options[option.name] = t(`{optionName} is required`, {
+                    optionName: option.name
+                });
+            });
+        }
+        if (!values.preOrder && isPreOrderRequired) {
+            errors.preOrder = t('Pre-order date is required');
+        }
+        return errors;
+    };
+    return { validate };
+};
+export function useAddToCart({ product, variant, submit, commentValidators = {}, getMissingOptions, initialValues }) {
+    var _a, _b;
+    if (!product)
+        throw new Error('No product was supplied to useAddToCart');
+    const productConfigurationContext = useContext(ProductConfigurationContext);
+    const configurationIds = productConfigurationContext === null || productConfigurationContext === void 0 ? void 0 : productConfigurationContext.ids;
+    const price = useDynamicPrice(product, variant);
+    const { cartId } = useCartId();
+    const articleNumber = getArticleNumber(product, variant);
+    const initialComments = {};
+    if (product.customerComments) {
+        product.customerComments.forEach(({ name }) => (initialComments[name] = ''));
+    }
+    const initialOptions = {};
+    (_b = (_a = product === null || product === void 0 ? void 0 : product.variants) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.forEach((option) => {
+        initialOptions[option.name] = '';
+    });
+    const { validate } = useValidate({
+        commentValidators,
+        articleNumber,
+        product,
+        variant,
+        getMissingOptions
+    });
+    const formik = useFormik({
+        validateOnChange: false,
+        validate,
+        initialValues: Object.assign({ quantity: 1, comments: initialComments, options: initialOptions }, initialValues),
+        onSubmit: (values) => {
+            const comments = Object.keys(values.comments).map((name) => ({
+                name,
+                value: values.comments[name]
+            }));
+            const preOrderDate = values.preOrder ? new Date(values.preOrder) : null;
+            submit({
+                input: {
+                    quantity: values.quantity,
+                    preOrderDate,
+                    comments,
+                    articleNumber,
+                    cartId,
+                    configurationIds
+                },
+                optimistic: Object.assign(Object.assign({}, price), { quantity: values.quantity, product,
+                    variant })
+            });
+        }
+    });
+    return {
+        form: formik
+    };
+}
 //# sourceMappingURL=useAddToCart.js.map

package/ci/.gitlab-ci.yml

@@ -1,3 +1,3 @@
-include:
-  project: 'jetshop/flight-ci'
-  file: 'pipelines/pipeline-kaniko.yaml'
+include:
+  project: 'jetshop/flight-ci'
+  file: 'pipelines/pipeline-kaniko.yaml'

package/components/Auth/CustomerUpdateForm.d.ts

@@ -1,32 +1,32 @@
-import { Country, CustomerUpdateInput } from '@jetshop/core/types';
-import { FormikProps } from 'formik';
-import { DocumentNode } from 'graphql';
-import React, { ReactNode } from 'react';
-import { EnhancedCustomerField } from './signup-context';
-export interface CustomerUpdateFormRenderPropsField {
-    inputProps: {
-        [key in keyof EnhancedCustomerField]: any;
-    };
-}
-export declare type CustomerUpdateFormRenderProps = FormikProps<CustomerUpdateInput> & {
-    billingAddressFields: CustomerUpdateFormRenderPropsField[];
-    deliveryAddressFields: CustomerUpdateFormRenderPropsField[];
-    setCountryCode: (countryCode: string) => void;
-    countries: Country[];
-    pidField: {
-        [key in keyof EnhancedCustomerField]: any;
-    };
-};
-export interface CustomerUpdateFormProps {
-    deliveryAddressId: number;
-    onSubmitSuccess?: () => void;
-    onSubmit?: () => void;
-    render: (props: CustomerUpdateFormRenderProps) => ReactNode;
-    /**
-     * The query that will be used for fetching the updated customer fields, once
-     * the mutation succeeds */
-    customerProfileQuery: DocumentNode;
-}
-export declare function getBillingAddressFieldsToRender(fields: EnhancedCustomerField[]): CustomerUpdateFormRenderPropsField[];
-export declare function getDeliveryAddressFieldsToRender(fields: EnhancedCustomerField[], index: number): CustomerUpdateFormRenderPropsField[];
-export declare const CustomerUpdateFormProvider: React.FunctionComponent<CustomerUpdateFormProps>;
+import { Country, CustomerUpdateInput } from '@jetshop/core/types';
+import { FormikProps } from 'formik';
+import { DocumentNode } from 'graphql';
+import React, { ReactNode } from 'react';
+import { EnhancedCustomerField } from './signup-context';
+export interface CustomerUpdateFormRenderPropsField {
+    inputProps: {
+        [key in keyof EnhancedCustomerField]: any;
+    };
+}
+export declare type CustomerUpdateFormRenderProps = FormikProps<CustomerUpdateInput> & {
+    billingAddressFields: CustomerUpdateFormRenderPropsField[];
+    deliveryAddressFields: CustomerUpdateFormRenderPropsField[];
+    setCountryCode: (countryCode: string) => void;
+    countries: Country[];
+    pidField: {
+        [key in keyof EnhancedCustomerField]: any;
+    };
+};
+export interface CustomerUpdateFormProps {
+    deliveryAddressId: number;
+    onSubmitSuccess?: () => void;
+    onSubmit?: () => void;
+    render: (props: CustomerUpdateFormRenderProps) => ReactNode;
+    /**
+     * The query that will be used for fetching the updated customer fields, once
+     * the mutation succeeds */
+    customerProfileQuery: DocumentNode;
+}
+export declare function getBillingAddressFieldsToRender(fields: EnhancedCustomerField[]): CustomerUpdateFormRenderPropsField[];
+export declare function getDeliveryAddressFieldsToRender(fields: EnhancedCustomerField[], index: number): CustomerUpdateFormRenderPropsField[];
+export declare const CustomerUpdateFormProvider: React.FunctionComponent<CustomerUpdateFormProps>;

package/components/Auth/CustomerUpdateForm.js

@@ -1,122 +1,122 @@
-import { createValidatorForFields, formFieldsFromSettings, getFieldType } from '@jetshop/core/components/Auth/formFieldsFromSettings';
-import ChannelContext from '@jetshop/core/components/ChannelContext';
-import logError from '@jetshop/core/helpers/logError';
-import t from '@jetshop/intl';
-import { Form, Formik } from 'formik';
-import React, { useContext, useMemo } from 'react';
-import { getAddressInputFieldName, getCustomerUpdateInput, useCustomerQuery, useCustomerUpdateMutation } from './useCustomer';
-export function getBillingAddressFieldsToRender(fields) {
-    return fields
-        .map((field) => {
-        const name = `billingAddress.${getAddressInputFieldName(field.name)}`;
-        if (name === `billingAddress.countryCode`) {
-            // omit changing `countryCode` for now
-            return null;
-        }
-        const inputProps = {
-            name,
-            label: field.label,
-            id: field.id,
-            required: field.required,
-            type: getFieldType(field.name)
-        };
-        return { inputProps };
-    })
-        .filter(Boolean);
-}
-export function getDeliveryAddressFieldsToRender(fields, index) {
-    return fields
-        .map((field) => {
-        const name = `deliveryAddresses[${index}].${getAddressInputFieldName(field.name)}`;
-        if (name === `deliveryAddresses[${index}].countryCode`) {
-            // omit changing `countryCode` for now
-            return null;
-        }
-        const inputProps = {
-            name,
-            label: field.label,
-            id: field.id,
-            required: field.required,
-            type: getFieldType(field.name)
-        };
-        return { inputProps };
-    })
-        .filter(Boolean);
-}
-export const CustomerUpdateFormProvider = ({ render, onSubmit, onSubmitSuccess, customerProfileQuery, deliveryAddressId }) => {
-    const { customer, countrySettings, setCountryCode, loading } = useCustomerQuery({
-        query: customerProfileQuery
-    });
-    const { selectedChannel } = useContext(ChannelContext);
-    const isBusinessCustomer = customer.__typename === 'BusinessCustomer';
-    const { billingAddressFields, deliveryAddressFields, pidField } = useMemo(() => formFieldsFromSettings(countrySettings, isBusinessCustomer), [countrySettings, isBusinessCustomer]);
-    const billingAddressFieldsToRender = useMemo(() => getBillingAddressFieldsToRender(billingAddressFields), [billingAddressFields]);
-    const deliveryAddressIndex = customer &&
-        customer.deliveryAddresses.findIndex((a) => a.id === deliveryAddressId);
-    const deliveryAddressFieldsToRender = useMemo(() => deliveryAddressIndex > -1
-        ? getDeliveryAddressFieldsToRender(deliveryAddressFields, deliveryAddressIndex)
-        : [], [deliveryAddressFields, deliveryAddressIndex]);
-    const initialValues = useMemo(() => getCustomerUpdateInput({
-        customer,
-        billingAddressFields,
-        culture: selectedChannel.language.culture,
-        countryCode: selectedChannel.country.code
-    }), [
-        customer,
-        billingAddressFields,
-        selectedChannel.language.culture,
-        selectedChannel.country.code
-    ]);
-    const billingAddressValidator = useMemo(() => addressValidator(billingAddressFields), [billingAddressFields]);
-    const deliveryAddressValidator = useMemo(() => addressValidator(deliveryAddressFields), [deliveryAddressFields]);
-    function addressValidator(fields) {
-        return createValidatorForFields(fields, {
-            getFieldName(name) {
-                const fieldName = getAddressInputFieldName(name);
-                return fieldName;
-            }
-        });
-    }
-    const customerUpdateMutation = useCustomerUpdateMutation({
-        customerQuery: customerProfileQuery
-    });
-    return loading ? null : (React.createElement(Formik, { initialValues: initialValues, validate: (values) => {
-            const errors = {};
-            const pidFieldName = pidField.name;
-            if (pidFieldName in values &&
-                pidField.required &&
-                (values[pidFieldName] || '').trim().length === 0) {
-                errors[pidFieldName] = t('This field is required');
-            }
-            const billingAddress = billingAddressValidator(values.billingAddress);
-            if (Object.keys(billingAddress).length > 0) {
-                errors.billingAddress = billingAddress;
-            }
-            if (deliveryAddressId !== undefined) {
-                const deliveryAddress = deliveryAddressValidator(values.deliveryAddresses[deliveryAddressIndex]);
-                if (Object.keys(deliveryAddress).length > 0) {
-                    errors.deliveryAddresses = [];
-                    errors.deliveryAddresses[deliveryAddressIndex] = deliveryAddress;
-                }
-            }
-            return errors;
-        }, onSubmit: (values, actions) => {
-            actions.setSubmitting(true);
-            onSubmit && onSubmit();
-            customerUpdateMutation(values)
-                .then(() => {
-                actions.setSubmitting(false);
-                actions.resetForm();
-                onSubmitSuccess && onSubmitSuccess();
-            })
-                .catch((err) => {
-                logError(true, err);
-                actions.setSubmitting(false);
-                actions.setStatus({
-                    globalError: t('Something went wrong saving information. Try again?')
-                });
-            });
-        }, render: (props) => (React.createElement(Form, null, render(Object.assign(Object.assign({}, props), { billingAddressFields: billingAddressFieldsToRender, deliveryAddressFields: deliveryAddressFieldsToRender, pidField,
-            setCountryCode, countries: selectedChannel.countries })))) }));
-};
+import { createValidatorForFields, formFieldsFromSettings, getFieldType } from '@jetshop/core/components/Auth/formFieldsFromSettings';
+import ChannelContext from '@jetshop/core/components/ChannelContext';
+import logError from '@jetshop/core/helpers/logError';
+import t from '@jetshop/intl';
+import { Form, Formik } from 'formik';
+import React, { useContext, useMemo } from 'react';
+import { getAddressInputFieldName, getCustomerUpdateInput, useCustomerQuery, useCustomerUpdateMutation } from './useCustomer';
+export function getBillingAddressFieldsToRender(fields) {
+    return fields
+        .map((field) => {
+        const name = `billingAddress.${getAddressInputFieldName(field.name)}`;
+        if (name === `billingAddress.countryCode`) {
+            // omit changing `countryCode` for now
+            return null;
+        }
+        const inputProps = {
+            name,
+            label: field.label,
+            id: field.id,
+            required: field.required,
+            type: getFieldType(field.name)
+        };
+        return { inputProps };
+    })
+        .filter(Boolean);
+}
+export function getDeliveryAddressFieldsToRender(fields, index) {
+    return fields
+        .map((field) => {
+        const name = `deliveryAddresses[${index}].${getAddressInputFieldName(field.name)}`;
+        if (name === `deliveryAddresses[${index}].countryCode`) {
+            // omit changing `countryCode` for now
+            return null;
+        }
+        const inputProps = {
+            name,
+            label: field.label,
+            id: field.id,
+            required: field.required,
+            type: getFieldType(field.name)
+        };
+        return { inputProps };
+    })
+        .filter(Boolean);
+}
+export const CustomerUpdateFormProvider = ({ render, onSubmit, onSubmitSuccess, customerProfileQuery, deliveryAddressId }) => {
+    const { customer, countrySettings, setCountryCode, loading } = useCustomerQuery({
+        query: customerProfileQuery
+    });
+    const { selectedChannel } = useContext(ChannelContext);
+    const isBusinessCustomer = customer.__typename === 'BusinessCustomer';
+    const { billingAddressFields, deliveryAddressFields, pidField } = useMemo(() => formFieldsFromSettings(countrySettings, isBusinessCustomer), [countrySettings, isBusinessCustomer]);
+    const billingAddressFieldsToRender = useMemo(() => getBillingAddressFieldsToRender(billingAddressFields), [billingAddressFields]);
+    const deliveryAddressIndex = customer &&
+        customer.deliveryAddresses.findIndex((a) => a.id === deliveryAddressId);
+    const deliveryAddressFieldsToRender = useMemo(() => deliveryAddressIndex > -1
+        ? getDeliveryAddressFieldsToRender(deliveryAddressFields, deliveryAddressIndex)
+        : [], [deliveryAddressFields, deliveryAddressIndex]);
+    const initialValues = useMemo(() => getCustomerUpdateInput({
+        customer,
+        billingAddressFields,
+        culture: selectedChannel.language.culture,
+        countryCode: selectedChannel.country.code
+    }), [
+        customer,
+        billingAddressFields,
+        selectedChannel.language.culture,
+        selectedChannel.country.code
+    ]);
+    const billingAddressValidator = useMemo(() => addressValidator(billingAddressFields), [billingAddressFields]);
+    const deliveryAddressValidator = useMemo(() => addressValidator(deliveryAddressFields), [deliveryAddressFields]);
+    function addressValidator(fields) {
+        return createValidatorForFields(fields, {
+            getFieldName(name) {
+                const fieldName = getAddressInputFieldName(name);
+                return fieldName;
+            }
+        });
+    }
+    const customerUpdateMutation = useCustomerUpdateMutation({
+        customerQuery: customerProfileQuery
+    });
+    return loading ? null : (React.createElement(Formik, { initialValues: initialValues, validate: (values) => {
+            const errors = {};
+            const pidFieldName = pidField.name;
+            if (pidFieldName in values &&
+                pidField.required &&
+                (values[pidFieldName] || '').trim().length === 0) {
+                errors[pidFieldName] = t('This field is required');
+            }
+            const billingAddress = billingAddressValidator(values.billingAddress);
+            if (Object.keys(billingAddress).length > 0) {
+                errors.billingAddress = billingAddress;
+            }
+            if (deliveryAddressId !== undefined) {
+                const deliveryAddress = deliveryAddressValidator(values.deliveryAddresses[deliveryAddressIndex]);
+                if (Object.keys(deliveryAddress).length > 0) {
+                    errors.deliveryAddresses = [];
+                    errors.deliveryAddresses[deliveryAddressIndex] = deliveryAddress;
+                }
+            }
+            return errors;
+        }, onSubmit: (values, actions) => {
+            actions.setSubmitting(true);
+            onSubmit && onSubmit();
+            customerUpdateMutation(values)
+                .then(() => {
+                actions.setSubmitting(false);
+                actions.resetForm();
+                onSubmitSuccess && onSubmitSuccess();
+            })
+                .catch((err) => {
+                logError(true, err);
+                actions.setSubmitting(false);
+                actions.setStatus({
+                    globalError: t('Something went wrong saving information. Try again?')
+                });
+            });
+        }, render: (props) => (React.createElement(Form, null, render(Object.assign(Object.assign({}, props), { billingAddressFields: billingAddressFieldsToRender, deliveryAddressFields: deliveryAddressFieldsToRender, pidField,
+            setCountryCode, countries: selectedChannel.countries })))) }));
+};
 //# sourceMappingURL=CustomerUpdateForm.js.map