Moved dates handling in short URLs list to query

src/short-urls/SearchBar.tsx

@@ -14,23 +14,20 @@ import { ShortUrlListRouteParams, useShortUrlsQuery } from './helpers/hooks';
 import './SearchBar.scss';
 
 export interface SearchBarProps extends RouteChildrenProps<ShortUrlListRouteParams> {
-  listShortUrls: (params: ShortUrlsListParams) => void;
   shortUrlsListParams: ShortUrlsListParams;
 }
 
 const dateOrNull = (date?: string) => date ? parseISO(date) : null;
 
-const SearchBar = (colorGenerator: ColorGenerator) => (
-  { listShortUrls, shortUrlsListParams, ...rest }: SearchBarProps,
-) => {
-  const [{ search, tags }, toFirstPage ] = useShortUrlsQuery(rest);
-  const selectedTags = tags?.split(',').map(decodeURIComponent) ?? [];
+const SearchBar = (colorGenerator: ColorGenerator) => ({ shortUrlsListParams, ...rest }: SearchBarProps) => {
+  const [{ search, tags, startDate, endDate }, toFirstPage ] = useShortUrlsQuery(rest);
+  const selectedTags = tags?.split(',') ?? [];
   const setDates = pipe(
     ({ startDate, endDate }: DateRange) => ({
       startDate: formatIsoDate(startDate) ?? undefined,
       endDate: formatIsoDate(endDate) ?? undefined,
     }),
-    (dates) => listShortUrls({ ...shortUrlsListParams, ...dates }),
+    toFirstPage,
   );
   const setSearch = pipe(
     (searchTerm: string) => isEmpty(searchTerm) ? undefined : searchTerm,
@@ -52,8 +49,8 @@ const SearchBar = (colorGenerator: ColorGenerator) => (
             <DateRangeSelector
               defaultText="All short URLs"
               initialDateRange={{
-                startDate: dateOrNull(shortUrlsListParams.startDate),
-                endDate: dateOrNull(shortUrlsListParams.endDate),
+                startDate: dateOrNull(startDate),
+                endDate: dateOrNull(endDate),
               }}
               onDatesChange={setDates}
             />

src/short-urls/ShortUrlsList.tsx

@@ -40,8 +40,8 @@ const ShortUrlsList = (ShortUrlsTable: FC<ShortUrlsTableProps>, SearchBar: FC) =
     field: orderBy && (head(keys(orderBy)) as OrderableFields),
     dir: orderBy && head(values(orderBy)),
   });
-  const [{ tags, search }, toFirstPage ] = useShortUrlsQuery({ history, match, location });
-  const decodedTags = useMemo(() => tags?.split(',').map(decodeURIComponent) ?? [], [ tags ]);
+  const [{ tags, search, startDate, endDate }, toFirstPage ] = useShortUrlsQuery({ history, match, location });
+  const selectedTags = useMemo(() => tags?.split(',') ?? [], [ tags ]);
   const { pagination } = shortUrlsList?.shortUrls ?? {};
 
   const refreshList = (extraParams: ShortUrlsListParams) => listShortUrls({ ...shortUrlsListParams, ...extraParams });
@@ -53,14 +53,16 @@ const ShortUrlsList = (ShortUrlsTable: FC<ShortUrlsTableProps>, SearchBar: FC) =
     handleOrderBy(field, determineOrderDir(field, order.field, order.dir));
   const renderOrderIcon = (field: OrderableFields) => <TableOrderIcon currentOrder={order} field={field} />;
   const addTag = pipe(
-    (newTag: string) => [ ...new Set([ ...decodedTags, newTag ]) ].join(','),
+    (newTag: string) => [ ...new Set([ ...selectedTags, newTag ]) ].join(','),
     (tags) => toFirstPage({ tags }),
   );
 
   useEffect(() => resetShortUrlParams, []);
   useEffect(() => {
-    refreshList({ page: match.params.page, searchTerm: search, tags: decodedTags, itemsPerPage: undefined });
-  }, [ match.params.page, search, decodedTags ]);
+    refreshList(
+      { page: match.params.page, searchTerm: search, tags: selectedTags, itemsPerPage: undefined, startDate, endDate },
+    );
+  }, [ match.params.page, search, selectedTags, startDate, endDate ]);
 
   return (
     <>

src/short-urls/helpers/hooks.ts

@@ -14,6 +14,8 @@ export interface ShortUrlListRouteParams {
 interface ShortUrlsQuery {
   tags?: string;
   search?: string;
+  startDate?: string;
+  endDate?: string;
 }
 
 export const useShortUrlsQuery = ({ history, location, match }: ServerIdRouteProps): [ShortUrlsQuery, ToFirstPage] => {

src/short-urls/services/provideServices.ts

@@ -52,7 +52,7 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator, withRouter:
 
   // Services
   bottle.serviceFactory('SearchBar', SearchBar, 'ColorGenerator');
-  bottle.decorator('SearchBar', connect([ 'shortUrlsListParams' ], [ 'listShortUrls' ]));
+  bottle.decorator('SearchBar', connect([ 'shortUrlsListParams' ]));
   bottle.decorator('SearchBar', withRouter);
 
   // Actions

src/utils/dates/DateRangeSelector.tsx

@@ -22,18 +22,16 @@ export interface DateRangeSelectorProps {
 export const DateRangeSelector = (
   { onDatesChange, initialDateRange, defaultText, disabled }: DateRangeSelectorProps,
 ) => {
-  const [ activeInterval, setActiveInterval ] = useState(
-    rangeIsInterval(initialDateRange) ? initialDateRange : undefined,
-  );
-  const [ activeDateRange, setActiveDateRange ] = useState(
-    !rangeIsInterval(initialDateRange) ? initialDateRange : undefined,
-  );
+  const initialIntervalIsRange = rangeIsInterval(initialDateRange);
+  const [ activeInterval, setActiveInterval ] = useState(initialIntervalIsRange ? initialDateRange : undefined);
+  const [ activeDateRange, setActiveDateRange ] = useState(initialIntervalIsRange ? undefined : initialDateRange);
+
   const updateDateRange = (dateRange: DateRange) => {
     setActiveInterval(dateRangeIsEmpty(dateRange) ? 'all' : undefined);
     setActiveDateRange(dateRange);
     onDatesChange(dateRange);
   };
-  const updateInterval = (dateInterval: DateInterval) => () => {
+  const updateInterval = (dateInterval: DateInterval) => {
     setActiveInterval(dateInterval);
     setActiveDateRange(undefined);
     onDatesChange(intervalToDateRange(dateInterval));
@@ -41,11 +39,7 @@ export const DateRangeSelector = (
 
   return (
     <DropdownBtn disabled={disabled} text={rangeOrIntervalToString(activeInterval ?? activeDateRange) ?? defaultText}>
-      <DateIntervalDropdownItems
-        allText={defaultText}
-        active={activeInterval}
-        onChange={(interval) => updateInterval(interval)()}
-      />
+      <DateIntervalDropdownItems allText={defaultText} active={activeInterval} onChange={updateInterval} />
       <DropdownItem divider />
       <DropdownItem header>Custom:</DropdownItem>
       <DropdownItem text>

test/short-urls/SearchBar.test.tsx

@@ -2,6 +2,7 @@ import { shallow, ShallowWrapper } from 'enzyme';
 import { Mock } from 'ts-mockery';
 import { History, Location } from 'history';
 import { match } from 'react-router';
+import { formatISO } from 'date-fns';
 import searchBarCreator, { SearchBarProps } from '../../src/short-urls/SearchBar';
 import SearchField from '../../src/utils/SearchField';
 import Tag from '../../src/tags/helpers/Tag';
@@ -11,13 +12,12 @@ import { ShortUrlListRouteParams } from '../../src/short-urls/helpers/hooks';
 
 describe('<SearchBar />', () => {
   let wrapper: ShallowWrapper;
-  const listShortUrlsMock = jest.fn();
   const SearchBar = searchBarCreator(Mock.all<ColorGenerator>());
   const push = jest.fn();
+  const now = new Date();
   const createWrapper = (props: Partial<SearchBarProps> = {}) => {
     wrapper = shallow(
       <SearchBar
-        listShortUrls={listShortUrlsMock}
         shortUrlsListParams={{}}
         history={Mock.of<History>({ push })}
         location={Mock.of<Location>({ search: '' })}
@@ -50,7 +50,7 @@ describe('<SearchBar />', () => {
     expect(wrapper.find(Tag)).toHaveLength(expectedTagComps);
   });
 
-  it('updates short URLs list when search field changes', () => {
+  it('redirects to first page when search field changes', () => {
     const wrapper = createWrapper();
     const searchField = wrapper.find(SearchField);
 
@@ -59,7 +59,7 @@ describe('<SearchBar />', () => {
     expect(push).toHaveBeenCalledWith('/server/1/list-short-urls/1?search=search-term');
   });
 
-  it('updates short URLs list when a tag is removed', () => {
+  it('redirects to first page when a tag is removed', () => {
     const wrapper = createWrapper({ location: Mock.of<Location>({ search: 'tags=foo,bar' }) });
     const tag = wrapper.find(Tag).first();
 
@@ -68,12 +68,19 @@ describe('<SearchBar />', () => {
     expect(push).toHaveBeenCalledWith('/server/1/list-short-urls/1?tags=bar');
   });
 
-  it('updates short URLs list when date range changes', () => {
+  it.each([
+    [{ startDate: now }, `startDate=${encodeURIComponent(formatISO(now))}` ],
+    [{ endDate: now }, `endDate=${encodeURIComponent(formatISO(now))}` ],
+    [
+      { startDate: now, endDate: now },
+      `startDate=${encodeURIComponent(formatISO(now))}&endDate=${encodeURIComponent(formatISO(now))}`,
+    ],
+  ])('redirects to first page when date range changes', (dates, expectedQuery) => {
     const wrapper = createWrapper();
     const dateRange = wrapper.find(DateRangeSelector);
 
-    expect(listShortUrlsMock).not.toHaveBeenCalled();
-    dateRange.simulate('datesChange', {});
-    expect(listShortUrlsMock).toHaveBeenCalledTimes(1);
+    expect(push).not.toHaveBeenCalled();
+    dateRange.simulate('datesChange', dates);
+    expect(push).toHaveBeenCalledWith(`/server/1/list-short-urls/1?${expectedQuery}`);
   });
 });