Renamed doFallbackRange to doIntervalFallback to make it more descriptive

CHANGELOG.md

@@ -18,6 +18,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 * [#534](https://github.com/shlinkio/shlink-web-client/pull/534) Updated axios.
 * [#538](https://github.com/shlinkio/shlink-web-client/pull/538) Switched to the `<field>-<dir>` notation in `orderBy` param for short URLs list, in preparation for Shlink v3.0.0
+* Fixed typo in identifier for "Last 180 days" interval.
+
+    If that was your default interval, you will see now "All visits" is selected instead. You will need to go to settings page and change it again to "Last 180 days".
 
 ### Deprecated
 * *Nothing*

src/utils/dates/DateRangeSelector.tsx

@@ -40,11 +40,10 @@ export const DateRangeSelector = (
   };
 
   updatable && useEffectExceptFirstTime(() => {
-    if (rangeIsInterval(initialDateRange)) {
+    const isDateInterval = rangeIsInterval(initialDateRange);
-      updateInterval(initialDateRange);
+
-    } else if (initialDateRange) {
+    isDateInterval && updateInterval(initialDateRange);
-      updateDateRange(initialDateRange);
+    initialDateRange && !isDateInterval && updateDateRange(initialDateRange);
-    }
   }, [ initialDateRange ]);
 
   return (

src/visits/OrphanVisits.tsx

@@ -10,7 +10,11 @@ import { CommonVisitsProps } from './types/CommonVisitsProps';
 import { toApiParams } from './types/helpers';
 
 export interface OrphanVisitsProps extends CommonVisitsProps, RouteComponentProps {
-  getOrphanVisits: (params?: ShlinkVisitsParams, orphanVisitsType?: OrphanVisitType, doFallbackRange?: boolean) => void;
+  getOrphanVisits: (
+    params?: ShlinkVisitsParams,
+    orphanVisitsType?: OrphanVisitType,
+    doIntervalFallback?: boolean,
+  ) => void;
   orphanVisits: VisitsInfo;
   cancelGetOrphanVisits: () => void;
 }
@@ -25,8 +29,8 @@ export const OrphanVisits = ({ exportVisits }: VisitsExporter) => boundToMercure
   selectedServer,
 }: OrphanVisitsProps) => {
   const exportCsv = (visits: NormalizedVisit[]) => exportVisits('orphan_visits.csv', visits);
-  const loadVisits = (params: VisitsParams, doFallbackRange?: boolean) =>
+  const loadVisits = (params: VisitsParams, doIntervalFallback?: boolean) =>
-    getOrphanVisits(toApiParams(params), params.filter?.orphanVisitsType, doFallbackRange);
+    getOrphanVisits(toApiParams(params), params.filter?.orphanVisitsType, doIntervalFallback);
 
   return (
     <VisitsStats

src/visits/ShortUrlVisits.tsx

@@ -14,7 +14,7 @@ import { CommonVisitsProps } from './types/CommonVisitsProps';
 import { toApiParams } from './types/helpers';
 
 export interface ShortUrlVisitsProps extends CommonVisitsProps, RouteComponentProps<{ shortCode: string }> {
-  getShortUrlVisits: (shortCode: string, query?: ShlinkVisitsParams, doFallbackRange?: boolean) => void;
+  getShortUrlVisits: (shortCode: string, query?: ShlinkVisitsParams, doIntervalFallback?: boolean) => void;
   shortUrlVisits: ShortUrlVisitsState;
   getShortUrlDetail: Function;
   shortUrlDetail: ShortUrlDetail;
@@ -35,8 +35,8 @@ const ShortUrlVisits = ({ exportVisits }: VisitsExporter) => boundToMercureHub((
 }: ShortUrlVisitsProps) => {
   const { shortCode } = params;
   const { domain } = parseQuery<{ domain?: string }>(search);
-  const loadVisits = (params: VisitsParams, doFallbackRange?: boolean) =>
+  const loadVisits = (params: VisitsParams, doIntervalFallback?: boolean) =>
-    getShortUrlVisits(shortCode, { ...toApiParams(params), domain }, doFallbackRange);
+    getShortUrlVisits(shortCode, { ...toApiParams(params), domain }, doIntervalFallback);
   const exportCsv = (visits: NormalizedVisit[]) => exportVisits(
     `short-url_${shortUrlDetail.shortUrl?.shortUrl.replace(/https?:\/\//g, '')}_visits.csv`,
     visits,

src/visits/TagVisits.tsx

@@ -12,7 +12,7 @@ import { CommonVisitsProps } from './types/CommonVisitsProps';
 import { toApiParams } from './types/helpers';
 
 export interface TagVisitsProps extends CommonVisitsProps, RouteComponentProps<{ tag: string }> {
-  getTagVisits: (tag: string, query?: ShlinkVisitsParams, doFallbackRange?: boolean) => void;
+  getTagVisits: (tag: string, query?: ShlinkVisitsParams, doIntervalFallback?: boolean) => void;
   tagVisits: TagVisitsState;
   cancelGetTagVisits: () => void;
 }
@@ -27,8 +27,8 @@ const TagVisits = (colorGenerator: ColorGenerator, { exportVisits }: VisitsExpor
   selectedServer,
 }: TagVisitsProps) => {
   const { tag } = params;
-  const loadVisits = (params: ShlinkVisitsParams, doFallbackRange?: boolean) =>
+  const loadVisits = (params: ShlinkVisitsParams, doIntervalFallback?: boolean) =>
-    getTagVisits(tag, toApiParams(params), doFallbackRange);
+    getTagVisits(tag, toApiParams(params), doIntervalFallback);
   const exportCsv = (visits: NormalizedVisit[]) => exportVisits(`tag_${tag}_visits.csv`, visits);
 
   return (

src/visits/VisitsStats.tsx

@@ -28,7 +28,7 @@ import { SortableBarChartCard } from './charts/SortableBarChartCard';
 import './VisitsStats.scss';
 
 export interface VisitsStatsProps {
-  getVisits: (params: VisitsParams, doFallbackRange?: boolean) => void;
+  getVisits: (params: VisitsParams, doIntervalFallback?: boolean) => void;
   visitsInfo: VisitsInfo;
   settings: Settings;
   selectedServer: SelectedServer;

src/visits/reducers/common.ts

@@ -86,10 +86,10 @@ export const getVisitsWithLoader = async <T extends Action<string> & { visits: V
 };
 
 export const lastVisitLoaderForLoader = (
-  doFallbackRange: boolean,
+  doIntervalFallback: boolean,
   loader: (params: ShlinkVisitsParams) => Promise<ShlinkVisits>,
 ): LastVisitLoader => {
-  if (!doFallbackRange) {
+  if (!doIntervalFallback) {
     return async () => Promise.resolve(undefined);
   }
 

src/visits/reducers/orphanVisits.ts

@@ -72,7 +72,7 @@ const matchesType = (visit: OrphanVisit, orphanVisitsType?: OrphanVisitType) =>
 export const getOrphanVisits = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
   query: ShlinkVisitsParams = {},
   orphanVisitsType?: OrphanVisitType,
-  doFallbackRange = false,
+  doIntervalFallback = false,
 ) => async (dispatch: Dispatch, getState: GetState) => {
   const { getOrphanVisits } = buildShlinkApiClient(getState);
   const visitsLoader = async (page: number, itemsPerPage: number) => getOrphanVisits({ ...query, page, itemsPerPage })
@@ -81,7 +81,7 @@ export const getOrphanVisits = (buildShlinkApiClient: ShlinkApiClientBuilder) =>
 
       return { ...result, data: visits };
     });
-  const lastVisitLoader = lastVisitLoaderForLoader(doFallbackRange, getOrphanVisits);
+  const lastVisitLoader = lastVisitLoaderForLoader(doIntervalFallback, getOrphanVisits);
   const shouldCancel = () => getState().orphanVisits.cancelLoad;
   const extraFinishActionData: Partial<OrphanVisitsAction> = { query };
   const actionMap = {

src/visits/reducers/shortUrlVisits.ts

@@ -78,7 +78,7 @@ export default buildReducer<ShortUrlVisits, ShortUrlVisitsCombinedAction>({
 export const getShortUrlVisits = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
   shortCode: string,
   query: ShlinkVisitsParams = {},
-  doFallbackRange = false,
+  doIntervalFallback = false,
 ) => async (dispatch: Dispatch, getState: GetState) => {
   const { getShortUrlVisits } = buildShlinkApiClient(getState);
   const visitsLoader = async (page: number, itemsPerPage: number) => getShortUrlVisits(
@@ -86,7 +86,7 @@ export const getShortUrlVisits = (buildShlinkApiClient: ShlinkApiClientBuilder)
     { ...query, page, itemsPerPage },
   );
   const lastVisitLoader = lastVisitLoaderForLoader(
-    doFallbackRange,
+    doIntervalFallback,
     async (params) => getShortUrlVisits(shortCode, { ...params, domain: query.domain }),
   );
   const shouldCancel = () => getState().shortUrlVisits.cancelLoad;

src/visits/reducers/tagVisits.ts

@@ -67,14 +67,14 @@ export default buildReducer<TagVisits, TagsVisitsCombinedAction>({
 export const getTagVisits = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
   tag: string,
   query: ShlinkVisitsParams = {},
-  doFallbackRange = false,
+  doIntervalFallback = false,
 ) => async (dispatch: Dispatch, getState: GetState) => {
   const { getTagVisits } = buildShlinkApiClient(getState);
   const visitsLoader = async (page: number, itemsPerPage: number) => getTagVisits(
     tag,
     { ...query, page, itemsPerPage },
   );
-  const lastVisitLoader = lastVisitLoaderForLoader(doFallbackRange, async (params) => getTagVisits(tag, params));
+  const lastVisitLoader = lastVisitLoaderForLoader(doIntervalFallback, async (params) => getTagVisits(tag, params));
   const shouldCancel = () => getState().tagVisits.cancelLoad;
   const extraFinishActionData: Partial<TagVisitsAction> = { tag, query };
   const actionMap = {