From ebc10240d941fc454572559a31d35cb796be9254 Mon Sep 17 00:00:00 2001
From: paket17 <a@a.a>
Date: Tue, 13 Aug 2024 23:17:04 +0400
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=D0=B0=D1=81=D0=B8=D0=BD=D1=85?=
 =?UTF-8?q?=D1=80=D0=BE=D0=BD=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B0=20=D1=81=20=D0=BC=D0=B5=D0=BD=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Добавлен статус "Update" на время выполнения операций
Асинхронно запускается: Сменить проект, Создать проект, Запуск инстанса, Остановка инстанса
Кнопки на время выполнение операций блокируются
StartAsyncHandlers запускается асинхронно
Добавлены иконки в выпадающее меню
---
 RXInstanceManager/App.cs                      |  17 +++
 RXInstanceManager/App.xaml                    |   3 +-
 RXInstanceManager/Constants.cs                |   1 +
 .../Entities/Controllers/Instances.cs         |  18 ++-
 RXInstanceManager/MainWindow.xaml             |  12 +-
 RXInstanceManager/MainWindow.xaml.cs          | 104 ++++++++++++------
 RXInstanceManager/MainWindowAsyncHandlers.cs  |   7 +-
 RXInstanceManager/MainWindowHandlers.cs       |  43 +++++++-
 RXInstanceManager/RXInstanceManager.csproj    |   1 +
 9 files changed, 152 insertions(+), 54 deletions(-)
 create mode 100644 RXInstanceManager/App.cs

diff --git a/RXInstanceManager/App.cs b/RXInstanceManager/App.cs
new file mode 100644
index 0000000..1f28df3
--- /dev/null
+++ b/RXInstanceManager/App.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Windows;
+
+namespace RXInstanceManager
+{
+  public partial class App : Application
+  {
+    protected async override void OnStartup(StartupEventArgs e)
+    {
+      base.OnStartup(e);
+      var mainWindow = new MainWindow();
+      MainWindow = mainWindow;
+      MainWindow.Show();
+      await mainWindow.StartAsyncHandlers();
+    }
+  }
+}
\ No newline at end of file
diff --git a/RXInstanceManager/App.xaml b/RXInstanceManager/App.xaml
index 4bfccaa..ae40125 100644
--- a/RXInstanceManager/App.xaml
+++ b/RXInstanceManager/App.xaml
@@ -1,8 +1,7 @@
 <Application x:Class="RXInstanceManager.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:RXInstanceManager"
-             StartupUri="MainWindow.xaml">
+             xmlns:local="clr-namespace:RXInstanceManager">
     <Application.Resources>
          
     </Application.Resources>
diff --git a/RXInstanceManager/Constants.cs b/RXInstanceManager/Constants.cs
index fd8cbed..818b62b 100644
--- a/RXInstanceManager/Constants.cs
+++ b/RXInstanceManager/Constants.cs
@@ -17,6 +17,7 @@ public static class InstanceStatus
       public const string Stopped = "Stopped";
       public const string NeedInstall = "NeedInstall";
       public const string NotInstalled = "Not installed";
+      public const string Update = "Update";
     }
 
     public static class EditEmptyValue
