Removed references to feature checks for version 2.7

src/short-urls/ShortUrlForm.tsx

@@ -4,7 +4,7 @@ import { Button, FormGroup, Input, Row } from 'reactstrap';
 import { cond, isEmpty, pipe, replace, trim, T } from 'ramda';
 import { parseISO } from 'date-fns';
 import { DateTimeInput, DateTimeInputProps } from '../utils/dates/DateTimeInput';
-import { supportsCrawlableVisits, supportsForwardQuery } from '../utils/helpers/features';
+import { supportsForwardQuery } from '../utils/helpers/features';
 import { SimpleCard } from '../utils/SimpleCard';
 import { handleEventPreventingDefault, hasValue, OptionalString } from '../utils/utils';
 import { Checkbox } from '../utils/Checkbox';
@@ -113,16 +113,14 @@ export const ShortUrlForm = (
     </>
   );
 
-  const showCrawlableControl = supportsCrawlableVisits(selectedServer);
   const showForwardQueryControl = supportsForwardQuery(selectedServer);
-  const showBehaviorCard = showCrawlableControl || showForwardQueryControl;
 
   return (
     <form name="shortUrlForm" className="short-url-form" onSubmit={submit}>
       {isBasicMode && basicComponents}
       {!isBasicMode && (
         <>
-          <SimpleCard title="Basic options" className="mb-3">
+          <SimpleCard title="Main options" className="mb-3">
             {basicComponents}
           </SimpleCard>
 
@@ -190,30 +188,26 @@ export const ShortUrlForm = (
                 )}
               </SimpleCard>
             </div>
-            {showBehaviorCard && (
-              <div className="col-sm-6 mb-3">
-                <SimpleCard title="Configure behavior">
-                  {showCrawlableControl && (
-                    <ShortUrlFormCheckboxGroup
-                      infoTooltip="This short URL will be included in the robots.txt for your Shlink instance, allowing web crawlers (like Google) to index it."
-                      checked={shortUrlData.crawlable}
-                      onChange={(crawlable) => setShortUrlData({ ...shortUrlData, crawlable })}
-                    >
-                      Make it crawlable
-                    </ShortUrlFormCheckboxGroup>
-                  )}
-                  {showForwardQueryControl && (
-                    <ShortUrlFormCheckboxGroup
-                      infoTooltip="When this short URL is visited, any query params appended to it will be forwarded to the long URL."
-                      checked={shortUrlData.forwardQuery}
-                      onChange={(forwardQuery) => setShortUrlData({ ...shortUrlData, forwardQuery })}
-                    >
-                      Forward query params on redirect
-                    </ShortUrlFormCheckboxGroup>
-                  )}
-                </SimpleCard>
-              </div>
-            )}
+            <div className="col-sm-6 mb-3">
+              <SimpleCard title="Configure behavior">
+                <ShortUrlFormCheckboxGroup
+                  infoTooltip="This short URL will be included in the robots.txt for your Shlink instance, allowing web crawlers (like Google) to index it."
+                  checked={shortUrlData.crawlable}
+                  onChange={(crawlable) => setShortUrlData({ ...shortUrlData, crawlable })}
+                >
+                  Make it crawlable
+                </ShortUrlFormCheckboxGroup>
+                {showForwardQueryControl && (
+                  <ShortUrlFormCheckboxGroup
+                    infoTooltip="When this short URL is visited, any query params appended to it will be forwarded to the long URL."
+                    checked={shortUrlData.forwardQuery}
+                    onChange={(forwardQuery) => setShortUrlData({ ...shortUrlData, forwardQuery })}
+                  >
+                    Forward query params on redirect
+                  </ShortUrlFormCheckboxGroup>
+                )}
+              </SimpleCard>
+            </div>
           </Row>
         </>
       )}

src/short-urls/ShortUrlsFilteringBar.tsx

@@ -8,7 +8,7 @@ import { SearchField } from '../utils/SearchField';
 import { DateRangeSelector } from '../utils/dates/DateRangeSelector';
 import { formatIsoDate } from '../utils/helpers/date';
 import { DateRange, datesToDateRange } from '../utils/helpers/dateIntervals';
-import { supportsAllTagsFiltering, supportsBotVisits } from '../utils/helpers/features';
+import { supportsAllTagsFiltering } from '../utils/helpers/features';
 import { SelectedServer } from '../servers/data';
 import { OrderDir } from '../utils/helpers/ordering';
 import { OrderingDropdown } from '../utils/OrderingDropdown';
@@ -47,7 +47,6 @@ export const ShortUrlsFilteringBar = (
   );
   const changeTagSelection = (selectedTags: string[]) => toFirstPage({ tags: selectedTags });
   const canChangeTagsMode = supportsAllTagsFiltering(selectedServer);
-  const botsSupported = supportsBotVisits(selectedServer);
   const toggleTagsMode = pipe(
     () => (tagsMode === 'any' ? 'all' : 'any'),
     (mode) => toFirstPage({ tagsMode: mode }),
@@ -83,7 +82,6 @@ export const ShortUrlsFilteringBar = (
             </div>
             <ShortUrlsFilterDropdown
               className="ms-0 ms-md-2 mt-3 mt-md-0"
-              botsSupported={botsSupported}
               selected={{ excludeBots: excludeBots ?? settings.visits?.excludeBots }}
               onChange={toFirstPage}
             />

src/short-urls/helpers/ShortUrlsFilterDropdown.tsx

@@ -7,27 +7,18 @@ interface ShortUrlsFilterDropdownProps {
   onChange: (filters: ShortUrlsFilter) => void;
   selected?: ShortUrlsFilter;
   className?: string;
-  botsSupported: boolean;
 }
 
 export const ShortUrlsFilterDropdown = (
-  { onChange, selected = {}, className, botsSupported }: ShortUrlsFilterDropdownProps,
+  { onChange, selected = {}, className }: ShortUrlsFilterDropdownProps,
 ) => {
-  if (!botsSupported) {
-    return null;
-  }
-
   const { excludeBots = false } = selected;
   const onBotsClick = () => onChange({ ...selected, excludeBots: !selected?.excludeBots });
 
   return (
     <DropdownBtn text="Filters" dropdownClassName={className} className="me-3" right minWidth={250}>
-      {botsSupported && (
-        <>
-          <DropdownItem header>Bots:</DropdownItem>
-          <DropdownItem active={excludeBots} onClick={onBotsClick}>Exclude bots visits</DropdownItem>
-        </>
-      )}
+      <DropdownItem header>Bots:</DropdownItem>
+      <DropdownItem active={excludeBots} onClick={onBotsClick}>Exclude bots visits</DropdownItem>
 
       <DropdownItem divider />
       <DropdownItem disabled={!hasValue(selected)} onClick={() => onChange({ excludeBots: false })}>