Removed references to feature checks for version 2.7

2026-04-11 17:16:20 +00:00 · 2022-12-23 21:06:59 +01:00
parent 815e06809a
commit 60fc351344
22 changed files with 71 additions and 168 deletions
--- a/src/visits/DomainVisits.tsx
+++ b/src/visits/DomainVisits.tsx
@@ -22,7 +22,6 @@ export const DomainVisits = ({ exportVisits }: ReportExporter) => boundToMercure
  domainVisits,
  cancelGetDomainVisits,
  settings,
-  selectedServer,
 }: DomainVisitsProps) => {
  const goBack = useGoBack();
  const { domain = '' } = useParams();
@@ -38,7 +37,6 @@ export const DomainVisits = ({ exportVisits }: ReportExporter) => boundToMercure
      visitsInfo={domainVisits}
      settings={settings}
      exportCsv={exportCsv}
-      selectedServer={selectedServer}
    >
      <VisitsHeader goBack={goBack} visits={domainVisits.visits} title={`"${authority}" visits`} />
    </VisitsStats>
--- a/src/visits/NonOrphanVisits.tsx
+++ b/src/visits/NonOrphanVisits.tsx
@@ -20,7 +20,6 @@ export const NonOrphanVisits = ({ exportVisits }: ReportExporter) => boundToMerc
  nonOrphanVisits,
  cancelGetNonOrphanVisits,
  settings,
-  selectedServer,
 }: NonOrphanVisitsProps) => {
  const goBack = useGoBack();
  const exportCsv = (visits: NormalizedVisit[]) => exportVisits('non_orphan_visits.csv', visits);
@@ -34,7 +33,6 @@ export const NonOrphanVisits = ({ exportVisits }: ReportExporter) => boundToMerc
      visitsInfo={nonOrphanVisits}
      settings={settings}
      exportCsv={exportCsv}
-      selectedServer={selectedServer}
    >
      <VisitsHeader title="Non-orphan visits" goBack={goBack} visits={nonOrphanVisits.visits} />
    </VisitsStats>
--- a/src/visits/OrphanVisits.tsx
+++ b/src/visits/OrphanVisits.tsx
@@ -21,7 +21,6 @@ export const OrphanVisits = ({ exportVisits }: ReportExporter) => boundToMercure
  orphanVisits,
  cancelGetOrphanVisits,
  settings,
-  selectedServer,
 }: OrphanVisitsProps) => {
  const goBack = useGoBack();
  const exportCsv = (visits: NormalizedVisit[]) => exportVisits('orphan_visits.csv', visits);
@@ -36,7 +35,6 @@ export const OrphanVisits = ({ exportVisits }: ReportExporter) => boundToMercure
      visitsInfo={orphanVisits}
      settings={settings}
      exportCsv={exportCsv}
-      selectedServer={selectedServer}
      isOrphanVisits
    >
      <VisitsHeader title="Orphan visits" goBack={goBack} visits={orphanVisits.visits} />
--- a/src/visits/ShortUrlVisits.tsx
+++ b/src/visits/ShortUrlVisits.tsx
@@ -30,7 +30,6 @@ export const ShortUrlVisits = ({ exportVisits }: ReportExporter) => boundToMercu
  getShortUrlDetail,
  cancelGetShortUrlVisits,
  settings,
-  selectedServer,
 }: ShortUrlVisitsProps) => {
  const { shortCode = '' } = useParams<{ shortCode: string }>();
  const { search } = useLocation();
@@ -57,7 +56,6 @@ export const ShortUrlVisits = ({ exportVisits }: ReportExporter) => boundToMercu
      visitsInfo={shortUrlVisits}
      settings={settings}
      exportCsv={exportCsv}
-      selectedServer={selectedServer}
    >
      <ShortUrlVisitsHeader shortUrlDetail={shortUrlDetail} shortUrlVisits={shortUrlVisits} goBack={goBack} />
    </VisitsStats>
--- a/src/visits/TagVisits.tsx
+++ b/src/visits/TagVisits.tsx
@@ -23,7 +23,6 @@ export const TagVisits = (colorGenerator: ColorGenerator, { exportVisits }: Repo
  tagVisits,
  cancelGetTagVisits,
  settings,
-  selectedServer,
 }: TagVisitsProps) => {
  const goBack = useGoBack();
  const { tag = '' } = useParams();
@@ -38,7 +37,6 @@ export const TagVisits = (colorGenerator: ColorGenerator, { exportVisits }: Repo
      visitsInfo={tagVisits}
      settings={settings}
      exportCsv={exportCsv}
-      selectedServer={selectedServer}
    >
      <TagVisitsHeader tagVisits={tagVisits} goBack={goBack} colorGenerator={colorGenerator} />
    </VisitsStats>
--- a/src/visits/VisitsStats.tsx
+++ b/src/visits/VisitsStats.tsx
@@ -11,8 +11,6 @@ import { Message } from '../utils/Message';
 import { Result } from '../utils/Result';
 import { ShlinkApiError } from '../api/ShlinkApiError';
 import { Settings } from '../settings/reducers/settings';
-import { SelectedServer } from '../servers/data';
-import { supportsBotVisits } from '../utils/helpers/features';
 import { prettify } from '../utils/helpers/numbers';
 import { NavPillItem, NavPills } from '../utils/NavPills';
 import { ExportBtn } from '../utils/ExportBtn';
@@ -33,7 +31,6 @@ export type VisitsStatsProps = PropsWithChildren<{
  getVisits: (params: VisitsParams, doIntervalFallback?: boolean) => void;
  visitsInfo: VisitsInfo;
  settings: Settings;
-  selectedServer: SelectedServer;
  cancelGetVisits: () => void;
  exportCsv: (visits: NormalizedVisit[]) => void;
  isOrphanVisits?: boolean;
@@ -63,7 +60,6 @@ export const VisitsStats: FC<VisitsStatsProps> = ({
  cancelGetVisits,
  settings,
  exportCsv,
-  selectedServer,
  isOrphanVisits = false,
 }) => {
  const { visits, loading, loadingLarge, error, errorData, progress, fallbackInterval } = visitsInfo;
@@ -82,7 +78,6 @@ export const VisitsStats: FC<VisitsStatsProps> = ({
  );
  const [highlightedVisits, setHighlightedVisits] = useState<NormalizedVisit[]>([]);
  const [highlightedLabel, setHighlightedLabel] = useState<string | undefined>();
-  const botsSupported = supportsBotVisits(selectedServer);
  const isFirstLoad = useRef(true);
  const { search } = useLocation();

@@ -273,7 +268,6 @@ export const VisitsStats: FC<VisitsStatsProps> = ({
                    selectedVisits={highlightedVisits}
                    setSelectedVisits={setSelectedVisits}
                    isOrphanVisits={isOrphanVisits}
-                    selectedServer={selectedServer}
                  />
                </div>
              )}
@@ -306,7 +300,6 @@ export const VisitsStats: FC<VisitsStatsProps> = ({
              <VisitsFilterDropdown
                className="ms-0 ms-md-2 mt-3 mt-md-0"
                isOrphanVisits={isOrphanVisits}
-                botsSupported={botsSupported}
                selected={resolvedFilter}
                onChange={(newVisitsFilter) => updateFiltering({ visitsFilter: newVisitsFilter })}
              />
--- a/src/visits/VisitsTable.tsx
+++ b/src/visits/VisitsTable.tsx
@@ -8,8 +8,6 @@ import { SimplePaginator } from '../common/SimplePaginator';
 import { SearchField } from '../utils/SearchField';
 import { determineOrderDir, Order, sortList } from '../utils/helpers/ordering';
 import { prettify } from '../utils/helpers/numbers';
-import { supportsBotVisits } from '../utils/helpers/features';
-import { SelectedServer } from '../servers/data';
 import { Time } from '../utils/dates/Time';
 import { TableOrderIcon } from '../utils/table/TableOrderIcon';
 import { MediaMatcher } from '../utils/types';
@@ -22,7 +20,6 @@ export interface VisitsTableProps {
  setSelectedVisits: (visits: NormalizedVisit[]) => void;
  matchMedia?: MediaMatcher;
  isOrphanVisits?: boolean;
-  selectedServer: SelectedServer;
 }

 type OrderableFields = 'date' | 'country' | 'city' | 'browser' | 'os' | 'referer' | 'visitedUrl' | 'potentialBot';
@@ -49,7 +46,6 @@ export const VisitsTable = ({
  visits,
  selectedVisits = [],
  setSelectedVisits,
-  selectedServer,
  matchMedia = window.matchMedia,
  isOrphanVisits = false,
 }: VisitsTableProps) => {
@@ -64,8 +60,7 @@ export const VisitsTable = ({
  const [page, setPage] = useState(1);
  const end = page * PAGE_SIZE;
  const start = end - PAGE_SIZE;
-  const supportsBots = supportsBotVisits(selectedServer);
-  const fullSizeColSpan = 7 + Number(supportsBots) + Number(isOrphanVisits);
+  const fullSizeColSpan = 8 + Number(isOrphanVisits);

  const orderByColumn = (field: OrderableFields) =>
    () => setOrder({ field, dir: determineOrderDir(field, order.field, order.dir) });
@@ -99,12 +94,10 @@ export const VisitsTable = ({
            >
              <FontAwesomeIcon icon={checkIcon} className={classNames({ 'text-primary': selectedVisits.length > 0 })} />
            </th>
-            {supportsBots && (
-              <th className={`${headerCellsClass} text-center`} onClick={orderByColumn('potentialBot')}>
-                <FontAwesomeIcon icon={botIcon} />
-                {renderOrderIcon('potentialBot')}
-              </th>
-            )}
+            <th className={`${headerCellsClass} text-center`} onClick={orderByColumn('potentialBot')}>
+              <FontAwesomeIcon icon={botIcon} />
+              {renderOrderIcon('potentialBot')}
+            </th>
            <th className={headerCellsClass} onClick={orderByColumn('date')}>
              Date
              {renderOrderIcon('date')}
@@ -165,18 +158,16 @@ export const VisitsTable = ({
                <td className="text-center">
                  {isSelected && <FontAwesomeIcon icon={checkIcon} className="text-primary" />}
                </td>
-                {supportsBots && (
-                  <td className="text-center">
-                    {visit.potentialBot && (
-                      <>
-                        <FontAwesomeIcon icon={botIcon} id={`botIcon${index}`} />
-                        <UncontrolledTooltip placement="right" target={`botIcon${index}`}>
-                          Potentially a visit from a bot or crawler
-                        </UncontrolledTooltip>
-                      </>
-                    )}
-                  </td>
-                )}
+                <td className="text-center">
+                  {visit.potentialBot && (
+                    <>
+                      <FontAwesomeIcon icon={botIcon} id={`botIcon${index}`} />
+                      <UncontrolledTooltip placement="right" target={`botIcon${index}`}>
+                        Potentially a visit from a bot or crawler
+                      </UncontrolledTooltip>
+                    </>
+                  )}
+                </td>
                <td><Time date={visit.date} /></td>
                <td>{visit.country}</td>
                <td>{visit.city}</td>
--- a/src/visits/helpers/VisitsFilterDropdown.tsx
+++ b/src/visits/helpers/VisitsFilterDropdown.tsx
@@ -8,16 +8,11 @@ interface VisitsFilterDropdownProps {
  selected?: VisitsFilter;
  className?: string;
  isOrphanVisits: boolean;
-  botsSupported: boolean;
 }

 export const VisitsFilterDropdown = (
-  { onChange, selected = {}, className, isOrphanVisits, botsSupported }: VisitsFilterDropdownProps,
+  { onChange, selected = {}, className, isOrphanVisits }: VisitsFilterDropdownProps,
 ) => {
-  if (!botsSupported && !isOrphanVisits) {
-    return null;
-  }
-
  const { orphanVisitsType, excludeBots = false } = selected;
  const propsForOrphanVisitsTypeItem = (type: OrphanVisitType): DropdownItemProps => ({
    active: orphanVisitsType === type,
@@ -27,17 +22,12 @@ export const VisitsFilterDropdown = (

  return (
    <DropdownBtn text="Filters" dropdownClassName={className} className="me-3" right minWidth={250}>
-      {botsSupported && (
-        <>
-          <DropdownItem header>Bots:</DropdownItem>
-          <DropdownItem active={excludeBots} onClick={onBotsClick}>Exclude potential bots</DropdownItem>
-        </>
-      )}
-
-      {botsSupported && isOrphanVisits && <DropdownItem divider />}
+      <DropdownItem header>Bots:</DropdownItem>
+      <DropdownItem active={excludeBots} onClick={onBotsClick}>Exclude potential bots</DropdownItem>

      {isOrphanVisits && (
        <>
+          <DropdownItem divider />
          <DropdownItem header>Orphan visits type:</DropdownItem>
          <DropdownItem {...propsForOrphanVisitsTypeItem('base_url')}>Base URL</DropdownItem>
          <DropdownItem {...propsForOrphanVisitsTypeItem('invalid_short_url')}>Invalid short URL</DropdownItem>
--- a/src/visits/services/provideServices.ts
+++ b/src/visits/services/provideServices.ts
@@ -22,31 +22,31 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {

  bottle.serviceFactory('ShortUrlVisits', ShortUrlVisits, 'ReportExporter');
  bottle.decorator('ShortUrlVisits', connect(
-    ['shortUrlVisits', 'shortUrlDetail', 'mercureInfo', 'settings', 'selectedServer'],
+    ['shortUrlVisits', 'shortUrlDetail', 'mercureInfo', 'settings'],
    ['getShortUrlVisits', 'getShortUrlDetail', 'cancelGetShortUrlVisits', 'createNewVisits', 'loadMercureInfo'],
  ));

  bottle.serviceFactory('TagVisits', TagVisits, 'ColorGenerator', 'ReportExporter');
  bottle.decorator('TagVisits', connect(
-    ['tagVisits', 'mercureInfo', 'settings', 'selectedServer'],
+    ['tagVisits', 'mercureInfo', 'settings'],
    ['getTagVisits', 'cancelGetTagVisits', 'createNewVisits', 'loadMercureInfo'],
  ));

  bottle.serviceFactory('DomainVisits', DomainVisits, 'ReportExporter');
  bottle.decorator('DomainVisits', connect(
-    ['domainVisits', 'mercureInfo', 'settings', 'selectedServer'],
+    ['domainVisits', 'mercureInfo', 'settings'],
    ['getDomainVisits', 'cancelGetDomainVisits', 'createNewVisits', 'loadMercureInfo'],
  ));

  bottle.serviceFactory('OrphanVisits', OrphanVisits, 'ReportExporter');
  bottle.decorator('OrphanVisits', connect(
-    ['orphanVisits', 'mercureInfo', 'settings', 'selectedServer'],
+    ['orphanVisits', 'mercureInfo', 'settings'],
    ['getOrphanVisits', 'cancelGetOrphanVisits', 'createNewVisits', 'loadMercureInfo'],
  ));

  bottle.serviceFactory('NonOrphanVisits', NonOrphanVisits, 'ReportExporter');
  bottle.decorator('NonOrphanVisits', connect(
-    ['nonOrphanVisits', 'mercureInfo', 'settings', 'selectedServer'],
+    ['nonOrphanVisits', 'mercureInfo', 'settings'],
    ['getNonOrphanVisits', 'cancelGetNonOrphanVisits', 'createNewVisits', 'loadMercureInfo'],
  ));

--- a/src/visits/types/CommonVisitsProps.ts
+++ b/src/visits/types/CommonVisitsProps.ts
@@ -1,7 +1,5 @@
-import { SelectedServer } from '../../servers/data';
 import { Settings } from '../../settings/reducers/settings';

 export interface CommonVisitsProps {
-  selectedServer: SelectedServer;
  settings: Settings;
 }