diff --git a/RXInstanceManager/Entities/Controllers/Instances.cs b/RXInstanceManager/Entities/Controllers/Instances.cs
index ee784b4..dfb5477 100644
--- a/RXInstanceManager/Entities/Controllers/Instances.cs
+++ b/RXInstanceManager/Entities/Controllers/Instances.cs
@@ -33,6 +33,7 @@ public static void Add(string instancePath)
     {
       if (!Instances.instancesFolders.Where(i => i == instancePath).Any())
       {
+        Instances.instances.Add(new Instance(instancePath));
         Instances.instancesFolders.Add(instancePath);
         UpdateYaml();
       }
@@ -40,16 +41,21 @@ public static void Add(string instancePath)
 
     public static List<Instance> Get()
     {
-      Instances.instances = new List<Instance>();
-      foreach (var folder in Instances.instancesFolders)
-        Instances.instances.Add(new Instance(folder));
-      return Instances.instances;
+      if (instances == null)
+      {
+        instances = new List<Instance>();
+        foreach (var folder in instancesFolders)
+          instances.Add(new Instance(folder));
+      }
+
+      return instances;
     }
 
     public static void Delete(Instance instance)
     {
-      var idx = Instances.instancesFolders.FindIndex(i => i == instance.InstancePath);
-      Instances.instancesFolders.RemoveAt(idx);
+      var index = Instances.instancesFolders.FindIndex(i => i == instance.InstancePath);
+      Instances.instances.RemoveAt(index);
+      Instances.instancesFolders.RemoveAt(index);
       UpdateYaml();
     }
 
diff --git a/RXInstanceManager/MainWindow.xaml b/RXInstanceManager/MainWindow.xaml
index df853b1..5f6cdaa 100644
--- a/RXInstanceManager/MainWindow.xaml
+++ b/RXInstanceManager/MainWindow.xaml
@@ -37,8 +37,8 @@
       </Grid.RowDefinitions>
       <StackPanel Orientation="Horizontal" Height="40" Grid.Row="0">
         <Button x:Name="ButtonAdd" Content="Добавить" Style="{DynamicResource RecordActionButton}" Margin="10,5,5,5" Background="SkyBlue" Click="ButtonAdd_Click" />
-        <Button x:Name="ButtonStart" Content="do all up" Style="{DynamicResource RecordActionButton}" Background="SteelBlue" Click="ButtonStart_Click" />
-        <Button x:Name="ButtonStop" Content="do all down" Style="{DynamicResource RecordActionButton}" Background="SteelBlue" Click="ButtonStop_Click" />
+        <Button x:Name="ButtonStart" Content="do all up" Style="{DynamicResource RecordActionButton}" Background="SteelBlue" Click="ButtonStart_ClickAsync" />
+        <Button x:Name="ButtonStop" Content="do all down" Style="{DynamicResource RecordActionButton}" Background="SteelBlue" Click="ButtonStop_ClickAsync" />
         <Button x:Name="ButtonDDSStart" Content="Development Studio" Style="{DynamicResource RecordActionButton}" Background="GreenYellow" Click="ButtonDDSStart_Click" />
         <Button x:Name="ButtonRXStart" Content="Веб-клиент" Style="{DynamicResource RecordActionButton}" Background="Violet" Click="ButtonRXStart_Click" />
         <Button x:Name="ButtonLogViewer" Content="Directum LogViewer" Style="{DynamicResource RecordActionButton}" Background="Gray" Click="RunDirectumLogViewer_Click" />
@@ -57,14 +57,14 @@
         </DataGrid.Columns>
         <DataGrid.ContextMenu>
           <ContextMenu x:Name="InstancesContextMenu">
-            <MenuItem x:Name="ChangeProject" Header="Сменить проект" Click="ChangeProject_Click" />
-            <MenuItem x:Name="CreateProject" Header="Создать проект" Click="CreateProject_Click" />
+            <MenuItem x:Name="ChangeProject" Header="Сменить проект" Click="ChangeProject_ClickAsync" />
+            <MenuItem x:Name="CreateProject" Header="Создать проект" Click="CreateProject_ClickAsync" />
             <MenuItem x:Name="CloneProject" Header="Создать копию текущего проекта" Click="CloneProject_Click" />
             <MenuItem x:Name="UpdateConfig" Header="Пропатчить config.yml" Click="UpdateConfig_Click" />
             <MenuItem x:Name="CheckServices" Header="Проверить сервисы" Click="CheckServices_Click" />
             <MenuItem x:Name="RunDDSWithOutDeploy" Header="Открыть DDS без deploy" Click="RunDDSWithOutDeploy_Click" />
             <MenuItem x:Name="InfoContext" Header="Сводка по инстансу" Click="InfoContext_Click" />
-            <MenuItem x:Name="CmdAdminContext" Header="Запустить cmd (от администратора)" Click="CmdAdminContext_Click" />
+            <MenuItem x:Name="CmdAdminContext" Header="Запустить cmd (от администратора)" Icon="🖥️" Click="CmdAdminContext_Click" />
             <MenuItem x:Name="ClearLogContext" Header="Очистить логи текущего экземпляра RX" Click="ClearLogContext_Click" />
             <MenuItem x:Name="ClearLogAllInstancesContext" Header="Очистить логи всех экземпляров RX" Click="ClearLogAllInstancesContext_Click" />
             <MenuItem x:Name="ConfigContext" Header="Открыть config.yml" Click="ConfigContext_Click" />
@@ -72,7 +72,7 @@
             <MenuItem x:Name="ConvertDBsContext" Header="Конвертировать БД проектов" Click="ConvertDBsContext_Click" />
             <MenuItem x:Name="RemoveProjectDataContext" Header="Удалить БД и домашний каталог выбранного проекта" Click="RemoveProjectDataContext_Click" />
             <MenuItem x:Name="RemoveInstance" Header="Убрать экземпляр RX из списка" Click="RemoveInstance_Click" />
-            <MenuItem x:Name="OpenRXFolder" Header="Открыть папку экземпляра RX" Click="OpenRXFolder_Click" />
+            <MenuItem x:Name="OpenRXFolder" Header="Открыть папку экземпляра RX" Icon="📁" Click="OpenRXFolder_Click" />
             <MenuItem x:Name="OpenLogFolder" Header="Открыть папку логов" Click="OpenLogFolder_Click" />
           </ContextMenu>
         </DataGrid.ContextMenu>
diff --git a/RXInstanceManager/MainWindow.xaml.cs b/RXInstanceManager/MainWindow.xaml.cs
index e40ebb6..e218aa5 100644
--- a/RXInstanceManager/MainWindow.xaml.cs
+++ b/RXInstanceManager/MainWindow.xaml.cs
@@ -73,7 +73,6 @@ public MainWindow()
       LoadConfig();
       LoadInstances();
       ActionButtonVisibleChanging();
-      StartAsyncHandlers();
       m_notifyIcon = new System.Windows.Forms.NotifyIcon();
       m_notifyIcon.BalloonTipText = "The app has been minimised. Click the tray icon to show.";
       m_notifyIcon.BalloonTipTitle = "RXInstanceManager";
@@ -95,41 +94,53 @@ private void GridInstances_SelectionChanged(object sender, SelectionChangedEvent
 
     #region ActionHandlers
 
-    private void ButtonStart_Click(object sender, RoutedEventArgs e)
+    private async void ButtonStart_ClickAsync(object sender, RoutedEventArgs e)
     {
-      AppHandlers.InfoHandler(_instance, MethodBase.GetCurrentMethod().Name);
+      var instance = _instance;
+      AppHandlers.InfoHandler(instance, MethodBase.GetCurrentMethod().Name);
 
-      if (_instance == null)
+      if (instance == null)
         return;
 
       try
       {
-        var serviceStatus = AppHandlers.GetServiceStatus(_instance);
+        var serviceStatus = AppHandlers.GetServiceStatus(instance);
         if (serviceStatus == Constants.InstanceStatus.Stopped)
-          AppHandlers.LaunchProcess(AppHelper.GetDoPath(_instance.InstancePath), "all up", true, true);
+        {
+          ChangeGridStatus(instance, Constants.InstanceStatus.Update);
+          await Task.Run(() => AppHandlers.LaunchProcess(AppHelper.GetDoPath(instance.InstancePath), "all up", true, true));
+          ChangeGridStatus(instance, Constants.InstanceStatus.Working);
+        }
       }
       catch (Exception ex)
       {
-        AppHandlers.ErrorHandler(_instance, ex);
+        ChangeGridStatus(instance, Constants.InstanceStatus.Stopped);
+        AppHandlers.ErrorHandler(instance, ex);
       }
     }
 
-    private void ButtonStop_Click(object sender, RoutedEventArgs e)
+    private async void ButtonStop_ClickAsync(object sender, RoutedEventArgs e)
     {
-      AppHandlers.InfoHandler(_instance, MethodBase.GetCurrentMethod().Name);
+      var instance = _instance;
+      AppHandlers.InfoHandler(instance, MethodBase.GetCurrentMethod().Name);
 
-      if (_instance == null || _instance.Status != Constants.InstanceStatus.Working)
+      if (instance == null || instance.Status != Constants.InstanceStatus.Working)
         return;
 
       try
       {
-        var serviceStatus = AppHandlers.GetServiceStatus(_instance);
+        var serviceStatus = AppHandlers.GetServiceStatus(instance);
         if (serviceStatus == Constants.InstanceStatus.Working)
-          AppHandlers.LaunchProcess(AppHelper.GetDoPath(_instance.InstancePath), "all down", true, true);
+        {
+          ChangeGridStatus(instance, Constants.InstanceStatus.Update);
+          await Task.Run(() => AppHandlers.LaunchProcess(AppHelper.GetDoPath(instance.InstancePath), "all down", true, true));
+          ChangeGridStatus(instance, Constants.InstanceStatus.Stopped);
+        }
       }
       catch (Exception ex)
       {
-        AppHandlers.ErrorHandler(_instance, ex);
+        ChangeGridStatus(instance, Constants.InstanceStatus.Stopped);
+        AppHandlers.ErrorHandler(instance, ex);
       }
     }
 
@@ -222,14 +233,15 @@ private void ProjectConfigContext_Click(object sender, RoutedEventArgs e)
       }
     }
 
