Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion RXInstanceManager/AppHandlers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ public static void LaunchProcess(string fileName, bool asAdmin)
LaunchProcess(fileName, null, asAdmin, false);
}

public static void LaunchProcess(string fileName, string args, bool asAdmin, bool waitForExit)
public static void LaunchProcess(string fileName, string args, bool asAdmin, bool waitForExit, bool isHiddenCommandLine = false)
{
using (var process = new Process())
{
Expand All @@ -253,6 +253,14 @@ public static void LaunchProcess(string fileName, string args, bool asAdmin, boo
if (asAdmin)
process.StartInfo.Verb = "runas";

if (isHiddenCommandLine)
{
process.StartInfo.CreateNoWindow = true;
process.StartInfo.UseShellExecute = false;
process.StartInfo.RedirectStandardOutput = true;
process.StartInfo.RedirectStandardError = true;
}

try
{
process.Start();
Expand Down
4 changes: 4 additions & 0 deletions RXInstanceManager/Entities/Models/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ public class Config
public string LogViewer { get; set; }
internal bool LogViewerExists { get; set; }

public string MetadataBrowser { get; set; }

internal bool MetadataBrowserExists { get; set; }

public bool NeedCheckAfterSet { get; set; }

public ContextMenuClass ContextMenu { get; set; }
Expand Down
1 change: 1 addition & 0 deletions RXInstanceManager/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<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" />
<Button x:Name="ButtonMetadataBrowser" Content="Metadata Browser" Style="{DynamicResource RecordActionButton}" Background="Yellow" Click="RunMetadataBrowser_Click" />
<Button x:Name="ButtonSourcesFolder" Content="Папка исходников" Style="{DynamicResource RecordActionButton}" Background="#FFDCA3FF" Click="ButtonSourcesFolder_Click" />
</StackPanel>
<DataGrid x:Name="GridInstances" AutoGenerateColumns="False" Style="{DynamicResource DataGridStyle}" Grid.Row="1" SelectionChanged="GridInstances_SelectionChanged" >
Expand Down
16 changes: 16 additions & 0 deletions RXInstanceManager/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,22 @@ private void RunDirectumLogViewer_Click(object sender, RoutedEventArgs e)
System.Windows.MessageBox.Show($"Папка {_instance.LogFolder} не существует.", "", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error);
}

private void RunMetadataBrowser_Click(object sender, RoutedEventArgs e)
{
if (_instance == null)
return;

if (File.Exists(_configRxInstMan.MetadataBrowser))
try
{
Task.Run(() => AppHandlers.LaunchProcess(AppHelper.GetDoPath(_instance.InstancePath), "map run_metadata_browser " + _configRxInstMan.MetadataBrowser, true, false, true));
}
catch (Exception ex)
{
AppHandlers.ErrorHandler(_instance, ex);
}
}

private void ButtonSourcesFolder_Click(object sender, RoutedEventArgs e)
{
if (Directory.Exists(_instance.WorkingRepositoryName))
Expand Down
25 changes: 24 additions & 1 deletion RXInstanceManager/MainWindowHandlers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ private void LoadConfig()
contextMenu.OpenLogFolder = true;

var config = new Config();
config.LogViewer = "";
config.LogViewer = "";
config.MetadataBrowser = "";
config.NeedCheckAfterSet = false;
config.ContextMenu = contextMenu;
var serializer = new YamlDotNet.Serialization.SerializerBuilder()
Expand All @@ -66,6 +67,20 @@ private void LoadConfig()
_configRxInstMan.LogViewerExists = File.Exists(_configRxInstMan.LogViewer);
if (!_configRxInstMan.LogViewerExists)
AppHandlers.logger.Error(string.Format("Файл LogViewer {0} не найден", _configRxInstMan.LogViewer));
try
{
_configRxInstMan.MetadataBrowser = ymlData.metadataBrowser;
}
catch (Exception e)
{
if (Environment.UserDomainName == "NT_WORK")
_configRxInstMan.MetadataBrowser = "\\\\orpihost\\MetadataBrowser\\MetadataBrowser.exe";
else
_configRxInstMan.MetadataBrowser = "";
}
_configRxInstMan.MetadataBrowserExists = File.Exists(_configRxInstMan.MetadataBrowser);
if (!_configRxInstMan.MetadataBrowserExists)
AppHandlers.logger.Error(string.Format("Файл MetadataBrowser {0} не найден", _configRxInstMan.MetadataBrowser));
_configRxInstMan.NeedCheckAfterSet = (ymlData.needCheckAfterSet == "true") ? true : false;

Func<string, bool> getContext = (contextMenuItem) => !ymlData.contextMenu.ContainsKey(contextMenuItem) || ymlData.contextMenu[contextMenuItem] == "true" ? true : false;
Expand Down Expand Up @@ -198,6 +213,10 @@ private void ActionButtonVisibleChanging(string status = null)
ButtonLogViewer.Visibility = Visibility.Visible;
else
ButtonLogViewer.Visibility = Visibility.Collapsed;
if (_configRxInstMan.MetadataBrowserExists)
ButtonMetadataBrowser.Visibility = Visibility.Visible;
else
ButtonMetadataBrowser.Visibility = Visibility.Collapsed;
ButtonSourcesFolder.Visibility = Visibility.Visible;
break;
case Constants.InstanceStatus.Working:
Expand All @@ -209,6 +228,10 @@ private void ActionButtonVisibleChanging(string status = null)
ButtonLogViewer.Visibility = Visibility.Visible;
else
ButtonLogViewer.Visibility = Visibility.Collapsed;
if (_configRxInstMan.MetadataBrowserExists)
ButtonMetadataBrowser.Visibility = Visibility.Visible;
else
ButtonMetadataBrowser.Visibility = Visibility.Collapsed;
ButtonSourcesFolder.Visibility = Visibility.Visible;
break;
}
Expand Down