From 2973c67eaff50d609985f4a21fe3afe785065a84 Mon Sep 17 00:00:00 2001
From: Gauthier <mail@gauthierth.fr>
Date: Mon, 26 Aug 2024 12:19:00 +0200
Subject: [PATCH] fix: resolve type errors

---
 .../Discover/DiscoverTvUpcoming.tsx           |   4 +-
 .../OverrideRule/OverrideRuleTile.tsx         | 322 +++++++++---------
 src/i18n/locale/en.json                       |   3 +-
 3 files changed, 170 insertions(+), 159 deletions(-)

diff --git a/src/components/Discover/DiscoverTvUpcoming.tsx b/src/components/Discover/DiscoverTvUpcoming.tsx
index 182cd1a54..a6a3be170 100644
--- a/src/components/Discover/DiscoverTvUpcoming.tsx
+++ b/src/components/Discover/DiscoverTvUpcoming.tsx
@@ -7,7 +7,9 @@ import defineMessages from '@app/utils/defineMessages';
 import type { TvResult } from '@server/models/Search';
 import { useIntl } from 'react-intl';
 
-const messages = defineMessages('components.DiscoverTvUpcoming', {});
+const messages = defineMessages('components.DiscoverTvUpcoming', {
+  upcomingtv: 'Upcoming Series',
+});
 
 const DiscoverTvUpcoming = () => {
   const intl = useIntl();
diff --git a/src/components/Settings/OverrideRule/OverrideRuleTile.tsx b/src/components/Settings/OverrideRule/OverrideRuleTile.tsx
index 474708137..c5c0451a7 100644
--- a/src/components/Settings/OverrideRule/OverrideRuleTile.tsx
+++ b/src/components/Settings/OverrideRule/OverrideRuleTile.tsx
@@ -89,171 +89,179 @@ const OverrideRuleTile = ({
     })();
   }, [rules]);
 
-  return rules
-    ?.filter(
-      (rule) =>
-        (rule.radarrServiceId !== null &&
-          rule.radarrServiceId === radarr?.id) ||
-        (rule.sonarrServiceId !== null && rule.sonarrServiceId === sonarr?.id)
-    )
-    .map((rule) => (
-      <li className="flex h-full flex-col rounded-lg bg-gray-800 text-left shadow ring-1 ring-gray-500">
-        <div className="flex w-full flex-1 items-center justify-between space-x-6 p-6">
-          <div className="flex-1 truncate">
-            <span className="text-lg">
-              {intl.formatMessage(messages.conditions)}
-            </span>
-            {rule.users && (
-              <p className="truncate text-sm leading-5 text-gray-300">
-                <span className="mr-2 font-bold">
-                  {intl.formatMessage(messages.users)}
+  return (
+    <>
+      {rules
+        .filter(
+          (rule) =>
+            (rule.radarrServiceId !== null &&
+              rule.radarrServiceId === radarr?.id) ||
+            (rule.sonarrServiceId !== null &&
+              rule.sonarrServiceId === sonarr?.id)
+        )
+        .map((rule) => (
+          <li className="flex h-full flex-col rounded-lg bg-gray-800 text-left shadow ring-1 ring-gray-500">
+            <div className="flex w-full flex-1 items-center justify-between space-x-6 p-6">
+              <div className="flex-1 truncate">
+                <span className="text-lg">
+                  {intl.formatMessage(messages.conditions)}
                 </span>
-                <div className="inline-flex gap-2">
-                  {rule.users.split(',').map((userId) => {
-                    return (
-                      <span>
-                        {
-                          users?.find((user) => user.id === Number(userId))
-                            ?.displayName
-                        }
-                      </span>
-                    );
-                  })}
-                </div>
-              </p>
-            )}
-            {rule.genre && (
-              <p className="truncate text-sm leading-5 text-gray-300">
-                <span className="mr-2 font-bold">
-                  {intl.formatMessage(messages.genre)}
-                </span>
-                <div className="inline-flex gap-2">
-                  {rule.genre.split(',').map((genreId) => (
-                    <span>
-                      {genres?.find((g) => g.id === Number(genreId))?.name}
+                {rule.users && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.users)}
                     </span>
-                  ))}
-                </div>
-              </p>
-            )}
-            {rule.language && (
-              <p className="truncate text-sm leading-5 text-gray-300">
-                <span className="mr-2 font-bold">
-                  {intl.formatMessage(messages.language)}
+                    <div className="inline-flex gap-2">
+                      {rule.users.split(',').map((userId) => {
+                        return (
+                          <span>
+                            {
+                              users?.find((user) => user.id === Number(userId))
+                                ?.displayName
+                            }
+                          </span>
+                        );
+                      })}
+                    </div>
+                  </p>
+                )}
+                {rule.genre && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.genre)}
+                    </span>
+                    <div className="inline-flex gap-2">
+                      {rule.genre.split(',').map((genreId) => (
+                        <span>
+                          {genres?.find((g) => g.id === Number(genreId))?.name}
+                        </span>
+                      ))}
+                    </div>
+                  </p>
+                )}
+                {rule.language && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.language)}
+                    </span>
+                    <div className="inline-flex gap-2">
+                      {rule.language
+                        .split('|')
+                        .filter((languageId) => languageId !== 'server')
+                        .map((languageId) => {
+                          const language = languages?.find(
+                            (language) => language.iso_639_1 === languageId
+                          );
+                          if (!language) return null;
+                          const languageName =
+                            intl.formatDisplayName(language.iso_639_1, {
+                              type: 'language',
+                              fallback: 'none',
+                            }) ?? language.english_name;
+                          return <span>{languageName}</span>;
+                        })}
+                    </div>
+                  </p>
+                )}
+                {rule.keywords && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.keywords)}
+                    </span>
+                    <div className="inline-flex gap-2">
+                      {rule.keywords.split(',').map((keywordId) => {
+                        return (
+                          <span>
+                            {
+                              keywords?.find(
+                                (keyword) => keyword.id === Number(keywordId)
+                              )?.name
+                            }
+                          </span>
+                        );
+                      })}
+                    </div>
+                  </p>
+                )}
+                <span className="text-lg">
+                  {intl.formatMessage(messages.settings)}
                 </span>