-    private void ChangeProject_Click(object sender, RoutedEventArgs e)
+    private async void ChangeProject_ClickAsync(object sender, RoutedEventArgs e)
     {
-      AppHandlers.InfoHandler(_instance, MethodBase.GetCurrentMethod().Name);
+      var instance = _instance;
+      AppHandlers.InfoHandler(instance, MethodBase.GetCurrentMethod().Name);
       using (System.Windows.Forms.OpenFileDialog openFileDialog = new System.Windows.Forms.OpenFileDialog())
       {
-        var filter = string.Format("configs for {0}|{0}_*.yml;{0}_*.yaml|YAML-файлы|*.yml;*.yaml|All files (*.*)|*.*", _instance.Code);
-        if (!string.IsNullOrEmpty(_instance.ProjectConfigPath))
-          openFileDialog.InitialDirectory = Path.GetDirectoryName(_instance.ProjectConfigPath);
+        var filter = string.Format("configs for {0}|{0}_*.yml;{0}_*.yaml|YAML-файлы|*.yml;*.yaml|All files (*.*)|*.*", instance.Code);
+        if (!string.IsNullOrEmpty(instance.ProjectConfigPath))
+          openFileDialog.InitialDirectory = Path.GetDirectoryName(instance.ProjectConfigPath);
         openFileDialog.Filter = filter;
         openFileDialog.FilterIndex = 1;
         openFileDialog.RestoreDirectory = true;
@@ -242,24 +254,33 @@ private void ChangeProject_Click(object sender, RoutedEventArgs e)
             string needCheck = "False";
             if (_configRxInstMan.NeedCheckAfterSet)
               needCheck = "True";
-            AppHandlers.LaunchProcess(AppHelper.GetDoPath(_instance.InstancePath), string.Format("map set {0} -rundds=False -need_pause -need_check={1}", config_filename, needCheck), true, true);
+
+            var lastStatus = instance.Status;
+            ChangeGridStatus(instance, Constants.InstanceStatus.Update);
+            await Task.Run(() => AppHandlers.LaunchProcess(AppHelper.GetDoPath(instance.InstancePath),
+                                                           string.Format("map set {0} -rundds=False -need_pause -need_check={1}", config_filename, needCheck),
+                                                           true,
+                                                           true));
+            ChangeGridStatus(instance, lastStatus);
           }
           catch (Exception ex)
           {
-            AppHandlers.ErrorHandler(_instance, ex);
+            ChangeGridStatus(instance, Constants.InstanceStatus.Stopped);
+            AppHandlers.ErrorHandler(instance, ex);
           }
 
         }
       }
     }
 
