History

Merge branch 'master' of github.com:GridProtectionAlliance/gsf

gsfbuildbot committed 4 years ago

Commit f08c1fe2 parents f6b0f39 96feff05 files · +34 −29Browse files

Unified · Split

5 files
  1. Source/Libraries/GSF.TimeSeries/UI/WPF/GSF.TimeSeries.UI.WPF.csproj +1 −0
  2. Source/Libraries/GSF.TimeSeries/UI/WPF/UserControls/AdapterUserControl.xaml.cs +2 −2
  3. Source/Libraries/GSF.TimeSeries/UI/WPF/ViewModels/AdapterConnectionStringParameter.cs +6 −4
  4. Source/Libraries/GSF.TimeSeries/UI/WPF/ViewModels/Adapters.cs +9 −9
  5. Source/Libraries/GSF.Web/Model/ModelController.cs +16 −14
Source/Libraries/GSF.TimeSeries/UI/WPF/GSF.TimeSeries.UI.WPF.csproj+1−0
@@ -15,6 +15,7 @@ · 14 unmodified lines
1515 <FileAlignment>512</FileAlignment>
1616 <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1717 <WarningLevel>4</WarningLevel>
18+ <LangVersion>9</LangVersion>
1819 </PropertyGroup>
1920 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2021 <DebugSymbols>true</DebugSymbols>
Source/Libraries/GSF.TimeSeries/UI/WPF/UserControls/AdapterUserControl.xaml.cs+2−2
@@ -95,7 +95,7 @@ namespace GSF.TimeSeries.UI.UserControls · 94 unmodified lines
9595 private void DataGridEnabledCheckBox_Click(object sender, RoutedEventArgs e)
9696 {
9797 // Get a reference to the enabled checkbox that was clicked
98− if (!(sender is CheckBox enabledCheckBox))
98+ if (sender is not CheckBox enabledCheckBox)
9999 return;
100100
101101 // Get the runtime ID of the currently selected adapter
@@ -143,7 +143,7 @@ namespace GSF.TimeSeries.UI.UserControls · 41 unmodified lines
143143 /// <param name="e">Arguments for the event.</param>
144144 private void Default_Click(object sender, RoutedEventArgs e)
145145 {
146− if (!(DataContext is ViewModels.Adapters dataContext) || dataContext.SelectedParameter is null)
146+ if (DataContext is not ViewModels.Adapters dataContext || dataContext.SelectedParameter is null)
147147 return;
148148
149149 Dictionary<string, string> settings = dataContext.CurrentItem.ConnectionString.ToNonNullString().ParseKeyValuePairs();
Source/Libraries/GSF.TimeSeries/UI/WPF/ViewModels/AdapterConnectionStringParameter.cs+6−4
@@ -177,13 +177,15 @@ namespace GSF.TimeSeries.UI.ViewModels · 176 unmodified lines
177177 ((Enum)Enum.Parse(m_info.PropertyType, Value.ToString(), true)).GetDescription(false) :
178178 null;
179179 }
180+ #if DEBUG
180181 catch (Exception ex)
181182 {
182− #if DEBUG
183183 return ex.Message;
184− #else
184+ #else
185+ catch
186+ {
185187 return null;
186− #endif
188+ #endif
187189 }
188190 }
189191 set { }
@@ -227,7 +229,7 @@ namespace GSF.TimeSeries.UI.ViewModels · 37 unmodified lines
227229 {
228230 try
229231 {
230− return !(m_info?.GetCustomAttribute<CustomConfigurationEditorAttribute>() is null);
232+ return m_info?.GetCustomAttribute<CustomConfigurationEditorAttribute>() is not null;
231233 }
232234 catch
233235 {
Source/Libraries/GSF.TimeSeries/UI/WPF/ViewModels/Adapters.cs+9−9
@@ -244,12 +244,12 @@ namespace GSF.TimeSeries.UI.ViewModels · 243 unmodified lines
244244 get => m_selectedParameter;
245245 set
246246 {
247− if (!(m_selectedParameter is null))
247+ if (m_selectedParameter is not null)
248248 m_selectedParameter.PropertyChanged -= ConnectionStringParameter_PropertyChanged;
249249
250250 m_selectedParameter = value;
251251
252− if (!(m_selectedParameter is null))
252+ if (m_selectedParameter is not null)
253253 m_selectedParameter.PropertyChanged += ConnectionStringParameter_PropertyChanged;
254254
255255 OnPropertyChanged("SelectedParameter");
@@ -310,7 +310,7 @@ namespace GSF.TimeSeries.UI.ViewModels · 54 unmodified lines
310310 {
311311 ItemsKeys = Adapter.LoadIDs(null, m_adapterType, SortMember, SortDirection);
312312
313− if (!(SortSelector is null))
313+ if (SortSelector is not null)
314314 {
315315 ItemsKeys = SortDirection == "ASC" ?
316316 ItemsKeys.OrderBy(SortSelector).ToList() :
@@ -404,7 +404,7 @@ namespace GSF.TimeSeries.UI.ViewModels · 87 unmodified lines
404404 .Select(tuple => tuple.Item1)
405405 .SingleOrDefault(type => type.FullName == CurrentItem.TypeName);
406406
407− if (!(selectedType is null))
407+ if (selectedType is not null)
408408 {
409409 string pattern = Regex.Escape(FilePath.GetAbsolutePath("").EnsureEnd(Path.DirectorySeparatorChar));
410410 CurrentItem.AssemblyName = Regex.Replace(selectedType.Assembly.Location, $"^{pattern}", "", RegexOptions.IgnoreCase);
@@ -441,7 +441,7 @@ namespace GSF.TimeSeries.UI.ViewModels · 30 unmodified lines
441441 /// <param name="e">Event arguments.</param>
442442 protected virtual void ConnectionStringParameter_PropertyChanged(object sender, PropertyChangedEventArgs e)
443443 {
444− if (m_suppressConnectionStringUpdates || !(sender is AdapterConnectionStringParameter parameter) || parameter.Value is null || e.PropertyName != "Value")
444+ if (m_suppressConnectionStringUpdates || sender is not AdapterConnectionStringParameter parameter || parameter.Value is null || e.PropertyName != "Value")
445445 return;
446446
447447 try
@@ -624,7 +624,7 @@ namespace GSF.TimeSeries.UI.ViewModels · 176 unmodified lines
624624 /// </returns>
625625 private List<AdapterConnectionStringParameter> GetParameterList(string assemblyName, string typeName)
626626 {
627− if (!(assemblyName is null) && !(typeName is null))
627+ if (assemblyName is not null && typeName is not null)
628628 {
629629 // For convenience, start by searching the type
630630 // list for a type matching the parameters.
@@ -637,7 +637,7 @@ namespace GSF.TimeSeries.UI.ViewModels · 6 unmodified lines
637637 if (adapterType is null && File.Exists(assemblyName))
638638 adapterType = Assembly.LoadFrom(assemblyName).GetType(typeName);
639639
640− if (!(adapterType is null))
640+ if (adapterType is not null)
641641 {
642642 // Get the list of properties with ConnectionStringParameterAttribute annotations.
643643 IEnumerable<PropertyInfo> infoList = adapterType.GetProperties()
@@ -686,7 +686,7 @@ namespace GSF.TimeSeries.UI.ViewModels · 42 unmodified lines
686686 object defaultValue = null;
687687 string description = null;
688688
689− if (!(m_parameterList is null))
689+ if (m_parameterList is not null)
690690 parameter = m_parameterList.SingleOrDefault(param => param.Name.Equals(info.Name, StringComparison.OrdinalIgnoreCase));
691691
692692 // These are different cases, but we need to extract the description
@@ -733,7 +733,7 @@ namespace GSF.TimeSeries.UI.ViewModels · 40 unmodified lines
733733 {
734734 AdapterConnectionStringParameter parameter = null;
735735
736− if (!(m_parameterList is null))
736+ if (m_parameterList is not null)
737737 parameter = m_parameterList.SingleOrDefault(param => param.Name.Equals(name, StringComparison.OrdinalIgnoreCase));
738738
739739 return parameter ?? new AdapterConnectionStringParameter()
Source/Libraries/GSF.Web/Model/ModelController.cs+16−14
@@ -32,10 +32,11 @@ using System.Security.Claims; · 31 unmodified lines
3232 using System.Web.Http;
3333 using GSF.Data;
3434 using GSF.Data.Model;
35−using GSF.Reflection;
3635 using Newtonsoft.Json;
3736 using Newtonsoft.Json.Linq;
3837
38+#pragma warning disable CS1591 // TODO: Fix missing XML comments for publicly visible types and members
39+
3940 namespace GSF.Web.Model
4041 {
4142 /// <summary>
@@ -45,6 +46,7 @@ namespace GSF.Web.Model · 3 unmodified lines
4546 public class ModelController<T> : ApiController where T : class, new()
4647 {
4748 #region [ Members ]
49+
4850 /// <summary>
4951 /// Class Providing Search Parameters for the Search Endpoints
5052 /// </summary>
@@ -223,10 +225,10 @@ namespace GSF.Web.Model · 172 unmodified lines
223225 }
224226
225227 /// <summary>
226− /// Gets record from associated table with a primary key matching the id provided
228+ /// Gets record from associated table with a primary key matching the <paramref name="id"/> provided.
227229 /// </summary>
228230 /// <param name="id">ID to be used</param>
229− /// <returns><see cref="IHttpActionResult"/> containing <see cref="T"/> or <see cref="Exception"/></returns>
231+ /// <returns><see cref="IHttpActionResult"/> containing <typeparamref name="T"/> or <see cref="Exception"/></returns>
230232 [HttpGet, Route("One/{id}")]
231233 public virtual IHttpActionResult GetOne(string id)
232234 {
@@ -266,7 +268,7 @@ namespace GSF.Web.Model · 33 unmodified lines
266268 }
267269
268270 /// <summary>
269− /// Gets a sorted list of <see cref="T"/>.
271+ /// Gets a sorted list of <typeparamref name="T"/>.
270272 /// </summary>
271273 /// <param name="sort"> the Field to be sorted by.</param>
272274 /// <param name="ascending"> parameter to indicate whether the list is in ascending order.</param>
@@ -345,7 +347,7 @@ namespace GSF.Web.Model · 72 unmodified lines
345347 /// <summary>
346348 /// Adds a new Record.
347349 /// </summary>
348− /// <param name="record"> The <see cref="T"/> record to be added.</param>
350+ /// <param name="record"> The <typeparamref name="T"/> record to be added.</param>
349351 /// <returns><see cref="IHttpActionResult"/> containing the added record or <see cref="Exception"/> </returns>
350352 [HttpPost, Route("Add")]
351353 public virtual IHttpActionResult Post([FromBody] JObject record)
@@ -378,7 +380,7 @@ namespace GSF.Web.Model · 26 unmodified lines
378380 /// <summary>
379381 /// Updates an existing Record.
380382 /// </summary>
381− /// <param name="record"> The <see cref="T"/> record to be updated.</param>
383+ /// <param name="record"> The <typeparamref name="T"/> record to be updated.</param>
382384 /// <returns><see cref="IHttpActionResult"/> containing the updated record or <see cref="Exception"/> </returns>
383385
384386 [HttpPatch, Route("Update")]
@@ -424,7 +426,7 @@ namespace GSF.Web.Model · 39 unmodified lines
424426 /// <summary>
425427 /// Deletes an existing Record.
426428 /// </summary>
427− /// <param name="record"> The <see cref="T"/> record to be deleted.</param>
429+ /// <param name="record"> The <typeparamref name="T"/> record to be deleted.</param>
428430 /// <returns><see cref="IHttpActionResult"/> containing the number of records deleted or <see cref="Exception"/> </returns>
429431
430432 [HttpDelete, Route("Delete")]
@@ -481,7 +483,7 @@ namespace GSF.Web.Model · 50 unmodified lines
481483 }
482484
483485 /// <summary>
484− /// Gets all records from associated table, filtered and sorted as defined in <see cref="postData"/>.
486+ /// Gets all records from associated table, filtered and sorted as defined in <paramref name="postData"/>.
485487 /// </summary>
486488 /// <param name="postData"><see cref="PostData"/> containing the search and sort parameters</param>
487489 /// <returns><see cref="IHttpActionResult"/> containing <see cref="IEnumerable{T}"/> or <see cref="Exception"/></returns>
@@ -733,7 +735,7 @@ namespace GSF.Web.Model · 245 unmodified lines
733735 SELECT
734736 SRC.*,
735737 ''AFV_'' + AF.{SearchSettings.FieldKeyField} AS AFFieldKey,
736− AF.{SearchSettings.ValueField} AS AFValue
738+ AF.{SearchSettings.ValueField} AS AFValue
737739 FROM {tableName} SRC LEFT JOIN
738740 {SearchSettings.AdditionalFieldTable} AF ON {joinCondition}
739741 ) as FullTbl ' + (SELECT CASE WHEN Len(@PivotColumns) > 0 THEN 'PIVOT (
@@ -743,9 +745,9 @@ namespace GSF.Web.Model · 3 unmodified lines
743745 DECLARE @NoNPivotColumns NVARCHAR(MAX) = N''''
744746 SELECT @NoNPivotColumns = @NoNPivotColumns + ''[''+ name + ''],''
745747 FROM tempdb.sys.columns WHERE object_id = Object_id(''tempdb..#Tbl'') AND name NOT LIKE ''AFV%'';
746− DECLARE @CleanSQL NVARCHAR(MAX) = N''SELECT '' + SUBSTRING(@NoNPivotColumns,0, LEN(@NoNPivotColumns)) + ''FROM #Tbl ORDER BY { postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}''
748+ DECLARE @CleanSQL NVARCHAR(MAX) = N''SELECT '' + SUBSTRING(@NoNPivotColumns,0, LEN(@NoNPivotColumns)) + ''FROM #Tbl ORDER BY { postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}''
747749
748− exec sp_executesql @CleanSQL
750+ exec sp_executesql @CleanSQL
749751 '
750752 exec sp_executesql @SQLStatement";
751753 else
@@ -759,7 +761,7 @@ namespace GSF.Web.Model · 7 unmodified lines
759761 SELECT
760762 SRC.*,
761763 ''AFV_'' + AF.{SearchSettings.FieldKeyField} AS AFFieldKey,
762− AF.{SearchSettings.ValueField} AS AFValue
764+ AF.{SearchSettings.ValueField} AS AFValue
763765 FROM ({CustomView.Replace("'", "''")}) SRC LEFT JOIN
764766 {SearchSettings.AdditionalFieldTable} AF ON {joinCondition}
765767 ) as FullTbl ' + (SELECT CASE WHEN Len(@PivotColumns) > 0 THEN 'PIVOT (
@@ -769,9 +771,9 @@ namespace GSF.Web.Model · 3 unmodified lines
769771 DECLARE @NoNPivotColumns NVARCHAR(MAX) = N''''
770772 SELECT @NoNPivotColumns = @NoNPivotColumns + ''[''+ name + ''],''
771773 FROM tempdb.sys.columns WHERE object_id = Object_id(''tempdb..#Tbl'') AND name NOT LIKE ''AFV%'';
772− DECLARE @CleanSQL NVARCHAR(MAX) = N''SELECT '' + SUBSTRING(@NoNPivotColumns,0, LEN(@NoNPivotColumns)) + ''FROM #Tbl ORDER BY { postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}''
774+ DECLARE @CleanSQL NVARCHAR(MAX) = N''SELECT '' + SUBSTRING(@NoNPivotColumns,0, LEN(@NoNPivotColumns)) + ''FROM #Tbl ORDER BY { postData.OrderBy} {(postData.Ascending ? "ASC" : "DESC")}''
773775
774− exec sp_executesql @CleanSQL
776+ exec sp_executesql @CleanSQL
775777 '
776778 exec sp_executesql @SQLStatement";
777779 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t