microsoft
/
FactoryOrchestrator
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'MainPageDeclutter' of https://github.com/nick5616/FactoryOrchestrator into MainPageDeclutter

This commit is contained in:
nick5616 2021-08-06 12:26:28 -07:00
Родитель dd35f5e61b debf092b33
Коммит b463d60237
10 изменённых файлов: 73 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
build/release-pipeline.yml
Просмотреть файл

@ -642,7 +642,6 @@ stages:
exit 1
}
condition: and(ne(variables['SKIPPWSHPUBLISH'], 'true'), succeeded())
ignoreLastExitCode: true
displayName: 'Publish PowerShell module to PSGallery'
# Publish NuGet binary & symbol packages to NuGet.org with API key in secret variable OCSYM.NuGetApiKey

6
src/App/ConnectionPage.xaml
Просмотреть файл

@ -71,7 +71,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="99" x:Uid="Welcome" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource HeaderTextBlockStyle}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="99" x:Uid="Welcome" HorizontalAlignment="Center" VerticalAlignment="Center" AutomationProperties.HeadingLevel="Level1" Style="{StaticResource HeaderTextBlockStyle}"/>
<Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="99" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
@ -84,11 +84,11 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="99" x:Uid="AttemptingLocalHost" HorizontalAlignment="Center" VerticalAlignment="Top" Style="{StaticResource SubheaderTextBlockStyle}"/>
<TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="99" x:Uid="AttemptingLocalHost" HorizontalAlignment="Center" VerticalAlignment="Top" AutomationProperties.HeadingLevel="Level2" Style="{StaticResource SubheaderTextBlockStyle}"/>
<ProgressBar x:Name="ConnectingProgress" x:Uid="ConnectingProgress" Grid.Row="3" Grid.Column="1" IsIndeterminate="True" Visibility="Visible" AllowFocusOnInteraction="False"/>
</Grid>
<TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="99" x:Uid="RemoteHost" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource TitleTextBlockStyle}"/>
<TextBlock Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="99" x:Uid="RemoteHost" HorizontalAlignment="Center" VerticalAlignment="Center" AutomationProperties.HeadingLevel="Level2" Style="{StaticResource TitleTextBlockStyle}"/>
<ListView Grid.Row="6" x:Name="ResultsListView" BorderBrush="AntiqueWhite" BorderThickness="1"
MinHeight="200" Margin="0,5,0,5"
ItemTemplate="{StaticResource ResultsListViewTemplate}" ScrollViewer.VerticalScrollMode="Enabled" ScrollViewer.VerticalScrollBarVisibility="Auto" IsItemClickEnabled="True" SelectionMode="Single" ItemClick="ResultsListView_ItemClick"/>

2
src/App/EditPage.xaml
Просмотреть файл

@ -105,7 +105,7 @@
<Button.Flyout>
<Flyout x:Name="EditListNameFlyout" Opening="EditListNameFlyout_Opening">
<StackPanel Orientation="Vertical">
<TextBlock TextWrapping="Wrap" x:Uid="RenammeListBlock" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}"/>
<TextBlock TextWrapping="Wrap" x:Uid="RenameListBlock" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}"/>
<TextBox TextWrapping="Wrap" x:Name="RenameBox"/>
<StackPanel Orientation="Horizontal">
<Button x:Name="CancelNameEdit" x:Uid="CancelEdit" Padding="5" Margin="5" Click="CancelNameEdit_Click">

4
src/App/EditPage.xaml.cs
Просмотреть файл