-    private void CreateProject_Click(object sender, RoutedEventArgs e)
+    private async void CreateProject_ClickAsync(object sender, RoutedEventArgs e)
     {
-      AppHandlers.InfoHandler(_instance, MethodBase.GetCurrentMethod().Name);
+      var instance = _instance;
+      AppHandlers.InfoHandler(instance, MethodBase.GetCurrentMethod().Name);
       using (System.Windows.Forms.OpenFileDialog openFileDialog = new System.Windows.Forms.OpenFileDialog())
       {
-        var filter = string.Format("configs for {0}|{0}_*.yml;{0}_*.yaml|YAML-файлы|*.yml;*.yaml|All files (*.*)|*.*", _instance.Code);
-        openFileDialog.InitialDirectory = string.IsNullOrEmpty(_instance.ProjectConfigPath) ? "C:\\" : Path.GetDirectoryName(_instance.ProjectConfigPath);
+        var filter = string.Format("configs for {0}|{0}_*.yml;{0}_*.yaml|YAML-файлы|*.yml;*.yaml|All files (*.*)|*.*", instance.Code);
+        openFileDialog.InitialDirectory = string.IsNullOrEmpty(instance.ProjectConfigPath) ? "C:\\" : Path.GetDirectoryName(_instance.ProjectConfigPath);
         openFileDialog.Filter = filter;
         openFileDialog.FilterIndex = 1;
         openFileDialog.RestoreDirectory = true;
@@ -269,14 +290,17 @@ private void CreateProject_Click(object sender, RoutedEventArgs e)
           var config_filename = openFileDialog.FileName;
           try
           {
-            AppHandlers.LaunchProcess("cmd",
-                                      string.Format("cmd /K {1} map create_project {0} -rundds=False -need_pause",
-                                      config_filename, AppHelper.GetDoPath(_instance.InstancePath)),
-                                      true, true);
+            ChangeGridStatus(instance, Constants.InstanceStatus.Update);
+            await Task.Run(() => AppHandlers.LaunchProcess("cmd",
+                                                      string.Format("cmd /K {1} map create_project {0} -rundds=False -need_pause",
+                                                      config_filename, AppHelper.GetDoPath(instance.InstancePath)),
+                                                      true, true));
+            ChangeGridStatus(instance, Constants.InstanceStatus.Working);
           }
           catch (Exception ex)
           {
-            AppHandlers.ErrorHandler(_instance, ex);
+            ChangeGridStatus(instance, Constants.InstanceStatus.Stopped);
+            AppHandlers.ErrorHandler(instance, ex);
           }
 
         }
@@ -382,13 +406,10 @@ private void InfoContext_Click(object sender, RoutedEventArgs e)
 
     #endregion
 
-    private void StartAsyncHandlers()
+    public async Task StartAsyncHandlers()
     {
-#pragma warning disable CS4014
-      // Так как этот вызов не ожидается, выполнение существующего метода продолжается до тех пор, пока вызов не будет завершен
-      UpdateInstanceGridAsync();
-      UpdateInstanceDataAsync();
-#pragma warning restore CS4014
+      await UpdateInstanceGridAsync();
+      await UpdateInstanceDataAsync();
     }
 
     private void HiddenButton_Click(object sender, RoutedEventArgs e)
@@ -636,5 +657,18 @@ private void OpenLogFolder_Click(object sender, RoutedEventArgs e)
       else
         System.Windows.MessageBox.Show($"Папка {_instance.LogFolder} не существует.", "", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
     }
+
+    private void ChangeGridStatus(Instance instance, string status)
+    {
+      instance.Status = status;
+      ActionButtonVisibleChanging(instance: instance);
+      LoadInstances(instance.InstancePath);
+    }
+
+    protected override void OnClosed(EventArgs e)
+    {
+      App.Current.Shutdown();
+      base.OnClosed(e);
+    }
   }
 }
