Skip to content

regression: fix departments with empty ancestors not being returned #22068

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
renatobecker merged 2 commits into from
May 18, 2021
Merged

regression: fix departments with empty ancestors not being returned #22068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a120a0
Regression: fix departments with empty ancestors not being returned
MartinSchoeler May 18, 2021
cba9013
fix not being able to select the same thing again
MartinSchoeler May 18, 2021
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
5 changes: 2 additions & 3 deletions ee/app/livechat-enterprise/server/lib/Department.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@ export const findAllDepartmentsAvailable = async (unitId, offset, count, text) =
const filterReg = new RegExp(escapeRegExp(text), 'i');

const cursor = LivechatDepartment.find({
$or: [{ ancestors: { $in: [unitId] } }, { ancestors: { $exists: false } }],
$or: [{ ancestors: { $in: [[unitId], null, []] } }, { ancestors: { $exists: false } }],
...text && { name: filterReg },

}, { limit: count, offset });

const departments = await cursor.toArray();
const total = await cursor.count();
const departmentsFiltered = departments.filter((department) => !department.ancestors?.length);

return { departments: departmentsFiltered, total };
return { departments, total };
};

export const findAllDepartmentsByUnit = async (unitId, offset, count) => {
Expand Down
4 changes: 2 additions & 2 deletions ee/client/omnichannel/units/UnitEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ function UnitEdit({ data, unitId, isNew, unitMonitors, unitDepartments, reload,
const [departmentsFilter, setDepartmentsFilter] = useState('');

const { itemsList: monitorsList, loadMoreItems: loadMoreMonitors } = useMonitorsList(
useMemo(() => ({ limit: 50, filter: monitorsFilter }), [monitorsFilter]),
useMemo(() => ({ filter: monitorsFilter }), [monitorsFilter]),
);

const { phase: monitorsPhase, items: monitorsItems, itemCount: monitorsTotal } = useRecordList(
monitorsList,
);

const { itemsList: departmentsList, loadMoreItems: loadMoreDepartments } = useDepartmentsList(
useMemo(() => ({ limit: 50, filter: departmentsFilter }), [departmentsFilter]),
useMemo(() => ({ filter: departmentsFilter, unitId }), [departmentsFilter, unitId]),
);

const {
Expand Down