-                <div className="inline-flex gap-2">
-                  {rule.language
-                    .split('|')
-                    .filter((languageId) => languageId !== 'server')
-                    .map((languageId) => {
-                      const language = languages?.find(
-                        (language) => language.iso_639_1 === languageId
-                      );
-                      if (!language) return null;
-                      const languageName =
-                        intl.formatDisplayName(language.iso_639_1, {
-                          type: 'language',
-                          fallback: 'none',
-                        }) ?? language.english_name;
-                      return <span>{languageName}</span>;
-                    })}
+                {rule.profileId && (
+                  <p className="runcate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.qualityprofile)}
+                    </span>
+                    {
+                      testResponse.profiles.find(
+                        (profile) => rule.profileId === profile.id
+                      )?.name
+                    }
+                  </p>
+                )}
+                {rule.rootFolder && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.rootfolder)}
+                    </span>
+                    {rule.rootFolder}
+                  </p>
+                )}
+                {rule.tags && rule.tags.length > 0 && (
+                  <p className="truncate text-sm leading-5 text-gray-300">
+                    <span className="mr-2 font-bold">
+                      {intl.formatMessage(messages.tags)}
+                    </span>
+                    <div className="inline-flex gap-2">
+                      {rule.tags.split(',').map((tag) => (
+                        <span>
+                          {
+                            testResponse.tags?.find((t) => t.id === Number(tag))
+                              ?.label
+                          }
+                        </span>
+                      ))}
+                    </div>
+                  </p>
+                )}
+              </div>
+            </div>
+            <div className="border-t border-gray-500">
+              <div className="-mt-px flex">
+                <div className="flex w-0 flex-1 border-r border-gray-500">
+                  <button
+                    onClick={() =>
+                      setOverrideRuleModal({ open: true, rule, testResponse })
+                    }
+                    className="focus:ring-blue relative -mr-px inline-flex w-0 flex-1 items-center justify-center rounded-bl-lg border border-transparent py-4 text-sm font-medium leading-5 text-gray-200 transition duration-150 ease-in-out hover:text-white focus:z-10 focus:border-gray-500 focus:outline-none"
+                  >
+                    <PencilIcon className="mr-2 h-5 w-5" />
+                    <span>{intl.formatMessage(globalMessages.edit)}</span>
+                  </button>
                 </div>