diff --git a/RXInstanceManager/MainWindowAsyncHandlers.cs b/RXInstanceManager/MainWindowAsyncHandlers.cs
index 49ec34b..68249e9 100644
--- a/RXInstanceManager/MainWindowAsyncHandlers.cs
+++ b/RXInstanceManager/MainWindowAsyncHandlers.cs
@@ -20,6 +20,9 @@ private async Task UpdateInstanceGridAsync()
         {
           if (!string.IsNullOrEmpty(instance.Code))
           {
+            if (instance.Status == Constants.InstanceStatus.Update)
+              continue;
+
             var status = AppHandlers.GetServiceStatus(instance);
             if (status != instance.Status)
               LoadInstances(_instance.InstancePath);
@@ -92,7 +95,9 @@ private async Task UpdateInstanceDataAsync()
                     }
                   }
                 }
-                instance.Status = AppHandlers.GetServiceStatus(instance);
+                if (instance.Status != Constants.InstanceStatus.Update)
+                  instance.Status = AppHandlers.GetServiceStatus(instance);
+
                 instance.ConfigChanged = changeTime;
 
                 LoadInstances(_instance.InstancePath);
diff --git a/RXInstanceManager/MainWindowHandlers.cs b/RXInstanceManager/MainWindowHandlers.cs
index 580c218..ec2aabc 100644
--- a/RXInstanceManager/MainWindowHandlers.cs
+++ b/RXInstanceManager/MainWindowHandlers.cs
@@ -156,8 +156,22 @@ private void LoadInstancesItems(string instancePath)
 
 #region Работа с визуальными эффектами.
 
