Fixed: Manual Import could lead to duplicate notifications

Closes #7922

frontend/src/RootFolder/RootFolderRow.tsx

@@ -83,7 +83,7 @@ function RootFolderRow(props: RootFolderRowProps) {
         isOpen={isDeleteModalOpen}
         kind={kinds.DANGER}
         title={translate('RemoveRootFolder')}
-        message={translate('RemoveRootFolderWithSeriesMessageText', { path })}
+        message={translate('RemoveRootFolderMessageText', { path })}
         confirmLabel={translate('Remove')}
         onConfirm={onConfirmDelete}
         onCancel={onDeleteModalClose}

frontend/src/Settings/Tags/Tag.tsx

@@ -55,13 +55,13 @@ function Tag({ id, label }: TagProps) {
   }, []);
 
   const handleConfirmDeleteTag = useCallback(() => {
-    dispatch(deleteTag({ id }));
-  }, [id, dispatch]);
-
-  const handleDeleteTagModalClose = useCallback(() => {
     setIsDeleteTagModalOpen(false);
   }, []);
 
+  const handleDeleteTagModalClose = useCallback(() => {
+    dispatch(deleteTag({ id }));
+  }, [id, dispatch]);
+
   return (
     <Card
       className={styles.tag}

src/NzbDrone.Core/Configuration/ConfigFileProvider.cs

@@ -209,20 +209,9 @@ namespace NzbDrone.Core.Configuration
                     return AuthenticationType.Forms;
                 }
 
-                var value = Enum.TryParse<AuthenticationType>(_authOptions.Method, out var enumValue)
+                return Enum.TryParse<AuthenticationType>(_authOptions.Method, out var enumValue)
                     ? enumValue
                     : GetValueEnum("AuthenticationMethod", AuthenticationType.None);
-
-#pragma warning disable CS0618 // Type or member is obsolete
-                if (value == AuthenticationType.Basic)
-#pragma warning restore CS0618 // Type or member is obsolete
-                {
-                    SetValue("AuthenticationMethod", AuthenticationType.Forms);
-
-                    return AuthenticationType.Forms;
-                }
-
-                return value;
             }
         }
 
@@ -397,12 +386,6 @@ namespace NzbDrone.Core.Configuration
             {
                 SetValue("EnableSsl", false);
             }
-#pragma warning disable CS0618 // Type or member is obsolete
-            if (AuthenticationMethod == AuthenticationType.Basic)
-#pragma warning restore CS0618 // Type or member is obsolete
-            {
-                SetValue("AuthenticationMethod", AuthenticationType.Forms);
-            }
         }
 
         private void DeleteOldValues()

src/NzbDrone.Core/Localization/Core/en.json

@@ -1739,7 +1739,7 @@
   "RemoveQueueItemRemovalMethodHelpTextWarning": "'Remove from Download Client' will remove the download and the file(s) from the download client.",
   "RemoveQueueItemsRemovalMethodHelpTextWarning": "'Remove from Download Client' will remove the downloads and the files from the download client.",
   "RemoveRootFolder": "Remove Root Folder",
-  "RemoveRootFolderWithSeriesMessageText": "Are you sure you want to remove the root folder '{path}'? Files and folders will not be deleted from disk, and series in this root folder will not be removed from {appName}.",
+  "RemoveRootFolderMessageText": "Are you sure you want to remove the root folder '{path}'? Files and folders will not be deleted from disk, and series in this root folder will not be removed from {appName}.",
   "RemoveSelected": "Remove Selected",
   "RemoveSelectedBlocklistMessageText": "Are you sure you want to remove the selected items from the blocklist?",
   "RemoveSelectedItem": "Remove Selected Item",

src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportService.cs

@@ -483,6 +483,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
 
             var imported = new List<ImportResult>();
             var importedTrackedDownload = new List<ManuallyImportedFile>();
+            var importedUntrackedDownload = new List<ImportResult>();
 
             for (var i = 0; i < message.Files.Count; i++)
             {
@@ -545,7 +546,10 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
 
                 if (trackedDownload == null)
                 {
-                    imported.AddRange(_importApprovedEpisodes.Import(new List<ImportDecision> { importDecision }, !existingFile, null, message.ImportMode));
+                    var importResult = _importApprovedEpisodes.Import(new List<ImportDecision> { importDecision }, !existingFile, null, message.ImportMode);
+
+                    imported.AddRange(importResult);
+                    importedUntrackedDownload.AddRange(importResult);
                 }
                 else
                 {
@@ -566,7 +570,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
                 _logger.ProgressTrace("Manually imported {0} files", imported.Count);
             }
 
-            var untrackedImports = imported.Where(i => i.Result == ImportResultType.Imported && importedTrackedDownload.FirstOrDefault(t => t.ImportResult != i) == null).ToList();
+            var untrackedImports = importedUntrackedDownload.Where(i => i.Result == ImportResultType.Imported).ToList();
 
             if (untrackedImports.Any())
             {

src/Sonarr.Http/Authentication/AuthenticationBuilderExtensions.cs

@@ -30,7 +30,7 @@ namespace Sonarr.Http.Authentication
 
         public static AuthenticationBuilder AddAppAuthentication(this IServiceCollection services)
         {
-            services.AddOptions<CookieAuthenticationOptions>(nameof(AuthenticationType.Forms))
+            services.AddOptions<CookieAuthenticationOptions>(AuthenticationType.Forms.ToString())
                 .Configure<IConfigFileProvider>((options, configFileProvider) =>
                 {
                     // Replace diacritics and replace non-word characters to ensure cookie name doesn't contain any valid URL characters not allowed in cookie names
@@ -47,9 +47,12 @@ namespace Sonarr.Http.Authentication
                 });
 
             return services.AddAuthentication()
-                .AddNone(nameof(AuthenticationType.None))
-                .AddExternal(nameof(AuthenticationType.External))
-                .AddCookie(nameof(AuthenticationType.Forms))
+                .AddNone(AuthenticationType.None.ToString())
+                .AddExternal(AuthenticationType.External.ToString())
+#pragma warning disable CS0618 // Type or member is obsolete
+                .AddCookie(AuthenticationType.Basic.ToString())
+#pragma warning restore CS0618 // Type or member is obsolete
+                .AddCookie(AuthenticationType.Forms.ToString())
                 .AddApiKey("API", options =>
                 {
                     options.HeaderName = "X-Api-Key";

src/Sonarr.Http/Authentication/UiAuthorizationPolicyProvider.cs

@@ -8,7 +8,7 @@ namespace NzbDrone.Http.Authentication
 {
     public class UiAuthorizationPolicyProvider : IAuthorizationPolicyProvider
     {
-        private const string PolicyName = "UI";
+        private const string POLICY_NAME = "UI";
         private readonly IConfigFileProvider _config;
 
         public DefaultAuthorizationPolicyProvider FallbackPolicyProvider { get; }
@@ -26,7 +26,7 @@ namespace NzbDrone.Http.Authentication
 
         public Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
         {
-            if (policyName.Equals(PolicyName, StringComparison.OrdinalIgnoreCase))
+            if (policyName.Equals(POLICY_NAME, StringComparison.OrdinalIgnoreCase))
             {
                 var policy = new AuthorizationPolicyBuilder(_config.AuthenticationMethod.ToString())
                     .AddRequirements(new BypassableDenyAnonymousAuthorizationRequirement());