From 2c0ba401d529ad4de98e3f5df56f736a0280ac43 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Sep 2018 16:30:11 +0900
Subject: [PATCH] Add ability to click on imported complete notification to
 present last import

---
 osu.Game/Beatmaps/BeatmapManager.cs                  |  9 ++++++++-
 osu.Game/Database/ArchiveModelManager.cs             | 12 +++++++++++-
 .../Overlays/Notifications/ProgressNotification.cs   |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index f676927404..eb30525e80 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -11,6 +11,7 @@ using Microsoft.EntityFrameworkCore;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Track;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
@@ -195,7 +196,7 @@ namespace osu.Game.Beatmaps
 
                     downloadNotification.CompletionClickAction = () =>
                     {
-                        PresentBeatmap?.Invoke(importedBeatmap);
+                        PresentCompletedImport(importedBeatmap.Yield());
                         return true;
                     };
                     downloadNotification.State = ProgressNotificationState.Completed;
@@ -231,6 +232,12 @@ namespace osu.Game.Beatmaps
             BeatmapDownloadBegan?.Invoke(request);
         }
 
+        protected override void PresentCompletedImport(IEnumerable<BeatmapSetInfo> imported)
+        {
+            base.PresentCompletedImport(imported);
+            PresentBeatmap?.Invoke(imported.LastOrDefault());
+        }
+
         /// <summary>
         /// Get an existing download request if it exists.
         /// </summary>
diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 326d042c39..e85d6f29aa 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -166,10 +166,20 @@ namespace osu.Game.Database
                 }
             }
 
-            notification.Text = errors > 0 ? $"Import complete with {errors} errors" : "Import successful!";
+            notification.CompletionText = errors > 0 ? $"Import complete with {errors} errors" : "Import successful!";
+            notification.CompletionClickAction += () =>
+            {
+                if (imported.Count > 0)
+                    PresentCompletedImport(imported);
+                return true;
+            };
             notification.State = ProgressNotificationState.Completed;
         }
 
+        protected virtual void PresentCompletedImport(IEnumerable<TModel> imported)
+        {
+        }
+
         /// <summary>
         /// Import an item from an <see cref="ArchiveReader"/>.
         /// </summary>
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index 7a07fb970c..254258d098 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -169,7 +169,7 @@ namespace osu.Game.Overlays.Notifications
         public Action<Notification> CompletionTarget { get; set; }
 
         /// <summary>
-        /// An action to complete when the completion notification is clicked.
+        /// An action to complete when the completion notification is clicked. Return true to close.
         /// </summary>
         public Func<bool> CompletionClickAction;