-    private void ActionButtonVisibleChanging(string status = null)
+    private void ActionButtonVisibleChanging(string status = null, Instance instance = null)
     {
+      if (instance == null)
+        instance = _instance;
+
+      ButtonDDSStart.IsEnabled = true;
+      ButtonStop.IsEnabled = true;
+      ButtonStart.IsEnabled = true;
+      ChangeProject.IsEnabled = true;
+      CreateProject.IsEnabled = true;
+      CloneProject.IsEnabled = true;
+      UpdateConfig.IsEnabled = true;
+      RunDDSWithOutDeploy.IsEnabled = true;
+      ConvertDBsContext.IsEnabled = true;
+
+
       ButtonStart.Visibility = Visibility.Collapsed;
       ButtonStop.Visibility = Visibility.Collapsed;
       ButtonDDSStart.Visibility = Visibility.Collapsed;
@@ -165,9 +179,9 @@ private void ActionButtonVisibleChanging(string status = null)
       ButtonLogViewer.Visibility = Visibility.Collapsed;
       ButtonSourcesFolder.Visibility = Visibility.Collapsed;
 
-      var IsVisibleContextButton = _instance == null || string.IsNullOrEmpty(_instance.Code) ? Visibility.Collapsed : Visibility.Visible;
+      var IsVisibleContextButton = instance == null || string.IsNullOrEmpty(instance.Code) ? Visibility.Collapsed : Visibility.Visible;
 
-      Func<bool, Visibility> isVisibleContextButton = (need_show) => !need_show || _instance == null || string.IsNullOrEmpty(_instance.Code) ? Visibility.Collapsed : Visibility.Visible;
+      Func<bool, Visibility> isVisibleContextButton = (need_show) => !need_show || instance == null || string.IsNullOrEmpty(instance.Code) ? Visibility.Collapsed : Visibility.Visible;
       ChangeProject.Visibility = isVisibleContextButton(_configRxInstMan.ContextMenu.ChangeProject);
       CreateProject.Visibility = isVisibleContextButton(_configRxInstMan.ContextMenu.CreateProject);
       CloneProject.Visibility = isVisibleContextButton(_configRxInstMan.ContextMenu.CloneProject);
@@ -185,7 +199,7 @@ private void ActionButtonVisibleChanging(string status = null)
       OpenRXFolder.Visibility = isVisibleContextButton(_configRxInstMan.ContextMenu.OpenRXFolder);
       OpenLogFolder.Visibility = isVisibleContextButton(_configRxInstMan.ContextMenu.OpenLogFolder);
 
-      status = _instance == null || string.IsNullOrEmpty(_instance.Code) ? status : _instance.Status;
+      status = instance == null || string.IsNullOrEmpty(instance.Code) ? status : instance.Status;
         
       switch (status)
       {
@@ -210,6 +224,27 @@ private void ActionButtonVisibleChanging(string status = null)
           else
             ButtonLogViewer.Visibility = Visibility.Collapsed;
           ButtonSourcesFolder.Visibility = Visibility.Visible;
+          break;
+        case Constants.InstanceStatus.Update:
+          ButtonDDSStart.Visibility = Visibility.Visible;
+          ButtonDDSStart.IsEnabled = false;
+          ButtonRXStart.Visibility = Visibility.Visible;
+          ButtonStop.Visibility = Visibility.Visible;
+          ButtonStop.IsEnabled = false;
+          ButtonStart.Visibility = Visibility.Collapsed;
+          ButtonSourcesFolder.Visibility = Visibility.Visible;
+          if (_configRxInstMan.LogViewerExists)
+            ButtonLogViewer.Visibility = Visibility.Visible;
+          else
+            ButtonLogViewer.Visibility = Visibility.Collapsed;
+
+          ButtonStart.IsEnabled = false;
+          ChangeProject.IsEnabled = false;
+          CreateProject.IsEnabled = false;
+          CloneProject.IsEnabled = false;
+          UpdateConfig.IsEnabled = false;
+          RunDDSWithOutDeploy.IsEnabled = false;
+          ConvertDBsContext.IsEnabled = false;
           break;
       }
     }
