Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LINK-2025 | use useAdminFormStyles hook to remove duplicate code #398

Merged
merged 1 commit into from
Jun 17, 2024
Merged

LINK-2025 | use useAdminFormStyles hook to remove duplicate code #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/domain/admin/layout/hooks/useAdminFormStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import {
KeywordFieldsFragment,
KeywordSetFieldsFragment,
OrganizationFieldsFragment,
PlaceFieldsFragment,
PriceGroupFieldsFragment,
} from '../../../../generated/graphql';
import styles from '../form.module.scss';

Expand All @@ -12,7 +14,9 @@ type UseAdminFormStylesProps = {
instance?:
| KeywordFieldsFragment
| KeywordSetFieldsFragment
| OrganizationFieldsFragment;
| OrganizationFieldsFragment
| PlaceFieldsFragment
| PriceGroupFieldsFragment;
};

type UseAdminFormStylesState = {
Expand Down
80 changes: 28 additions & 52 deletions src/domain/place/placeForm/PlaceForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable max-len */
import { ServerError } from '@apollo/client';
import { Field, Form, Formik } from 'formik';
import React, { useMemo } from 'react';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router';
import { ValidationError } from 'yup';
Expand All @@ -27,6 +27,7 @@ import {
} from '../../../utils/validationUtils';
import styles from '../../admin/layout/form.module.scss';
import FormRow from '../../admin/layout/formRow/FormRow';
import useAdminFormStyles from '../../admin/layout/hooks/useAdminFormStyles';
import Section from '../../app/layout/section/Section';
import { useNotificationsContext } from '../../app/notificationsContext/hooks/useNotificationsContext';
import useOrganizationAncestors from '../../organization/hooks/useOrganizationAncestors';
Expand Down Expand Up @@ -104,34 +105,20 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {
});
};

const inputRowBorderStyle = useMemo(
() =>
/* istanbul ignore next */
isEditingAllowed ? '' : styles.borderInMobile,
[isEditingAllowed]
);

const inputRowBorderStyleIfPlace = useMemo(
() => (!isEditingAllowed || place ? styles.borderInMobile : ''),
[isEditingAllowed, place]
);

const alignedInputStyle = useMemo(
() =>
/* istanbul ignore next */
isEditingAllowed
? styles.alignedInput
: styles.alignedInputWithFullBorder,
[isEditingAllowed]
);
const {
alignedInputStyle,
alignedInputStyleIfHasInstance,
inputRowBorderStyle,
inputRowBorderStyleIfHasInstance,
} = useAdminFormStyles({
instance: place,
isEditingAllowed,
});

const alignedInputStyleIfPlace = useMemo(
() =>
!isEditingAllowed || place
? styles.alignedInputWithFullBorder
: styles.alignedInput,
[isEditingAllowed, place]
);
const commonTextInputFieldProps = {
className: alignedInputStyle,
component: TextInputField,
};