@ -22,6 +22,7 @@ using System.Threading.Tasks;
using TaskStatus = Microsoft.FactoryOrchestrator.Core.TaskStatus;
using Windows.ApplicationModel.Resources;
using System.Globalization;
using Windows.UI.Xaml.Automation;
namespace Microsoft.FactoryOrchestrator.UWP
{
@ -736,7 +737,7 @@ namespace Microsoft.FactoryOrchestrator.UWP
CloseButtonText = resourceLoader.GetString("Ok")
};
RenameBox.Text = activeList.Name;
RenameBox.SetValue(AutomationProperties.NameProperty, activeList.Name);
_ = await failedEdit.ShowAsync();
}
else if (!activeList.Name.Equals(RenameBox.Text, StringComparison.InvariantCulture))
@ -750,6 +751,7 @@ namespace Microsoft.FactoryOrchestrator.UWP
private void EditListNameFlyout_Opening(object sender, object e)
{
RenameBox.Text = activeList.Name;
RenameBox.SetValue(AutomationProperties.NameProperty, activeList.Name);
}
private ObservableCollection<TaskBase> TasksCollection;

10
src/App/FileTransferPage.xaml
Просмотреть файл

@ -8,7 +8,7 @@
mc:Ignorable="d"
>
<Page.Resources>
<Flyout x:Name="ConfirmTransferFlyout" x:Key="ConfirmTransferFlyout">
<Flyout x:Name="ConfirmTransferFlyout" x:Key="ConfirmTransferFlyout" AutomationProperties.Name="Confirm Transfer Flyout">
<StackPanel>
<TextBlock x:Name="HeaderGet" x:Uid="HeaderGet" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}" Padding="5"/>
<TextBlock x:Name="HeaderSend" x:Uid="HeaderSend" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}" Padding="5" Visibility="Collapsed"/>
@ -55,19 +55,19 @@
</Grid.ColumnDefinitions>
<HyperlinkButton Content="Windows 10 (Desktop) only: You must allow file system access for this app! Click here for instructions." NavigateUri="https://support.microsoft.com/en-us/help/4468237/windows-10-file-system-access-and-privacy-microsoft-privacy" Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Center" FontWeight="bold"/>
<TextBlock x:Name="ClientText" x:Uid="ClientText" Grid.Row="2" Grid.Column="1" Style="{StaticResource TitleTextBlockStyle}" HorizontalAlignment="Right" Margin="10,0,0,0" VerticalAlignment="Center"/>
<TextBox x:Name="ClientFileTextBox" Grid.Row="2" Grid.Column="2" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="10,0" AutomationProperties.LabeledBy="{Binding ElementName=ClientText}"/>
<TextBox x:Name="ClientFileTextBox" Grid.Row="2" Grid.Column="2" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="10,0" TextChanged="ClientServerFile_TextChanged" AutomationProperties.LabeledBy="{Binding ElementName=ClientText}"/>
<TextBlock x:Name="ServerText" x:Uid="ServerText" Grid.Row="4" Grid.Column="1" Style="{StaticResource TitleTextBlockStyle}" HorizontalAlignment="Right" Margin="10,0,0,0" VerticalAlignment="Center"/>
<TextBox x:Name="ServerFileTextBox" Grid.Row="4" Grid.Column="2" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="10,0" AutomationProperties.LabeledBy="{Binding ElementName=ServerText}"/>
<TextBox x:Name="ServerFileTextBox" Grid.Row="4" Grid.Column="2" TextWrapping="Wrap" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="10,0" TextChanged="ClientServerFile_TextChanged" AutomationProperties.LabeledBy="{Binding ElementName=ServerText}"/>
<StackPanel Grid.Row="6" Orientation="Horizontal" Grid.Column="2" HorizontalAlignment="Left" Padding="10,0,0,0">
<Button x:Name="SendClientFileButton" Margin="0,0,10,0" Click="SendClientFileButton_Click" FlyoutBase.AttachedFlyout="{StaticResource ConfirmTransferFlyout}" AutomationProperties.LabeledBy="{Binding ElementName=SendText}">
<Button x:Name="SendClientFileButton" Margin="0,0,10,0" Click="SendClientFileButton_Click" FlyoutBase.AttachedFlyout="{StaticResource ConfirmTransferFlyout}" AutomationProperties.LabeledBy="{Binding ElementName=SendText}" IsEnabled="False">
<StackPanel Orientation="Horizontal">
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE898;"/>
<TextBlock x:Name="SendText" x:Uid="SendText" Margin="5,0"/>
</StackPanel>
</Button>
<Button x:Name="GetServerFileButton" Margin="0,0,10,0" Click="GetServerFileButton_Click" FlyoutBase.AttachedFlyout="{StaticResource ConfirmTransferFlyout}" AutomationProperties.LabeledBy="{Binding ElementName=GetText}">
<Button x:Name="GetServerFileButton" Margin="0,0,10,0" Click="GetServerFileButton_Click" FlyoutBase.AttachedFlyout="{StaticResource ConfirmTransferFlyout}" AutomationProperties.LabeledBy="{Binding ElementName=GetText}" IsEnabled="False">
<StackPanel Orientation="Horizontal">
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE896;"/>
<TextBlock x:Name="GetText" x:Uid="GetText" Margin="5,0"/>

