From 9126601ae7f724ba5e99a2af6eff01d3618a05c6 Mon Sep 17 00:00:00 2001
From: RobertBeekman <mail@rbeekman.nl>
Date: Mon, 19 Feb 2024 21:54:53 +0100
Subject: [PATCH] UI - Fixed UI showing during auto-run even with show on
 startup disabled

UI - Fixen an issue during startup where Artemis would navigate to home after a few seconds
Workshop - Added Submit new entry button to submissions tab
---
 .../Routing/Router/Router.cs                  |  2 ++
 src/Artemis.UI/Screens/Root/RootViewModel.cs  |  6 ++--
 .../Library/Tabs/SubmissionsTabView.axaml     | 32 +++++++++++--------
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/Artemis.UI.Shared/Routing/Router/Router.cs b/src/Artemis.UI.Shared/Routing/Router/Router.cs
index 2f84eb145..39e067ec5 100644
--- a/src/Artemis.UI.Shared/Routing/Router/Router.cs
+++ b/src/Artemis.UI.Shared/Routing/Router/Router.cs
@@ -199,6 +199,8 @@ internal class Router : CorePropertyChanged, IRouter, IDisposable
     {
         if (_previousWindowRoute != null && _currentRouteSubject.Value == "blank")
             Dispatcher.UIThread.InvokeAsync(async () => await Navigate(_previousWindowRoute, new RouterNavigationOptions {AddToHistory = false, EnableLogging = false}));
+        else if (_currentRouteSubject.Value == null || _currentRouteSubject.Value == "blank")
+            Dispatcher.UIThread.InvokeAsync(async () => await Navigate("home", new RouterNavigationOptions {AddToHistory = false, EnableLogging = true}));
     }
 
     private void MainWindowServiceOnMainWindowClosed(object? sender, EventArgs e)
diff --git a/src/Artemis.UI/Screens/Root/RootViewModel.cs b/src/Artemis.UI/Screens/Root/RootViewModel.cs
index 141566ff1..6b01838a9 100644
--- a/src/Artemis.UI/Screens/Root/RootViewModel.cs
+++ b/src/Artemis.UI/Screens/Root/RootViewModel.cs
@@ -94,8 +94,6 @@ public class RootViewModel : RoutableHostScreen<RoutableScreen>, IMainWindowProv
             registrationService.RegisterBuiltInDataModelDisplays();
             registrationService.RegisterBuiltInDataModelInputs();
             registrationService.RegisterBuiltInPropertyEditors();
-
-            _router.Navigate("home");
         });
     }
 
@@ -130,7 +128,9 @@ public class RootViewModel : RoutableHostScreen<RoutableScreen>, IMainWindowProv
         bool minimized = Constants.StartupArguments.Contains("--minimized");
         bool showOnAutoRun = _settingsService.GetSetting("UI.ShowOnStartup", true).Value;
 
-        return (autoRunning && showOnAutoRun) || !minimized;
+        if (autoRunning)
+            return showOnAutoRun;
+        return !minimized;
     }
 
     private void ShowSplashScreen()
diff --git a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml
index 1c0aa64a5..bdd4a5bc5 100644
--- a/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Library/Tabs/SubmissionsTabView.axaml
@@ -36,20 +36,24 @@
                 <Button HorizontalAlignment="Center" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
             </StackPanel>
 
-            <ScrollViewer IsVisible="{CompiledBinding Entries.Count}">
-                <ItemsControl ItemsSource="{CompiledBinding Entries}">
-                    <ItemsControl.ItemTemplate>
-                        <DataTemplate>
-                            <ContentControl Content="{CompiledBinding}"/>
-                        </DataTemplate>
-                    </ItemsControl.ItemTemplate>
-                    <ItemsControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <VirtualizingStackPanel />
-                        </ItemsPanelTemplate>
-                    </ItemsControl.ItemsPanel>
-                </ItemsControl>
-            </ScrollViewer>
+            <StackPanel Spacing="15">
+                <Button HorizontalAlignment="Right" Command="{CompiledBinding AddSubmission}">Submit new entry</Button>
+                <ScrollViewer IsVisible="{CompiledBinding Entries.Count}">
+                    <ItemsControl ItemsSource="{CompiledBinding Entries}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <ContentControl Content="{CompiledBinding}" />
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <VirtualizingStackPanel />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                    </ItemsControl>
+                </ScrollViewer>
+            </StackPanel>
+
         </Panel>
     </Panel>