return (
<Formik
Expand Down Expand Up @@ -211,17 +198,16 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {
</FormRow>
<FormRow className={styles.borderInMobile}>
<Field
className={alignedInputStyleIfPlace}
className={alignedInputStyleIfHasInstance}
component={TextInputField}
label={t(`place.form.labelDataSource`)}
name={PLACE_FIELDS.DATA_SOURCE}
readOnly
/>
</FormRow>
<FormRow className={inputRowBorderStyleIfPlace}>
<FormRow className={inputRowBorderStyleIfHasInstance}>
<Field
className={styles.alignedInput}
component={TextInputField}
{...commonTextInputFieldProps}
label={t(`place.form.labelOriginId`)}
name={PLACE_FIELDS.ORIGIN_ID}
readOnly={disabledIfPlace}
Expand All @@ -248,8 +234,7 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {
return (
<FormRow key={language} className={inputRowBorderStyle}>
<Field
className={alignedInputStyle}
component={TextInputField}
{...commonTextInputFieldProps}
label={`${t('place.form.labelName')} (${langText})`}
name={`${PLACE_FIELDS.NAME}.${language}`}
readOnly={!isEditingAllowed}
Expand Down Expand Up @@ -285,8 +270,7 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {
return (
<FormRow key={language} className={inputRowBorderStyle}>
<Field
className={alignedInputStyle}
component={TextInputField}
{...commonTextInputFieldProps}
label={t('place.form.labelInfoUrl', { langText })}
name={`${PLACE_FIELDS.INFO_URL}.${language}`}
readOnly={!isEditingAllowed}
Expand Down Expand Up @@ -315,8 +299,7 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {
<Section title={t('place.form.titleContactInfo')}>
<FormRow className={inputRowBorderStyle}>
<Field
className={alignedInputStyle}
component={TextInputField}
{...commonTextInputFieldProps}
label={t(`place.form.labelEmail`)}
name={PLACE_FIELDS.EMAIL}
readOnly={!isEditingAllowed}
Expand All @@ -331,8 +314,7 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {
return (
<FormRow key={language} className={inputRowBorderStyle}>
<Field
className={alignedInputStyle}
component={TextInputField}
{...commonTextInputFieldProps}
label={t('place.form.labelTelephone', { langText })}
name={`${PLACE_FIELDS.TELEPHONE}.${language}`}
readOnly={!isEditingAllowed}
Expand All @@ -343,8 +325,7 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {

<FormRow className={inputRowBorderStyle}>
<Field
className={alignedInputStyle}
component={TextInputField}
{...commonTextInputFieldProps}
label={t(`place.form.labelContactType`)}
name={PLACE_FIELDS.CONTACT_TYPE}
readOnly={!isEditingAllowed}
Expand All @@ -359,8 +340,7 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {
return (
<FormRow key={language} className={inputRowBorderStyle}>
<Field
className={alignedInputStyle}
component={TextInputField}
{...commonTextInputFieldProps}
label={t('place.form.labelStreetAddress', { langText })}
name={`${PLACE_FIELDS.STREET_ADDRESS}.${language}`}
readOnly={!isEditingAllowed}
Expand All @@ -377,8 +357,7 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {
return (
<FormRow key={language} className={inputRowBorderStyle}>
<Field
className={alignedInputStyle}
component={TextInputField}
{...commonTextInputFieldProps}
label={t('place.form.labelAddressLocality', { langText })}
name={`${PLACE_FIELDS.ADDRESS_LOCALITY}.${language}`}
readOnly={!isEditingAllowed}
Expand All @@ -389,8 +368,7 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {

<FormRow className={inputRowBorderStyle}>
<Field
className={alignedInputStyle}
component={TextInputField}
{...commonTextInputFieldProps}
label={t(`place.form.labelAddressRegion`)}
name={PLACE_FIELDS.ADDRESS_REGION}
readOnly={!isEditingAllowed}
Expand All @@ -399,8 +377,7 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {

<FormRow className={inputRowBorderStyle}>
<Field
className={alignedInputStyle}
component={TextInputField}
{...commonTextInputFieldProps}
label={t(`place.form.labelPostalCode`)}
name={PLACE_FIELDS.POSTAL_CODE}
readOnly={!isEditingAllowed}
Expand All @@ -409,8 +386,7 @@ const PlaceForm: React.FC<PlaceFormProps> = ({ place }) => {

<FormRow className={inputRowBorderStyle}>
<Field
className={alignedInputStyle}
component={TextInputField}
{...commonTextInputFieldProps}
label={t(`place.form.labelPostOfficeBoxNum`)}
name={PLACE_FIELDS.POST_OFFICE_BOX_NUM}
readOnly={!isEditingAllowed}
Expand Down
22 changes: 6 additions & 16 deletions src/domain/priceGroup/priceGroupForm/PriceGroupForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable max-len */
import { ServerError } from '@apollo/client';
import { Field, Form, Formik } from 'formik';
import React, { useMemo } from 'react';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router';
import { ValidationError } from 'yup';
Expand All @@ -25,6 +25,7 @@ import {
} from '../../../utils/validationUtils';
import styles from '../../admin/layout/form.module.scss';
import FormRow from '../../admin/layout/formRow/FormRow';
import useAdminFormStyles from '../../admin/layout/hooks/useAdminFormStyles';
import { useNotificationsContext } from '../../app/notificationsContext/hooks/useNotificationsContext';
import useOrganizationAncestors from '../../organization/hooks/useOrganizationAncestors';
import useUser from '../../user/hooks/useUser';
Expand Down Expand Up @@ -103,21 +104,10 @@ const PriceGroupForm: React.FC<PriceGroupFormProps> = ({ priceGroup }) => {
user,
});

const inputRowBorderStyle = useMemo(
() =>
/* istanbul ignore next */
isEditingAllowed ? '' : styles.borderInMobile,
[isEditingAllowed]
);

const alignedInputStyle = useMemo(
() =>
/* istanbul ignore next */
isEditingAllowed
? styles.alignedInput
: styles.alignedInputWithFullBorder,
[isEditingAllowed]
);
const { alignedInputStyle, inputRowBorderStyle } = useAdminFormStyles({
instance: priceGroup,
isEditingAllowed,
});

return (
<Formik
Expand Down