Merge pull request #224 from skttl/develop

Preparing 1.2.5

Author: skttl

CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Resetting saveButtonState when validation contains errors #221
+- Handle null value when deserializing grid value in DataValueReference 50ba85aaeeb66ed305248d303d568e4698943094
+
+## [1.2.4] - 2020-09-09
 - Clear earlier serverside validation errors #217
 - Null Pointer Exception on save when no grid layout selected #211
 - Unsaved Changes dialog fires when hitting submit on grid editors #205
@@ -45,7 +49,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Developers Guide updated
 - New minimum Umbraco version requirement: 8.1.0 - Doc Type Grid Editor will not work in lower versions!
 
-[unreleased]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.2...HEAD
+[unreleased]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.4...HEAD
+[1.2.4]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.3...1.2.4
 [1.2.3]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.2...1.2.3
 [1.2.2]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.1...1.2.2
 [1.2.1]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.0...1.2.1

src/Our.Umbraco.DocTypeGridEditor.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2009
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30503.244
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Our.Umbraco.DocTypeGridEditor", "Our.Umbraco.DocTypeGridEditor\Our.Umbraco.DocTypeGridEditor.csproj", "{4BD1DB40-1B39-4966-8740-D6A39D658598}"
 EndProject
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Package", "Build Pack
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8412A31B-D80C-42DE-9589-4BD08F43F86B}"
 	ProjectSection(SolutionItems) = preProject
+		..\CHANGELOG.md = ..\CHANGELOG.md
 		..\CONTRIBUTING.md = ..\CONTRIBUTING.md
 		..\LICENSE.md = ..\LICENSE.md
 		..\README.md = ..\README.md

src/Our.Umbraco.DocTypeGridEditor/ValueProcessing/DocTypeGridEditorDataValueReference.cs

@@ -30,9 +30,9 @@ public IEnumerable<UmbracoEntityReference> GetReferences(object value)
             var result = new List<UmbracoEntityReference>();
             var _propertyEditors = Current.PropertyEditors;
             var rawJson = value == null ? string.Empty : value is string str ? str : value.ToString();
-            
+
             if(rawJson.IsNullOrWhiteSpace()) return result;
-            
+
             DeserializeGridValue(rawJson, out var dtgeValues);
 
             foreach (var control in dtgeValues)
@@ -67,9 +67,16 @@ internal GridValue DeserializeGridValue(string rawJson, out IEnumerable<DocTypeG
         {
             var grid = JsonConvert.DeserializeObject<GridValue>(rawJson);
 
-            // Find all controls that uses DTGE editor
-            var controls = grid.Sections.SelectMany(x => x.Rows.SelectMany(r => r.Areas).SelectMany(a => a.Controls)).ToArray();
-            dtgeValues = controls.Where(x => x.Editor.Alias.ToLowerInvariant() == "doctype").Select(x => x.Value.ToObject<DocTypeGridEditorValue>());
+            if (grid != null)
+            {
+                // Find all controls that uses DTGE editor
+                var controls = grid.Sections.SelectMany(x => x.Rows.SelectMany(r => r.Areas).SelectMany(a => a.Controls)).ToArray();
+                dtgeValues = controls.Where(x => x.Editor.Alias.ToLowerInvariant() == "doctype").Select(x => x.Value.ToObject<DocTypeGridEditorValue>());
+            }
+            else
+            {
+                dtgeValues = Enumerable.Empty<DocTypeGridEditorValue>();
+            }
 
             return grid;
         }

src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js

@@ -297,6 +297,7 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT
                             $routeParams.create = routeParamsCreate;
                             // cleanup the blueprint immediately
                             cleanup();
+                            vm.saveButtonState = "error";
                     });
                 }
             }