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

Chore: Rewrite AutoCompleteDepartment to TypeScript #27198

Merged
merged 9 commits into from
Nov 13, 2022
Merged

Chore: Rewrite AutoCompleteDepartment to TypeScript #27198

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6768e60
ts
tiagoevanp Nov 5, 2022
5f74d71
alek review
tiagoevanp Nov 7, 2022
a18a1e6
ops
tiagoevanp Nov 7, 2022
0fe8c4d
remove comment
tiagoevanp Nov 7, 2022
5386843
fix QA findings
tiagoevanp Nov 9, 2022
ed4065f
last fix
tiagoevanp Nov 10, 2022
351756b
last review
tiagoevanp Nov 10, 2022
dac6cf6
use default import
tiagoevanp Nov 11, 2022
3922c3a
Merge branch 'develop' into rewrite/auto-complete-department
kodiakhq[bot] Nov 13, 2022
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
8 changes: 5 additions & 3 deletions apps/meteor/client/components/AutoCompleteDepartment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ export const AutoCompleteDepartment = ({
);

const department = useMemo(() => {
const findValue = typeof value === 'string' ? value : value.value || '';
return sortedByName.find((dep) => dep._id === findValue)?.value;
const valueFound = typeof value !== 'object' ? value : value.value || '';
return sortedByName.find((dep) => dep.value.value === valueFound)?.value;
}, [sortedByName, value]);

return (
Expand All @@ -76,7 +76,9 @@ export const AutoCompleteDepartment = ({
filter={departmentsFilter}
// Workaround for setFilter weird typing
setFilter={setDepartmentsFilter as (value: string | number | undefined) => void}
options={sortedByName.map((dep) => ({ value: dep._id, label: dep.name }))}
// TODO: Fix typing on fuselage
// Workaround for options wrong typing
aleksandernsilva marked this conversation as resolved.
Show resolved Hide resolved
options={sortedByName as any}
placeholder={t('Select_an_option')}
data-qa='autocomplete-department'
endReached={
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const FilterByText: FilterByTextType = ({ setFilter, reload, customFields, setCu
guest,
servedBy,
status,
...(department?.value && department.value !== 'all' && { department: department.value }),
department: department?.value && department.value !== 'all' ? department.value : '',
from: from && moment(new Date(from)).utc().format('YYYY-MM-DDTHH:mm:ss'),
to: to && moment(new Date(to)).utc().format('YYYY-MM-DDTHH:mm:ss'),
tags: tags.map((tag) => tag.label),
Expand Down