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

TASK-387 Sort shifts in dropdown #282

Merged
merged 10 commits into from
Mar 18, 2021
Merged

TASK-387 Sort shifts in dropdown #282

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f8b0df8
Finished. All tests passing.
net-runner Mar 16, 2021
1a1e8f6
Merge branch 'develop' into TASK-387-sort-and-rendering-fix-for-dropd…
net-runner Mar 16, 2021
8c587ca
Replaced hardcoded string with one from ShiftTypes.
net-runner Mar 17, 2021
45ca473
Removed obsolete comment.
net-runner Mar 17, 2021
ecf4e06
Removed faulty destructuring. Cypress passing.
net-runner Mar 17, 2021
d5c0de0
Now using isWorkingShift. Moved autocomplete component into shift-aut…
net-runner Mar 17, 2021
43327c1
Local cypress passing.
net-runner Mar 17, 2021
6497db8
Bugfix: Separator was rendering when no nonWorkingShifts were present.
net-runner Mar 18, 2021
610c227
Removed unnecessary component file.
net-runner Mar 18, 2021
067aee3
Merge branch 'develop' into TASK-387-sort-and-rendering-fix-for-dropd…
Qwebeck Mar 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
4 changes: 2 additions & 2 deletions src/components/common-components/autocomplete/autocomplete.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function AutocompleteComponent<
getOptionLabel,
open: true,
});
const { ShiftTypes } = useSelector(
const ShiftTypes = useSelector(
net-runner marked this conversation as resolved.
Show resolved Hide resolved
(state: ApplicationStateModel) => state.actualState.persistentSchedule.present.shift_types
);
const LabelComponent = ({ option, index }): JSX.Element => {
Expand Down Expand Up @@ -96,7 +96,7 @@ export function AutocompleteComponent<
onKeyDown={onKeyDown}
/>
</div>
{groupedOptions.length > 0 ? (
{ShiftTypes && groupedOptions.length > 0 ? (
<div
ref={tooltipRef}
className={classNames("listbox")}
Expand Down