14
src/App/FileTransferPage.xaml.cs
Просмотреть файл

@ -87,6 +87,20 @@ namespace Microsoft.FactoryOrchestrator.UWP
}
}
private void ClientServerFile_TextChanged(Object sender, TextChangedEventArgs e)
{
if ((!string.IsNullOrWhiteSpace(ServerFileTextBox.Text)) && (!string.IsNullOrWhiteSpace(ClientFileTextBox.Text)))
{
GetServerFileButton.IsEnabled = true;
SendClientFileButton.IsEnabled = true;
}
else
{
GetServerFileButton.IsEnabled = false;
SendClientFileButton.IsEnabled = false;
}
}
private void GetServerFileButton_Click(object sender, RoutedEventArgs e)
{
if ((!string.IsNullOrWhiteSpace(ServerFileTextBox.Text)) && (!string.IsNullOrWhiteSpace(ClientFileTextBox.Text)))

32
src/App/ResultsPage.xaml
Просмотреть файл

@ -25,7 +25,7 @@
</Grid.RowDefinitions>
<Button x:Name="BackButton" x:Uid="BackButton" Grid.Row="0" Grid.Column="0" Click="Back_Click" Style="{StaticResource NavigationBackButtonNormalStyle}" />
<StackPanel x:Name="HeaderStack" Grid.Row="0" Grid.Column="1" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal" >
<Button x:Name="PreviousRunButton" Click="PreviousRunButton_Click" Visibility="Visible" IsEnabled="False" AutomationProperties.LabeledBy="{Binding ElementName=PrevText}">
<Button x:Name="PreviousRunButton" Click="PreviousRunButton_Click" Visibility="Visible" IsEnabled="False" AutomationProperties.LabeledBy="{Binding ElementName=PrevText}">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<SymbolIcon Symbol="Back" />
<TextBlock x:Name="PrevText" x:Uid="PrevText" Padding="5,0" TextWrapping="Wrap" />
@ -51,12 +51,18 @@
<TextBlock x:Name="ArgsConst" x:Uid="ArgumentsBlock" Grid.Column="0" FontWeight="Bold" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5" />
<TextBlock x:Name="Args" Text="" Grid.Column="1" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" Margin="5" TextWrapping="NoWrap" IsTextSelectionEnabled="True"/>
</Grid>
<StackPanel x:Name="TaskRunStack" Grid.Row="3" Grid.Column="1" Margin="0" Orientation="Horizontal" VerticalAlignment="Center">
<TextBlock x:Name="TaskGuidConst" x:Uid="TaskGuidConst" FontWeight="Bold" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5"/>
<TextBlock x:Name="TaskGuid" Text="" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5" IsTextSelectionEnabled="True"/>
<TextBlock x:Name="TaskRunGuidConst" x:Uid="TaskRunGuidConst" FontWeight="Bold" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5" Visibility="Collapsed"/>
<TextBlock x:Name="TaskRunGuid" Text="" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5" IsTextSelectionEnabled="True" Visibility="Collapsed"/>
</StackPanel>
<Grid x:Name="TaskRunStack" Grid.Row="3" Grid.Column="1" Margin="0" VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock x:Name="TaskGuidConst" x:Uid="TaskGuidConst" FontWeight="Bold" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5" Grid.Column="0"/>
<TextBlock x:Name="TaskGuid" Text="" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5" IsTextSelectionEnabled="True" Grid.Column="1"/>
<TextBlock x:Name="TaskRunGuidConst" x:Uid="TaskRunGuidConst" FontWeight="Bold" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5" Visibility="Collapsed" Grid.Column="2"/>
<TextBlock x:Name="TaskRunGuid" Text="" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5" IsTextSelectionEnabled="True" Visibility="Collapsed" TextWrapping="Wrap" Grid.Column="3"/>
</Grid>
<StackPanel x:Name="TestResultSummaryStack" Grid.Row="4" Grid.Column="1" Margin="0" VerticalAlignment="Center" Orientation="Horizontal" >
<TextBlock x:Name="OverallTaskResultConst" x:Uid="OverallTaskResultConst" FontWeight="Bold" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5"/>
<TextBlock x:Name="OverallTaskResult" Text="" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5" IsTextSelectionEnabled="True"/>
@ -74,10 +80,14 @@
<TextBlock x:Name="RunTimeConst" x:Uid="RunTimeConst" FontWeight="Bold" VerticalAlignment="Bottom" Margin="5" HorizontalAlignment="Left" Visibility="Collapsed"/>
<TextBlock x:Name="RunTime" Text="" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5" Visibility="Collapsed" IsTextSelectionEnabled="True"/>
</StackPanel>
<StackPanel x:Name="TestResultSummaryStack2" Grid.Row="5" Grid.Column="1" Margin="0" VerticalAlignment="Center" Orientation="Horizontal" >
<TextBlock x:Name="LogPathConst" x:Uid="LogPathConst" FontWeight="Bold" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5"/>
<TextBlock x:Name="LogPath" Text="" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="5" IsTextSelectionEnabled="True"/>
</StackPanel>
<Grid x:Name="TestResultSummaryStack2" Grid.Row="5" Grid.Column="1" Margin="0" VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<TextBlock x:Name="LogPathConst" x:Uid="LogPathConst" FontWeight="Bold" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Column="0" Margin="5"/>
<TextBlock x:Name="LogPath" Text="" VerticalAlignment="Center" HorizontalAlignment="Left" IsTextSelectionEnabled="True" TextWrapping="Wrap" Grid.Column="1" Margin="5"/>
</Grid>
<TextBlock x:Name="OutputConst" Grid.Column="1" Grid.Row="6" FontWeight="Bold" VerticalAlignment="Bottom" Padding="5,5,0,5" HorizontalAlignment="Left" Text="Task Output:"/>
<ScrollViewer x:Name="ScrollView" HorizontalScrollBarVisibility="Auto" Grid.Column="1" Grid.Row="7" Margin="5" ViewChanged="ScrollView_ViewChanged">
<StackPanel x:Name="OutputStack" VerticalAlignment="Top" Orientation="Vertical" />

4
src/App/TaskListExecutionPage.xaml
Просмотреть файл

@ -149,14 +149,14 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<ProgressRing x:Name="LoadingTasksRing" Grid.ColumnSpan="2" IsActive="False" Width="100" Height="100"/>
<ListView x:Name="ActiveTestsView" Grid.Column="0" ScrollViewer.VerticalScrollMode="Disabled" ItemsSource="{x:Bind ActiveListCollection, Mode=OneWay}" SelectionMode="Single" ItemClick="ActiveTestsResultsView_ItemClick" IsItemClickEnabled="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<ListView x:Name="ActiveTestsView" Grid.Column="0" ScrollViewer.VerticalScrollMode="Disabled" ItemsSource="{x:Bind ActiveListCollection, Mode=OneWay}" SelectionMode="Single" SelectionChanged="ActiveTestsView_SelectionChanged" ItemClick="ActiveTestsResultsView_ItemClick" IsItemClickEnabled="True" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<ListView.ItemTemplate>
<DataTemplate x:DataType="local:TaskBaseWithTemplate">
<TextBlock x:Name="TaskName" Text="{x:Bind Task.Name}" ToolTipService.ToolTip="{x:Bind Task.Name}" VerticalAlignment="Center" Margin="10,0" />
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
<ListView x:Name="ActiveTestsResultsView" Grid.Column="1" ScrollViewer.VerticalScrollMode="Disabled" ItemsSource="{x:Bind ActiveListCollection, Mode=OneWay}" ItemTemplateSelector="{StaticResource ResultsViewSelector}" SelectionMode="Single" ItemClick="ActiveTestsResultsView_ItemClick" IsItemClickEnabled="True" HorizontalAlignment="Right"/>
<ListView x:Name="ActiveTestsResultsView" Grid.Column="1" ScrollViewer.VerticalScrollMode="Disabled" ItemsSource="{x:Bind ActiveListCollection, Mode=OneWay}" ItemTemplateSelector="{StaticResource ResultsViewSelector}" SelectionMode="Single" SelectionChanged="ActiveTestsResultsView_SelectionChanged" ItemClick="ActiveTestsResultsView_ItemClick" IsItemClickEnabled="True" HorizontalAlignment="Right"/>
</Grid>
</ScrollViewer>

25
src/App/TaskListExecutionPage.xaml.cs
Просмотреть файл

@ -34,6 +34,7 @@ namespace Microsoft.FactoryOrchestrator.UWP
this.NavigationCacheMode = NavigationCacheMode.Enabled;
_selectedTaskList = -1;
_selectedTaskListGuid = Guid.Empty;
_selectedTask = -1;
_selectedTaskGuid = Guid.Empty;
_headerUpdateLock = new object();
mainPage = null;
@ -102,9 +103,28 @@ namespace Microsoft.FactoryOrchestrator.UWP
// Select the tasklist to trigger TaskListsView_SelectionChanged
TaskListsView.SelectedIndex = TaskListsResultsAndButtonsView.SelectedIndex;
}
}
private void ActiveTestsView_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if ((ActiveTestsView.SelectedIndex != -1) && (_selectedTask != ActiveTestsView.SelectedIndex))
{
// Select the tasklist to trigger ActiveTestsResultsView_SelectionChanged
_selectedTask = ActiveTestsView.SelectedIndex;
ActiveTestsResultsView.SelectedIndex = ActiveTestsView.SelectedIndex;
}
}
private void ActiveTestsResultsView_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
if ((ActiveTestsResultsView.SelectedIndex != -1) && (_selectedTask != ActiveTestsResultsView.SelectedIndex))
{
// Select the tasklist to trigger ACtiveTestView_SelectionChanged
_selectedTask = ActiveTestsResultsView.SelectedIndex;
ActiveTestsView.SelectedIndex = ActiveTestsResultsView.SelectedIndex;
}
}
private void ActiveTestsResultsView_ItemClick(object sender, ItemClickEventArgs e)
{
if (e.ClickedItem != null)
@ -648,7 +668,8 @@ namespace Microsoft.FactoryOrchestrator.UWP
private ServerPoller _activeListPoller;
private ServerPoller _taskListGuidPoller;
private int _selectedTaskList;
private Guid _selectedTaskListGuid;
private Guid _selectedTaskListGuid;
private int _selectedTask;
private Guid _selectedTaskGuid;
private readonly object _headerUpdateLock;
private FactoryOrchestratorUWPClient Client = ((App)Application.Current).Client;

2
src/common.props
Просмотреть файл

@ -6,7 +6,7 @@
<!-- Assembly, App, Package version for all non-OSS files. Uses SemVer. -->
<PropertyGroup Label="Version">
<VersionPrefix>10.3.0</VersionPrefix>
<VersionPrefix>10.3.1</VersionPrefix>
</PropertyGroup>
<!-- Common packaging properties -->