-              </p>
-            )}
-            {rule.keywords && (
-              <p className="truncate text-sm leading-5 text-gray-300">
-                <span className="mr-2 font-bold">
-                  {intl.formatMessage(messages.keywords)}
-                </span>
-                <div className="inline-flex gap-2">
-                  {rule.keywords.split(',').map((keywordId) => {
-                    return (
-                      <span>
+                <div className="-ml-px flex w-0 flex-1">
+                  <button
+                    onClick={async () => {
+                      const res = await fetch(
+                        `/api/v1/overrideRule/${rule.id}`,
                         {
-                          keywords?.find(
-                            (keyword) => keyword.id === Number(keywordId)
-                          )?.name
+                          method: 'DELETE',
                         }
-                      </span>
-                    );
-                  })}
-                </div>
-              </p>
-            )}
-            <span className="text-lg">
-              {intl.formatMessage(messages.settings)}
-            </span>
-            {rule.profileId && (
-              <p className="runcate text-sm leading-5 text-gray-300">
-                <span className="mr-2 font-bold">
-                  {intl.formatMessage(messages.qualityprofile)}
-                </span>
-                {
-                  testResponse.profiles.find(
-                    (profile) => rule.profileId === profile.id
-                  )?.name
-                }
-              </p>
-            )}
-            {rule.rootFolder && (
-              <p className="truncate text-sm leading-5 text-gray-300">
-                <span className="mr-2 font-bold">
-                  {intl.formatMessage(messages.rootfolder)}
-                </span>
-                {rule.rootFolder}
-              </p>
-            )}
-            {rule.tags && rule.tags.length > 0 && (
-              <p className="truncate text-sm leading-5 text-gray-300">
-                <span className="mr-2 font-bold">
-                  {intl.formatMessage(messages.tags)}
-                </span>
-                <div className="inline-flex gap-2">
-                  {rule.tags.split(',').map((tag) => (
-                    <span>
-                      {
-                        testResponse.tags?.find((t) => t.id === Number(tag))
-                          ?.label
-                      }
-                    </span>
-                  ))}
+                      );
+                      if (!res.ok) throw new Error();
+                      revalidate();
+                    }}
+                    className="focus:ring-blue relative inline-flex w-0 flex-1 items-center justify-center rounded-br-lg border border-transparent py-4 text-sm font-medium leading-5 text-gray-200 transition duration-150 ease-in-out hover:text-white focus:z-10 focus:border-gray-500 focus:outline-none"
+                  >
+                    <TrashIcon className="mr-2 h-5 w-5" />
+                    <span>{intl.formatMessage(globalMessages.delete)}</span>
+                  </button>
                 </div>
-              </p>
-            )}
-          </div>
-        </div>
-        <div className="border-t border-gray-500">
-          <div className="-mt-px flex">
-            <div className="flex w-0 flex-1 border-r border-gray-500">
-              <button
-                onClick={() =>
-                  setOverrideRuleModal({ open: true, rule, testResponse })
-                }
-                className="focus:ring-blue relative -mr-px inline-flex w-0 flex-1 items-center justify-center rounded-bl-lg border border-transparent py-4 text-sm font-medium leading-5 text-gray-200 transition duration-150 ease-in-out hover:text-white focus:z-10 focus:border-gray-500 focus:outline-none"
-              >
-                <PencilIcon className="mr-2 h-5 w-5" />
-                <span>{intl.formatMessage(globalMessages.edit)}</span>
-              </button>
-            </div>
-            <div className="-ml-px flex w-0 flex-1">
-              <button
-                onClick={async () => {
-                  const res = await fetch(`/api/v1/overrideRule/${rule.id}`, {
-                    method: 'DELETE',
-                  });
-                  if (!res.ok) throw new Error();
-                  revalidate();
-                }}
-                className="focus:ring-blue relative inline-flex w-0 flex-1 items-center justify-center rounded-br-lg border border-transparent py-4 text-sm font-medium leading-5 text-gray-200 transition duration-150 ease-in-out hover:text-white focus:z-10 focus:border-gray-500 focus:outline-none"
-              >
-                <TrashIcon className="mr-2 h-5 w-5" />
-                <span>{intl.formatMessage(globalMessages.delete)}</span>
-              </button>
+              </div>
             </div>
-          </div>
-        </div>
-      </li>
-    ));
+          </li>
+        ))}
+    </>
+  );
 };
 
 export default OverrideRuleTile;
diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
index e3a0254bc..32ba2180a 100644
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -89,6 +89,7 @@
   "components.Discover.StudioSlider.studios": "Studios",
   "components.Discover.TvGenreList.seriesgenres": "Series Genres",
   "components.Discover.TvGenreSlider.tvgenres": "Series Genres",
+  "components.DiscoverTvUpcoming.upcomingtv": "Upcoming Series",
   "components.Discover.createnewslider": "Create New Slider",
   "components.Discover.customizediscover": "Customize Discover",
   "components.Discover.discover": "Discover",
@@ -1091,7 +1092,7 @@
   "components.Setup.finishing": "Finishing…",
   "components.Setup.servertype": "Choose Server Type",
   "components.Setup.setup": "Setup",
-  "components.Setup.signin": "Sign in to your account",
+  "components.Setup.signin": "Sign In",
   "components.Setup.signinMessage": "Get started by signing in",
   "components.Setup.signinWithEmby": "Enter your Emby details",
   "components.Setup.signinWithJellyfin": "Enter your Jellyfin details",