Skip to content

fix: LaunchDevly: Pagination for 'Only show flags with overrides' #426

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
cdelst merged 2 commits into from
Sep 13, 2024
Merged

fix: LaunchDevly: Pagination for 'Only show flags with overrides' #426

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b889d10
Fix pagination for 'Only show flags with overrides'
cdelst Sep 12, 2024
eb1cc5e
Merge branch 'main' into cdelst/sc-255978/pagination-functionality-bug
cdelst Sep 13, 2024
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
29 changes: 19 additions & 10 deletions internal/dev_server/ui/src/Flags.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,24 @@ function Flags({
const filteredFlags = useMemo(() => {
if (!flags) return [];
const flagEntries = Object.entries(flags);
const search = searchTerm.toLowerCase();
const filtered = fuzzysort
.go(search, flagEntries, { all: true, key: '0', threshold: 0.7 })
.map((result) => result.obj);
return filtered;
}, [flags, searchTerm]);
return flagEntries
.filter((entry) => {
Copy link
Copy Markdown
Contributor Author

@cdelst cdelst Sep 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactored to be clearer filter entries. I assume we'll add another for tags in the future ;)

if (!searchTerm) return true;
const [flagKey] = entry;
const result = fuzzysort.single(searchTerm.toLowerCase(), flagKey);
return result && result.score > -5000; // Adjust threshold as needed
})
.filter((entry) => {
const [flagKey] = entry;
const hasOverride = flagKey in overrides;

if (onlyShowOverrides && !hasOverride) {
return false;
}

return true;
});
}, [flags, searchTerm, onlyShowOverrides]);

const paginatedFlags = useMemo(() => {
const startIndex = currentPage * flagsPerPage; // Adjust startIndex calculation
Expand Down Expand Up @@ -231,6 +243,7 @@ function Flags({
setSearchTerm(e.target.value);
setCurrentPage(0); // Reset pagination
}}
value={searchTerm}
Copy link
Copy Markdown
Contributor Author

@cdelst cdelst Sep 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously the input of the search box wasn't actually coupled to the display of the search... We were just relying on onChange events.

aria-label="Search flags input"
/>
<IconButton
Expand All @@ -249,10 +262,6 @@ function Flags({
const hasOverride = flagKey in overrides;
const currentValue = hasOverride ? overrideValue : flagValue;

if (onlyShowOverrides && !hasOverride) {
Copy link
Copy Markdown
Contributor Author

@cdelst cdelst Sep 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was causing issues, because we need to not do any filter logic in the display logic for the pagination to work as expected.

return null;
}

return (
<li
key={flagKey}
Expand Down