Skip to content

feat: make workspace search bar remember text #9759

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
merged 17 commits into from
Sep 20, 2023
Merged

feat: make workspace search bar remember text #9759

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2f92f86
minor: Add useEffectEvent polyfill
Parkreiner Sep 18, 2023
e2d3a67
chore: update filter to have better callback support
Parkreiner Sep 18, 2023
eeb3083
docs: Clean up comments
Parkreiner Sep 18, 2023
553ce89
fix: add localStorage to useWorkspacesFilter
Parkreiner Sep 18, 2023
b06d772
refactor: Centralize stable useSearchParams
Parkreiner Sep 18, 2023
df1f8df
refactor: clean up filter to be fully pure on mount
Parkreiner Sep 18, 2023
29656c1
chore: add tests for useEffectEvent
Parkreiner Sep 19, 2023
54a5940
wip: commit progress for searchbar fix
Parkreiner Sep 19, 2023
ae5b359
chore: clean up WorkspacesPage
Parkreiner Sep 19, 2023
7dd1b4f
fix: add logic for syncing queries with search params
Parkreiner Sep 19, 2023
ab9de0c
chore: Rename initialValue to fallbackFilter
Parkreiner Sep 19, 2023
391648a
chore: Remove todo comment
Parkreiner Sep 19, 2023
7e15671
Merge branch 'main' into workspace-searchbar-storage
Parkreiner Sep 19, 2023
60e9b10
Merge branch 'main' into workspace-searchbar-storage
Parkreiner Sep 20, 2023
dfad46f
refactor: update code to use useEffectEvent
Parkreiner Sep 20, 2023
dcd8691
docs: clean up comments for clarity
Parkreiner Sep 20, 2023
3a7efd5
fix: update url check to use regex
Parkreiner Sep 20, 2023
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
Prev Previous commit
Next Next commit
chore: clean up WorkspacesPage
  • Loading branch information
@Parkreiner
Parkreiner committed Sep 19, 2023
commit ae5b3592f5539e036bf50e5f6447ee3fb9e13220
12 changes: 6 additions & 6 deletions site/src/pages/WorkspacesPage/WorkspacesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ import { useEffectEvent } from "hooks/hookPolyfills";
function useSafeSearchParams() {
// Have to wrap setSearchParams because React Router doesn't make sure that
// the function's memory reference stays stable on each render, even though
// its logic never changes, and it even has function update support
// its logic never changes, and even though it has function update support
const [searchParams, setSearchParams] = useSearchParams();
const stableSetSearchParams = useEffectEvent(setSearchParams);

// Need this to be a tuple type, but can't use "as const", because that would
// make the whole array readonly and cause type mismatches
// make the whole array readonly and cause type mismatches downstream
return [searchParams, stableSetSearchParams] as ReturnType<
typeof useSearchParams
>;
Expand All @@ -46,7 +46,7 @@ const WorkspacesPage: FC = () => {
const pagination = usePagination({ searchParamsResult });
const filterProps = useWorkspacesFilter({
searchParamsResult,
onPageChange: () => pagination.goToPage(1),
onFilterChange: () => pagination.goToPage(1),
});

const { data, error, queryKey, refetch } = useWorkspacesData({
Expand Down Expand Up @@ -165,12 +165,12 @@ function subscribeToFilterChanges(notifyReact: () => void) {

type UseWorkspacesFilterOptions = {
searchParamsResult: ReturnType<typeof useSearchParams>;
onPageChange: () => void;
onFilterChange: () => void;
};

const useWorkspacesFilter = ({
searchParamsResult,
onPageChange,
onFilterChange,
}: UseWorkspacesFilterOptions) => {
// Using useSyncExternalStore store to safely access localStorage from the
// first render; both snapshot callbacks return primitives, so no special
Expand All @@ -194,7 +194,7 @@ const useWorkspacesFilter = ({
searchParamsResult,
onUpdate: (newValues) => {
window.localStorage.setItem(workspaceFilterKey, newValues);
onPageChange();
onFilterChange();
},
});

Expand Down