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.

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

Set focus when opening a dropdown filter #1503

Merged
merged 4 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Changelog

# [23.10.1] = 2023/12/07
* [UI]: Fixed issue where filter inputs required focus when they are opened on the project samples page. See [PR 1503](https://github.com/phac-nml/irida/pull/1503)

## [23.10] - 2023/10/15
* [Developer]: Added functionality to delete sequence files from file system when a sequence run is removed. [See PR 1468](https://github.com/phac-nml/irida/pull/1468)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ plugins {
}

group = "ca.corefacility.bioinformatics"
version = "23.10"
version = "23.10.1"
description = "irida"

java {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ const { RangePicker } = DatePicker;
* @constructor
*/
export function SamplesTable() {
const nameInputRef = React.useRef(null);
const organismInputRef = React.useRef(null);
const collectedByInputRef = React.useRef(null);
const createdInputRef = React.useRef(null);
const modifiedInputRef = React.useRef(null);

const dispatch = useDispatch();
const {
projectId,
Expand Down Expand Up @@ -115,106 +121,139 @@ export function SamplesTable() {
confirm({ closeDropdown: false });
};

function determineCurrentRef(filterName) {
return filterName === "t-organism-select"
? organismInputRef
: filterName === "t-name-select"
? nameInputRef
: filterName === "t-collectedBy-select"
? collectedByInputRef
: filterName === "t-created-filter"
? createdInputRef
: filterName === "t-modified-filter"
? modifiedInputRef
: null;
}
const getColumnSearchProps = (
dataIndex,
filterName = "",
placeholder = ""
) => ({
filterDropdown: ({
setSelectedKeys,
selectedKeys,
confirm,
clearFilters,
}) => (
<div style={{ padding: 8 }}>
<Select
className={filterName}
mode="tags"
placeholder={placeholder}
value={selectedKeys[0]}
onChange={(e) => {
const values = Array.isArray(e) && e.length > 0 ? [e] : e;
setSelectedKeys(values);
confirm({ closeDropdown: false });
}}
style={{ marginBottom: 8, display: "block" }}
/>
<Space>
<Button
disabled={selectedKeys.length === 0 || selectedKeys[0].length === 0}
onClick={() => handleClearSearch(clearFilters, confirm)}
size="small"
style={{ width: 89 }}
>
{i18n("Filter.clear")}
</Button>
<Button
type="primary"
onClick={() => handleSearch(selectedKeys, confirm)}
icon={<IconSearch />}
size="small"
style={{ width: 90 }}
>
{i18n("Filter.search")}
</Button>
</Space>
</div>
),
filterIcon: (filtered) => (
<IconSearch style={{ color: filtered ? blue6 : undefined }} />
),
});

const getDateColumnSearchProps = (filterName) => ({
filterDropdown: ({
setSelectedKeys,
selectedKeys,
confirm,
clearFilters,
}) => (
<div style={{ padding: 8 }} className={filterName}>
<div style={{ marginBottom: 8, display: "block" }}>
<RangePicker
) => {
const currentRef = determineCurrentRef(filterName);
return {
onFilterDropdownVisibleChange: (visible) => {
if (visible) {
setTimeout(() => currentRef.current?.focus(), 100);
}
},
filterDropdown: ({
setSelectedKeys,
selectedKeys,
confirm,
clearFilters,
}) => (
<div style={{ padding: 8 }}>
<Select
className={filterName}
mode="tags"
placeholder={placeholder}
value={selectedKeys[0]}
onChange={(dates) => {
if (dates !== null) {
setSelectedKeys([
[dates[0].startOf("day"), dates[1].endOf("day")],
]);
confirm({ closeDropdown: false });
} else {
handleClearSearch(clearFilters, confirm);
}
onChange={(e) => {
const values = Array.isArray(e) && e.length > 0 ? [e] : e;
setSelectedKeys(values);
confirm({ closeDropdown: false });
}}
style={{ marginBottom: 8, display: "block" }}
ref={currentRef}
/>
<Space>
<Button
disabled={
selectedKeys.length === 0 || selectedKeys[0].length === 0
}
onClick={() => handleClearSearch(clearFilters, confirm)}
size="small"
style={{ width: 89 }}
>
{i18n("Filter.clear")}
</Button>
<Button
type="primary"
onClick={() => handleSearch(selectedKeys, confirm)}
icon={<IconSearch />}
size="small"
style={{ width: 90 }}
>
{i18n("Filter.search")}
</Button>
</Space>
</div>
<Space>
<Button
disabled={selectedKeys.length === 0}
onClick={() => handleClearSearch(clearFilters, confirm)}
size="small"
style={{ width: 89 }}
className="t-clear-btn"
>
{i18n("Filter.clear")}
</Button>
<Button
type="primary"
onClick={() => handleSearch(selectedKeys, confirm)}
icon={<IconSearch />}
size="small"
style={{ width: 90 }}
className="t-search-btn"
>
{i18n("Filter.search")}
</Button>
</Space>
</div>
),
filterIcon: (filtered) => (
<IconSearch style={{ color: filtered ? blue6 : undefined }} />
),
});
),
filterIcon: (filtered) => (
<IconSearch style={{ color: filtered ? blue6 : undefined }} />
),
};
};

const getDateColumnSearchProps = (filterName) => {
const currentRef = determineCurrentRef(filterName);
return {
onFilterDropdownVisibleChange: (visible) => {
if (visible) {
setTimeout(() => currentRef.current?.focus(), 100);
}
},
filterDropdown: ({
setSelectedKeys,
selectedKeys,
confirm,
clearFilters,
}) => (
<div style={{ padding: 8 }} className={filterName}>
<div style={{ marginBottom: 8, display: "block" }}>
<RangePicker
ref={currentRef}
value={selectedKeys[0]}
onChange={(dates) => {
if (dates !== null) {
setSelectedKeys([
[dates[0].startOf("day"), dates[1].endOf("day")],
]);
confirm({ closeDropdown: false });
} else {
handleClearSearch(clearFilters, confirm);
}
}}
/>
</div>
<Space>
<Button
disabled={selectedKeys.length === 0}
onClick={() => handleClearSearch(clearFilters, confirm)}
size="small"
style={{ width: 89 }}
className="t-clear-btn"
>
{i18n("Filter.clear")}
</Button>
<Button
type="primary"
onClick={() => handleSearch(selectedKeys, confirm)}
icon={<IconSearch />}
size="small"
style={{ width: 90 }}
className="t-search-btn"
>
{i18n("Filter.search")}
</Button>
</Space>
</div>
),
filterIcon: (filtered) => (
<IconSearch style={{ color: filtered ? blue6 : undefined }} />
),
};
};

const columns = [
{
Expand Down Expand Up @@ -298,7 +337,10 @@ export function SamplesTable() {
title: i18n("SamplesTable.Column.collectedBy"),
dataIndex: ["sample", "collectedBy"],
sorter: true,
...getColumnSearchProps(["sample", "collectedBy"]),
...getColumnSearchProps(
["sample", "collectedBy"],
"t-collectedBy-select"
),
},
{
title: i18n("SamplesTable.Column.created"),
Expand Down
Loading