AGD-2199 - custom dropdown node

src/Libraries/CoreNodeModels/CoreNodeModels.csproj

@@ -1,105 +1,105 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)Config\CS_SDK.props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <ProjectGuid>{D8262D40-4880-41E4-91E4-AF8F480C8637}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CoreNodeModels</RootNamespace>
-    <AssemblyName>CoreNodeModels</AssemblyName>
-    <OutputPath>$(OutputPath)\nodes\</OutputPath>
-    <DocumentationFile>$(OutputPath)\CoreNodeModels.XML</DocumentationFile>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ReferenceCopyLocalPaths>
-	  <!--Copy all assembly references to the OutputPath parent dir (/nodes/../) -->
-	  <DestinationSubDirectory>..\</DestinationSubDirectory>
-    </ReferenceCopyLocalPaths>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Remove="CoreNodeModelsImages.resources" />
-  </ItemGroup>
-  <ItemGroup>
-  <PackageReference Include="ncalc" Version="1.3.8">
-    <GeneratePathProperty>true</GeneratePathProperty>
-    <!--Exclude copying the runtime dlls because we will handle it in the BinaryCompatibilityOps target -->
-    <ExcludeAssets>runtime</ExcludeAssets>
-  </PackageReference>
-	<PackageReference Include="Newtonsoft.Json" Version="8.0.3" />
-    <Reference Include="System.Web" />
-    <ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
-      <Project>{7858fa8c-475f-4b8e-b468-1f8200778cf8}</Project>
-      <Name>DynamoCore</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\DynamoUtilities\DynamoUtilities.csproj">
-      <Project>{b5f435cb-0d8a-40b1-a4f7-5ecb3ce792a9}</Project>
-      <Name>DynamoUtilities</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Engine\ProtoCore\ProtoCore.csproj">
-      <Project>{7a9e0314-966f-4584-baa3-7339cbb849d1}</Project>
-      <Name>ProtoCore</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\NodeServices\DynamoServices.csproj">
-      <Project>{ef879a10-041d-4c68-83e7-3192685f1bae}</Project>
-      <Name>DynamoServices</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\CoreNodes\CoreNodes.csproj">
-      <Project>{87550b2b-6cb8-461e-8965-dfafe3aafb5c}</Project>
-      <Name>CoreNodes</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\DynamoConversions\DynamoConversions.csproj">
-      <Project>{c5adc05b-34e8-47bf-8e78-9c7bf96418c2}</Project>
-      <Name>DynamoConversions</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\VMDataBridge\VMDataBridge.csproj">
-      <Project>{ccb6e56b-2da1-4eba-a1f9-e8510e129d12}</Project>
-      <Name>VMDataBridge</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Properties\Resources.en-US.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.en-US.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Properties\Resources.en-US.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.en-US.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Target Name="BinaryCompatibilityOps" BeforeTargets="Build">
-    <Copy SourceFiles="$(PkgNCalc)\lib\NCalc.dll" DestinationFolder="$(OutputPath)" />
-  </Target>
-  <Target Name="GenerateFiles" AfterTargets="Build" Condition=" '$(OS)' != 'Unix' ">
-    <!-- Get System.Drawing.dll -->
-    <GetReferenceAssemblyPaths TargetFrameworkMoniker=".NETFramework, Version=$(ResourceGeneration_FrameworkVersion)">
-      <Output TaskParameter="FullFrameworkReferenceAssemblyPaths" PropertyName="FrameworkAssembliesPath" />
-    </GetReferenceAssemblyPaths>
-    <!-- Get assembly -->
-    <GetAssemblyIdentity AssemblyFiles="$(OutDir)$(TargetName).dll">
-      <Output TaskParameter="Assemblies" ItemName="AssemblyInfo" />
-    </GetAssemblyIdentity>
-    <!-- Generate customization dll -->
-    <GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)CoreNodeModelsImages.resx" OutputResources="$(ProjectDir)CoreNodeModelsImages.resources" References="$(FrameworkAssembliesPath)System.Drawing.dll" />
-    <AL SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" TargetType="library" EmbedResources="$(ProjectDir)CoreNodeModelsImages.resources" OutputAssembly="$(OutDir)CoreNodeModels.customization.dll" Version="%(AssemblyInfo.Version)" />
-   </Target>
+    <ImportGroup Label="PropertySheets">
+        <Import Project="$(SolutionDir)Config\CS_SDK.props"/>
+    </ImportGroup>
+    <PropertyGroup>
+        <ProjectGuid>{D8262D40-4880-41E4-91E4-AF8F480C8637}</ProjectGuid>
+        <OutputType>Library</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>CoreNodeModels</RootNamespace>
+        <AssemblyName>CoreNodeModels</AssemblyName>
+        <OutputPath>$(OutputPath)\nodes\</OutputPath>
+        <DocumentationFile>$(OutputPath)\CoreNodeModels.XML</DocumentationFile>
+    </PropertyGroup>
+    <ItemDefinitionGroup>
+        <ReferenceCopyLocalPaths>
+            <!--Copy all assembly references to the OutputPath parent dir (/nodes/../) -->
+            <DestinationSubDirectory>..\</DestinationSubDirectory>
+        </ReferenceCopyLocalPaths>
+    </ItemDefinitionGroup>
+    <ItemGroup>
+        <None Remove="CoreNodeModelsImages.resources"/>
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="ncalc" Version="1.3.8">
+            <GeneratePathProperty>true</GeneratePathProperty>
+            <!--Exclude copying the runtime dlls because we will handle it in the BinaryCompatibilityOps target -->
+            <ExcludeAssets>runtime</ExcludeAssets>
+        </PackageReference>
+        <PackageReference Include="Newtonsoft.Json" Version="8.0.3"/>
+        <Reference Include="System.Web"/>
+        <ProjectReference Include="..\..\DynamoCore\DynamoCore.csproj">
+            <Project>{7858fa8c-475f-4b8e-b468-1f8200778cf8}</Project>
+            <Name>DynamoCore</Name>
+            <Private>False</Private>
+        </ProjectReference>
+        <ProjectReference Include="..\..\DynamoUtilities\DynamoUtilities.csproj">
+            <Project>{b5f435cb-0d8a-40b1-a4f7-5ecb3ce792a9}</Project>
+            <Name>DynamoUtilities</Name>
+            <Private>False</Private>
+        </ProjectReference>
+        <ProjectReference Include="..\..\Engine\ProtoCore\ProtoCore.csproj">
+            <Project>{7a9e0314-966f-4584-baa3-7339cbb849d1}</Project>
+            <Name>ProtoCore</Name>
+            <Private>False</Private>
+        </ProjectReference>
+        <ProjectReference Include="..\..\NodeServices\DynamoServices.csproj">
+            <Project>{ef879a10-041d-4c68-83e7-3192685f1bae}</Project>
+            <Name>DynamoServices</Name>
+            <Private>False</Private>
+        </ProjectReference>
+        <ProjectReference Include="..\CoreNodes\CoreNodes.csproj">
+            <Project>{87550b2b-6cb8-461e-8965-dfafe3aafb5c}</Project>
+            <Name>CoreNodes</Name>
+            <Private>False</Private>
+        </ProjectReference>
+        <ProjectReference Include="..\DynamoConversions\DynamoConversions.csproj">
+            <Project>{c5adc05b-34e8-47bf-8e78-9c7bf96418c2}</Project>
+            <Name>DynamoConversions</Name>
+            <Private>False</Private>
+        </ProjectReference>
+        <ProjectReference Include="..\VMDataBridge\VMDataBridge.csproj">
+            <Project>{ccb6e56b-2da1-4eba-a1f9-e8510e129d12}</Project>
+            <Name>VMDataBridge</Name>
+            <Private>False</Private>
+        </ProjectReference>
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Update="Properties\Resources.Designer.cs">
+            <AutoGen>True</AutoGen>
+            <DesignTime>True</DesignTime>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+        <Compile Update="Properties\Resources.en-US.Designer.cs">
+            <AutoGen>True</AutoGen>
+            <DesignTime>True</DesignTime>
+            <DependentUpon>Resources.en-US.resx</DependentUpon>
+        </Compile>
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Update="Properties\Resources.resx">
+            <Generator>PublicResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+        <EmbeddedResource Update="Properties\Resources.en-US.resx">
+            <Generator>PublicResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.en-US.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
+    </ItemGroup>
+    <Target Name="BinaryCompatibilityOps" BeforeTargets="Build">
+        <Copy SourceFiles="$(PkgNCalc)\lib\NCalc.dll" DestinationFolder="$(OutputPath)"/>
+    </Target>
+    <Target Name="GenerateFiles" AfterTargets="Build" Condition=" '$(OS)' != 'Unix' ">
+        <!-- Get System.Drawing.dll -->
+        <GetReferenceAssemblyPaths TargetFrameworkMoniker=".NETFramework, Version=$(ResourceGeneration_FrameworkVersion)">
+            <Output TaskParameter="FullFrameworkReferenceAssemblyPaths" PropertyName="FrameworkAssembliesPath"/>
+        </GetReferenceAssemblyPaths>
+        <!-- Get assembly -->
+        <GetAssemblyIdentity AssemblyFiles="$(OutDir)$(TargetName).dll">
+            <Output TaskParameter="Assemblies" ItemName="AssemblyInfo"/>
+        </GetAssemblyIdentity>
+        <!-- Generate customization dll -->
+        <GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)CoreNodeModelsImages.resx" OutputResources="$(ProjectDir)CoreNodeModelsImages.resources" References="$(FrameworkAssembliesPath)System.Drawing.dll"/>
+        <AL SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" TargetType="library" EmbedResources="$(ProjectDir)CoreNodeModelsImages.resources" OutputAssembly="$(OutDir)CoreNodeModels.customization.dll" Version="%(AssemblyInfo.Version)"/>
+    </Target>
 </Project>