diff --git a/RXInstanceManager/RXInstanceManager.csproj b/RXInstanceManager/RXInstanceManager.csproj
index 69f5039..edc6493 100644
--- a/RXInstanceManager/RXInstanceManager.csproj
+++ b/RXInstanceManager/RXInstanceManager.csproj
@@ -163,6 +163,7 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="AppHandlers.cs" />
+    <Compile Include="App.cs" />
     <Compile Include="Dialogs\EnterValueDialog.xaml.cs">
       <DependentUpon>EnterValueDialog.xaml</DependentUpon>
     </Compile>

From 6ff71086f2e28001b5ab31b6a8feeb35807b8fb3 Mon Sep 17 00:00:00 2001
From: paket17 <a@a.a>
Date: Sat, 17 Aug 2024 21:34:34 +0400
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81?=
 =?UTF-8?q?=D0=BA=20=D0=B0=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=87?=
 =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

асинхронный показ информации об инстансе
---
 RXInstanceManager/App.cs                   | 17 -----------------
 RXInstanceManager/App.xaml                 |  3 ++-
 RXInstanceManager/Dialogs/Dialogs.cs       |  4 ++--
 RXInstanceManager/MainWindow.xaml.cs       | 14 +++++++-------
 RXInstanceManager/RXInstanceManager.csproj |  1 -
 5 files changed, 11 insertions(+), 28 deletions(-)
 delete mode 100644 RXInstanceManager/App.cs

diff --git a/RXInstanceManager/App.cs b/RXInstanceManager/App.cs
deleted file mode 100644
index 1f28df3..0000000
--- a/RXInstanceManager/App.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Windows;
-
-namespace RXInstanceManager
-{
-  public partial class App : Application
-  {
-    protected async override void OnStartup(StartupEventArgs e)
-    {
-      base.OnStartup(e);
-      var mainWindow = new MainWindow();
-      MainWindow = mainWindow;
-      MainWindow.Show();
-      await mainWindow.StartAsyncHandlers();
-    }
-  }
-}
\ No newline at end of file
diff --git a/RXInstanceManager/App.xaml b/RXInstanceManager/App.xaml
index ae40125..4bfccaa 100644
--- a/RXInstanceManager/App.xaml
+++ b/RXInstanceManager/App.xaml
@@ -1,7 +1,8 @@
 <Application x:Class="RXInstanceManager.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:RXInstanceManager">
+             xmlns:local="clr-namespace:RXInstanceManager"
+             StartupUri="MainWindow.xaml">
     <Application.Resources>
          
     </Application.Resources>
diff --git a/RXInstanceManager/Dialogs/Dialogs.cs b/RXInstanceManager/Dialogs/Dialogs.cs
index 5fe1a21..3450286 100644
--- a/RXInstanceManager/Dialogs/Dialogs.cs
+++ b/RXInstanceManager/Dialogs/Dialogs.cs
@@ -19,11 +19,11 @@ public static string ShowEnterValueDialog(string emptyValue, string defaultValue
       return dialog.Value;
     }
 
-    public static void ShowInformationDialog(string information)
+    public static void ShowInformation(string information)
     {
       var dialog = new InformationDialog();
       dialog.Value = information;
-      dialog.ShowDialog();
+      dialog.Show();
     }
     public static void ShowFileContentDialog(string path)
     {
diff --git a/RXInstanceManager/MainWindow.xaml.cs b/RXInstanceManager/MainWindow.xaml.cs
index e218aa5..2d76d69 100644
--- a/RXInstanceManager/MainWindow.xaml.cs
+++ b/RXInstanceManager/MainWindow.xaml.cs
@@ -80,6 +80,12 @@ public MainWindow()
       m_notifyIcon.Icon = new System.Drawing.Icon("App.ico");
       m_notifyIcon.Click += new EventHandler(m_notifyIcon_Click);
       TrayStatus();
+      Loaded += MainWindow_Loaded;
+    }
+
+    private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
+    {
+      await StartAsyncHandlers();
     }
 
     private void GridInstances_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -401,7 +407,7 @@ private void InfoContext_Click(object sender, RoutedEventArgs e)
       if (_instance == null)
         return;
 
-      Dialogs.ShowInformationDialog(_instance.ToString());
+      Dialogs.ShowInformation(_instance.ToString());
     }
 
     #endregion
