From 7e4231fc0e8bf063d1f83b422ff6f757044ddd83 Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Fri, 23 Feb 2024 05:30:37 +0200
Subject: [PATCH] Fixed: Selection of last added custom filter

Plus some translations and typos
---
 .../Filter/Builder/FilterBuilderModalContent.js     | 13 ++++++-------
 .../Components/Filter/CustomFilters/CustomFilter.js |  4 ++--
 src/NzbDrone.Core/Localization/Core/en.json         |  3 +++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js b/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js
index 033b9a69a..fb9d8da87 100644
--- a/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js
@@ -1,3 +1,4 @@
+import { maxBy } from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import FormInputGroup from 'Components/Form/FormInputGroup';
@@ -50,7 +51,7 @@ class FilterBuilderModalContent extends Component {
       if (id) {
         dispatchSetFilter({ selectedFilterKey: id });
       } else {
-        const last = customFilters[customFilters.length -1];
+        const last = maxBy(customFilters, 'id');
         dispatchSetFilter({ selectedFilterKey: last.id });
       }
 
@@ -108,7 +109,7 @@ class FilterBuilderModalContent extends Component {
       this.setState({
         labelErrors: [
           {
-            message: 'Label is required'
+            message: translate('LabelIsRequired')
           }
         ]
       });
@@ -146,13 +147,13 @@ class FilterBuilderModalContent extends Component {
     return (
       <ModalContent onModalClose={onModalClose}>
         <ModalHeader>
-          Custom Filter
+          {translate('CustomFilter')}
         </ModalHeader>
 
         <ModalBody>
           <div className={styles.labelContainer}>
             <div className={styles.label}>
-              Label
+              {translate('Label')}
             </div>
 
             <div className={styles.labelInputContainer}>
@@ -166,9 +167,7 @@ class FilterBuilderModalContent extends Component {
             </div>
           </div>
 
-          <div className={styles.label}>
-            {translate('Filters')}
-          </div>
+          <div className={styles.label}>{translate('Filters')}</div>
 
           <div className={styles.rows}>
             {
diff --git a/frontend/src/Components/Filter/CustomFilters/CustomFilter.js b/frontend/src/Components/Filter/CustomFilters/CustomFilter.js
index 7407f729a..9f378d5a2 100644
--- a/frontend/src/Components/Filter/CustomFilters/CustomFilter.js
+++ b/frontend/src/Components/Filter/CustomFilters/CustomFilter.js
@@ -37,8 +37,8 @@ class CustomFilter extends Component {
       dispatchSetFilter
     } = this.props;
 
-    // Assume that delete and then unmounting means the delete was successful.
-    // Moving this check to a ancestor would be more accurate, but would have
+    // Assume that delete and then unmounting means the deletion was successful.
+    // Moving this check to an ancestor would be more accurate, but would have
     // more boilerplate.
     if (this.state.isDeleting && id === selectedFilterKey) {
       dispatchSetFilter({ selectedFilterKey: 'all' });
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 4b591948e..6e0dcf015 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -245,6 +245,7 @@
   "Crew": "Crew",
   "CurrentlyInstalled": "Currently Installed",
   "Custom": "Custom",
+  "CustomFilter": "Custom Filter",
   "CustomFilters": "Custom Filters",
   "CustomFormat": "Custom Format",
   "CustomFormatHelpText": "{appName} scores each release using the sum of scores for matching custom formats. If a new release would improve the score, at the same or better quality, then {appName} will grab it.",
@@ -767,6 +768,8 @@
   "InvalidUILanguage": "Your UI is set to an invalid language, correct it and save your settings",
   "KeepAndUnmonitorMovie": "Keep and Unmonitor Movie",
   "KeyboardShortcuts": "Keyboard Shortcuts",
+  "Label": "Label",
+  "LabelIsRequired": "Label is required",
   "Language": "Language",
   "LanguageHelpText": "Language for Releases",
   "Languages": "Languages",