Merge pull request #820 from shlinkio/develop

Release 3.10.0
Merge pull request #819 from acelaya-forks/feature/tags-non-bot-visits
2026-02-25 03:06:36 +00:00 · 2023-03-19 12:00:45 +01:00 · 2023-03-19 11:54:54 +01:00 · 2023-03-19 11:50:06 +01:00 · 2023-03-19 11:47:02 +01:00 · 2023-03-19 11:44:40 +01:00
384 changed files with 8997 additions and 34254 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
 ./.github
-./.stryker-tmp
 ./build
 ./coverage
 ./node_modules
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,6 @@ jobs:
  ci:
    uses: shlinkio/github-actions/.github/workflows/web-app-ci.yml@main
    with:
-      node-version: 16.15
-      with-mutation-tests: true
+      node-version: 18.12
      publish-coverage: true
      force-install: true
--- a/.github/workflows/deploy-preview.yml
+++ b/.github/workflows/deploy-preview.yml
@@ -16,12 +16,11 @@ jobs:
      - name: Use node.js
        uses: actions/setup-node@v1
        with:
-          node-version: 16.15
+          node-version: 18.12
      - name: Build
        run: |
          npm ci --force && \
          node ./scripts/set-homepage.js /shlink-web-client/${GITHUB_HEAD_REF#refs/heads/} && \
-          rm src/service-worker.ts && \
          npm run build
      - name: Deploy preview
        uses: shlinkio/deploy-preview-action@v1.0.1
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -14,7 +14,7 @@ jobs:
      - name: Use node.js
        uses: actions/setup-node@v1
        with:
-          node-version: 16.15
+          node-version: 18.12
      - name: Generate release assets
        run: npm ci --force && VERSION=${GITHUB_REF#refs/tags/v} npm run build:dist
      - name: Publish release with assets
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@

 # testing
 /coverage
-/.stryker-tmp
 /reports

 # production
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,108 @@ All notable changes to this project will be documented in this file.

 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).

+## [3.10.0] - 2023-03-19
+### Added
+* [#807](https://github.com/shlinkio/shlink-web-client/issues/807) Add support for device-specific long-URLs when creating or editing short URLs.
+* [#808](https://github.com/shlinkio/shlink-web-client/issues/808) Respect settings on excluding bots in the overview section, for visits cards.
+* [#809](https://github.com/shlinkio/shlink-web-client/issues/809) Respect settings on excluding bots in the tags list.
+
+### Changed
+* [#798](https://github.com/shlinkio/shlink-web-client/issues/798) Remove stryker and mutation testing.
+* [#800](https://github.com/shlinkio/shlink-web-client/issues/800) Use `/tags/stats` endpoint to load tags stats, when the server supports it.
+* Update to Vite 4.2
+* Update to TypeScript 5
+* Update to coding standard v2.1.0
+* Decouple tests from RTK internals.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#799](https://github.com/shlinkio/shlink-web-client/issues/799) Fix fallback visits not taking into account configuration regarding excluding bots.
+
+
+## [3.9.1] - 2022-12-31
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#787](https://github.com/shlinkio/shlink-web-client/issues/787) Fixed wrong base path set in vite config when homepage is set as empty string.
+
+
+## [3.9.0] - 2022-12-31
+### Added
+* [#750](https://github.com/shlinkio/shlink-web-client/issues/750) Added new icon indicators telling if a short URL can be normally visited, it received the max amount of visits, is still not enabled, etc.
+* [#764](https://github.com/shlinkio/shlink-web-client/issues/764) Added support to exclude visits from visits on short URLs list when consuming Shlink 3.4.0.
+
+  This feature also comes with a new setting to disable visits from bots by default, both on short URLs lists and visits sections.
+
+* [#760](https://github.com/shlinkio/shlink-web-client/issues/760) Added support to exclude short URLs which have reached the maximum amount of visits, or are valid until a date in the past.
+
+### Changed
+* [#753](https://github.com/shlinkio/shlink-web-client/issues/753) Migrated from react-scripts/webpack to vite.
+* [#770](https://github.com/shlinkio/shlink-web-client/issues/770) Updated to latest dependencies.
+* [#741](https://github.com/shlinkio/shlink-web-client/issues/741) Improved `visitsAsyncThunk`, making it wrap pending/fulfilled/rejected actions, as well as custom ones, in a type-safe way.
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* [#736](https://github.com/shlinkio/shlink-web-client/issues/736) Removed cards mode in tags. Only table mode is supported now.
+* [#774](https://github.com/shlinkio/shlink-web-client/issues/774) Dropped support for Shlink older than 2.8.0.
+
+### Fixed
+* [#715](https://github.com/shlinkio/shlink-web-client/issues/715) Fixed connection still failing on miss-configured servers, after editing their params to set proper values.
+
+
+## [3.8.2] - 2022-12-17
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#766](https://github.com/shlinkio/shlink-web-client/issues/766) Fixed visits query being lost when switching between sub-sections.
+* [#765](https://github.com/shlinkio/shlink-web-client/issues/765) Added missing `"Content-Type": "application/json"` to requests with payload, making older Shlink versions fail.
+
+
+## [3.8.1] - 2022-12-06
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#756](https://github.com/shlinkio/shlink-web-client/issues/756) Fixed all visits interval not working unless switching to a different interval first.
+* [#757](https://github.com/shlinkio/shlink-web-client/issues/757) Fixed visits fallback interval not working until the visits view has been loaded at least twice.
+
+
 ## [3.8.0] - 2022-12-03
 ### Added
 * [#708](https://github.com/shlinkio/shlink-web-client/issues/708) Added support for API v3.
--- a/6
+++ b/6
@@ -1,10 +1,10 @@
-FROM node:16.15-alpine as node
+FROM node:18.12-alpine as node
 COPY . /shlink-web-client
 ARG VERSION="latest"
 ENV VERSION ${VERSION}
-RUN cd /shlink-web-client && npm ci --force && NODE_ENV=production npm run build
+RUN cd /shlink-web-client && npm ci --force && npm run build

-FROM nginx:1.21-alpine
+FROM nginx:1.23-alpine
 LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
 RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf
 COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # shlink-web-client

-[![Build Status](https://img.shields.io/github/workflow/status/shlinkio/shlink-web-client/Continuous%20integration/develop?logo=github&style=flat-square)](https://github.com/shlinkio/shlink-web-client/actions?query=workflow%3A%22Continuous+integration%22)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/shlinkio/shlink-web-client/ci.yml?branch=develop&logo=github&style=flat-square)](https://github.com/shlinkio/shlink-web-client/actions/workflows/ci.yml?query=workflow%3A%22Continuous+integration%22)
 [![Code Coverage](https://img.shields.io/codecov/c/gh/shlinkio/shlink-web-client/develop?style=flat-square)](https://app.codecov.io/gh/shlinkio/shlink-web-client)
 [![GitHub release](https://img.shields.io/github/release/shlinkio/shlink-web-client.svg?style=flat-square)](https://github.com/shlinkio/shlink-web-client/releases/latest)
 [![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink-web-client.svg?logo=docker&style=flat-square)](https://hub.docker.com/r/shlinkio/shlink-web-client/)
 [![GitHub license](https://img.shields.io/github/license/shlinkio/shlink-web-client.svg?style=flat-square)](https://github.com/shlinkio/shlink-web-client/blob/main/LICENSE)
-[![Twitter](https://img.shields.io/twitter/follow/shlinkio?color=blue&label=follow&logo=twitter&style=flat-square)](https://twitter.com/shlinkio)
+[![Twitter](https://img.shields.io/badge/follow-shlinkio-blue.svg?style=flat-square&logo=twitter&color=blue)](https://twitter.com/shlinkio)
 [![Mastodon](https://img.shields.io/mastodon/follow/109329425426175098?color=%236364ff&domain=https%3A%2F%2Ffosstodon.org&label=follow&logo=mastodon&logoColor=white&style=flat-square)](https://fosstodon.org/@shlinkio)
 [![Paypal Donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=cccccc)](https://slnk.to/donate)

@@ -54,7 +54,7 @@ Those servers can be exported and imported in other browsers, but if for some re
 [
  {
    "name": "Main server",
-    "url": "https://doma.in",
+    "url": "https://s.test",
    "apiKey": "09c972b7-506b-49f1-a19a-d729e22e599c"
  },
  {
@@ -85,7 +85,7 @@ If you want to pre-configure a single server, you can provide its config via env
    docker run \
        --name shlink-web-client \
        -p 8000:80 \
-        -e SHLINK_SERVER_URL=https://doma.in \
+        -e SHLINK_SERVER_URL=https://s.test \
        -e SHLINK_SERVER_API_KEY=6aeb82c6-e275-4538-a747-31f9abfba63c \
        shlinkio/shlink-web-client
    ```
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,11 +1,9 @@
 module.exports = {
  presets: [
-    [
-      'react-app',
-      {
-        runtime: 'automatic',
-        typescript: true,
-      },
-    ],
+    ['@babel/preset-env', {
+      targets: { esmodules: true }
+    }],
+    ['@babel/preset-react', { runtime: 'automatic' }],
+    '@babel/preset-typescript',
  ],
 };
--- a/config/jest/setupTests.ts
+++ b/config/jest/setupTests.ts
@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom';
 import 'jest-canvas-mock';
+import 'chart.js/auto';
 import ResizeObserver from 'resize-observer-polyfill';
 import { setAutoFreeze } from 'immer';

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,11 +3,11 @@ version: '3'
 services:
  shlink_web_client_node:
    container_name: shlink_web_client_node
-    image: node:16.15-alpine
-    command: /bin/sh -c "cd /home/shlink/www && npm install && npm run start"
+    image: node:18.12-alpine
+    command: /bin/sh -c "cd /home/shlink/www && npm install --force && npm run start"
    volumes:
      - ./:/home/shlink/www
    ports:
      - "3000:3000"
      - "56745:56745"
-      - "5000:5000"
+      - "4173:4173"
--- a/index.html
+++ b/index.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta name="theme-color" content="#4696e5">
+
+    <!--
+      manifest.json provides metadata used when your web app is added to the
+      homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
+    -->
+    <link rel="manifest" href="/manifest.json" crossorigin="use-credentials">
+
+    <!-- FavIcon itself -->
+    <link rel="icon" type="image/x-icon" href="/favicon.ico">
+    <link rel="icon" type="image/svg+xml" href="/favicon.svg" sizes="any">
+    <link rel="icon" type="image/png" href="/favicon.png">
+    <link rel="icon" type="image/gif" href="/favicon.gif">
+    <!-- Apple Touch -->
+    <link rel="apple-touch-icon" sizes="16x16" href="/icons/icon-16x16.png">
+    <link rel="apple-touch-icon" sizes="24x24" href="/icons/icon-24x24.png">
+    <link rel="apple-touch-icon" sizes="32x32" href="/icons/icon-32x32.png">
+    <link rel="apple-touch-icon" sizes="40x40" href="/icons/icon-40x40.png">
+    <link rel="apple-touch-icon" sizes="48x48" href="/icons/icon-48x48.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/icons/icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="64x64" href="/icons/icon-64x64.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/icons/icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/icons/icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="96x96" href="/icons/icon-96x96.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/icons/icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/icons/icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="128x128" href="/icons/icon-128x128.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/icons/icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="150x150" href="/icons/icon-150x150.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/icons/icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="160x160" href="/icons/icon-160x160.png">
+    <link rel="apple-touch-icon" sizes="167x167" href="/icons/icon-167x167.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/icons/icon-180x180.png">
+    <link rel="apple-touch-icon" sizes="192x192" href="/icons/icon-192x192.png">
+    <link rel="apple-touch-icon" sizes="196x196" href="/icons/icon-196x196.png">
+    <link rel="apple-touch-icon" sizes="228x228" href="/icons/icon-228x228.png">
+    <link rel="apple-touch-icon" sizes="256x256" href="/icons/icon-256x256.png">
+    <link rel="apple-touch-icon" sizes="310x310" href="/icons/icon-310x310.png">
+    <link rel="apple-touch-icon" sizes="384x384" href="/icons/icon-384x384.png">
+    <link rel="apple-touch-icon" sizes="512x512" href="/icons/icon-512x512.png">
+    <link rel="apple-touch-icon" sizes="1024x1024" href="/icons/icon-1024x1024.png">
+    <!-- Normal -->
+    <link rel="icon" type="image/png" sizes="1024x1024" href="/icons/icon-1024x1024.png">
+    <link rel="icon" type="image/png" sizes="512x512" href="/icons/icon-512x512.png">
+    <link rel="icon" type="image/png" sizes="384x384" href="/icons/icon-384x384.png">
+    <link rel="icon" type="image/png" sizes="310x310" href="/icons/icon-310x310.png">
+    <link rel="icon" type="image/png" sizes="256x256" href="/icons/icon-256x256.png">
+    <link rel="icon" type="image/png" sizes="228x228" href="/icons/icon-228x228.png">
+    <link rel="icon" type="image/png" sizes="196x196" href="/icons/icon-196x196.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="/icons/icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="180x180" href="/icons/icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="167x167" href="/icons/icon-167x167.png">
+    <link rel="icon" type="image/png" sizes="160x160" href="/icons/icon-160x160.png">
+    <link rel="icon" type="image/png" sizes="152x152" href="/icons/icon-152x152.png">
+    <link rel="icon" type="image/png" sizes="150x150" href="/icons/icon-150x150.png">
+    <link rel="icon" type="image/png" sizes="144x144" href="/icons/icon-144x144.png">
+    <link rel="icon" type="image/png" sizes="128x128" href="/icons/icon-128x128.png">
+    <link rel="icon" type="image/png" sizes="120x120" href="/icons/icon-120x120.png">
+    <link rel="icon" type="image/png" sizes="114x114" href="/icons/icon-114x114.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/icons/icon-96x96.png">
+    <link rel="icon" type="image/png" sizes="76x76" href="/icons/icon-76x76.png">
+    <link rel="icon" type="image/png" sizes="72x72" href="/icons/icon-72x72.png">
+    <link rel="icon" type="image/png" sizes="64x64" href="/icons/icon-64x64.png">
+    <link rel="icon" type="image/png" sizes="60x60" href="/icons/icon-60x60.png">
+    <link rel="icon" type="image/png" sizes="48x48" href="/icons/icon-48x48.png">
+    <link rel="icon" type="image/png" sizes="40x40" href="/icons/icon-40x40.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/icons/icon-32x32.png">
+    <link rel="icon" type="image/png" sizes="24x24" href="/icons/icon-24x24.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/icons/icon-16x16.png">
+    <!-- MS -->
+    <meta name="msapplication-TileImage" content="/icons/icon-144x144.png">
+    <meta name="msapplication-square70x70logo" content="/icons/icon-70x70.png">
+    <meta name="msapplication-square144x144logo" content="/icons/icon-144x144.png">
+    <meta name="msapplication-square150x150logo" content="/icons/icon-150x150.png">
+    <meta name="msapplication-square310x310logo" content="/icons/icon-310x310.png">
+    <title>Shlink — The URL shortener</title>
+  </head>
+  <body>
+    <noscript>
+      You need to enable JavaScript to run this app.
+    </noscript>
+    <div id="root"></div>
+    <script type="module" src="/src/index.tsx"></script>
+  </body>
+</html>
--- a/jest.config.js
+++ b/jest.config.js
@@ -10,14 +10,13 @@ module.exports = {
  coverageThreshold: {
    global: {
      statements: 90,
-      branches: 80,
-      functions: 85,
+      branches: 85,
+      functions: 90,
      lines: 90,
    },
  },
  setupFilesAfterEnv: ['<rootDir>/config/jest/setupTests.ts'],
  testMatch: ['<rootDir>/test/**/*.test.{ts,tsx}'],
-  modulePathIgnorePatterns: ['<rootDir>/.stryker-tmp'],
  testEnvironment: 'jsdom',
  testEnvironmentOptions: {
    url: 'http://localhost',
@@ -28,7 +27,6 @@ module.exports = {
    '^(?!.*\\.(ts|tsx|js|json|scss)$)': '<rootDir>/config/jest/fileTransform.js',
  },
  transformIgnorePatterns: [
-    '<rootDir>/.stryker-tmp',
    'node_modules\/(?!(\@react-leaflet|react-leaflet|leaflet|react-chartjs-2|react-colorful)\/)',
    '^.+\\.module\\.scss$',
  ],
--- a/manifest.ts
+++ b/manifest.ts
@@ -0,0 +1,145 @@
+export const manifest = {
+  short_name: 'Shlink',
+  name: 'Shlink',
+  start_url: '/',
+  display: 'standalone',
+  theme_color: '#4696e5',
+  background_color: '#4696e5',
+  icons: [
+    {
+      src: './icons/icon-16x16.png',
+      type: 'image/png',
+      sizes: '16x16',
+    },
+    {
+      src: './icons/icon-24x24.png',
+      type: 'image/png',
+      sizes: '24x24',
+    },
+    {
+      src: './icons/icon-32x32.png',
+      type: 'image/png',
+      sizes: '32x32',
+    },
+    {
+      src: './icons/icon-40x40.png',
+      type: 'image/png',
+      sizes: '40x40',
+    },
+    {
+      src: './icons/icon-48x48.png',
+      type: 'image/png',
+      sizes: '48x48',
+    },
+    {
+      src: './icons/icon-60x60.png',
+      type: 'image/png',
+      sizes: '60x60',
+    },
+    {
+      src: './icons/icon-64x64.png',
+      type: 'image/png',
+      sizes: '64x64',
+    },
+    {
+      src: './icons/icon-72x72.png',
+      type: 'image/png',
+      sizes: '72x72',
+    },
+    {
+      src: './icons/icon-76x76.png',
+      type: 'image/png',
+      sizes: '76x76',
+    },
+    {
+      src: './icons/icon-96x96.png',
+      type: 'image/png',
+      sizes: '96x96',
+    },
+    {
+      src: './icons/icon-114x114.png',
+      type: 'image/png',
+      sizes: '114x114',
+    },
+    {
+      src: './icons/icon-120x120.png',
+      type: 'image/png',
+      sizes: '120x120',
+    },
+    {
+      src: './icons/icon-128x128.png',
+      type: 'image/png',
+      sizes: '128x128',
+    },
+    {
+      src: './icons/icon-144x144.png',
+      type: 'image/png',
+      sizes: '144x144',
+    },
+    {
+      src: './icons/icon-150x150.png',
+      type: 'image/png',
+      sizes: '150x150',
+    },
+    {
+      src: './icons/icon-152x152.png',
+      type: 'image/png',
+      sizes: '152x152',
+    },
+    {
+      src: './icons/icon-160x160.png',
+      type: 'image/png',
+      sizes: '160x160',
+    },
+    {
+      src: './icons/icon-167x167.png',
+      type: 'image/png',
+      sizes: '167x167',
+    },
+    {
+      src: './icons/icon-180x180.png',
+      type: 'image/png',
+      sizes: '180x180',
+    },
+    {
+      src: './icons/icon-192x192.png',
+      type: 'image/png',
+      sizes: '192x192',
+    },
+    {
+      src: './icons/icon-196x196.png',
+      type: 'image/png',
+      sizes: '196x196',
+    },
+    {
+      src: './icons/icon-228x228.png',
+      type: 'image/png',
+      sizes: '228x228',
+    },
+    {
+      src: './icons/icon-256x256.png',
+      type: 'image/png',
+      sizes: '256x256',
+    },
+    {
+      src: './icons/icon-310x310.png',
+      type: 'image/png',
+      sizes: '310x310',
+    },
+    {
+      src: './icons/icon-384x384.png',
+      type: 'image/png',
+      sizes: '384x384',
+    },
+    {
+      src: './icons/icon-512x512.png',
+      type: 'image/png',
+      sizes: '512x512',
+    },
+    {
+      src: './icons/icon-1024x1024.png',
+      type: 'image/png',
+      sizes: '1024x1024',
+    },
+  ],
+};
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -12,55 +12,58 @@
    "lint:fix": "npm run lint:css:fix && npm run lint:js:fix",
    "lint:css:fix": "npm run lint:css -- --fix",
    "lint:js:fix": "npm run lint:js -- --fix",
-    "start": "DISABLE_ESLINT_PLUGIN=true react-scripts start",
-    "build": "DISABLE_ESLINT_PLUGIN=true react-scripts build && node scripts/replace-version.mjs",
+    "types": "tsc",
+    "start": "vite serve --host=0.0.0.0",
+    "preview": "vite preview --host=0.0.0.0",
+    "build": "npm run types && vite build && node scripts/replace-version.mjs",
    "build:dist": "npm run build && node scripts/create-dist-file.mjs",
-    "build:serve": "serve -p 5000 ./build",
    "test": "jest --env=jsdom --colors",
    "test:coverage": "npm run test -- --coverage --coverageReporters=text --coverageReporters=text-summary",
    "test:ci": "npm run test:coverage -- --coverageReporters=clover --ci",
    "test:pretty": "npm run test:coverage -- --coverageReporters=html",
-    "test:verbose": "npm run test -- --verbose",
-    "mutate": "./node_modules/.bin/stryker run --concurrency 4 --ignoreStatic"
+    "test:verbose": "npm run test -- --verbose"
  },
  "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.2.0",
-    "@fortawesome/fontawesome-svg-core": "^6.2.0",
-    "@fortawesome/free-regular-svg-icons": "^6.2.0",
-    "@fortawesome/free-solid-svg-icons": "^6.2.0",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-react": "^7.18.6",
+    "@babel/preset-typescript": "^7.21.0",
+    "@fortawesome/fontawesome-free": "^6.3.0",
+    "@fortawesome/fontawesome-svg-core": "^6.3.0",
+    "@fortawesome/free-brands-svg-icons": "^6.3.0",
+    "@fortawesome/free-regular-svg-icons": "^6.3.0",
+    "@fortawesome/free-solid-svg-icons": "^6.3.0",
    "@fortawesome/react-fontawesome": "^0.2.0",
-    "@reduxjs/toolkit": "^1.9.0",
-    "bootstrap": "^5.2.2",
+    "@json2csv/plainjs": "^6.1.2",
+    "@reduxjs/toolkit": "^1.9.1",
+    "bootstrap": "^5.2.3",
    "bottlejs": "^2.0.1",
    "bowser": "^2.11.0",
-    "chart.js": "^3.9.1",
-    "classnames": "^2.3.1",
-    "compare-versions": "^5.0.1",
+    "chart.js": "^4.1.1",
+    "classnames": "^2.3.2",
+    "compare-versions": "^5.0.3",
    "csvtojson": "^2.0.10",
    "date-fns": "^2.29.3",
    "event-source-polyfill": "^1.0.31",
    "history": "^5.3.0",
-    "json2csv": "^5.0.7",
-    "leaflet": "^1.9.2",
+    "leaflet": "^1.9.3",
    "qs": "^6.11.0",
    "ramda": "^0.27.2",
    "react": "^18.2.0",
-    "react-chartjs-2": "^4.3.1",
+    "react-chartjs-2": "^5.1.0",
    "react-colorful": "^5.6.1",
    "react-copy-to-clipboard": "^5.1.0",
    "react-datepicker": "^4.8.0",
    "react-dom": "^18.2.0",
    "react-external-link": "^2.0.0",
-    "react-leaflet": "^4.1.0",
-    "react-redux": "^8.0.4",
-    "react-router-dom": "^6.4.1",
+    "react-leaflet": "^4.2.0",
+    "react-redux": "^8.0.5",
+    "react-router-dom": "^6.6.1",
    "react-swipeable": "^7.0.0",
    "react-tag-autocomplete": "^6.3.0",
-    "reactstrap": "^9.1.4",
+    "reactstrap": "^9.1.5",
    "redux": "^4.2.0",
    "redux-localstorage-simple": "^2.5.1",
-    "redux-thunk": "^2.4.1",
-    "stream": "^0.0.2",
+    "redux-thunk": "^2.4.2",
    "uuid": "^8.3.2",
    "workbox-core": "^6.5.4",
    "workbox-expiration": "^6.5.4",
@@ -69,43 +72,39 @@
    "workbox-strategies": "^6.5.4"
  },
  "devDependencies": {
-    "@shlinkio/eslint-config-js-coding-standard": "~2.0.2",
+    "@shlinkio/eslint-config-js-coding-standard": "~2.1.0",
    "@shlinkio/stylelint-config-css-coding-standard": "~1.0.1",
-    "@stryker-mutator/core": "^6.2.2",
-    "@stryker-mutator/jest-runner": "^6.2.2",
-    "@stryker-mutator/typescript-checker": "^6.2.2",
    "@testing-library/jest-dom": "^5.16.5",
    "@testing-library/react": "^13.4.0",
    "@testing-library/user-event": "^14.4.3",
-    "@types/jest": "^29.1.1",
+    "@types/jest": "^29.2.4",
    "@types/json2csv": "^5.0.3",
-    "@types/leaflet": "^1.8.0",
+    "@types/leaflet": "^1.9.0",
    "@types/qs": "^6.9.7",
    "@types/ramda": "^0.28.15",
-    "@types/react": "^18.0.21",
+    "@types/react": "^18.0.26",
    "@types/react-color": "^3.0.6",
    "@types/react-copy-to-clipboard": "^5.0.4",
-    "@types/react-datepicker": "^4.4.2",
-    "@types/react-dom": "^18.0.6",
+    "@types/react-datepicker": "^4.8.0",
+    "@types/react-dom": "^18.0.10",
    "@types/react-tag-autocomplete": "^6.3.0",
    "@types/uuid": "^8.3.4",
-    "adm-zip": "^0.5.9",
-    "babel-jest": "^29.1.2",
-    "chalk": "^5.0.1",
-    "eslint": "^8.24.0",
+    "@vitejs/plugin-react": "^3.1.0",
+    "adm-zip": "^0.5.10",
+    "babel-jest": "^29.5.0",
+    "chalk": "^5.2.0",
+    "eslint": "^8.30.0",
    "identity-obj-proxy": "^3.0.0",
-    "jest": "^29.1.2",
+    "jest": "^29.3.1",
    "jest-canvas-mock": "^2.4.0",
-    "jest-environment-jsdom": "^29.1.2",
-    "react-scripts": "^5.0.1",
+    "jest-environment-jsdom": "^29.3.1",
    "resize-observer-polyfill": "^1.5.1",
-    "sass": "^1.55.0",
-    "serve": "^14.1.1",
-    "stryker-cli": "^1.0.2",
-    "stylelint": "^14.13.0",
+    "sass": "^1.57.1",
+    "stylelint": "^14.16.0",
    "ts-mockery": "^1.2.0",
-    "typescript": "^4.8.4",
-    "webpack": "^5.74.0"
+    "typescript": "^5.0.2",
+    "vite": "^4.2.0",
+    "vite-plugin-pwa": "^0.14.4"
  },
  "browserslist": [
    ">0.2%",
--- a/public/index.html
+++ b/public/index.html
@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <meta name="theme-color" content="#4696e5">
-
-    <!--
-      manifest.json provides metadata used when your web app is added to the
-      homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" crossorigin="use-credentials">
-
-    <!-- FavIcon itself -->
-    <link rel="icon" type="image/x-icon" href="%PUBLIC_URL%/favicon.ico">
-    <link rel="icon" type="image/svg+xml" href="%PUBLIC_URL%/favicon.svg" sizes="any">
-    <link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon.png">
-    <link rel="icon" type="image/gif" href="%PUBLIC_URL%/favicon.gif">
-    <!-- Apple Touch -->
-    <link rel="apple-touch-icon" sizes="16x16" href="%PUBLIC_URL%/icons/icon-16x16.png">
-    <link rel="apple-touch-icon" sizes="24x24" href="%PUBLIC_URL%/icons/icon-24x24.png">
-    <link rel="apple-touch-icon" sizes="32x32" href="%PUBLIC_URL%/icons/icon-32x32.png">
-    <link rel="apple-touch-icon" sizes="40x40" href="%PUBLIC_URL%/icons/icon-40x40.png">
-    <link rel="apple-touch-icon" sizes="48x48" href="%PUBLIC_URL%/icons/icon-48x48.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="%PUBLIC_URL%/icons/icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="64x64" href="%PUBLIC_URL%/icons/icon-64x64.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="%PUBLIC_URL%/icons/icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/icons/icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="96x96" href="%PUBLIC_URL%/icons/icon-96x96.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="%PUBLIC_URL%/icons/icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="%PUBLIC_URL%/icons/icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="128x128" href="%PUBLIC_URL%/icons/icon-128x128.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="%PUBLIC_URL%/icons/icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="150x150" href="%PUBLIC_URL%/icons/icon-150x150.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="%PUBLIC_URL%/icons/icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="160x160" href="%PUBLIC_URL%/icons/icon-160x160.png">
-    <link rel="apple-touch-icon" sizes="167x167" href="%PUBLIC_URL%/icons/icon-167x167.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/icons/icon-180x180.png">
-    <link rel="apple-touch-icon" sizes="192x192" href="%PUBLIC_URL%/icons/icon-192x192.png">
-    <link rel="apple-touch-icon" sizes="196x196" href="%PUBLIC_URL%/icons/icon-196x196.png">
-    <link rel="apple-touch-icon" sizes="228x228" href="%PUBLIC_URL%/icons/icon-228x228.png">
-    <link rel="apple-touch-icon" sizes="256x256" href="%PUBLIC_URL%/icons/icon-256x256.png">
-    <link rel="apple-touch-icon" sizes="310x310" href="%PUBLIC_URL%/icons/icon-310x310.png">
-    <link rel="apple-touch-icon" sizes="384x384" href="%PUBLIC_URL%/icons/icon-384x384.png">
-    <link rel="apple-touch-icon" sizes="512x512" href="%PUBLIC_URL%/icons/icon-512x512.png">
-    <link rel="apple-touch-icon" sizes="1024x1024" href="%PUBLIC_URL%/icons/icon-1024x1024.png">
-    <!-- Normal -->
-    <link rel="icon" type="image/png" sizes="1024x1024" href="%PUBLIC_URL%/icons/icon-1024x1024.png">
-    <link rel="icon" type="image/png" sizes="512x512" href="%PUBLIC_URL%/icons/icon-512x512.png">
-    <link rel="icon" type="image/png" sizes="384x384" href="%PUBLIC_URL%/icons/icon-384x384.png">
-    <link rel="icon" type="image/png" sizes="310x310" href="%PUBLIC_URL%/icons/icon-310x310.png">
-    <link rel="icon" type="image/png" sizes="256x256" href="%PUBLIC_URL%/icons/icon-256x256.png">
-    <link rel="icon" type="image/png" sizes="228x228" href="%PUBLIC_URL%/icons/icon-228x228.png">
-    <link rel="icon" type="image/png" sizes="196x196" href="%PUBLIC_URL%/icons/icon-196x196.png">
-    <link rel="icon" type="image/png" sizes="192x192" href="%PUBLIC_URL%/icons/icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="180x180" href="%PUBLIC_URL%/icons/icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="167x167" href="%PUBLIC_URL%/icons/icon-167x167.png">
-    <link rel="icon" type="image/png" sizes="160x160" href="%PUBLIC_URL%/icons/icon-160x160.png">
-    <link rel="icon" type="image/png" sizes="152x152" href="%PUBLIC_URL%/icons/icon-152x152.png">
-    <link rel="icon" type="image/png" sizes="150x150" href="%PUBLIC_URL%/icons/icon-150x150.png">
-    <link rel="icon" type="image/png" sizes="144x144" href="%PUBLIC_URL%/icons/icon-144x144.png">
-    <link rel="icon" type="image/png" sizes="128x128" href="%PUBLIC_URL%/icons/icon-128x128.png">
-    <link rel="icon" type="image/png" sizes="120x120" href="%PUBLIC_URL%/icons/icon-120x120.png">
-    <link rel="icon" type="image/png" sizes="114x114" href="%PUBLIC_URL%/icons/icon-114x114.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="%PUBLIC_URL%/icons/icon-96x96.png">
-    <link rel="icon" type="image/png" sizes="76x76" href="%PUBLIC_URL%/icons/icon-76x76.png">
-    <link rel="icon" type="image/png" sizes="72x72" href="%PUBLIC_URL%/icons/icon-72x72.png">
-    <link rel="icon" type="image/png" sizes="64x64" href="%PUBLIC_URL%/icons/icon-64x64.png">
-    <link rel="icon" type="image/png" sizes="60x60" href="%PUBLIC_URL%/icons/icon-60x60.png">
-    <link rel="icon" type="image/png" sizes="48x48" href="%PUBLIC_URL%/icons/icon-48x48.png">
-    <link rel="icon" type="image/png" sizes="40x40" href="%PUBLIC_URL%/icons/icon-40x40.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/icons/icon-32x32.png">
-    <link rel="icon" type="image/png" sizes="24x24" href="%PUBLIC_URL%/icons/icon-24x24.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/icons/icon-16x16.png">
-    <!-- MS -->
-    <meta name="msapplication-TileImage" content="%PUBLIC_URL%/icons/icon-144x144.png">
-    <meta name="msapplication-square70x70logo" content="%PUBLIC_URL%/icons/icon-70x70.png">
-    <meta name="msapplication-square144x144logo" content="%PUBLIC_URL%/icons/icon-144x144.png">
-    <meta name="msapplication-square150x150logo" content="%PUBLIC_URL%/icons/icon-150x150.png">
-    <meta name="msapplication-square310x310logo" content="%PUBLIC_URL%/icons/icon-310x310.png">
-    
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>Shlink — The URL shortener</title>
-  </head>
-  <body>
-    <noscript>
-      You need to enable JavaScript to run this app.
-    </noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,145 +0,0 @@
-{
-  "short_name": "Shlink",
-  "name": "Shlink",
-  "start_url": "/",
-  "display": "standalone",
-  "theme_color": "#4696e5",
-  "background_color": "#4696e5",
-  "icons": [
-    {
-      "src": "./icons/icon-16x16.png",
-      "type": "image/png",
-      "sizes": "16x16"
-    },
-    {
-      "src": "./icons/icon-24x24.png",
-      "type": "image/png",
-      "sizes": "24x24"
-    },
-    {
-      "src": "./icons/icon-32x32.png",
-      "type": "image/png",
-      "sizes": "32x32"
-    },
-    {
-      "src": "./icons/icon-40x40.png",
-      "type": "image/png",
-      "sizes": "40x40"
-    },
-    {
-      "src": "./icons/icon-48x48.png",
-      "type": "image/png",
-      "sizes": "48x48"
-    },
-    {
-      "src": "./icons/icon-60x60.png",
-      "type": "image/png",
-      "sizes": "60x60"
-    },
-    {
-      "src": "./icons/icon-64x64.png",
-      "type": "image/png",
-      "sizes": "64x64"
-    },
-    {
-      "src": "./icons/icon-72x72.png",
-      "type": "image/png",
-      "sizes": "72x72"
-    },
-    {
-      "src": "./icons/icon-76x76.png",
-      "type": "image/png",
-      "sizes": "76x76"
-    },
-    {
-      "src": "./icons/icon-96x96.png",
-      "type": "image/png",
-      "sizes": "96x96"
-    },
-    {
-      "src": "./icons/icon-114x114.png",
-      "type": "image/png",
-      "sizes": "114x114"
-    },
-    {
-      "src": "./icons/icon-120x120.png",
-      "type": "image/png",
-      "sizes": "120x120"
-    },
-    {
-      "src": "./icons/icon-128x128.png",
-      "type": "image/png",
-      "sizes": "128x128"
-    },
-    {
-      "src": "./icons/icon-144x144.png",
-      "type": "image/png",
-      "sizes": "144x144"
-    },
-    {
-      "src": "./icons/icon-150x150.png",
-      "type": "image/png",
-      "sizes": "150x150"
-    },
-    {
-      "src": "./icons/icon-152x152.png",
-      "type": "image/png",
-      "sizes": "152x152"
-    },
-    {
-      "src": "./icons/icon-160x160.png",
-      "type": "image/png",
-      "sizes": "160x160"
-    },
-    {
-      "src": "./icons/icon-167x167.png",
-      "type": "image/png",
-      "sizes": "167x167"
-    },
-    {
-      "src": "./icons/icon-180x180.png",
-      "type": "image/png",
-      "sizes": "180x180"
-    },
-    {
-      "src": "./icons/icon-192x192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "./icons/icon-196x196.png",
-      "type": "image/png",
-      "sizes": "196x196"
-    },
-    {
-      "src": "./icons/icon-228x228.png",
-      "type": "image/png",
-      "sizes": "228x228"
-    },
-    {
-      "src": "./icons/icon-256x256.png",
-      "type": "image/png",
-      "sizes": "256x256"
-    },
-    {
-      "src": "./icons/icon-310x310.png",
-      "type": "image/png",
-      "sizes": "310x310"
-    },
-    {
-      "src": "./icons/icon-384x384.png",
-      "type": "image/png",
-      "sizes": "384x384"
-    },
-    {
-      "src": "./icons/icon-512x512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    },
-    {
-      "src": "./icons/icon-1024x1024.png",
-      "type": "image/png",
-      "sizes": "1024x1024"
-    }
-  ]
-}
--- a/scripts/replace-version.mjs
+++ b/scripts/replace-version.mjs
@@ -1,11 +1,11 @@
 import fs from 'fs';

 function replaceVersionPlaceholder(version) {
-  const staticJsFilesPath = './build/static/js';
+  const staticJsFilesPath = './build/assets';
  const versionPlaceholder = '%_VERSION_%';

-  const isMainFile = (file) => file.startsWith('main.') && file.endsWith('.js');
-  const [ mainJsFile ] = fs.readdirSync(staticJsFilesPath).filter(isMainFile);
+  const isMainFile = (file) => file.startsWith('index-') && file.endsWith('.js');
+  const [mainJsFile] = fs.readdirSync(staticJsFilesPath).filter(isMainFile);
  const filePath = `${staticJsFilesPath}/${mainJsFile}`;
  const fileContent = fs.readFileSync(filePath, 'utf-8');
  const replaced = fileContent.replace(versionPlaceholder, version);
--- a/shlink-web-client.d.ts
+++ b/shlink-web-client.d.ts
@@ -1,3 +1,4 @@
+// eslint-disable-next-line max-classes-per-file
 declare module 'event-source-polyfill' {
  declare class EventSourcePolyfill {
    public onmessage?: ({ data }: { data: string }) => void;
@@ -7,4 +8,10 @@ declare module 'event-source-polyfill' {
  }
 }

+declare module '@json2csv/plainjs' {
+  export class Parser {
+    parse: <T>(data: T[]) => string;
+  }
+}
+
 declare module '*.png'
--- a/src/api/ShlinkApiError.tsx
+++ b/src/api/ShlinkApiError.tsx
@@ -1,5 +1,5 @@
+import type { ProblemDetailsError } from './types/errors';
 import { isInvalidArgumentError } from './utils';
-import { ProblemDetailsError } from './types/errors';

 export interface ShlinkApiErrorProps {
  errorData?: ProblemDetailsError;
--- a/src/api/services/ShlinkApiClient.ts
+++ b/src/api/services/ShlinkApiClient.ts
@@ -1,32 +1,38 @@
 import { isEmpty, isNil, reject } from 'ramda';
-import { ShortUrl, ShortUrlData } from '../../short-urls/data';
-import { OptionalString } from '../../utils/utils';
-import {
+import type { HttpClient } from '../../common/services/HttpClient';
+import type { ShortUrl, ShortUrlData } from '../../short-urls/data';
+import { orderToString } from '../../utils/helpers/ordering';
+import { stringifyQuery } from '../../utils/helpers/query';
+import type { OptionalString } from '../../utils/utils';
+import type {
+  ShlinkDomainRedirects,
+  ShlinkDomainsResponse,
+  ShlinkEditDomainRedirects,
  ShlinkHealth,
  ShlinkMercureInfo,
+  ShlinkShortUrlData,
+  ShlinkShortUrlsListNormalizedParams,
+  ShlinkShortUrlsListParams,
  ShlinkShortUrlsResponse,
  ShlinkTags,
  ShlinkTagsResponse,
+  ShlinkTagsStatsResponse,
  ShlinkVisits,
-  ShlinkVisitsParams,
-  ShlinkShortUrlData,
-  ShlinkDomainsResponse,
  ShlinkVisitsOverview,
-  ShlinkEditDomainRedirects,
-  ShlinkDomainRedirects,
-  ShlinkShortUrlsListParams,
-  ShlinkShortUrlsListNormalizedParams,
+  ShlinkVisitsParams,
 } from '../types';
-import { orderToString } from '../../utils/helpers/ordering';
 import { isRegularNotFound, parseApiError } from '../utils';
-import { stringifyQuery } from '../../utils/helpers/query';
-import { HttpClient } from '../../common/services/HttpClient';

 const buildShlinkBaseUrl = (url: string, version: 2 | 3) => `${url}/rest/v${version}`;
 const rejectNilProps = reject(isNil);
-const normalizeOrderByInParams = (
-  { orderBy = {}, ...rest }: ShlinkShortUrlsListParams,
-): ShlinkShortUrlsListNormalizedParams => ({ ...rest, orderBy: orderToString(orderBy) });
+const normalizeListParams = (
+  { orderBy = {}, excludeMaxVisitsReached, excludePastValidUntil, ...rest }: ShlinkShortUrlsListParams,
+): ShlinkShortUrlsListNormalizedParams => ({
+  ...rest,
+  excludeMaxVisitsReached: excludeMaxVisitsReached === true ? 'true' : undefined,
+  excludePastValidUntil: excludePastValidUntil === true ? 'true' : undefined,
+  orderBy: orderToString(orderBy),
+});

 export class ShlinkApiClient {
  private apiVersion: 2 | 3;
@@ -40,7 +46,7 @@ export class ShlinkApiClient {
  }

  public readonly listShortUrls = async (params: ShlinkShortUrlsListParams = {}): Promise<ShlinkShortUrlsResponse> =>
-    this.performRequest<{ shortUrls: ShlinkShortUrlsResponse }>('/short-urls', 'GET', normalizeOrderByInParams(params))
+    this.performRequest<{ shortUrls: ShlinkShortUrlsResponse }>('/short-urls', 'GET', normalizeListParams(params))
      .then(({ shortUrls }) => shortUrls);

  public readonly createShortUrl = async (options: ShortUrlData): Promise<ShortUrl> => {
@@ -85,6 +91,11 @@ export class ShlinkApiClient {
      .then(({ tags }) => tags)
      .then(({ data, stats }) => ({ tags: data, stats }));

+  public readonly tagsStats = async (): Promise<ShlinkTags> =>
+    this.performRequest<{ tags: ShlinkTagsStatsResponse }>('/tags/stats', 'GET')
+      .then(({ tags }) => tags)
+      .then(({ data }) => ({ tags: data.map(({ tag }) => tag), stats: data }));
+
  public readonly deleteTags = async (tags: string[]): Promise<{ tags: string[] }> =>
    this.performEmptyRequest('/tags', 'DELETE', { tags }).then(() => ({ tags }));

--- a/src/api/services/ShlinkApiClientBuilder.ts
+++ b/src/api/services/ShlinkApiClientBuilder.ts
@@ -1,7 +1,8 @@
-import { hasServerData, ServerWithId } from '../../servers/data';
-import { GetState } from '../../container/types';
+import type { HttpClient } from '../../common/services/HttpClient';
+import type { GetState } from '../../container/types';
+import type { ServerWithId } from '../../servers/data';
+import { hasServerData } from '../../servers/data';
 import { ShlinkApiClient } from './ShlinkApiClient';
-import { HttpClient } from '../../common/services/HttpClient';

 const apiClients: Record<string, ShlinkApiClient> = {};

--- a/src/api/services/provideServices.ts
+++ b/src/api/services/provideServices.ts
@@ -1,8 +1,6 @@
-import Bottle from 'bottlejs';
+import type Bottle from 'bottlejs';
 import { buildShlinkApiClient } from './ShlinkApiClientBuilder';

-const provideServices = (bottle: Bottle) => {
+export const provideServices = (bottle: Bottle) => {
  bottle.serviceFactory('buildShlinkApiClient', buildShlinkApiClient, 'HttpClient');
 };
-
-export default provideServices;
--- a/src/api/types/index.ts
+++ b/src/api/types/index.ts
@@ -1,6 +1,7 @@
-import { Visit } from '../../visits/types';
-import { OptionalString } from '../../utils/utils';
-import { ShortUrl, ShortUrlMeta, ShortUrlsOrder } from '../../short-urls/data';
+import type { ShortUrl, ShortUrlMeta } from '../../short-urls/data';
+import type { Order } from '../../utils/helpers/ordering';
+import type { OptionalString } from '../../utils/utils';
+import type { Visit } from '../../visits/types';

 export interface ShlinkShortUrlsResponse {
  data: ShortUrl[];
@@ -17,9 +18,12 @@ export interface ShlinkHealth {
  version: string;
 }

-interface ShlinkTagsStats {
+export interface ShlinkTagsStats {
  tag: string;
  shortUrlsCount: number;
+  visitsSummary?: ShlinkVisitsSummary; // Optional only before Shlink 3.5.0
+
+  /** @deprecated */
  visitsCount: number;
 }

@@ -30,22 +34,38 @@ export interface ShlinkTags {

 export interface ShlinkTagsResponse {
  data: string[];
+  /** @deprecated Present only when withStats=true is provided, which is deprecated */
  stats: ShlinkTagsStats[];
 }

+export interface ShlinkTagsStatsResponse {
+  data: ShlinkTagsStats[];
+}
+
 export interface ShlinkPaginator {
  currentPage: number;
  pagesCount: number;
  totalItems: number;
 }

+export interface ShlinkVisitsSummary {
+  total: number;
+  nonBots: number;
+  bots: number;
+}
+
 export interface ShlinkVisits {
  data: Visit[];
  pagination: ShlinkPaginator;
 }

 export interface ShlinkVisitsOverview {
+  nonOrphanVisits?: ShlinkVisitsSummary; // Optional only before Shlink 3.5.0
+  orphanVisits?: ShlinkVisitsSummary; // Optional only before Shlink 3.5.0
+
+  /** @deprecated */
  visitsCount: number;
+  /** @deprecated */
  orphanVisitsCount: number;
 }

@@ -88,17 +108,26 @@ export interface ShlinkDomainsResponse {

 export type TagsFilteringMode = 'all' | 'any';

+type ShlinkShortUrlsOrderableFields = 'dateCreated' | 'shortCode' | 'longUrl' | 'title' | 'visits' | 'nonBotVisits';
+
+export type ShlinkShortUrlsOrder = Order<ShlinkShortUrlsOrderableFields>;
+
 export interface ShlinkShortUrlsListParams {
  page?: string;
  itemsPerPage?: number;
-  tags?: string[];
  searchTerm?: string;
+  tags?: string[];
+  tagsMode?: TagsFilteringMode;
+  orderBy?: ShlinkShortUrlsOrder;
  startDate?: string;
  endDate?: string;
-  orderBy?: ShortUrlsOrder;
-  tagsMode?: TagsFilteringMode;
+  excludeMaxVisitsReached?: boolean;
+  excludePastValidUntil?: boolean;
 }

-export interface ShlinkShortUrlsListNormalizedParams extends Omit<ShlinkShortUrlsListParams, 'orderBy'> {
+export interface ShlinkShortUrlsListNormalizedParams extends
+  Omit<ShlinkShortUrlsListParams, 'orderBy' | 'excludeMaxVisitsReached' | 'excludePastValidUntil'> {
  orderBy?: string;
+  excludeMaxVisitsReached?: 'true';
+  excludePastValidUntil?: 'true';
 }
--- a/src/api/utils/index.ts
+++ b/src/api/utils/index.ts
@@ -1,10 +1,11 @@
-import {
-  ErrorTypeV2,
-  ErrorTypeV3,
+import type {
  InvalidArgumentError,
  InvalidShortUrlDeletion,
  ProblemDetailsError,
-  RegularNotFound,
+  RegularNotFound } from '../types/errors';
+import {
+  ErrorTypeV2,
+  ErrorTypeV3,
 } from '../types/errors';

 const isProblemDetails = (e: unknown): e is ProblemDetailsError =>
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -1,12 +1,13 @@
-import { useEffect, FC } from 'react';
-import { Route, Routes, useLocation } from 'react-router-dom';
 import classNames from 'classnames';
-import { NotFound } from '../common/NotFound';
-import { ServersMap } from '../servers/data';
-import { Settings } from '../settings/reducers/settings';
-import { changeThemeInMarkup } from '../utils/theme';
+import type { FC } from 'react';
+import { useEffect } from 'react';
+import { Route, Routes, useLocation } from 'react-router-dom';
 import { AppUpdateBanner } from '../common/AppUpdateBanner';
+import { NotFound } from '../common/NotFound';
+import type { ServersMap } from '../servers/data';
+import type { Settings } from '../settings/reducers/settings';
 import { forceUpdate } from '../utils/helpers/sw';
+import { changeThemeInMarkup } from '../utils/theme';
 import './App.scss';

 interface AppProps {
--- a/src/app/services/provideServices.ts
+++ b/src/app/services/provideServices.ts
@@ -1,9 +1,9 @@
-import Bottle from 'bottlejs';
-import { appUpdateAvailable, resetAppUpdate } from '../reducers/appUpdates';
+import type Bottle from 'bottlejs';
+import type { ConnectDecorator } from '../../container/types';
 import { App } from '../App';
-import { ConnectDecorator } from '../../container/types';
+import { appUpdateAvailable, resetAppUpdate } from '../reducers/appUpdates';

-const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
+export const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
  // Components
  bottle.serviceFactory(
    'App',
@@ -23,5 +23,3 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
  bottle.serviceFactory('appUpdateAvailable', () => appUpdateAvailable);
  bottle.serviceFactory('resetAppUpdate', () => resetAppUpdate);
 };
-
-export default provideServices;
--- a/src/common/AppUpdateBanner.tsx
+++ b/src/common/AppUpdateBanner.tsx
@@ -1,9 +1,9 @@
-import { FC, MouseEventHandler } from 'react';
-import { Alert, Button } from 'reactstrap';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faSyncAlt as reloadIcon } from '@fortawesome/free-solid-svg-icons';
-import { SimpleCard } from '../utils/SimpleCard';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import type { FC, MouseEventHandler } from 'react';
+import { Alert, Button } from 'reactstrap';
 import { useToggle } from '../utils/helpers/hooks';
+import { SimpleCard } from '../utils/SimpleCard';
 import './AppUpdateBanner.scss';

 interface AppUpdateBannerProps {
--- a/src/common/AsideMenu.tsx
+++ b/src/common/AsideMenu.tsx
@@ -1,18 +1,19 @@
 import {
-  faList as listIcon,
-  faLink as createIcon,
-  faTags as tagsIcon,
-  faPen as editIcon,
-  faHome as overviewIcon,
  faGlobe as domainsIcon,
+  faHome as overviewIcon,
+  faLink as createIcon,
+  faList as listIcon,
+  faPen as editIcon,
+  faTags as tagsIcon,
 } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { FC } from 'react';
-import { NavLink, NavLinkProps, useLocation } from 'react-router-dom';
 import classNames from 'classnames';
-import { DeleteServerButtonProps } from '../servers/DeleteServerButton';
-import { isServerWithId, SelectedServer } from '../servers/data';
-import { supportsDomainRedirects } from '../utils/helpers/features';
+import type { FC } from 'react';
+import type { NavLinkProps } from 'react-router-dom';
+import { NavLink, useLocation } from 'react-router-dom';
+import type { SelectedServer } from '../servers/data';
+import { isServerWithId } from '../servers/data';
+import type { DeleteServerButtonProps } from '../servers/DeleteServerButton';
 import './AsideMenu.scss';

 export interface AsideMenuProps {
@@ -22,6 +23,7 @@ export interface AsideMenuProps {

 interface AsideMenuItemProps extends NavLinkProps {
  to: string;
+  className?: string;
 }

 const AsideMenuItem: FC<AsideMenuItemProps> = ({ children, to, className, ...rest }) => (
@@ -40,7 +42,6 @@ export const AsideMenu = (DeleteServerButton: FC<DeleteServerButtonProps>) => (
  const hasId = isServerWithId(selectedServer);
  const serverId = hasId ? selectedServer.id : '';
  const { pathname } = useLocation();
-  const addManageDomainsLink = supportsDomainRedirects(selectedServer);
  const asideClass = classNames('aside-menu', {
    'aside-menu--hidden': !showOnMobile,
  });
@@ -68,12 +69,10 @@ export const AsideMenu = (DeleteServerButton: FC<DeleteServerButtonProps>) => (
          <FontAwesomeIcon fixedWidth icon={tagsIcon} />
          <span className="aside-menu__item-text">Manage tags</span>
        </AsideMenuItem>
-        {addManageDomainsLink && (
-          <AsideMenuItem to={buildPath('/manage-domains')}>
-            <FontAwesomeIcon fixedWidth icon={domainsIcon} />
-            <span className="aside-menu__item-text">Manage domains</span>
-          </AsideMenuItem>
-        )}
+        <AsideMenuItem to={buildPath('/manage-domains')}>
+          <FontAwesomeIcon fixedWidth icon={domainsIcon} />
+          <span className="aside-menu__item-text">Manage domains</span>
+        </AsideMenuItem>
        <AsideMenuItem to={buildPath('/edit')} className="aside-menu__item--push">
          <FontAwesomeIcon fixedWidth icon={editIcon} />
          <span className="aside-menu__item-text">Edit this server</span>
--- a/src/common/ErrorHandler.tsx
+++ b/src/common/ErrorHandler.tsx
@@ -1,4 +1,5 @@
-import { Component, ReactNode } from 'react';
+import type { ReactNode } from 'react';
+import { Component } from 'react';
 import { Button } from 'reactstrap';
 import { SimpleCard } from '../utils/SimpleCard';

--- a/src/common/Home.tsx
+++ b/src/common/Home.tsx
@@ -1,12 +1,12 @@
-import { useEffect } from 'react';
+import { faExternalLinkAlt, faPlus } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { isEmpty, values } from 'ramda';
+import { useEffect } from 'react';
+import { ExternalLink } from 'react-external-link';
 import { Link, useNavigate } from 'react-router-dom';
 import { Card, Row } from 'reactstrap';
-import { ExternalLink } from 'react-external-link';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faExternalLinkAlt, faPlus } from '@fortawesome/free-solid-svg-icons';
+import type { ServersMap } from '../servers/data';
 import { ServersListGroup } from '../servers/ServersListGroup';
-import { ServersMap } from '../servers/data';
 import { ShlinkLogo } from './img/ShlinkLogo';
 import './Home.scss';

--- a/src/common/MainHeader.tsx
+++ b/src/common/MainHeader.tsx
@@ -1,9 +1,10 @@
 import { faChevronDown as arrowIcon, faCogs as cogsIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { FC, useEffect } from 'react';
+import classNames from 'classnames';
+import type { FC } from 'react';
+import { useEffect } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import { Collapse, Nav, Navbar, NavbarBrand, NavbarToggler, NavItem, NavLink } from 'reactstrap';
-import classNames from 'classnames';
 import { useToggle } from '../utils/helpers/hooks';
 import { ShlinkLogo } from './img/ShlinkLogo';
 import './MainHeader.scss';
--- a/src/common/MenuLayout.tsx
+++ b/src/common/MenuLayout.tsx
@@ -1,14 +1,15 @@
-import { FC, useEffect } from 'react';
-import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 import { faBars as burgerIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import classNames from 'classnames';
-import { withSelectedServer } from '../servers/helpers/withSelectedServer';
-import { useSwipeable, useToggle } from '../utils/helpers/hooks';
-import { supportsDomainRedirects, supportsDomainVisits, supportsNonOrphanVisits } from '../utils/helpers/features';
+import type { FC } from 'react';
+import { useEffect } from 'react';
+import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 import { isReachableServer } from '../servers/data';
+import { withSelectedServer } from '../servers/helpers/withSelectedServer';
+import { useFeature } from '../utils/helpers/features';
+import { useSwipeable, useToggle } from '../utils/helpers/hooks';
+import type { AsideMenuProps } from './AsideMenu';
 import { NotFound } from './NotFound';
-import { AsideMenuProps } from './AsideMenu';
 import './MenuLayout.scss';

 interface MenuLayoutProps {
@@ -38,7 +39,6 @@ export const MenuLayout = (
  useEffect(() => hideSidebar(), [location]);
  useEffect(() => {
    showContent && sidebarPresent();
-
    return () => sidebarNotPresent();
  }, []);

@@ -46,9 +46,8 @@ export const MenuLayout = (
    return <ServerError />;
  }

-  const addNonOrphanVisitsRoute = supportsNonOrphanVisits(selectedServer);
-  const addManageDomainsRoute = supportsDomainRedirects(selectedServer);
-  const addDomainVisitsRoute = supportsDomainVisits(selectedServer);
+  const addNonOrphanVisitsRoute = useFeature('nonOrphanVisits', selectedServer);
+  const addDomainVisitsRoute = useFeature('domainVisits', selectedServer);
  const burgerClasses = classNames('menu-layout__burger-icon', { 'menu-layout__burger-icon--active': sidebarVisible });
  const swipeableProps = useSwipeable(showSidebar, hideSidebar);

@@ -73,7 +72,7 @@ export const MenuLayout = (
                <Route path="/orphan-visits/*" element={<OrphanVisits />} />
                {addNonOrphanVisitsRoute && <Route path="/non-orphan-visits/*" element={<NonOrphanVisits />} />}
                <Route path="/manage-tags" element={<TagsList />} />
-                {addManageDomainsRoute && <Route path="/manage-domains" element={<ManageDomains />} />}
+                <Route path="/manage-domains" element={<ManageDomains />} />
                <Route
                  path="*"
                  element={<NotFound to={`/server/${selectedServer.id}/list-short-urls/1`}>List short URLs</NotFound>}
--- a/src/common/NoMenuLayout.tsx
+++ b/src/common/NoMenuLayout.tsx
@@ -1,4 +1,4 @@
-import { FC, PropsWithChildren } from 'react';
+import type { FC, PropsWithChildren } from 'react';
 import './NoMenuLayout.scss';

 export const NoMenuLayout: FC<PropsWithChildren<unknown>> = ({ children }) => (
--- a/src/common/NotFound.tsx
+++ b/src/common/NotFound.tsx
@@ -1,4 +1,4 @@
-import { FC, PropsWithChildren } from 'react';
+import type { FC, PropsWithChildren } from 'react';
 import { Link } from 'react-router-dom';
 import { SimpleCard } from '../utils/SimpleCard';

--- a/src/common/ScrollToTop.tsx
+++ b/src/common/ScrollToTop.tsx
@@ -1,4 +1,5 @@
-import { FC, PropsWithChildren, useEffect } from 'react';
+import type { FC, PropsWithChildren } from 'react';
+import { useEffect } from 'react';
 import { useLocation } from 'react-router-dom';

 export const ScrollToTop: FC<PropsWithChildren<unknown>> = ({ children }) => {
--- a/src/common/ShlinkVersions.tsx
+++ b/src/common/ShlinkVersions.tsx
@@ -1,7 +1,8 @@
 import { pipe } from 'ramda';
 import { ExternalLink } from 'react-external-link';
+import type { SelectedServer } from '../servers/data';
+import { isReachableServer } from '../servers/data';
 import { versionToPrintable, versionToSemVer } from '../utils/helpers/version';
-import { isReachableServer, SelectedServer } from '../servers/data';

 const SHLINK_WEB_CLIENT_VERSION = '%_VERSION_%';
 const normalizeVersion = pipe(versionToSemVer(), versionToPrintable);
--- a/src/common/ShlinkVersionsContainer.tsx
+++ b/src/common/ShlinkVersionsContainer.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
-import { SelectedServer } from '../servers/data';
+import type { SelectedServer } from '../servers/data';
+import type { Sidebar } from './reducers/sidebar';
 import { ShlinkVersions } from './ShlinkVersions';
-import { Sidebar } from './reducers/sidebar';
 import './ShlinkVersionsContainer.scss';

 export interface ShlinkVersionsContainerProps {
--- a/src/common/SimplePaginator.tsx
+++ b/src/common/SimplePaginator.tsx
@@ -1,12 +1,13 @@
-import { FC } from 'react';
 import classNames from 'classnames';
+import type { FC } from 'react';
 import { Pagination, PaginationItem, PaginationLink } from 'reactstrap';
+import type {
+  NumberOrEllipsis } from '../utils/helpers/pagination';
 import {
-  pageIsEllipsis,
  keyForPage,
-  NumberOrEllipsis,
-  progressivePagination,
+  pageIsEllipsis,
  prettifyPageNumber,
+  progressivePagination,
 } from '../utils/helpers/pagination';
 import './SimplePaginator.scss';

--- a/src/common/react-tag-autocomplete.scss
+++ b/src/common/react-tag-autocomplete.scss
@@ -3,7 +3,7 @@
 .react-tags {
  position: relative;
  padding: 5px 0 0 6px;
-  border-radius: .3rem;
+  border-radius: .5rem;
  background-color: var(--primary-color);
  border: 1px solid var(--input-border-color);
  transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out;
--- a/src/common/services/HttpClient.ts
+++ b/src/common/services/HttpClient.ts
@@ -1,10 +1,27 @@
-import { Fetch } from '../../utils/types';
+import type { Fetch } from '../../utils/types';
+
+const applicationJsonHeader = { 'Content-Type': 'application/json' };
+const withJsonContentType = (options?: RequestInit): RequestInit | undefined => {
+  if (!options?.body) {
+    return options;
+  }
+
+  return options ? {
+    ...options,
+    headers: {
+      ...(options.headers ?? {}),
+      ...applicationJsonHeader,
+    },
+  } : {
+    headers: applicationJsonHeader,
+  };
+};

 export class HttpClient {
  constructor(private readonly fetch: Fetch) {}

  public readonly fetchJson = <T>(url: string, options?: RequestInit): Promise<T> =>
-    this.fetch(url, options).then(async (resp) => {
+    this.fetch(url, withJsonContentType(options)).then(async (resp) => {
      const json = await resp.json();

      if (!resp.ok) {
@@ -15,7 +32,7 @@ export class HttpClient {
    });

  public readonly fetchEmpty = (url: string, options?: RequestInit): Promise<void> =>
-    this.fetch(url, options).then(async (resp) => {
+    this.fetch(url, withJsonContentType(options)).then(async (resp) => {
      if (!resp.ok) {
        throw await resp.json();
      }
--- a/src/common/services/ImageDownloader.ts
+++ b/src/common/services/ImageDownloader.ts
@@ -1,5 +1,5 @@
 import { saveUrl } from '../../utils/helpers/files';
-import { HttpClient } from './HttpClient';
+import type { HttpClient } from './HttpClient';

 export class ImageDownloader {
  public constructor(private readonly httpClient: HttpClient, private readonly window: Window) {}
--- a/src/common/services/ReportExporter.ts
+++ b/src/common/services/ReportExporter.ts
@@ -1,7 +1,7 @@
-import { NormalizedVisit } from '../../visits/types';
-import { ExportableShortUrl } from '../../short-urls/data';
+import type { ExportableShortUrl } from '../../short-urls/data';
+import type { JsonToCsv } from '../../utils/helpers/csvjson';
 import { saveCsv } from '../../utils/helpers/files';
-import { JsonToCsv } from '../../utils/helpers/csvjson';
+import type { NormalizedVisit } from '../../visits/types';

 export class ReportExporter {
  public constructor(private readonly window: Window, private readonly jsonToCsv: JsonToCsv) {}
--- a/src/common/services/provideServices.ts
+++ b/src/common/services/provideServices.ts
@@ -1,23 +1,23 @@
-import Bottle from 'bottlejs';
-import { ScrollToTop } from '../ScrollToTop';
-import { MainHeader } from '../MainHeader';
-import { Home } from '../Home';
-import { MenuLayout } from '../MenuLayout';
+import type Bottle from 'bottlejs';
+import type { ConnectDecorator } from '../../container/types';
+import { withoutSelectedServer } from '../../servers/helpers/withoutSelectedServer';
 import { AsideMenu } from '../AsideMenu';
 import { ErrorHandler } from '../ErrorHandler';
-import { ShlinkVersionsContainer } from '../ShlinkVersionsContainer';
-import { ConnectDecorator } from '../../container/types';
-import { withoutSelectedServer } from '../../servers/helpers/withoutSelectedServer';
+import { Home } from '../Home';
+import { MainHeader } from '../MainHeader';
+import { MenuLayout } from '../MenuLayout';
 import { sidebarNotPresent, sidebarPresent } from '../reducers/sidebar';
+import { ScrollToTop } from '../ScrollToTop';
+import { ShlinkVersionsContainer } from '../ShlinkVersionsContainer';
+import { HttpClient } from './HttpClient';
 import { ImageDownloader } from './ImageDownloader';
 import { ReportExporter } from './ReportExporter';
-import { HttpClient } from './HttpClient';

-const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
+export const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
  // Services
-  bottle.constant('window', (global as any).window);
-  bottle.constant('console', global.console);
-  bottle.constant('fetch', (global as any).fetch.bind(global));
+  bottle.constant('window', window);
+  bottle.constant('console', console);
+  bottle.constant('fetch', window.fetch.bind(window));

  bottle.service('HttpClient', HttpClient, 'fetch');
  bottle.service('ImageDownloader', ImageDownloader, 'HttpClient', 'window');
@@ -62,5 +62,3 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
  bottle.serviceFactory('sidebarPresent', () => sidebarPresent);
  bottle.serviceFactory('sidebarNotPresent', () => sidebarNotPresent);
 };
-
-export default provideServices;
--- a/src/container/index.ts
+++ b/src/container/index.ts
@@ -1,18 +1,19 @@
-import Bottle, { IContainer } from 'bottlejs';
-import { connect as reduxConnect } from 'react-redux';
+import type { IContainer } from 'bottlejs';
+import Bottle from 'bottlejs';
 import { pick } from 'ramda';
-import provideApiServices from '../api/services/provideServices';
-import provideCommonServices from '../common/services/provideServices';
-import provideShortUrlsServices from '../short-urls/services/provideServices';
-import provideServersServices from '../servers/services/provideServices';
-import provideVisitsServices from '../visits/services/provideServices';
-import provideTagsServices from '../tags/services/provideServices';
-import provideUtilsServices from '../utils/services/provideServices';
-import provideMercureServices from '../mercure/services/provideServices';
-import provideSettingsServices from '../settings/services/provideServices';
-import provideDomainsServices from '../domains/services/provideServices';
-import provideAppServices from '../app/services/provideServices';
-import { ConnectDecorator } from './types';
+import { connect as reduxConnect } from 'react-redux';
+import { provideServices as provideApiServices } from '../api/services/provideServices';
+import { provideServices as provideAppServices } from '../app/services/provideServices';
+import { provideServices as provideCommonServices } from '../common/services/provideServices';
+import { provideServices as provideDomainsServices } from '../domains/services/provideServices';
+import { provideServices as provideMercureServices } from '../mercure/services/provideServices';
+import { provideServices as provideServersServices } from '../servers/services/provideServices';
+import { provideServices as provideSettingsServices } from '../settings/services/provideServices';
+import { provideServices as provideShortUrlsServices } from '../short-urls/services/provideServices';
+import { provideServices as provideTagsServices } from '../tags/services/provideServices';
+import { provideServices as provideUtilsServices } from '../utils/services/provideServices';
+import { provideServices as provideVisitsServices } from '../visits/services/provideServices';
+import type { ConnectDecorator } from './types';

 type LazyActionMap = Record<string, Function>;

--- a/src/container/store.ts
+++ b/src/container/store.ts
@@ -1,9 +1,10 @@
-import { IContainer } from 'bottlejs';
-import { save, load, RLSOptions } from 'redux-localstorage-simple';
 import { configureStore } from '@reduxjs/toolkit';
-import reducer from '../reducers';
+import type { IContainer } from 'bottlejs';
+import type { RLSOptions } from 'redux-localstorage-simple';
+import { load, save } from 'redux-localstorage-simple';
+import { initReducers } from '../reducers';
 import { migrateDeprecatedSettings } from '../settings/helpers';
-import { ShlinkState } from './types';
+import type { ShlinkState } from './types';

 const isProduction = process.env.NODE_ENV === 'production';
 const localStorageConfig: RLSOptions = {
@@ -16,7 +17,7 @@ const preloadedState = migrateDeprecatedSettings(load(localStorageConfig) as Shl

 export const setUpStore = (container: IContainer) => configureStore({
  devTools: !isProduction,
-  reducer: reducer(container),
+  reducer: initReducers(container),
  preloadedState,
  middleware: (defaultMiddlewaresIncludingReduxThunk) =>
    defaultMiddlewaresIncludingReduxThunk({ immutableCheck: false, serializableCheck: false }) // State is too big for these
--- a/src/container/types.ts
+++ b/src/container/types.ts
@@ -1,21 +1,21 @@
-import { MercureInfo } from '../mercure/reducers/mercureInfo';
-import { SelectedServer, ServersMap } from '../servers/data';
-import { Settings } from '../settings/reducers/settings';
-import { ShortUrlCreation } from '../short-urls/reducers/shortUrlCreation';
-import { ShortUrlDeletion } from '../short-urls/reducers/shortUrlDeletion';
-import { ShortUrlEdition } from '../short-urls/reducers/shortUrlEdition';
-import { ShortUrlsList } from '../short-urls/reducers/shortUrlsList';
-import { TagDeletion } from '../tags/reducers/tagDelete';
-import { TagEdition } from '../tags/reducers/tagEdit';
-import { TagsList } from '../tags/reducers/tagsList';
-import { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail';
-import { ShortUrlVisits } from '../visits/reducers/shortUrlVisits';
-import { TagVisits } from '../visits/reducers/tagVisits';
-import { DomainsList } from '../domains/reducers/domainsList';
-import { VisitsOverview } from '../visits/reducers/visitsOverview';
-import { Sidebar } from '../common/reducers/sidebar';
-import { DomainVisits } from '../visits/reducers/domainVisits';
-import { VisitsInfo } from '../visits/reducers/types';
+import type { Sidebar } from '../common/reducers/sidebar';
+import type { DomainsList } from '../domains/reducers/domainsList';
+import type { MercureInfo } from '../mercure/reducers/mercureInfo';
+import type { SelectedServer, ServersMap } from '../servers/data';
+import type { Settings } from '../settings/reducers/settings';
+import type { ShortUrlCreation } from '../short-urls/reducers/shortUrlCreation';
+import type { ShortUrlDeletion } from '../short-urls/reducers/shortUrlDeletion';
+import type { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail';
+import type { ShortUrlEdition } from '../short-urls/reducers/shortUrlEdition';
+import type { ShortUrlsList } from '../short-urls/reducers/shortUrlsList';
+import type { TagDeletion } from '../tags/reducers/tagDelete';
+import type { TagEdition } from '../tags/reducers/tagEdit';
+import type { TagsList } from '../tags/reducers/tagsList';
+import type { DomainVisits } from '../visits/reducers/domainVisits';
+import type { ShortUrlVisits } from '../visits/reducers/shortUrlVisits';
+import type { TagVisits } from '../visits/reducers/tagVisits';
+import type { VisitsInfo } from '../visits/reducers/types';
+import type { VisitsOverview } from '../visits/reducers/visitsOverview';

 export interface ShlinkState {
  servers: ServersMap;
--- a/src/domains/DomainRow.tsx
+++ b/src/domains/DomainRow.tsx
@@ -1,14 +1,15 @@
-import { FC, useEffect } from 'react';
-import { UncontrolledTooltip } from 'reactstrap';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faDotCircle as defaultDomainIcon } from '@fortawesome/free-solid-svg-icons';
-import { ShlinkDomainRedirects } from '../api/types';
-import { OptionalString } from '../utils/utils';
-import { SelectedServer } from '../servers/data';
-import { Domain } from './data';
-import { DomainStatusIcon } from './helpers/DomainStatusIcon';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import type { FC } from 'react';
+import { useEffect } from 'react';
+import { UncontrolledTooltip } from 'reactstrap';
+import type { ShlinkDomainRedirects } from '../api/types';
+import type { SelectedServer } from '../servers/data';
+import type { OptionalString } from '../utils/utils';
+import type { Domain } from './data';
 import { DomainDropdown } from './helpers/DomainDropdown';
-import { EditDomainRedirects } from './reducers/domainRedirects';
+import { DomainStatusIcon } from './helpers/DomainStatusIcon';
+import type { EditDomainRedirects } from './reducers/domainRedirects';

 interface DomainRowProps {
  domain: Domain;
--- a/src/domains/DomainSelector.tsx
+++ b/src/domains/DomainSelector.tsx
@@ -1,11 +1,12 @@
-import { useEffect } from 'react';
-import { Button, DropdownItem, Input, InputGroup, UncontrolledTooltip, InputProps } from 'reactstrap';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faUndo } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { isEmpty, pipe } from 'ramda';
+import { useEffect } from 'react';
+import type { InputProps } from 'reactstrap';
+import { Button, DropdownItem, Input, InputGroup, UncontrolledTooltip } from 'reactstrap';
 import { DropdownBtn } from '../utils/DropdownBtn';
 import { useToggle } from '../utils/helpers/hooks';
-import { DomainsList } from './reducers/domainsList';
+import type { DomainsList } from './reducers/domainsList';
 import './DomainSelector.scss';

 export interface DomainSelectorProps extends Omit<InputProps, 'onChange'> {
--- a/src/domains/ManageDomains.tsx
+++ b/src/domains/ManageDomains.tsx
@@ -1,13 +1,14 @@
-import { FC, useEffect } from 'react';
+import type { FC } from 'react';
+import { useEffect } from 'react';
+import { ShlinkApiError } from '../api/ShlinkApiError';
+import type { SelectedServer } from '../servers/data';
 import { Message } from '../utils/Message';
 import { Result } from '../utils/Result';
-import { ShlinkApiError } from '../api/ShlinkApiError';
-import { SimpleCard } from '../utils/SimpleCard';
 import { SearchField } from '../utils/SearchField';
-import { EditDomainRedirects } from './reducers/domainRedirects';
-import { SelectedServer } from '../servers/data';
-import { DomainsList } from './reducers/domainsList';
+import { SimpleCard } from '../utils/SimpleCard';
 import { DomainRow } from './DomainRow';
+import type { EditDomainRedirects } from './reducers/domainRedirects';
+import type { DomainsList } from './reducers/domainsList';

 interface ManageDomainsProps {
  listDomains: Function;
--- a/src/domains/data/index.ts
+++ b/src/domains/data/index.ts
@@ -1,4 +1,4 @@
-import { ShlinkDomain } from '../../api/types';
+import type { ShlinkDomain } from '../../api/types';

 export type DomainStatus = 'validating' | 'valid' | 'invalid';

--- a/src/domains/helpers/DomainDropdown.tsx
+++ b/src/domains/helpers/DomainDropdown.tsx
@@ -1,16 +1,17 @@
-import { FC } from 'react';
-import { DropdownItem } from 'reactstrap';
-import { Link } from 'react-router-dom';
 import { faChartPie as pieChartIcon, faEdit as editIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { useToggle } from '../../utils/helpers/hooks';
+import type { FC } from 'react';
+import { Link } from 'react-router-dom';
+import { DropdownItem } from 'reactstrap';
+import type { SelectedServer } from '../../servers/data';
+import { getServerId } from '../../servers/data';
 import { DropdownBtnMenu } from '../../utils/DropdownBtnMenu';
-import { EditDomainRedirectsModal } from './EditDomainRedirectsModal';
-import { Domain } from '../data';
-import { EditDomainRedirects } from '../reducers/domainRedirects';
-import { supportsDefaultDomainRedirectsEdition, supportsDomainVisits } from '../../utils/helpers/features';
-import { getServerId, SelectedServer } from '../../servers/data';
+import { useFeature } from '../../utils/helpers/features';
+import { useToggle } from '../../utils/helpers/hooks';
 import { DEFAULT_DOMAIN } from '../../visits/reducers/domainVisits';
+import type { Domain } from '../data';
+import type { EditDomainRedirects } from '../reducers/domainRedirects';
+import { EditDomainRedirectsModal } from './EditDomainRedirectsModal';

 interface DomainDropdownProps {
  domain: Domain;
@@ -22,8 +23,8 @@ export const DomainDropdown: FC<DomainDropdownProps> = ({ domain, editDomainRedi
  const [isOpen, toggle] = useToggle();
  const [isModalOpen, toggleModal] = useToggle();
  const { isDefault } = domain;
-  const canBeEdited = !isDefault || supportsDefaultDomainRedirectsEdition(selectedServer);
-  const withVisits = supportsDomainVisits(selectedServer);
+  const canBeEdited = !isDefault || useFeature('defaultDomainRedirectsEdition', selectedServer);
+  const withVisits = useFeature('domainVisits', selectedServer);
  const serverId = getServerId(selectedServer);

  return (
--- a/src/domains/helpers/DomainStatusIcon.tsx
+++ b/src/domains/helpers/DomainStatusIcon.tsx
@@ -1,15 +1,16 @@
-import { FC, useEffect, useRef, useState } from 'react';
-import { UncontrolledTooltip } from 'reactstrap';
-import { ExternalLink } from 'react-external-link';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import {
-  faTimes as invalidIcon,
  faCheck as checkIcon,
  faCircleNotch as loadingStatusIcon,
+  faTimes as invalidIcon,
 } from '@fortawesome/free-solid-svg-icons';
-import { MediaMatcher } from '../../utils/types';
-import { mutableRefToElementRef } from '../../utils/helpers/components';
-import { DomainStatus } from '../data';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import type { FC } from 'react';
+import { useEffect, useState } from 'react';
+import { ExternalLink } from 'react-external-link';
+import { UncontrolledTooltip } from 'reactstrap';
+import { useElementRef } from '../../utils/helpers/hooks';
+import type { MediaMatcher } from '../../utils/types';
+import type { DomainStatus } from '../data';

 interface DomainStatusIconProps {
  status: DomainStatus;
@@ -17,7 +18,7 @@ interface DomainStatusIconProps {
 }

 export const DomainStatusIcon: FC<DomainStatusIconProps> = ({ status, matchMedia = window.matchMedia }) => {
-  const ref = useRef<HTMLSpanElement>();
+  const ref = useElementRef<HTMLSpanElement>();
  const matchesMobile = () => matchMedia('(max-width: 991px)').matches;
  const [isMobile, setIsMobile] = useState<boolean>(matchesMobile());

@@ -35,13 +36,13 @@ export const DomainStatusIcon: FC<DomainStatusIconProps> = ({ status, matchMedia

  return (
    <>
-      <span ref={mutableRefToElementRef(ref)}>
+      <span ref={ref}>
        {status === 'valid'
          ? <FontAwesomeIcon fixedWidth icon={checkIcon} className="text-muted" />
          : <FontAwesomeIcon fixedWidth icon={invalidIcon} className="text-danger" />}
      </span>
      <UncontrolledTooltip
-        target={(() => ref.current) as any}
+        target={ref}
        placement={isMobile ? 'top-start' : 'left'}
        autohide={status === 'valid'}
      >
--- a/src/domains/helpers/EditDomainRedirectsModal.tsx
+++ b/src/domains/helpers/EditDomainRedirectsModal.tsx
@@ -1,10 +1,12 @@
-import { FC, useState } from 'react';
+import type { FC } from 'react';
+import { useState } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
-import { ShlinkDomain } from '../../api/types';
-import { InputFormGroup, InputFormGroupProps } from '../../utils/forms/InputFormGroup';
-import { handleEventPreventingDefault, nonEmptyValueOrNull } from '../../utils/utils';
+import type { ShlinkDomain } from '../../api/types';
+import type { InputFormGroupProps } from '../../utils/forms/InputFormGroup';
+import { InputFormGroup } from '../../utils/forms/InputFormGroup';
 import { InfoTooltip } from '../../utils/InfoTooltip';
-import { EditDomainRedirects } from '../reducers/domainRedirects';
+import { handleEventPreventingDefault, nonEmptyValueOrNull } from '../../utils/utils';
+import type { EditDomainRedirects } from '../reducers/domainRedirects';

 interface EditDomainRedirectsModalProps {
  domain: ShlinkDomain;
--- a/src/domains/reducers/domainRedirects.ts
+++ b/src/domains/reducers/domainRedirects.ts
@@ -1,6 +1,6 @@
+import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkDomainRedirects } from '../../api/types';
 import { createAsyncThunk } from '../../utils/helpers/redux';
-import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
-import { ShlinkDomainRedirects } from '../../api/types';

 const EDIT_DOMAIN_REDIRECTS = 'shlink/domainRedirects/EDIT_DOMAIN_REDIRECTS';

--- a/src/domains/reducers/domainsList.ts
+++ b/src/domains/reducers/domainsList.ts
@@ -1,13 +1,14 @@
-import { createSlice, createAction, SliceCaseReducers, AsyncThunk } from '@reduxjs/toolkit';
-import { createAsyncThunk } from '../../utils/helpers/redux';
-import { ShlinkDomainRedirects } from '../../api/types';
-import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
-import { Domain, DomainStatus } from '../data';
-import { hasServerData } from '../../servers/data';
-import { replaceAuthorityFromUri } from '../../utils/helpers/uri';
-import { ProblemDetailsError } from '../../api/types/errors';
+import type { AsyncThunk, SliceCaseReducers } from '@reduxjs/toolkit';
+import { createAction, createSlice } from '@reduxjs/toolkit';
+import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkDomainRedirects } from '../../api/types';
+import type { ProblemDetailsError } from '../../api/types/errors';
 import { parseApiError } from '../../api/utils';
-import { EditDomainRedirects } from './domainRedirects';
+import { hasServerData } from '../../servers/data';
+import { createAsyncThunk } from '../../utils/helpers/redux';
+import { replaceAuthorityFromUri } from '../../utils/helpers/uri';
+import type { Domain, DomainStatus } from '../data';
+import type { EditDomainRedirects } from './domainRedirects';

 const REDUCER_PREFIX = 'shlink/domainsList';

--- a/src/domains/services/provideServices.ts
+++ b/src/domains/services/provideServices.ts
@@ -1,12 +1,12 @@
+import type Bottle from 'bottlejs';
 import { prop } from 'ramda';
-import Bottle from 'bottlejs';
-import { ConnectDecorator } from '../../container/types';
-import { domainsListReducerCreator } from '../reducers/domainsList';
+import type { ConnectDecorator } from '../../container/types';
 import { DomainSelector } from '../DomainSelector';
 import { ManageDomains } from '../ManageDomains';
 import { editDomainRedirects } from '../reducers/domainRedirects';
+import { domainsListReducerCreator } from '../reducers/domainsList';

-const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
+export const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
  // Components
  bottle.serviceFactory('DomainSelector', () => DomainSelector);
  bottle.decorator('DomainSelector', connect(['domainsList'], ['listDomains']));
@@ -32,5 +32,3 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
  bottle.serviceFactory('editDomainRedirects', editDomainRedirects, 'buildShlinkApiClient');
  bottle.serviceFactory('checkDomainHealth', prop('checkDomainHealth'), 'domainsListReducerCreator');
 };
-
-export default provideServices;
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,15 +1,15 @@
+import 'chart.js/auto'; // TODO Import specific ones to reduce bundle size https://react-chartjs-2.js.org/docs/migration-to-v4/#tree-shaking
 import { createRoot } from 'react-dom/client';
 import { Provider } from 'react-redux';
 import { BrowserRouter } from 'react-router-dom';
 import pack from '../package.json';
 import { container } from './container';
 import { setUpStore } from './container/store';
-import { fixLeafletIcons } from './utils/helpers/leaflet';
 import { register as registerServiceWorker } from './serviceWorkerRegistration';
-import 'chart.js/auto'; // TODO Import specific ones to reduce bundle size https://react-chartjs-2.js.org/docs/migration-to-v4/#tree-shaking
-import 'react-datepicker/dist/react-datepicker.css';
-import 'leaflet/dist/leaflet.css';
+import { fixLeafletIcons } from './utils/helpers/leaflet';
 import './index.scss';
+import 'leaflet/dist/leaflet.css';
+import 'react-datepicker/dist/react-datepicker.css';

 // This overwrites icons used for leaflet maps, fixing some issues caused by webpack while processing the CSS
 fixLeafletIcons();
--- a/src/mercure/helpers/boundToMercureHub.tsx
+++ b/src/mercure/helpers/boundToMercureHub.tsx
@@ -1,8 +1,9 @@
-import { FC, useEffect } from 'react';
 import { pipe } from 'ramda';
+import type { FC } from 'react';
+import { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
-import { CreateVisit } from '../../visits/types';
-import { MercureInfo } from '../reducers/mercureInfo';
+import type { CreateVisit } from '../../visits/types';
+import type { MercureInfo } from '../reducers/mercureInfo';
 import { bindToMercureTopic } from './index';

 export interface MercureBoundProps {
--- a/src/mercure/helpers/index.ts
+++ b/src/mercure/helpers/index.ts
@@ -1,5 +1,5 @@
 import { EventSourcePolyfill as EventSource } from 'event-source-polyfill';
-import { MercureInfo } from '../reducers/mercureInfo';
+import type { MercureInfo } from '../reducers/mercureInfo';

 export const bindToMercureTopic = <T>(mercureInfo: MercureInfo, topics: string[], onMessage: (message: T) => void, onTokenExpired: () => void) => { // eslint-disable-line max-len
  const { mercureHubUrl, token, loading, error } = mercureInfo;
--- a/src/mercure/reducers/mercureInfo.ts
+++ b/src/mercure/reducers/mercureInfo.ts
@@ -1,7 +1,7 @@
 import { createSlice } from '@reduxjs/toolkit';
+import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkMercureInfo } from '../../api/types';
 import { createAsyncThunk } from '../../utils/helpers/redux';
-import { ShlinkMercureInfo } from '../../api/types';
-import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';

 const REDUCER_PREFIX = 'shlink/mercure';

--- a/src/mercure/services/provideServices.ts
+++ b/src/mercure/services/provideServices.ts
@@ -1,8 +1,8 @@
+import type Bottle from 'bottlejs';
 import { prop } from 'ramda';
-import Bottle from 'bottlejs';
 import { mercureInfoReducerCreator } from '../reducers/mercureInfo';

-const provideServices = (bottle: Bottle) => {
+export const provideServices = (bottle: Bottle) => {
  // Reducer
  bottle.serviceFactory('mercureInfoReducerCreator', mercureInfoReducerCreator, 'buildShlinkApiClient');
  bottle.serviceFactory('mercureInfoReducer', prop('reducer'), 'mercureInfoReducerCreator');
@@ -10,5 +10,3 @@ const provideServices = (bottle: Bottle) => {
  // Actions
  bottle.serviceFactory('loadMercureInfo', prop('loadMercureInfo'), 'mercureInfoReducerCreator');
 };
-
-export default provideServices;
--- a/src/reducers/index.ts
+++ b/src/reducers/index.ts
@@ -1,12 +1,12 @@
-import { IContainer } from 'bottlejs';
 import { combineReducers } from '@reduxjs/toolkit';
-import { serversReducer } from '../servers/reducers/servers';
-import { settingsReducer } from '../settings/reducers/settings';
+import type { IContainer } from 'bottlejs';
 import { appUpdatesReducer } from '../app/reducers/appUpdates';
 import { sidebarReducer } from '../common/reducers/sidebar';
-import { ShlinkState } from '../container/types';
+import type { ShlinkState } from '../container/types';
+import { serversReducer } from '../servers/reducers/servers';
+import { settingsReducer } from '../settings/reducers/settings';

-export default (container: IContainer) => combineReducers<ShlinkState>({
+export const initReducers = (container: IContainer) => combineReducers<ShlinkState>({
  servers: serversReducer,
  selectedServer: container.selectedServerReducer,
  shortUrlsList: container.shortUrlsListReducer,
--- a/src/servers/CreateServer.tsx
+++ b/src/servers/CreateServer.tsx
@@ -1,14 +1,16 @@
-import { FC, useEffect, useState } from 'react';
-import { v4 as uuid } from 'uuid';
-import { Button } from 'reactstrap';
+import type { FC } from 'react';
+import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { Result } from '../utils/Result';
+import { Button } from 'reactstrap';
+import { v4 as uuid } from 'uuid';
 import { NoMenuLayout } from '../common/NoMenuLayout';
-import { TimeoutToggle, useGoBack, useToggle } from '../utils/helpers/hooks';
-import { ServerForm } from './helpers/ServerForm';
-import { ImportServersBtnProps } from './helpers/ImportServersBtn';
-import { ServerData, ServersMap, ServerWithId } from './data';
+import type { TimeoutToggle } from '../utils/helpers/hooks';
+import { useGoBack, useToggle } from '../utils/helpers/hooks';
+import { Result } from '../utils/Result';
+import type { ServerData, ServersMap, ServerWithId } from './data';
 import { DuplicatedServersModal } from './helpers/DuplicatedServersModal';
+import type { ImportServersBtnProps } from './helpers/ImportServersBtn';
+import { ServerForm } from './helpers/ServerForm';

 const SHOW_IMPORT_MSG_TIME = 4000;

--- a/src/servers/DeleteServerButton.tsx
+++ b/src/servers/DeleteServerButton.tsx
@@ -1,9 +1,9 @@
-import { FC, PropsWithChildren } from 'react';
 import { faMinusCircle as deleteIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import type { FC, PropsWithChildren } from 'react';
 import { useToggle } from '../utils/helpers/hooks';
-import { DeleteServerModalProps } from './DeleteServerModal';
-import { ServerWithId } from './data';
+import type { ServerWithId } from './data';
+import type { DeleteServerModalProps } from './DeleteServerModal';

 export type DeleteServerButtonProps = PropsWithChildren<{
  server: ServerWithId;
--- a/src/servers/DeleteServerModal.tsx
+++ b/src/servers/DeleteServerModal.tsx
@@ -1,7 +1,8 @@
-import { FC, useRef } from 'react';
-import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
+import type { FC } from 'react';
+import { useRef } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { ServerWithId } from './data';
+import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
+import type { ServerWithId } from './data';

 export interface DeleteServerModalProps {
  server: ServerWithId;
--- a/src/servers/EditServer.tsx
+++ b/src/servers/EditServer.tsx
@@ -1,17 +1,21 @@
-import { FC } from 'react';
+import type { FC } from 'react';
 import { Button } from 'reactstrap';
 import { NoMenuLayout } from '../common/NoMenuLayout';
-import { useGoBack } from '../utils/helpers/hooks';
+import { useGoBack, useParsedQuery } from '../utils/helpers/hooks';
+import type { ServerData } from './data';
+import { isServerWithId } from './data';
 import { ServerForm } from './helpers/ServerForm';
 import { withSelectedServer } from './helpers/withSelectedServer';
-import { isServerWithId, ServerData } from './data';

 interface EditServerProps {
  editServer: (serverId: string, serverData: ServerData) => void;
 }

-export const EditServer = (ServerError: FC) => withSelectedServer<EditServerProps>(({ editServer, selectedServer }) => {
+export const EditServer = (ServerError: FC) => withSelectedServer<EditServerProps>((
+  { editServer, selectedServer, selectServer },
+) => {
  const goBack = useGoBack();
+  const { reconnect } = useParsedQuery<{ reconnect?: 'true' }>();

  if (!isServerWithId(selectedServer)) {
    return null;
@@ -19,6 +23,7 @@ export const EditServer = (ServerError: FC) => withSelectedServer<EditServerProp

  const handleSubmit = (serverData: ServerData) => {
    editServer(selectedServer.id, serverData);
+    reconnect === 'true' && selectServer(selectedServer.id);
    goBack();
  };

--- a/src/servers/ManageServers.tsx
+++ b/src/servers/ManageServers.tsx
@@ -1,17 +1,18 @@
-import { FC, useEffect, useState } from 'react';
-import { Button, Row } from 'reactstrap';
 import { faFileDownload as exportIcon, faPlus as plusIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import type { FC } from 'react';
+import { useEffect, useState } from 'react';
 import { Link } from 'react-router-dom';
+import { Button, Row } from 'reactstrap';
 import { NoMenuLayout } from '../common/NoMenuLayout';
-import { SimpleCard } from '../utils/SimpleCard';
-import { SearchField } from '../utils/SearchField';
+import type { TimeoutToggle } from '../utils/helpers/hooks';
 import { Result } from '../utils/Result';
-import { TimeoutToggle } from '../utils/helpers/hooks';
-import { ImportServersBtnProps } from './helpers/ImportServersBtn';
-import { ServersMap } from './data';
-import { ManageServersRowProps } from './ManageServersRow';
-import ServersExporter from './services/ServersExporter';
+import { SearchField } from '../utils/SearchField';
+import { SimpleCard } from '../utils/SimpleCard';
+import type { ServersMap } from './data';
+import type { ImportServersBtnProps } from './helpers/ImportServersBtn';
+import type { ManageServersRowProps } from './ManageServersRow';
+import type { ServersExporter } from './services/ServersExporter';

 interface ManageServersProps {
  servers: ServersMap;
--- a/src/servers/ManageServersRow.tsx
+++ b/src/servers/ManageServersRow.tsx
@@ -1,10 +1,10 @@
-import { FC } from 'react';
-import { UncontrolledTooltip } from 'reactstrap';
-import { Link } from 'react-router-dom';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faCheck as checkIcon } from '@fortawesome/free-solid-svg-icons';
-import { ServerWithId } from './data';
-import { ManageServersRowDropdownProps } from './ManageServersRowDropdown';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import type { FC } from 'react';
+import { Link } from 'react-router-dom';
+import { UncontrolledTooltip } from 'reactstrap';
+import type { ServerWithId } from './data';
+import type { ManageServersRowDropdownProps } from './ManageServersRowDropdown';

 export interface ManageServersRowProps {
  server: ServerWithId;
--- a/src/servers/ManageServersRowDropdown.tsx
+++ b/src/servers/ManageServersRowDropdown.tsx
@@ -1,18 +1,18 @@
-import { FC } from 'react';
-import { DropdownItem } from 'reactstrap';
-import { Link } from 'react-router-dom';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faCircle as toggleOnIcon } from '@fortawesome/free-regular-svg-icons';
 import {
  faBan as toggleOffIcon,
  faEdit as editIcon,
  faMinusCircle as deleteIcon,
  faPlug as connectIcon,
 } from '@fortawesome/free-solid-svg-icons';
-import { faCircle as toggleOnIcon } from '@fortawesome/free-regular-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import type { FC } from 'react';
+import { Link } from 'react-router-dom';
+import { DropdownItem } from 'reactstrap';
 import { DropdownBtnMenu } from '../utils/DropdownBtnMenu';
 import { useToggle } from '../utils/helpers/hooks';
-import { DeleteServerModalProps } from './DeleteServerModal';
-import { ServerWithId } from './data';
+import type { ServerWithId } from './data';
+import type { DeleteServerModalProps } from './DeleteServerModal';

 export interface ManageServersRowDropdownProps {
  server: ServerWithId;
--- a/src/servers/Overview.tsx
+++ b/src/servers/Overview.tsx
@@ -1,18 +1,23 @@
-import { FC, useEffect } from 'react';
-import { Card, CardBody, CardHeader, Row } from 'reactstrap';
+import type { FC } from 'react';
+import { useEffect } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
-import { ITEMS_IN_OVERVIEW_PAGE, ShortUrlsList as ShortUrlsListState } from '../short-urls/reducers/shortUrlsList';
-import { prettify } from '../utils/helpers/numbers';
-import { TagsList } from '../tags/reducers/tagsList';
-import { ShortUrlsTableProps } from '../short-urls/ShortUrlsTable';
+import { Card, CardBody, CardHeader, Row } from 'reactstrap';
+import type { ShlinkShortUrlsListParams } from '../api/types';
 import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
-import { CreateShortUrlProps } from '../short-urls/CreateShortUrl';
-import { VisitsOverview } from '../visits/reducers/visitsOverview';
 import { Topics } from '../mercure/helpers/Topics';
-import { ShlinkShortUrlsListParams } from '../api/types';
-import { supportsNonOrphanVisits } from '../utils/helpers/features';
-import { getServerId, SelectedServer } from './data';
+import type { Settings } from '../settings/reducers/settings';
+import type { CreateShortUrlProps } from '../short-urls/CreateShortUrl';
+import type { ShortUrlsList as ShortUrlsListState } from '../short-urls/reducers/shortUrlsList';
+import { ITEMS_IN_OVERVIEW_PAGE } from '../short-urls/reducers/shortUrlsList';
+import type { ShortUrlsTableType } from '../short-urls/ShortUrlsTable';
+import type { TagsList } from '../tags/reducers/tagsList';
+import { useFeature } from '../utils/helpers/features';
+import { prettify } from '../utils/helpers/numbers';
+import type { VisitsOverview } from '../visits/reducers/visitsOverview';
+import type { SelectedServer } from './data';
+import { getServerId } from './data';
 import { HighlightCard } from './helpers/HighlightCard';
+import { VisitsHighlightCard } from './helpers/VisitsHighlightCard';

 interface OverviewConnectProps {
  shortUrlsList: ShortUrlsListState;
@@ -22,10 +27,11 @@ interface OverviewConnectProps {
  selectedServer: SelectedServer;
  visitsOverview: VisitsOverview;
  loadVisitsOverview: Function;
+  settings: Settings;
 }

 export const Overview = (
-  ShortUrlsTable: FC<ShortUrlsTableProps>,
+  ShortUrlsTable: ShortUrlsTableType,
  CreateShortUrl: FC<CreateShortUrlProps>,
 ) => boundToMercureHub(({
  shortUrlsList,
@@ -35,12 +41,13 @@ export const Overview = (
  selectedServer,
  loadVisitsOverview,
  visitsOverview,
+  settings: { visits },
 }: OverviewConnectProps) => {
  const { loading, shortUrls } = shortUrlsList;
  const { loading: loadingTags } = tagsList;
-  const { loading: loadingVisits, visitsCount, orphanVisitsCount } = visitsOverview;
+  const { loading: loadingVisits, nonOrphanVisits, orphanVisits } = visitsOverview;
  const serverId = getServerId(selectedServer);
-  const linkToNonOrphanVisits = supportsNonOrphanVisits(selectedServer);
+  const linkToNonOrphanVisits = useFeature('nonOrphanVisits', selectedServer);
  const navigate = useNavigate();

  useEffect(() => {
@@ -53,14 +60,22 @@ export const Overview = (
    <>
      <Row>
        <div className="col-lg-6 col-xl-3 mb-3">
-          <HighlightCard title="Visits" link={linkToNonOrphanVisits && `/server/${serverId}/non-orphan-visits`}>
-            {loadingVisits ? 'Loading...' : prettify(visitsCount)}
-          </HighlightCard>
+          <VisitsHighlightCard
+            title="Visits"
+            link={linkToNonOrphanVisits ? `/server/${serverId}/non-orphan-visits` : undefined}
+            excludeBots={visits?.excludeBots ?? false}
+            loading={loadingVisits}
+            visitsSummary={nonOrphanVisits}
+          />
        </div>
        <div className="col-lg-6 col-xl-3 mb-3">
-          <HighlightCard title="Orphan visits" link={`/server/${serverId}/orphan-visits`}>
-            {loadingVisits ? 'Loading...' : prettify(orphanVisitsCount)}
-          </HighlightCard>
+          <VisitsHighlightCard
+            title="Orphan visits"
+            link={`/server/${serverId}/orphan-visits`}
+            excludeBots={visits?.excludeBots ?? false}
+            loading={loadingVisits}
+            visitsSummary={orphanVisits}
+          />
        </div>
        <div className="col-lg-6 col-xl-3 mb-3">
          <HighlightCard title="Short URLs" link={`/server/${serverId}/list-short-urls/1`}>
--- a/src/servers/ServersDropdown.tsx
+++ b/src/servers/ServersDropdown.tsx
@@ -1,9 +1,10 @@
-import { isEmpty, values } from 'ramda';
-import { DropdownItem, DropdownMenu, DropdownToggle, UncontrolledDropdown } from 'reactstrap';
-import { Link } from 'react-router-dom';
 import { faPlus as plusIcon, faServer as serverIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { getServerId, SelectedServer, ServersMap } from './data';
+import { isEmpty, values } from 'ramda';
+import { Link } from 'react-router-dom';
+import { DropdownItem, DropdownMenu, DropdownToggle, UncontrolledDropdown } from 'reactstrap';
+import type { SelectedServer, ServersMap } from './data';
+import { getServerId } from './data';

 export interface ServersDropdownProps {
  servers: ServersMap;
--- a/src/servers/ServersListGroup.tsx
+++ b/src/servers/ServersListGroup.tsx
@@ -1,10 +1,10 @@
-import { FC, PropsWithChildren } from 'react';
-import { ListGroup, ListGroupItem } from 'reactstrap';
-import { Link } from 'react-router-dom';
-import classNames from 'classnames';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faChevronRight as chevronIcon } from '@fortawesome/free-solid-svg-icons';
-import { ServerWithId } from './data';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import classNames from 'classnames';
+import type { FC, PropsWithChildren } from 'react';
+import { Link } from 'react-router-dom';
+import { ListGroup, ListGroupItem } from 'reactstrap';
+import type { ServerWithId } from './data';
 import './ServersListGroup.scss';

 type ServersListGroupProps = PropsWithChildren<{
--- a/src/servers/data/index.ts
+++ b/src/servers/data/index.ts
@@ -1,5 +1,5 @@
 import { omit } from 'ramda';
-import { SemVer } from '../../utils/helpers/version';
+import type { SemVer } from '../../utils/helpers/version';

 export interface ServerData {
  name: string;
--- a/src/servers/helpers/DuplicatedServersModal.tsx
+++ b/src/servers/helpers/DuplicatedServersModal.tsx
@@ -1,6 +1,7 @@
-import { FC, Fragment } from 'react';
+import type { FC } from 'react';
+import { Fragment } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
-import { ServerData } from '../data';
+import type { ServerData } from '../data';

 interface DuplicatedServersModalProps {
  duplicatedServers: ServerData[];
--- a/src/servers/helpers/HighlightCard.tsx
+++ b/src/servers/helpers/HighlightCard.tsx
@@ -1,21 +1,30 @@
-import { FC, PropsWithChildren } from 'react';
-import { Card, CardText, CardTitle } from 'reactstrap';
-import { Link } from 'react-router-dom';
 import { faArrowAltCircleRight as linkIcon } from '@fortawesome/free-regular-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import type { FC, PropsWithChildren, ReactNode } from 'react';
+import { Link } from 'react-router-dom';
+import { Card, CardText, CardTitle, UncontrolledTooltip } from 'reactstrap';
+import { useElementRef } from '../../utils/helpers/hooks';
 import './HighlightCard.scss';

 export type HighlightCardProps = PropsWithChildren<{
  title: string;
-  link?: string | false;
+  link?: string;
+  tooltip?: ReactNode;
 }>;

-const buildExtraProps = (link?: string | false) => (!link ? {} : { tag: Link, to: link });
+const buildExtraProps = (link?: string) => (!link ? {} : { tag: Link, to: link });

-export const HighlightCard: FC<HighlightCardProps> = ({ children, title, link }) => (
-  <Card className="highlight-card" body {...buildExtraProps(link)}>
-    {link && <FontAwesomeIcon size="3x" className="highlight-card__link-icon" icon={linkIcon} />}
-    <CardTitle tag="h5" className="highlight-card__title">{title}</CardTitle>
-    <CardText tag="h2">{children}</CardText>
-  </Card>
-);
+export const HighlightCard: FC<HighlightCardProps> = ({ children, title, link, tooltip }) => {
+  const ref = useElementRef<HTMLElement>();
+
+  return (
+    <>
+      <Card innerRef={ref} className="highlight-card" body {...buildExtraProps(link)}>
+        {link && <FontAwesomeIcon size="3x" className="highlight-card__link-icon" icon={linkIcon} />}
+        <CardTitle tag="h5" className="highlight-card__title">{title}</CardTitle>
+        <CardText tag="h2">{children}</CardText>
+      </Card>
+      {tooltip && <UncontrolledTooltip target={ref} placement="bottom">{tooltip}</UncontrolledTooltip>}
+    </>
+  );
+};
--- a/src/servers/helpers/ImportServersBtn.tsx
+++ b/src/servers/helpers/ImportServersBtn.tsx
@@ -1,12 +1,12 @@
-import { useRef, ChangeEvent, useState, useEffect, FC, PropsWithChildren } from 'react';
-import { Button, UncontrolledTooltip } from 'reactstrap';
-import { complement, pipe } from 'ramda';
 import { faFileUpload as importIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { useToggle } from '../../utils/helpers/hooks';
-import { mutableRefToElementRef } from '../../utils/helpers/components';
-import { ServersImporter } from '../services/ServersImporter';
-import { ServerData, ServersMap } from '../data';
+import { complement, pipe } from 'ramda';
+import type { ChangeEvent, FC, PropsWithChildren } from 'react';
+import { useEffect, useState } from 'react';
+import { Button, UncontrolledTooltip } from 'reactstrap';
+import { useElementRef, useToggle } from '../../utils/helpers/hooks';
+import type { ServerData, ServersMap } from '../data';
+import type { ServersImporter } from '../services/ServersImporter';
 import { DuplicatedServersModal } from './DuplicatedServersModal';
 import './ImportServersBtn.scss';

@@ -34,7 +34,7 @@ export const ImportServersBtn = ({ importServersFromFile }: ServersImporter): FC
  tooltipPlacement = 'bottom',
  className = '',
 }) => {
-  const ref = useRef<HTMLInputElement>();
+  const ref = useElementRef<HTMLInputElement>();
  const [serversToCreate, setServersToCreate] = useState<ServerData[] | undefined>();
  const [duplicatedServers, setDuplicatedServers] = useState<ServerData[]>([]);
  const [isModalOpen,, showModal, hideModal] = useToggle();
@@ -79,7 +79,7 @@ export const ImportServersBtn = ({ importServersFromFile }: ServersImporter): FC
        type="file"
        accept="text/csv"
        className="import-servers-btn__csv-select"
-        ref={mutableRefToElementRef(ref)}
+        ref={ref}
        onChange={onFile}
      />

--- a/src/servers/helpers/ServerError.tsx
+++ b/src/servers/helpers/ServerError.tsx
@@ -1,10 +1,11 @@
-import { FC } from 'react';
+import type { FC } from 'react';
 import { Link } from 'react-router-dom';
-import { Message } from '../../utils/Message';
-import { ServersListGroup } from '../ServersListGroup';
-import { DeleteServerButtonProps } from '../DeleteServerButton';
-import { isServerWithId, SelectedServer, ServersMap } from '../data';
 import { NoMenuLayout } from '../../common/NoMenuLayout';
+import { Message } from '../../utils/Message';
+import type { SelectedServer, ServersMap } from '../data';
+import { isServerWithId } from '../data';
+import type { DeleteServerButtonProps } from '../DeleteServerButton';
+import { ServersListGroup } from '../ServersListGroup';
 import './ServerError.scss';

 interface ServerErrorProps {
@@ -37,7 +38,7 @@ export const ServerError = (DeleteServerButton: FC<DeleteServerButtonProps>): FC
          <h5>
            Alternatively, if you think you may have miss-configured this server, you
            can <DeleteServerButton server={selectedServer} className="server-error__delete-btn">remove it</DeleteServerButton> or&nbsp;
-            <Link to={`/server/${selectedServer.id}/edit`}>edit it</Link>.
+            <Link to={`/server/${selectedServer.id}/edit?reconnect=true`}>edit it</Link>.
          </h5>
        </div>
      )}
--- a/src/servers/helpers/ServerForm.tsx
+++ b/src/servers/helpers/ServerForm.tsx
@@ -1,8 +1,9 @@
-import { FC, PropsWithChildren, ReactNode, useEffect, useState } from 'react';
+import type { FC, PropsWithChildren, ReactNode } from 'react';
+import { useEffect, useState } from 'react';
 import { InputFormGroup } from '../../utils/forms/InputFormGroup';
-import { handleEventPreventingDefault } from '../../utils/utils';
-import { ServerData } from '../data';
 import { SimpleCard } from '../../utils/SimpleCard';
+import { handleEventPreventingDefault } from '../../utils/utils';
+import type { ServerData } from '../data';

 type ServerFormProps = PropsWithChildren<{
  onSubmit: (server: ServerData) => void;
--- a/src/servers/helpers/VisitsHighlightCard.tsx
+++ b/src/servers/helpers/VisitsHighlightCard.tsx
@@ -0,0 +1,26 @@
+import type { FC } from 'react';
+import { prettify } from '../../utils/helpers/numbers';
+import type { PartialVisitsSummary } from '../../visits/reducers/visitsOverview';
+import type { HighlightCardProps } from './HighlightCard';
+import { HighlightCard } from './HighlightCard';
+
+export type VisitsHighlightCardProps = Omit<HighlightCardProps, 'tooltip' | 'children'> & {
+  loading: boolean;
+  excludeBots: boolean;
+  visitsSummary: PartialVisitsSummary;
+};
+
+export const VisitsHighlightCard: FC<VisitsHighlightCardProps> = ({ loading, excludeBots, visitsSummary, ...rest }) => (
+  <HighlightCard
+    tooltip={
+      visitsSummary.bots !== undefined
+        ? <>{excludeBots ? 'Plus' : 'Including'} <b>{prettify(visitsSummary.bots)}</b> potential bot visits</>
+        : undefined
+    }
+    {...rest}
+  >
+    {loading ? 'Loading...' : prettify(
+      excludeBots && visitsSummary.nonBots ? visitsSummary.nonBots : visitsSummary.total,
+    )}
+  </HighlightCard>
+);
--- a/src/servers/helpers/withSelectedServer.tsx
+++ b/src/servers/helpers/withSelectedServer.tsx
@@ -1,8 +1,10 @@
-import { FC, useEffect } from 'react';
+import type { FC } from 'react';
+import { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
-import { Message } from '../../utils/Message';
-import { isNotFoundServer, SelectedServer } from '../data';
 import { NoMenuLayout } from '../../common/NoMenuLayout';
+import { Message } from '../../utils/Message';
+import type { SelectedServer } from '../data';
+import { isNotFoundServer } from '../data';

 interface WithSelectedServerProps {
  selectServer: (serverId: string) => void;
--- a/src/servers/helpers/withoutSelectedServer.tsx
+++ b/src/servers/helpers/withoutSelectedServer.tsx
@@ -1,4 +1,5 @@
-import { FC, useEffect } from 'react';
+import type { FC } from 'react';
+import { useEffect } from 'react';

 interface WithoutSelectedServerProps {
  resetSelectedServer: Function;
--- a/src/servers/reducers/remoteServers.ts
+++ b/src/servers/reducers/remoteServers.ts
@@ -1,8 +1,9 @@
 import pack from '../../../package.json';
-import { hasServerData, ServerData } from '../data';
-import { createServers } from './servers';
+import type { HttpClient } from '../../common/services/HttpClient';
 import { createAsyncThunk } from '../../utils/helpers/redux';
-import { HttpClient } from '../../common/services/HttpClient';
+import type { ServerData } from '../data';
+import { hasServerData } from '../data';
+import { createServers } from './servers';

 const responseToServersList = (data: any): ServerData[] => (Array.isArray(data) ? data.filter(hasServerData) : []);

--- a/src/servers/reducers/selectedServer.ts
+++ b/src/servers/reducers/selectedServer.ts
@@ -1,10 +1,12 @@
-import { createAction, createListenerMiddleware, createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { identity, memoizeWith, pipe } from 'ramda';
-import { versionToPrintable, versionToSemVer as toSemVer } from '../../utils/helpers/version';
-import { isReachableServer, SelectedServer } from '../data';
-import { ShlinkHealth } from '../../api/types';
+import type { PayloadAction } from '@reduxjs/toolkit';
+import { createAction, createListenerMiddleware, createSlice } from '@reduxjs/toolkit';
+import { memoizeWith, pipe } from 'ramda';
+import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkHealth } from '../../api/types';
 import { createAsyncThunk } from '../../utils/helpers/redux';
-import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import { versionToPrintable, versionToSemVer as toSemVer } from '../../utils/helpers/version';
+import type { SelectedServer, ServerWithId } from '../data';
+import { isReachableServer } from '../data';

 const REDUCER_PREFIX = 'shlink/selectedServer';

@@ -18,8 +20,8 @@ const versionToSemVer = pipe(
 );

 const getServerVersion = memoizeWith(
-  identity,
-  async (_serverId: string, health: () => Promise<ShlinkHealth>) => health().then(({ version }) => ({
+  (server: ServerWithId) => `${server.id}_${server.url}_${server.apiKey}`,
+  async (_server: ServerWithId, health: () => Promise<ShlinkHealth>) => health().then(({ version }) => ({
    version: versionToSemVer(version),
    printableVersion: versionToPrintable(version),
  })),
@@ -43,7 +45,7 @@ export const selectServer = (buildShlinkApiClient: ShlinkApiClientBuilder) => cr

    try {
      const { health } = buildShlinkApiClient(selectedServer);
-      const { version, printableVersion } = await getServerVersion(serverId, health);
+      const { version, printableVersion } = await getServerVersion(selectedServer, health);

      return {
        ...selectedServer,
--- a/src/servers/reducers/servers.ts
+++ b/src/servers/reducers/servers.ts
@@ -1,7 +1,8 @@
-import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import type { PayloadAction } from '@reduxjs/toolkit';
+import { createSlice } from '@reduxjs/toolkit';
 import { assoc, dissoc, fromPairs, map, pipe, reduce, toPairs } from 'ramda';
 import { v4 as uuid } from 'uuid';
-import { ServerData, ServersMap, ServerWithId } from '../data';
+import type { ServerData, ServersMap, ServerWithId } from '../data';

 interface EditServer {
  serverId: string;
--- a/src/servers/services/ServersExporter.ts
+++ b/src/servers/services/ServersExporter.ts
@@ -1,12 +1,13 @@
 import { values } from 'ramda';
-import { LocalStorage } from '../../utils/services/LocalStorage';
-import { ServersMap, serverWithIdToServerData } from '../data';
+import type { JsonToCsv } from '../../utils/helpers/csvjson';
 import { saveCsv } from '../../utils/helpers/files';
-import { JsonToCsv } from '../../utils/helpers/csvjson';
+import type { LocalStorage } from '../../utils/services/LocalStorage';
+import type { ServersMap } from '../data';
+import { serverWithIdToServerData } from '../data';

 const SERVERS_FILENAME = 'shlink-servers.csv';

-export default class ServersExporter {
+export class ServersExporter {
  public constructor(
    private readonly storage: LocalStorage,
    private readonly window: Window,
--- a/src/servers/services/ServersImporter.ts
+++ b/src/servers/services/ServersImporter.ts
@@ -1,5 +1,5 @@
-import { ServerData } from '../data';
-import { CsvToJson } from '../../utils/helpers/csvjson';
+import type { CsvToJson } from '../../utils/helpers/csvjson';
+import type { ServerData } from '../data';

 const validateServer = (server: any): server is ServerData =>
  typeof server.url === 'string' && typeof server.apiKey === 'string' && typeof server.name === 'string';
--- a/src/servers/services/provideServices.ts
+++ b/src/servers/services/provideServices.ts
@@ -1,11 +1,18 @@
+import type Bottle from 'bottlejs';
 import { prop } from 'ramda';
-import Bottle from 'bottlejs';
+import type { ConnectDecorator } from '../../container/types';
 import { CreateServer } from '../CreateServer';
-import { ServersDropdown } from '../ServersDropdown';
-import { DeleteServerModal } from '../DeleteServerModal';
 import { DeleteServerButton } from '../DeleteServerButton';
+import { DeleteServerModal } from '../DeleteServerModal';
 import { EditServer } from '../EditServer';
 import { ImportServersBtn } from '../helpers/ImportServersBtn';
+import { ServerError } from '../helpers/ServerError';
+import { withoutSelectedServer } from '../helpers/withoutSelectedServer';
+import { ManageServers } from '../ManageServers';
+import { ManageServersRow } from '../ManageServersRow';
+import { ManageServersRowDropdown } from '../ManageServersRowDropdown';
+import { Overview } from '../Overview';
+import { fetchServers } from '../reducers/remoteServers';
 import {
  resetSelectedServer,
  selectedServerReducerCreator,
@@ -13,18 +20,11 @@ import {
  selectServerListener,
 } from '../reducers/selectedServer';
 import { createServers, deleteServer, editServer, setAutoConnect } from '../reducers/servers';
-import { fetchServers } from '../reducers/remoteServers';
-import { ServerError } from '../helpers/ServerError';
-import { ConnectDecorator } from '../../container/types';
-import { withoutSelectedServer } from '../helpers/withoutSelectedServer';
-import { Overview } from '../Overview';
-import { ManageServers } from '../ManageServers';
-import { ManageServersRow } from '../ManageServersRow';
-import { ManageServersRowDropdown } from '../ManageServersRowDropdown';
+import { ServersDropdown } from '../ServersDropdown';
+import { ServersExporter } from './ServersExporter';
 import { ServersImporter } from './ServersImporter';
-import ServersExporter from './ServersExporter';

-const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
+export const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
  // Components
  bottle.serviceFactory(
    'ManageServers',
@@ -65,7 +65,7 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {

  bottle.serviceFactory('Overview', Overview, 'ShortUrlsTable', 'CreateShortUrl');
  bottle.decorator('Overview', connect(
-    ['shortUrlsList', 'tagsList', 'selectedServer', 'mercureInfo', 'visitsOverview'],
+    ['shortUrlsList', 'tagsList', 'selectedServer', 'mercureInfo', 'visitsOverview', 'settings'],
    ['listShortUrls', 'listTags', 'createNewVisits', 'loadMercureInfo', 'loadVisitsOverview'],
  ));

@@ -89,5 +89,3 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
  bottle.serviceFactory('selectedServerReducerCreator', selectedServerReducerCreator, 'selectServer');
  bottle.serviceFactory('selectedServerReducer', prop('reducer'), 'selectedServerReducerCreator');
 };
-
-export default provideServices;
--- a/src/service-worker.ts
+++ b/src/service-worker.ts
@@ -12,12 +12,13 @@ import { ExpirationPlugin } from 'workbox-expiration';
 import { precacheAndRoute, createHandlerBoundToURL } from 'workbox-precaching';
 import { registerRoute } from 'workbox-routing';
 import { StaleWhileRevalidate } from 'workbox-strategies';
+import pack from '../package.json';

 declare const self: ServiceWorkerGlobalScope;

 clientsClaim();

-// Precache all of the assets generated by your build process.
+// Precache all the assets generated by your build process.
 // Their URLs are injected into the manifest variable below.
 // This variable must be present somewhere in your service worker file,
 // even if you decide not to use precaching. See https://cra.link/PWA
@@ -49,7 +50,7 @@ registerRoute(
    // Return true to signal that we want to use the handler.
    return true;
  },
-  createHandlerBoundToURL(process.env.PUBLIC_URL + '/index.html')
+  createHandlerBoundToURL(`${pack.homepage}/index.html`)
 );

 // An example runtime caching route for requests that aren't handled by the
--- a/src/serviceWorkerRegistration.ts
+++ b/src/serviceWorkerRegistration.ts
@@ -9,6 +9,7 @@

 // To learn more about the benefits of this model and instructions on how to
 // opt-in, read https://cra.link/PWA
+import pack from'../package.json';

 const isLocalhost = Boolean(
  window.location.hostname === 'localhost' ||
@@ -26,7 +27,7 @@ type Config = {
 export function register(config?: Config) {
  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
    // The URL constructor is available in all browsers that support SW.
-    const publicUrl = new URL(process.env.PUBLIC_URL ?? '', window.location.href);
+    const publicUrl = new URL(pack.homepage, window.location.href);
    if (publicUrl.origin !== window.location.origin) {
      // Our service worker won't work if PUBLIC_URL is on a different origin
      // from what our page is served on. This might happen if a CDN is used to
@@ -35,7 +36,7 @@ export function register(config?: Config) {
    }

    window.addEventListener('load', () => {
-      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+      const swUrl = `${pack.homepage}/service-worker.js`;

      if (isLocalhost) {
        // This is running on localhost. Let's check if a service worker still exists or not.
--- a/src/settings/RealTimeUpdatesSettings.tsx
+++ b/src/settings/RealTimeUpdatesSettings.tsx
@@ -1,11 +1,11 @@
-import { FormGroup, Input } from 'reactstrap';
 import classNames from 'classnames';
-import { ToggleSwitch } from '../utils/ToggleSwitch';
-import { SimpleCard } from '../utils/SimpleCard';
+import { FormGroup, Input } from 'reactstrap';
 import { FormText } from '../utils/forms/FormText';
 import { LabeledFormGroup } from '../utils/forms/LabeledFormGroup';
-import { Settings } from './reducers/settings';
 import { useDomId } from '../utils/helpers/hooks';
+import { SimpleCard } from '../utils/SimpleCard';
+import { ToggleSwitch } from '../utils/ToggleSwitch';
+import type { Settings } from './reducers/settings';

 interface RealTimeUpdatesProps {
  settings: Settings;
--- a/src/settings/Settings.tsx
+++ b/src/settings/Settings.tsx
@@ -1,5 +1,5 @@
-import { FC, ReactNode } from 'react';
-import { Navigate, Routes, Route } from 'react-router-dom';
+import type { FC, ReactNode } from 'react';
+import { Navigate, Route, Routes } from 'react-router-dom';
 import { NoMenuLayout } from '../common/NoMenuLayout';
 import { NavPillItem, NavPills } from '../utils/NavPills';

--- a/src/settings/ShortUrlCreationSettings.tsx
+++ b/src/settings/ShortUrlCreationSettings.tsx
@@ -1,11 +1,11 @@
-import { FC, ReactNode } from 'react';
+import type { FC, ReactNode } from 'react';
 import { DropdownItem, FormGroup } from 'reactstrap';
-import { SimpleCard } from '../utils/SimpleCard';
-import { ToggleSwitch } from '../utils/ToggleSwitch';
 import { DropdownBtn } from '../utils/DropdownBtn';
 import { FormText } from '../utils/forms/FormText';
 import { LabeledFormGroup } from '../utils/forms/LabeledFormGroup';
-import { Settings, ShortUrlCreationSettings as ShortUrlsSettings, TagFilteringMode } from './reducers/settings';
+import { SimpleCard } from '../utils/SimpleCard';
+import { ToggleSwitch } from '../utils/ToggleSwitch';
+import type { Settings, ShortUrlCreationSettings as ShortUrlsSettings, TagFilteringMode } from './reducers/settings';

 interface ShortUrlCreationProps {
  settings: Settings;
--- a/src/settings/ShortUrlsListSettings.tsx
+++ b/src/settings/ShortUrlsListSettings.tsx
@@ -1,9 +1,10 @@
-import { FC } from 'react';
-import { OrderingDropdown } from '../utils/OrderingDropdown';
+import type { FC } from 'react';
 import { SHORT_URLS_ORDERABLE_FIELDS } from '../short-urls/data';
-import { SimpleCard } from '../utils/SimpleCard';
 import { LabeledFormGroup } from '../utils/forms/LabeledFormGroup';
-import { DEFAULT_SHORT_URLS_ORDERING, Settings, ShortUrlsListSettings as ShortUrlsSettings } from './reducers/settings';
+import { OrderingDropdown } from '../utils/OrderingDropdown';
+import { SimpleCard } from '../utils/SimpleCard';
+import type { Settings, ShortUrlsListSettings as ShortUrlsSettings } from './reducers/settings';
+import { DEFAULT_SHORT_URLS_ORDERING } from './reducers/settings';

 interface ShortUrlsListSettingsProps {
  settings: Settings;
--- a/src/settings/TagsSettings.tsx
+++ b/src/settings/TagsSettings.tsx
@@ -1,12 +1,9 @@
-import { FC } from 'react';
-import { SimpleCard } from '../utils/SimpleCard';
-import { TagsModeDropdown } from '../tags/TagsModeDropdown';
-import { capitalize } from '../utils/utils';
-import { OrderingDropdown } from '../utils/OrderingDropdown';
+import type { FC } from 'react';
 import { TAGS_ORDERABLE_FIELDS } from '../tags/data/TagsListChildrenProps';
-import { FormText } from '../utils/forms/FormText';
 import { LabeledFormGroup } from '../utils/forms/LabeledFormGroup';
-import { Settings, TagsSettings as TagsSettingsOptions } from './reducers/settings';
+import { OrderingDropdown } from '../utils/OrderingDropdown';
+import { SimpleCard } from '../utils/SimpleCard';
+import type { Settings, TagsSettings as TagsSettingsOptions } from './reducers/settings';

 interface TagsProps {
  settings: Settings;
@@ -15,14 +12,6 @@ interface TagsProps {

 export const TagsSettings: FC<TagsProps> = ({ settings: { tags }, setTagsSettings }) => (
  <SimpleCard title="Tags" className="h-100">
-    <LabeledFormGroup label="Default display mode when managing tags:">
-      <TagsModeDropdown
-        mode={tags?.defaultMode ?? 'cards'}
-        renderTitle={(tagsMode) => capitalize(tagsMode)}
-        onChange={(defaultMode) => setTagsSettings({ ...tags, defaultMode })}
-      />
-      <FormText>Tags will be displayed as <b>{tags?.defaultMode ?? 'cards'}</b>.</FormText>
-    </LabeledFormGroup>
    <LabeledFormGroup noMargin label="Default ordering for tags list:">
      <OrderingDropdown
        items={TAGS_ORDERABLE_FIELDS}
--- a/src/settings/UserInterfaceSettings.tsx
+++ b/src/settings/UserInterfaceSettings.tsx
@@ -1,10 +1,11 @@
-import { FC } from 'react';
+import { faMoon, faSun } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faSun, faMoon } from '@fortawesome/free-solid-svg-icons';
+import type { FC } from 'react';
 import { SimpleCard } from '../utils/SimpleCard';
+import type { Theme } from '../utils/theme';
+import { changeThemeInMarkup } from '../utils/theme';
 import { ToggleSwitch } from '../utils/ToggleSwitch';
-import { changeThemeInMarkup, Theme } from '../utils/theme';
-import { Settings, UiSettings } from './reducers/settings';
+import type { Settings, UiSettings } from './reducers/settings';
 import './UserInterfaceSettings.scss';

 interface UserInterfaceProps {
--- a/src/settings/VisitsSettings.tsx
+++ b/src/settings/VisitsSettings.tsx
@@ -1,20 +1,39 @@
-import { FC } from 'react';
-import { SimpleCard } from '../utils/SimpleCard';
+import type { FC } from 'react';
+import { FormGroup } from 'reactstrap';
 import { DateIntervalSelector } from '../utils/dates/DateIntervalSelector';
+import { FormText } from '../utils/forms/FormText';
 import { LabeledFormGroup } from '../utils/forms/LabeledFormGroup';
-import { Settings, VisitsSettings as VisitsSettingsConfig } from './reducers/settings';
+import type { DateInterval } from '../utils/helpers/dateIntervals';
+import { SimpleCard } from '../utils/SimpleCard';
+import { ToggleSwitch } from '../utils/ToggleSwitch';
+import type { Settings, VisitsSettings as VisitsSettingsConfig } from './reducers/settings';

 interface VisitsProps {
  settings: Settings;
  setVisitsSettings: (settings: VisitsSettingsConfig) => void;
 }

+const currentDefaultInterval = (settings: Settings): DateInterval => settings.visits?.defaultInterval ?? 'last30Days';
+
 export const VisitsSettings: FC<VisitsProps> = ({ settings, setVisitsSettings }) => (
  <SimpleCard title="Visits" className="h-100">
+    <FormGroup>
+      <ToggleSwitch
+        checked={!!settings.visits?.excludeBots}
+        onChange={(excludeBots) => setVisitsSettings(
+          { defaultInterval: currentDefaultInterval(settings), excludeBots },
+        )}
+      >
+        Exclude bots wherever possible (this option&lsquo;s effect might depend on Shlink server&lsquo;s version).
+        <FormText>
+          The visits coming from potential bots will be <b>{settings.visits?.excludeBots ? 'excluded' : 'included'}</b>.
+        </FormText>
+      </ToggleSwitch>
+    </FormGroup>
    <LabeledFormGroup noMargin label="Default interval to load on visits sections:">
      <DateIntervalSelector
        allText="All visits"
-        active={settings.visits?.defaultInterval ?? 'last30Days'}
+        active={currentDefaultInterval(settings)}
        onChange={(defaultInterval) => setVisitsSettings({ defaultInterval })}
      />
    </LabeledFormGroup>
--- a/src/settings/helpers/index.ts
+++ b/src/settings/helpers/index.ts
@@ -1,4 +1,4 @@
-import { ShlinkState } from '../../container/types';
+import type { ShlinkState } from '../../container/types';

 /* eslint-disable no-param-reassign */
 export const migrateDeprecatedSettings = (state: Partial<ShlinkState>): Partial<ShlinkState> => {
@@ -11,12 +11,5 @@ export const migrateDeprecatedSettings = (state: Partial<ShlinkState>): Partial<
    state.settings.visits && (state.settings.visits.defaultInterval = 'last180Days');
  }

-  // The "tags display mode" option has been moved from "ui" to "tags"
-  state.settings.tags = {
-    ...state.settings.tags,
-    defaultMode: state.settings.tags?.defaultMode ?? (state.settings.ui as any)?.tagsMode,
-  };
-  state.settings.ui && delete (state.settings.ui as any).tagsMode;
-
  return state;
 };
--- a/src/settings/reducers/settings.ts
+++ b/src/settings/reducers/settings.ts
@@ -1,9 +1,10 @@
-import { createSlice, PayloadAction, PrepareAction } from '@reduxjs/toolkit';
+import type { PayloadAction, PrepareAction } from '@reduxjs/toolkit';
+import { createSlice } from '@reduxjs/toolkit';
 import { mergeDeepRight } from 'ramda';
-import { Theme } from '../../utils/theme';
-import { DateInterval } from '../../utils/helpers/dateIntervals';
-import { TagsOrder } from '../../tags/data/TagsListChildrenProps';
-import { ShortUrlsOrder } from '../../short-urls/data';
+import type { ShortUrlsOrder } from '../../short-urls/data';
+import type { TagsOrder } from '../../tags/data/TagsListChildrenProps';
+import type { DateInterval } from '../../utils/helpers/dateIntervals';
+import type { Theme } from '../../utils/theme';

 export const DEFAULT_SHORT_URLS_ORDERING: ShortUrlsOrder = {
  field: 'dateCreated',
@@ -28,19 +29,17 @@ export interface ShortUrlCreationSettings {
  forwardQuery?: boolean;
 }

-export type TagsMode = 'cards' | 'list';
-
 export interface UiSettings {
  theme: Theme;
 }

 export interface VisitsSettings {
  defaultInterval: DateInterval;
+  excludeBots?: boolean;
 }

 export interface TagsSettings {
  defaultOrdering?: TagsOrder;
-  defaultMode?: TagsMode;
 }

 export interface ShortUrlsListSettings {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alejandro Celaya	457458a894	Merge pull request #820 from shlinkio/develop Release 3.10.0	2023-03-19 12:00:45 +01:00
Alejandro Celaya	f6334c3618	Merge pull request #819 from acelaya-forks/feature/tags-non-bot-visits Feature/tags non bot visits	2023-03-19 11:54:54 +01:00
Alejandro Celaya	cf27de965e	Remove redundant type	2023-03-19 11:50:06 +01:00
Alejandro Celaya	43b2926063	Update changelog	2023-03-19 11:47:02 +01:00
Alejandro Celaya	1d6464fefb	Take into consideration types of visits when increasing tags visits	2023-03-19 11:44:40 +01:00
Alejandro Celaya	927ab76dbd	Increase required coverage	2023-03-19 10:46:52 +01:00
Alejandro Celaya	34cfe2077b	Test proper amount of visits is displayed in TagsList	2023-03-19 10:44:09 +01:00
Alejandro Celaya	4ebe23e89f	Add logic to dynamically exclude bots visits in tags table	2023-03-19 10:32:11 +01:00
Alejandro Celaya	8fa61a6301	Merge pull request #817 from acelaya-forks/feature/tags-stats Feature/tags stats	2023-03-18 16:36:06 +01:00
Alejandro Celaya	96c20b36a5	Split tagsList and tagsStats methods in ShlinkApiClient for clarity	2023-03-18 16:32:04 +01:00
Alejandro Celaya	a9af5163c1	Update changelog	2023-03-18 16:27:52 +01:00
Alejandro Celaya	b87b108e53	Use /tags/stats endpoint when the server supports it	2023-03-18 16:26:28 +01:00
Alejandro Celaya	ddaec7c6ac	Merge pull request #816 from acelaya-forks/feature/decouple-actions Feature/decouple actions	2023-03-18 16:07:15 +01:00
Alejandro Celaya	4e8e16f16d	Refactor of redux tests to avoid covering RTK implementation details	2023-03-18 16:02:06 +01:00
Alejandro Celaya	9cefdb7977	First refactor of redux tests to avoid covering RTK implementation details	2023-03-18 12:09:38 +01:00
Alejandro Celaya	a6d000714b	Merge pull request #815 from acelaya-forks/feature/overview-bots Feature/overview bots	2023-03-18 11:15:01 +01:00
Alejandro Celaya	54758272be	Update changelog	2023-03-18 11:10:50 +01:00
Alejandro Celaya	8e9e2c5b61	Create test for VisitsHighlightCard	2023-03-18 11:10:03 +01:00
Alejandro Celaya	934bf495a0	Extend overview to exclude/include bot visits based on config	2023-03-18 10:55:07 +01:00
Alejandro Celaya	1d8189369c	Enhance visits overview reducer to handle bot and non-bots visits amounts	2023-03-18 10:54:14 +01:00
Alejandro Celaya	25aa9b9bd7	Enhance types including potential bots on visits summary endpoint	2023-03-18 10:29:49 +01:00
Alejandro Celaya	a1b879a5b4	Add support for a tooltip on HighlightCard component	2023-03-18 10:17:17 +01:00
Alejandro Celaya	b70724f7d6	Update babel-typescript plugin	2023-03-18 10:08:44 +01:00
Alejandro Celaya	a52f96f8e5	Merge pull request #814 from acelaya-forks/feature/update-ts-vite Update to latest TypeScript and Vite versions	2023-03-17 08:57:11 +01:00
Alejandro Celaya	970c573a12	Update to latest TypeScript and Vite versions	2023-03-17 08:49:47 +01:00
Alejandro Celaya	46749044e2	Merge pull request #813 from acelaya-forks/feature/device-long-urls Feature/device long urls	2023-03-14 09:11:54 +01:00
Alejandro Celaya	16d748800c	Update copy-to-clipboard icons	2023-03-14 09:06:57 +01:00
Alejandro Celaya	3e698b045a	Add IconInput test	2023-03-14 09:02:12 +01:00
Alejandro Celaya	999b21577a	Removed duplicated CSS from DateInput	2023-03-14 08:50:53 +01:00
Alejandro Celaya	3be5126e2d	Add missing ref to IconInput	2023-03-13 18:18:35 +01:00
Alejandro Celaya	2b14c49c80	Update snapshots	2023-03-13 18:04:09 +01:00
Alejandro Celaya	bace2a10e8	Create component to display input with an icon	2023-03-13 18:02:29 +01:00
Alejandro Celaya	006e6b30b7	Update changelog	2023-03-13 09:06:49 +01:00
Alejandro Celaya	4c5d0321d2	Add support for device-specific long URLs when using Shlink 3.5.0 or newer	2023-03-13 09:05:54 +01:00
Alejandro Celaya	fa69c21fa2	Merge pull request #811 from acelaya-forks/feature/feature-flag-hooks Convert feature flags into hooks	2023-03-11 10:38:26 +01:00
Alejandro Celaya	95439e5602	Convert feature flags into hooks	2023-03-11 10:33:03 +01:00
Alejandro Celaya	bbd8d8ef4e	Fix border radius on tags input	2023-03-10 09:17:07 +01:00
Alejandro Celaya	ef269d565c	Merge pull request #810 from acelaya-forks/feature/fallback-bots Make sure the request to get the latest fallback visit respects bots config	2023-03-10 08:58:56 +01:00
Alejandro Celaya	8acf6dda6e	Make sure the request to get the latest fallback visit respects bots config	2023-03-10 08:53:05 +01:00
Alejandro Celaya	d18219dc14	Merge pull request #806 from acelaya-forks/feature/preview Feature/preview	2023-03-08 09:27:57 +01:00
Alejandro Celaya	3f1718f4c5	Fix merge conflicts	2023-03-08 09:21:05 +01:00
Alejandro Celaya	825a749b45	Replace serve with vite preview to check generated build	2023-03-08 09:18:32 +01:00
Alejandro Celaya	c2eb09e664	Merge pull request #804 from acelaya-forks/feature/update-coding-standard Feature/update coding standard	2023-02-18 11:44:05 +01:00
Alejandro Celaya	adb670dd0c	Update coding standard	2023-02-18 11:40:04 +01:00
Alejandro Celaya	5e9ec071dc	Remove default exports	2023-02-18 11:37:49 +01:00
Alejandro Celaya	1f41f8da23	Ordered imports alphabetically	2023-02-18 11:15:35 +01:00
Alejandro Celaya	2a5480da79	Add import type whenever possible	2023-02-18 10:40:37 +01:00
Alejandro Celaya	7add854b40	Merge pull request #803 from acelaya-forks/feature/remove-stryker Remove stryker and mutation testing	2023-02-17 20:31:39 +01:00
Alejandro Celaya	e639cd0bd2	Update changelog	2023-02-17 20:27:48 +01:00
Alejandro Celaya	3503f1f580	Remove stryker and mutation testing	2023-02-17 20:09:31 +01:00
Alejandro Celaya	853dcbd69a	Merge pull request #801 from acelaya-forks/feature/vite-4.1 Update to vite 4.1	2023-02-11 13:22:56 +01:00
Alejandro Celaya	c54fff5472	Update to vite 4.1	2023-02-11 13:16:41 +01:00
Alejandro Celaya	699d3d3eaa	Fix twitter badge	2023-01-28 11:18:08 +01:00
Alejandro Celaya	0c91f488f0	Merge pull request #794 from acelaya-forks/feature/domain Replace references to doma.in with s.test	2023-01-18 08:12:25 +01:00
Alejandro Celaya	d3a644877e	Replace references to doma.in with s.test	2023-01-17 22:53:49 +01:00
Alejandro Celaya	aac2832eb7	Merge pull request #791 from acelaya-forks/feature/fix-ref-types Improved types on element ref objects and their usage	2023-01-10 20:11:36 +01:00
Alejandro Celaya	487c832f5b	Improved types on element ref objects and their usage	2023-01-10 20:04:47 +01:00
Alejandro Celaya	98e2e57bb2	Merge pull request #790 from shlinkio/dependabot/npm_and_yarn/json5-1.0.2 Bump json5 from 1.0.1 to 1.0.2	2023-01-08 09:04:30 +01:00
dependabot[bot]	c5170df402	Bump json5 from 1.0.1 to 1.0.2 Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-01-08 06:27:50 +00:00
Alejandro Celaya	4be38dfd0c	Merge pull request #789 from shlinkio/develop Release 3.9.1	2022-12-31 18:22:38 +01:00
Alejandro Celaya	597f2b69e9	Merge pull request #788 from acelaya-forks/feature/fix-base-path Fixed wrong base path being used in vite config	2022-12-31 18:21:26 +01:00
Alejandro Celaya	c078a5fb55	Fixed wrong base path being used in vite config	2022-12-31 18:15:47 +01:00
Alejandro Celaya	5db0326350	Merge pull request #786 from shlinkio/develop Release 3.9.0	2022-12-31 17:07:56 +01:00
Alejandro Celaya	7f6c678eaa	Merge pull request #785 from acelaya-forks/feature/server-error-fix Feature/server error fix	2022-12-31 17:02:12 +01:00
Alejandro Celaya	37ac6cebc1	Fixed selectedServer reucer test	2022-12-31 16:56:22 +01:00
Alejandro Celaya	27099aa7fb	Updated changelog	2022-12-31 16:43:34 +01:00
Alejandro Celaya	91f4d09608	Ensured a recconnection happens to selected server when its params are edited	2022-12-31 16:42:04 +01:00
Alejandro Celaya	d34b9b1233	Merge pull request #783 from acelaya-forks/feature/visits-async-thunk Feature/visits async thunk	2022-12-31 10:47:30 +01:00
Alejandro Celaya	2badd2b743	Fixed warning in tests	2022-12-31 10:47:15 +01:00
Alejandro Celaya	4517f38680	Fixed injection of visits loaders	2022-12-31 10:43:03 +01:00
Alejandro Celaya	84f9727836	Updated changelog	2022-12-31 10:35:58 +01:00
Alejandro Celaya	85452cde23	Enhanced visits async thunk so that it wraps both standard async thunk actions and extra ones	2022-12-31 10:34:29 +01:00
Alejandro Celaya	9b19113262	Merge pull request #780 from acelaya-forks/feature/short-urls-filtering Feature/short urls filtering	2022-12-29 19:26:44 +01:00
Alejandro Celaya	e1bb091363	Updated changelog	2022-12-29 19:21:11 +01:00
Alejandro Celaya	732d664715	Fixed coding styles	2022-12-29 19:19:46 +01:00
Alejandro Celaya	33498ce903	Added support to filter out disabled short URLs	2022-12-29 19:03:17 +01:00
Alejandro Celaya	c25b74de84	Added test for ShortUrlsFilterDropdown	2022-12-29 10:35:50 +01:00
Alejandro Celaya	1c39e3402b	Added function to parse optional boolean to string	2022-12-28 23:00:55 +01:00
Alejandro Celaya	a3bd10bc82	Updated ShlinkApiClient to support more filtering options for short URLs list	2022-12-28 22:59:11 +01:00
Alejandro Celaya	d6d237fc52	Merge pull request #779 from shlinkio/feature/tweak-ts Added --noEmit to tsc as part of production build	2022-12-26 10:31:31 +01:00
Alejandro Celaya	9b7a169110	Added --noEmit to tsc as part of production build	2022-12-26 10:24:53 +01:00
Alejandro Celaya	2b17a24206	Merge pull request #778 from acelaya-forks/feature/chartjs-4 Feature/chartjs 4	2022-12-25 22:52:49 +01:00
Alejandro Celaya	a0d9bd6f09	Fixed type error in AsideMenu	2022-12-25 22:48:47 +01:00
Alejandro Celaya	cd33abd92d	Updated changelog	2022-12-25 22:45:21 +01:00
Alejandro Celaya	c83563c0ea	Fixed subpath and tests for chartjs	2022-12-25 22:44:43 +01:00
Alejandro Celaya	79515ac960	Updated production deps	2022-12-25 22:31:28 +01:00
Alejandro Celaya	8e8a5f3fd6	Updated to chartjs 4	2022-12-25 09:53:50 +01:00
Alejandro Celaya	51283cc130	Merge pull request #777 from acelaya-forks/feature/fix-visits-filters Fixed bots filter getting reset when changing date	2022-12-25 09:49:57 +01:00
Alejandro Celaya	4023c077b3	Fixed bots filter getting reset when changing date	2022-12-25 09:44:47 +01:00
Alejandro Celaya	f3cf21ba08	Merge pull request #776 from acelaya-forks/feature/vite Feature/vite	2022-12-25 09:30:14 +01:00
Alejandro Celaya	bec7b59abf	Updated changelog	2022-12-25 09:20:45 +01:00
Alejandro Celaya	3e0abe329f	Fixed preview generation, including service worker	2022-12-25 09:19:26 +01:00
Alejandro Celaya	822fe3db9e	Small fixes	2022-12-25 09:13:45 +01:00
Alejandro Celaya	408ec82a10	Migrated serice worker generation to vite-plugin-pwa	2022-12-24 19:17:33 +01:00
Alejandro Celaya	ced3fa00ef	Ensured service-worker is bundled separately	2022-12-24 18:20:01 +01:00
Alejandro Celaya	595b3c0450	Updated to node 18 and fixed replace-version script for vite structure	2022-12-24 11:34:39 +01:00
Alejandro Celaya	1d1c8153e7	Updated babel plugins for jest	2022-12-24 10:48:03 +01:00
Alejandro Celaya	52f556eb2e	Migrated from react-scripts and webpack to vite	2022-12-24 10:18:26 +01:00
Alejandro Celaya	35fcd20123	Merge pull request #775 from acelaya-forks/feature/shlink-updates Feature/shlink updates	2022-12-23 21:21:06 +01:00
Alejandro Celaya	e518b94fba	Fixed tests	2022-12-23 21:16:17 +01:00
Alejandro Celaya	05553ba18a	Updated changelog	2022-12-23 21:09:35 +01:00
Alejandro Celaya	4a9e05cf17	Updated prop to make it required as in Shlink v2.8.0 or newer	2022-12-23 21:08:41 +01:00
Alejandro Celaya	60fc351344	Removed references to feature checks for version 2.7	2022-12-23 21:06:59 +01:00
Alejandro Celaya	815e06809a	Removed references to feature checks for version 2.8	2022-12-23 20:42:47 +01:00
Alejandro Celaya	bfcdf703e8	Merge pull request #772 from acelaya-forks/feature/exclude-bots Feature/exclude bots	2022-12-23 20:29:24 +01:00
Alejandro Celaya	ddb2c1e641	Updated changelog	2022-12-23 20:24:55 +01:00
Alejandro Celaya	e790360de9	Added filtering dropdown to short URLs filtering bar	2022-12-23 20:15:52 +01:00
Alejandro Celaya	b00f6fadf8	Added test for parseBooleanToString	2022-12-23 20:03:27 +01:00
Alejandro Celaya	1d6f4bf5db	Take into consideration exclñudeBots from query on short URLs row	2022-12-23 20:00:59 +01:00
Alejandro Celaya	80cea91339	Ensured bots exclusion is selected by default in visits filter dropdown, if it was selected in settings	2022-12-23 10:07:23 +01:00
Alejandro Celaya	5942cd6fcf	Ensured proper amount of visits is displayed on short URLs based on config	2022-12-22 18:39:09 +01:00
Alejandro Celaya	2859ba6cd2	Simplified reducer logic to update short URLs when new visits come	2022-12-22 18:30:02 +01:00
Alejandro Celaya	b9285fd600	Enrues proper ordering is sent to shlink when ordering by visits	2022-12-22 18:07:44 +01:00
Alejandro Celaya	901df2b90d	Added new setting to exclude bots from visits, wherever possible	2022-12-22 12:25:25 +01:00
Alejandro Celaya	662573d940	Merge pull request #771 from acelaya-forks/feature/highlight-disabled Feature/highlight disabled	2022-12-19 20:49:46 +01:00
Alejandro Celaya	a8dcd3cac7	Updated changelog	2022-12-19 20:45:02 +01:00
Alejandro Celaya	0ac16a1626	Added test for ShortUrlStatus component	2022-12-19 20:43:55 +01:00
Alejandro Celaya	5162fa2a13	Created Tags test	2022-12-19 20:27:33 +01:00
Alejandro Celaya	73a3d1d50f	Extended ShortUrlVisitsCount test to cover different contents of the tooltip	2022-12-19 20:18:50 +01:00
Alejandro Celaya	afc272c4d9	Improved ShortUrlsRow test covering new status icon	2022-12-19 20:00:52 +01:00
Alejandro Celaya	f8bcaed3ad	Moved short URL status to the last column in the table	2022-12-19 19:40:04 +01:00
Alejandro Celaya	d1a1b7426e	Added ShortUrlStatus concept	2022-12-18 19:26:30 +01:00
Alejandro Celaya	99485cc6d8	Removed conept on short URL tags	2022-12-18 13:29:39 +01:00
Alejandro Celaya	187fee46f4	Added extra info and new label to highlight disabled short URLs	2022-12-18 13:17:49 +01:00
Alejandro Celaya	90837546ab	Exported some specific component types and improved spacing in short URLs list	2022-12-18 10:12:34 +01:00
Alejandro Celaya	f4cf4850a3	Merge pull request #769 from acelaya-forks/feature/drop-tags-cards Feature/drop tags cards	2022-12-17 20:07:51 +01:00
Alejandro Celaya	4ef1e491bc	Updated changelog	2022-12-17 20:01:31 +01:00
Alejandro Celaya	170f45d46b	Removed references to tagsMode setting	2022-12-17 19:59:55 +01:00
Alejandro Celaya	37caa1ad19	Removed references to tags cards	2022-12-17 19:56:58 +01:00
Alejandro Celaya	0312a0911c	Fixed build badge in README	2022-12-17 10:54:18 +01:00
Alejandro Celaya	cc88f7678c	Merge pull request #768 from shlinkio/develop Release 3.8.2	2022-12-17 10:07:37 +01:00
Alejandro Celaya	653b470fec	Merge pull request #767 from acelaya-forks/feature/fixes Feature/fixes	2022-12-17 10:03:19 +01:00
Alejandro Celaya	2603f2f987	Added missing application/json content-type when calling Shlink with payload	2022-12-17 09:57:40 +01:00
Alejandro Celaya	b106b3cd0a	Updated changelog	2022-12-17 09:29:34 +01:00
Alejandro Celaya	b2b6b3af18	Fixed visits query being lost when switching between sub-sections	2022-12-17 09:28:42 +01:00
Alejandro Celaya	f911f78c95	Merge pull request #763 from shlinkio/dependabot/npm_and_yarn/express-4.18.2 Bump express from 4.17.1 to 4.18.2	2022-12-14 19:06:22 +01:00
dependabot[bot]	a7560443f3	Bump express from 4.17.1 to 4.18.2 Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-12-14 17:59:03 +00:00
Alejandro Celaya	ab757b2f67	Merge pull request #759 from shlinkio/develop Release 3.8.1	2022-12-06 20:21:39 +01:00
Alejandro Celaya	261cc68624	Merge pull request #758 from acelaya-forks/feature/fix-visits-interval Feature/fix visits interval	2022-12-06 20:20:22 +01:00
Alejandro Celaya	dc2db3a463	Updated changelog	2022-12-06 20:15:44 +01:00
Alejandro Celaya	ae625e4c8a	Fixed all visits interval not working after loading the default configured interval unless switching to another one first	2022-12-06 20:13:43 +01:00
Alejandro Celaya	6f5c5b122f	Fixed fallback interval not working on visits pages	2022-12-06 18:09:50 +01:00
Alejandro Celaya	5d712d7d78	Created helper curried function to compare two values	2022-12-05 17:29:59 +01:00
Alejandro Celaya	1654784471	Created now function and refactored intervalToDateRange	2022-12-05 17:18:00 +01:00