src/Libraries/CoreNodeModels/CustomSelectionItem.cs

@@ -0,0 +1,165 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Input;
+using Newtonsoft.Json;
+
+namespace CoreNodeModels
+{
+    /// <summary>
+    /// Represents an Enum item
+    /// </summary>
+    public class CustomSelectionItem
+    {
+        public string Name { get; set; }
+
+        public string Value { get; set; }
+
+        public CustomSelectionItem()
+        {
+
+        }
+    }
+
+
+    public class CustomSelectionItemViewModel : INotifyPropertyChanged, IDataErrorInfo
+    {
+        private readonly CustomSelectionItem customSelectionItem;
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #region Properties
+
+        [JsonIgnore]
+        public Func<CustomSelectionItem, bool> IsUnique { get; set; }
+
+        [JsonIgnore]
+        public Action ItemChanged { get; set; }
+
+        [JsonIgnore]
+        public Action<CustomSelectionItemViewModel> RemoveRequested { get; set; }
+
+        public string Name
+        {
+            get
+            {
+                return customSelectionItem.Name;
+            }
+            set
+            {
+                customSelectionItem.Name = value;
+
+                OnPropertyChanged("Name");
+                OnPropertyChanged("IsValid");
+
+                if (ItemChanged != null)
+                    ItemChanged();
+            }
+        }
+
+        public string Value
+        {
+            get
+            {
+                return customSelectionItem.Value;
+            }
+            set
+            {
+                customSelectionItem.Value = value;
+                OnPropertyChanged("Value");
+
+                if (ItemChanged != null)
+                    ItemChanged();
+            }
+        }
+
+        [JsonIgnore]
+        public bool IsValid
+        {
+            get
+            {
+                if (string.IsNullOrWhiteSpace(Name))
+                    return false;
+
+                if (IsUnique != null && !IsUnique(customSelectionItem))
+                    return false;
+
+                return true;
+            }
+        }
+
+        #endregion
+
+        #region IDataErrorInfo
+
+        [JsonIgnore]
+        public string Error
+        {
+            get
+            {
+                return string.Empty;
+            }
+        }
+
+        [JsonIgnore]
+        public string this[string columnName]
+        {
+            get
+            {
+                if (columnName.Equals("Name"))
+                {
+                    if (string.IsNullOrWhiteSpace(Name))
+                        return "Name cannot be empty";
+                    else if (IsUnique != null && !IsUnique(customSelectionItem))
+                        return "Name must be unique";
+                }
+
+                return string.Empty;
+            }
+        }
+
+        #endregion
+
+        #region Commands
+
+        [JsonIgnore]
+        public ICommand RemoveCommand { get; private set; }
+
+        #endregion
+
+        #region Public logic
+
+        public CustomSelectionItemViewModel()
+        {
+            customSelectionItem = new CustomSelectionItem();
+            RemoveCommand = new RelayCommand(RemoveCommandExecute);
+        }
+
+        public CustomSelectionItemViewModel(CustomSelectionItem customSelectionItem)
+        {
+            if (customSelectionItem == null)
+                throw new ArgumentException("enumItem cannot be null");
+
+            this.customSelectionItem = customSelectionItem;
+            RemoveCommand = new RelayCommand(RemoveCommandExecute);
+        }
+
+        public void RemoveCommandExecute(object param)
+        {
+            if (RemoveRequested != null)
+                RemoveRequested(this);
+        }
+
+        public void Validate()
+        {
+            OnPropertyChanged("Name");
+        }
+
+        protected void OnPropertyChanged(string propertyName)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        #endregion
+    }
+}