@@ -664,11 +670,5 @@ private void ChangeGridStatus(Instance instance, string status)
       ActionButtonVisibleChanging(instance: instance);
       LoadInstances(instance.InstancePath);
     }
-
-    protected override void OnClosed(EventArgs e)
-    {
-      App.Current.Shutdown();
-      base.OnClosed(e);
-    }
   }
 }
diff --git a/RXInstanceManager/RXInstanceManager.csproj b/RXInstanceManager/RXInstanceManager.csproj
index edc6493..69f5039 100644
--- a/RXInstanceManager/RXInstanceManager.csproj
+++ b/RXInstanceManager/RXInstanceManager.csproj
@@ -163,7 +163,6 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="AppHandlers.cs" />
-    <Compile Include="App.cs" />
     <Compile Include="Dialogs\EnterValueDialog.xaml.cs">
       <DependentUpon>EnterValueDialog.xaml</DependentUpon>
     </Compile>

From 442f712d8aa16e4d15629478021bc392f35aac80 Mon Sep 17 00:00:00 2001
From: paket17 <a@a.a>
Date: Tue, 20 Aug 2024 19:49:51 +0400
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA?=
 =?UTF-8?q?=20=D0=B0=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=BD=D1=8B?=
 =?UTF-8?q?=D1=85=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87,=20=D0=BE=D0=B1=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D1=82=D1=83=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RXInstanceManager/MainWindow.xaml.cs         | 10 +++++-----
 RXInstanceManager/MainWindowAsyncHandlers.cs |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/RXInstanceManager/MainWindow.xaml.cs b/RXInstanceManager/MainWindow.xaml.cs
index 2d76d69..e958f3e 100644
--- a/RXInstanceManager/MainWindow.xaml.cs
+++ b/RXInstanceManager/MainWindow.xaml.cs
@@ -83,9 +83,9 @@ public MainWindow()
       Loaded += MainWindow_Loaded;
     }
 
-    private async void MainWindow_Loaded(object sender, RoutedEventArgs e)
+    private void MainWindow_Loaded(object sender, RoutedEventArgs e)
     {
-      await StartAsyncHandlers();
+      StartAsyncHandlers();
     }
 
     private void GridInstances_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -412,10 +412,10 @@ private void InfoContext_Click(object sender, RoutedEventArgs e)
 
     #endregion
 
-    public async Task StartAsyncHandlers()
+    public void StartAsyncHandlers()
     {
-      await UpdateInstanceGridAsync();
-      await UpdateInstanceDataAsync();
+      _ = UpdateInstanceGridAsync();
+      _ = UpdateInstanceDataAsync();
     }
 
     private void HiddenButton_Click(object sender, RoutedEventArgs e)
diff --git a/RXInstanceManager/MainWindowAsyncHandlers.cs b/RXInstanceManager/MainWindowAsyncHandlers.cs
index 68249e9..4dcbcd9 100644
--- a/RXInstanceManager/MainWindowAsyncHandlers.cs
+++ b/RXInstanceManager/MainWindowAsyncHandlers.cs
@@ -25,7 +25,10 @@ private async Task UpdateInstanceGridAsync()
 
             var status = AppHandlers.GetServiceStatus(instance);
             if (status != instance.Status)
-              LoadInstances(_instance.InstancePath);
+            {
+              instance.Status = status;
+              LoadInstances(instance.InstancePath);
+            }
           }
         }
       }

From b37294c6df660bd3b678a3646710c57d33b1b8ed Mon Sep 17 00:00:00 2001
From: paket17 <a@a.a>
Date: Tue, 20 Aug 2024 19:53:38 +0400
Subject: [PATCH 4/4] =?UTF-8?q?revert:=20=D1=82=D0=B8=D0=BF=D0=B0=20=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B4=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RXInstanceManager/MainWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RXInstanceManager/MainWindow.xaml.cs b/RXInstanceManager/MainWindow.xaml.cs
index e958f3e..49a108f 100644
--- a/RXInstanceManager/MainWindow.xaml.cs
+++ b/RXInstanceManager/MainWindow.xaml.cs
@@ -412,7 +412,7 @@ private void InfoContext_Click(object sender, RoutedEventArgs e)
 
     #endregion
 
-    public void StartAsyncHandlers()
+    private void StartAsyncHandlers()
     {
       _ = UpdateInstanceGridAsync();
       _ = UpdateInstanceDataAsync();