Skip to content

[FIX] Selecting the same department for multiple units #19168

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

Merged
ggazzo merged 1 commit into from
Oct 7, 2020
Merged

[FIX] Selecting the same department for multiple units #19168

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions ee/client/omnichannel/units/EditUnit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useForm } from '../../../../client/hooks/useForm';
import { useRoute } from '../../../../client/contexts/RouterContext';


export function UnitEditWithData({ unitId, reload }) {
export function UnitEditWithData({ unitId, reload, allUnits }) {
const query = useMemo(() => ({ unitId }), [unitId]);
const { data, state, error } = useEndpointDataExperimental('livechat/units.getOne', query);
const { data: availableDepartments, state: availableDepartmentsState, error: availableDepartmentsError } = useEndpointDataExperimental('livechat/department');
Expand All @@ -29,16 +29,19 @@ export function UnitEditWithData({ unitId, reload }) {
return <Callout m='x16' type='danger'>{t('Not_Available')}</Callout>;
}

const filteredDepartments = { departments: availableDepartments.departments.filter((department) => !allUnits || !allUnits.units || !department.ancestors || department.ancestors[0] === unitId || !allUnits.units.find((unit) => unit._id === department.ancestors[0])) };


return <UnitEdit
unitId={unitId}
data={data}
availableDepartments={availableDepartments}
availableDepartments={filteredDepartments}
availableMonitors={availableMonitors}
unitMonitors={unitMonitors}
reload={reload}/>;
}

export function UnitNew({ reload }) {
export function UnitNew({ reload, allUnits }) {
const t = useTranslation();

const { data: availableDepartments, state: availableDepartmentsState, error: availableDepartmentsError } = useEndpointDataExperimental('livechat/department');
Expand All @@ -52,7 +55,8 @@ export function UnitNew({ reload }) {
return <Box mbs='x16'>{t('Not_found')}</Box>;
}

return <UnitEdit reload={reload} isNew availableDepartments={availableDepartments} availableMonitors={availableMonitors}/>;
const filteredDepartments = { departments: availableDepartments.departments.filter((department) => !allUnits || !allUnits.units || !department.ancestors || !allUnits.units.find((unit) => unit._id === department.ancestors[0])) };
return <UnitEdit reload={reload} isNew availableDepartments={filteredDepartments} availableMonitors={availableMonitors}/>;
}

export function UnitEdit({ data, unitId, isNew, availableDepartments, availableMonitors, unitMonitors, reload, ...props }) {
Expand Down Expand Up @@ -89,10 +93,10 @@ export function UnitEdit({ data, unitId, isNew, availableDepartments, availableM
monitors,
} = values;

const nameError = useMemo(() => (!name || name.length === 0 ? t('The_field_is_required', 'name') : undefined), [name, t]);
const visibilityError = useMemo(() => (!visibility || visibility.length === 0 ? t('The_field_is_required', 'description') : undefined), [visibility, t]);
const departmentError = useMemo(() => (!departments || departments.length === 0 ? t('The_field_is_required', 'departments') : undefined), [departments, t]);
const unitMonitorsError = useMemo(() => (!monitors || monitors.length === 0 ? t('The_field_is_required', 'monitors') : undefined), [monitors, t]);
const nameError = useMemo(() => (!name || name.length === 0 ? t('The_field_is_required', t('name')) : undefined), [name, t]);
const visibilityError = useMemo(() => (!visibility || visibility.length === 0 ? t('The_field_is_required', t('description')) : undefined), [visibility, t]);
const departmentError = useMemo(() => (!departments || departments.length === 0 ? t('The_field_is_required', t('departments')) : undefined), [departments, t]);
const unitMonitorsError = useMemo(() => (!monitors || monitors.length === 0 ? t('The_field_is_required', t('monitors')) : undefined), [monitors, t]);

const saveUnit = useMethod('livechat:saveUnit');

Expand Down
6 changes: 3 additions & 3 deletions ee/client/omnichannel/units/UnitsRoute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ function UnitsRoute() {
<VerticalBar.Close onClick={handleVerticalBarCloseButtonClick} />
</VerticalBar.Header>

{context === 'edit' && <UnitEditWithData unitId={id} reload={reload}/>}
{context === 'new' && <UnitNew reload={reload} />}
{context === 'edit' && <UnitEditWithData unitId={id} reload={reload} allUnits={data} />}
{context === 'new' && <UnitNew reload={reload} allUnits={data} />}

</VerticalBar>;
}, [t, context, id, unitsRoute, reload]);
}, [t, context, id, unitsRoute, reload, data]);

if (!canViewUnits) {
return <NotAuthorizedPage />;
Expand Down