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
2 changes: 2 additions & 0 deletions src/DynamoCoreWpf/DynamoCoreWpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
<None Remove="Packages\SplashScreen\build\index.html" />
<None Remove="Packages\DynamoHome\build\index.bundle.js" />
<None Remove="Packages\DynamoHome\build\index.html" />
<None Remove="UI\Images\adsk-logo-16px.png" />
<None Remove="UI\Images\Annotations\frozen-dark-64px.png" />
<None Remove="UI\Images\Annotations\frozen-hover-64px.png" />
<None Remove="UI\Images\Annotations\frozen-light-64px.png" />
Expand Down Expand Up @@ -1184,6 +1185,7 @@
<Resource Include="UI\Images\AboutWindow\logo_about_dark.png">
<CopyToOutputDirectory></CopyToOutputDirectory>
</Resource>
<Resource Include="UI\Images\adsk-logo-16px.png" />
<Resource Include="UI\Images\Alignment\align_bottom.png" />
<Resource Include="UI\Images\Alignment\align_left.png" />
<Resource Include="UI\Images\Alignment\align_right.png" />
Expand Down
9 changes: 9 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.en-US.resx
Original file line number Diff line number Diff line change
Expand Up @@ -3135,6 +3135,9 @@ This package will be unloaded after the next Dynamo restart.</value>
<value>Package</value>
<comment>Datagrid Column Header in the PackageDetailsViewExtension.</comment>
</data>
<data name="PackageDetailsPackageApprovedTooltip" xml:space="preserve">
<value>Created by Autodesk</value>
</data>
<data name="PackageSortToolTip" xml:space="preserve">
<value>Sort Packages.</value>
</data>
Expand Down
3 changes: 3 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1392,6 +1392,9 @@ Don't worry, you'll have the option to save your work.</value>
<value>Package</value>
<comment>Datagrid Column Header in the PackageDetailsViewExtension.</comment>
</data>
<data name="PackageDetailsPackageApprovedTooltip" xml:space="preserve">
<value>Created by Autodesk</value>
</data>
<data name="PackageDownloadStateDownloaded" xml:space="preserve">
<value>Downloaded</value>
</data>
Expand Down
2 changes: 2 additions & 0 deletions src/DynamoCoreWpf/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1369,6 +1369,7 @@ Dynamo.PackageManager.ViewModels.PackageManagerSearchElementViewModel.Hosts.get
Dynamo.PackageManager.ViewModels.PackageManagerSearchElementViewModel.IsDeprecated.get -> bool
Dynamo.PackageManager.ViewModels.PackageManagerSearchElementViewModel.IsEnabledForInstall.get -> bool
Dynamo.PackageManager.ViewModels.PackageManagerSearchElementViewModel.IsOnwer.get -> bool
Dynamo.PackageManager.ViewModels.PackageManagerSearchElementViewModel.IsPublishedByDynamoTeam.get -> bool
Dynamo.PackageManager.ViewModels.PackageManagerSearchElementViewModel.IsSelectedVersionCompatible.get -> bool?
Dynamo.PackageManager.ViewModels.PackageManagerSearchElementViewModel.IsSelectedVersionCompatible.set -> void
Dynamo.PackageManager.ViewModels.PackageManagerSearchElementViewModel.LatestVersion.get -> string
Expand Down Expand Up @@ -5159,6 +5160,7 @@ static Dynamo.Wpf.Properties.Resources.NodeAutoCompleteNotAvailableForCollapsedG
static Dynamo.Wpf.Properties.Resources.NodeAutoCompleteToolTip.get -> string
static Dynamo.Wpf.Properties.Resources.OfflineStatusTooltip.get -> string
static Dynamo.Wpf.Properties.Resources.OnlineStatusTooltip.get -> string
static Dynamo.Wpf.Properties.Resources.PackageDetailsPackageApprovedTooltip.get -> string
static Dynamo.Wpf.Properties.Resources.PackageDuplicateAssembliesFoundMessage.get -> string
static Dynamo.Wpf.Properties.Resources.PreferencesViewEnableNodeAutoCompleteNewUI.get -> string
static Dynamo.Wpf.Properties.Resources.PreferencesViewEnableNodeAutoCompleteNewUITooltipText.get -> string
Expand Down
Binary file added src/DynamoCoreWpf/UI/Images/adsk-logo-16px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ namespace Dynamo.PackageManager.ViewModels
{
public class PackageManagerSearchElementViewModel : BrowserItemViewModel, IEquatable<PackageManagerSearchElementViewModel>
{
private const string DynamoTeamPublisherName = "DynamoTeam";
public ICommand DownloadLatestCommand { get; set; }
public ICommand UpvoteCommand { get; set; }
public ICommand VisitSiteCommand { get; set; }
Expand Down Expand Up @@ -61,6 +62,17 @@ public class PackageManagerSearchElementViewModel : BrowserItemViewModel, IEquat
/// VM Name Property
/// </summary>
public string Name { get { return this.SearchElementModel.Name; } }
/// <summary>
/// Gets a value indicating whether the publisher is DynamoTeam
/// </summary>
public bool IsPublishedByDynamoTeam
{
get
{
return SearchElementModel?.Header?.maintainers?
.Any(m => string.Equals(m?.username, DynamoTeamPublisherName, StringComparison.OrdinalIgnoreCase)) == true;
}
}

public PackageManagerSearchElement SearchElementModel { get; internal set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -485,37 +485,56 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<!-- Package Name -->
<TextBlock Name="packageName"
Grid.Column="0"
<!-- Package Name + DynamoTeam badge-->
<Grid x:Name="packageNameArea" Grid.Column="0" HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<!--Package Name-->
<TextBlock Name="packageName"
Grid.Column="0"
VerticalAlignment="Center"
FontFamily="{StaticResource ArtifaktElementRegular}"
FontSize="14"
FontWeight="SemiBold"
MouseDown="PackageName_MouseDown"
Text="{Binding Path=Name}"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Style.Triggers>
<DataTrigger Binding="{Binding Path=IsDeprecated}" Value="True">
<Setter Property="Foreground" Value="#999999" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=IsDeprecated}" Value="False">
<Setter Property="Foreground" Value="{StaticResource PMForegroundColorBrush}" />
</DataTrigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="TextDecorations" Value="Underline" />
</Trigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
<TextBlock.ToolTip>
<ToolTip Content="{Binding Path=Name}" Style="{StaticResource GenericToolTipLight}" />
</TextBlock.ToolTip>
</TextBlock>
<!--DynamoTeam badge icon -->
<Image Grid.Column="1"
Width="16"
Height="16"
Margin="6,0,0,3"
VerticalAlignment="Center"
FontFamily="{StaticResource ArtifaktElementRegular}"
FontSize="14"
FontWeight="SemiBold"
MouseDown="PackageName_MouseDown"
Text="{Binding Path=Name}"
TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap">
<TextBlock.Style>
<Style TargetType="TextBlock">
<Style.Triggers>
<DataTrigger Binding="{Binding Path=IsDeprecated}" Value="True">
<Setter Property="Foreground" Value="#999999" />
</DataTrigger>
<DataTrigger Binding="{Binding Path=IsDeprecated}" Value="False">
<Setter Property="Foreground" Value="{StaticResource PMForegroundColorBrush}" />
</DataTrigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="TextDecorations" Value="Underline" />
</Trigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
<TextBlock.ToolTip>
<ToolTip Content="{Binding Path=Name}" Style="{StaticResource GenericToolTipLight}" />
</TextBlock.ToolTip>
</TextBlock>

Source="/DynamoCoreWpf;component/UI/Images/adsk-logo-16px.png"
Visibility="{Binding IsPublishedByDynamoTeam, Converter={StaticResource BoolToVisibilityCollapsedConverter}}">
<Image.ToolTip>
<ToolTip Content="{x:Static p:Resources.PackageDetailsPackageApprovedTooltip}" Style="{StaticResource GenericToolTipLight}" />
</Image.ToolTip>
</Image>
</Grid>

<!-- Tag Bubble -->
<Border Name="newPackageLabel"
Grid.Column="1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1617,5 +1617,57 @@ public void NormalizeAndCompareVersionStringList_ShouldFail()

#endregion

[Test]
public void IsPublishedByDynamoTeam_IsFalse_WhenMaintainersNull()
{
var tmpPackageVersion = new PackageVersion { version = "1.0.0", created = DateTime.Now.ToString() };
var vm = new PackageManagerSearchElementViewModel(
new PackageManagerSearchElement(new PackageHeader()
{
name = "pkg",
versions = new List<PackageVersion> { tmpPackageVersion },
maintainers = null
}),
false);

Assert.IsFalse(vm.IsPublishedByDynamoTeam);
}

[Test]
public void IsPublishedByDynamoTeam_IsFalse_WhenMaintainersDoNotContainDynamoTeam()
{
var tmpPackageVersion = new PackageVersion { version = "1.0.0", created = DateTime.Now.ToString() };
var vm = new PackageManagerSearchElementViewModel(
new PackageManagerSearchElement(new PackageHeader()
{
name = "pkg",
versions = new List<PackageVersion> { tmpPackageVersion },
maintainers = new List<User> { new User { username = "someoneElse" } }
}),
false);

Assert.IsFalse(vm.IsPublishedByDynamoTeam);
}

[Test]
public void IsPublishedByDynamoTeam_IsTrue_WhenMaintainersContainDynamoTeam_IgnoringCase()
{
var tmpPackageVersion = new PackageVersion { version = "1.0.0", created = DateTime.Now.ToString() };
var vm = new PackageManagerSearchElementViewModel(
new PackageManagerSearchElement(new PackageHeader()
{
name = "pkg",
versions = new List<PackageVersion> { tmpPackageVersion },
maintainers = new List<User>
{
new User { username = "someoneElse" },
new User { username = "dYnaMoTeAm" }
}
}),
false);

Assert.IsTrue(vm.IsPublishedByDynamoTeam);
}

}
}
Loading