From 8b5b035568929f5383c66824d50b7e8111384b0f Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Sat, 25 Sep 2021 11:47:18 +0200
Subject: [PATCH] Removed rest of version checks for versions older than 2.4

---
 src/servers/Overview.tsx             |  9 +--------
 src/tags/TagCard.tsx                 | 13 ++-----------
 src/tags/services/provideServices.ts |  9 +--------
 test/servers/Overview.test.tsx       |  7 -------
 test/tags/TagCard.test.tsx           | 11 ++++++-----
 5 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/src/servers/Overview.tsx b/src/servers/Overview.tsx
index 84614b2e..99311133 100644
--- a/src/servers/Overview.tsx
+++ b/src/servers/Overview.tsx
@@ -55,14 +55,7 @@ export const Overview = (
         <div className="col-md-6 col-xl-3">
           <Card className="overview__card mb-3" body>
             <CardTitle tag="h5" className="overview__card-title">Visits</CardTitle>
-            <CardText tag="h2">
-              <ForServerVersion minVersion="2.2.0">
-                {loadingVisits ? 'Loading...' : prettify(visitsCount)}
-              </ForServerVersion>
-              <ForServerVersion maxVersion="2.1.*">
-                <small className="text-muted"><i>Shlink 2.2 is needed</i></small>
-              </ForServerVersion>
-            </CardText>
+            <CardText tag="h2">{loadingVisits ? 'Loading...' : prettify(visitsCount)}</CardText>
           </Card>
         </div>
         <div className="col-md-6 col-xl-3">
diff --git a/src/tags/TagCard.tsx b/src/tags/TagCard.tsx
index 6bad3281..e3cd220e 100644
--- a/src/tags/TagCard.tsx
+++ b/src/tags/TagCard.tsx
@@ -5,7 +5,6 @@ import { FC, useEffect, useRef } from 'react';
 import { Link } from 'react-router-dom';
 import { prettify } from '../utils/helpers/numbers';
 import { useToggle } from '../utils/helpers/hooks';
-import { Versions } from '../utils/helpers/version';
 import ColorGenerator from '../utils/services/ColorGenerator';
 import { isServerWithId, SelectedServer } from '../servers/data';
 import TagBullet from './helpers/TagBullet';
@@ -25,16 +24,13 @@ const isTruncated = (el: HTMLElement | undefined): boolean => !!el && el.scrollW
 const TagCard = (
   DeleteTagConfirmModal: FC<TagModalProps>,
   EditTagModal: FC<TagModalProps>,
-  ForServerVersion: FC<Versions>,
   colorGenerator: ColorGenerator,
 ) => ({ tag, tagStats, selectedServer, displayed, toggle }: TagCardProps) => {
   const [ isDeleteModalOpen, toggleDelete ] = useToggle();
   const [ isEditModalOpen, toggleEdit ] = useToggle();
   const [ hasTitle,, displayTitle ] = useToggle();
   const titleRef = useRef<HTMLElement>();
-
   const serverId = isServerWithId(selectedServer) ? selectedServer.id : '';
-  const shortUrlsLink = `/server/${serverId}/list-short-urls/1?tag=${encodeURIComponent(tag)}`;
 
   useEffect(() => {
     if (isTruncated(titleRef.current)) {
@@ -59,12 +55,7 @@ const TagCard = (
           }}
         >
           <TagBullet tag={tag} colorGenerator={colorGenerator} />
-          <ForServerVersion minVersion="2.2.0">
-            <span className="tag-card__tag-name" onClick={toggle}>{tag}</span>
-          </ForServerVersion>
-          <ForServerVersion maxVersion="2.1.*">
-            <Link to={shortUrlsLink}>{tag}</Link>
-          </ForServerVersion>
+          <span className="tag-card__tag-name" onClick={toggle}>{tag}</span>
         </h5>
       </CardHeader>
 
@@ -72,7 +63,7 @@ const TagCard = (
         <Collapse isOpen={displayed}>
           <CardBody className="tag-card__body">
             <Link
-              to={shortUrlsLink}
+              to={`/server/${serverId}/list-short-urls/1?tag=${encodeURIComponent(tag)}`}
               className="btn btn-outline-secondary btn-block d-flex justify-content-between align-items-center mb-1"
             >
               <span className="text-ellipsis"><FontAwesomeIcon icon={faLink} className="mr-2" />Short URLs</span>
diff --git a/src/tags/services/provideServices.ts b/src/tags/services/provideServices.ts
index ac1753dc..1e3e8d39 100644
--- a/src/tags/services/provideServices.ts
+++ b/src/tags/services/provideServices.ts
@@ -18,14 +18,7 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
   bottle.serviceFactory('TagsSelector', TagsSelector, 'ColorGenerator');
   bottle.decorator('TagsSelector', connect([ 'tagsList', 'settings' ], [ 'listTags' ]));
 
-  bottle.serviceFactory(
-    'TagCard',
-    TagCard,
-    'DeleteTagConfirmModal',
-    'EditTagModal',
-    'ForServerVersion',
-    'ColorGenerator',
-  );
+  bottle.serviceFactory('TagCard', TagCard, 'DeleteTagConfirmModal', 'EditTagModal', 'ColorGenerator');
 
   bottle.serviceFactory('DeleteTagConfirmModal', () => DeleteTagConfirmModal);
   bottle.decorator('DeleteTagConfirmModal', connect([ 'tagDelete' ], [ 'deleteTag', 'tagDeleted' ]));
diff --git a/test/servers/Overview.test.tsx b/test/servers/Overview.test.tsx
index 3b29b3e4..14cc85b1 100644
--- a/test/servers/Overview.test.tsx
+++ b/test/servers/Overview.test.tsx
@@ -64,13 +64,6 @@ describe('<Overview />', () => {
     expect(cards.at(3).html()).toContain(prettify(3));
   });
 
-  it('displays warning in first card for old shlink versions', () => {
-    const wrapper = createWrapper();
-    const firstCard = wrapper.find(CardText).first();
-
-    expect(firstCard.html()).toContain('Shlink 2.2 is needed');
-  });
-
   it('nests complex components', () => {
     const wrapper = createWrapper();
 
diff --git a/test/tags/TagCard.test.tsx b/test/tags/TagCard.test.tsx
index db1dce18..8bdd6c6c 100644
--- a/test/tags/TagCard.test.tsx
+++ b/test/tags/TagCard.test.tsx
@@ -14,7 +14,7 @@ describe('<TagCard />', () => {
   };
   const DeleteTagConfirmModal = jest.fn();
   const EditTagModal = jest.fn();
-  const TagCard = createTagCard(DeleteTagConfirmModal, EditTagModal, () => null, Mock.all<ColorGenerator>());
+  const TagCard = createTagCard(DeleteTagConfirmModal, EditTagModal, Mock.all<ColorGenerator>());
   const createWrapper = (tag = 'ssr') => {
     wrapper = shallow(
       <TagCard
@@ -65,9 +65,10 @@ describe('<TagCard />', () => {
   it('shows expected tag stats', () => {
     const links = wrapper.find(Link);
 
-    expect(links.at(1).prop('to')).toEqual('/server/1/list-short-urls/1?tag=ssr');
-    expect(links.at(1).text()).toContain('48');
-    expect(links.at(2).prop('to')).toEqual('/server/1/tag/ssr/visits');
-    expect(links.at(2).text()).toContain('23,257');
+    expect(links).toHaveLength(2);
+    expect(links.at(0).prop('to')).toEqual('/server/1/list-short-urls/1?tag=ssr');
+    expect(links.at(0).text()).toContain('48');
+    expect(links.at(1).prop('to')).toEqual('/server/1/tag/ssr/visits');
+    expect(links.at(1).text()).toContain('23,257');
   });
 });