Merge pull request #3 from skttl/develop

Merge

Author: inetzo

CHANGELOG.md

@@ -0,0 +1,58 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+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]
+- 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
+
+## [1.2.3] - 2020-06-05
+- #199 2 Element Types in same Nested Content freeze the Add content button in the grid layout
+- #202 Contenttemplates are left behind when validation is not succesfull
+- #203 "activeVariant.language is null" - thanks @Matthew-Wise
+
+## [1.2.2] - 2020-05-14
+- Infinite loading when doc type has a content template #192 - thanks for reporting @OlePc
+- GetPreviewMarkup null reference error when getting cultures #195 - thanks for reporting *and fixing* @Matthew-Wise
+
+## [1.2.1] - 2020-04-27
+- Disables notifications after each edit #190
+- Moves intrusive styling in previews to css file #188
+- Fixes JS error when no doctypes selected in multitype #186
+- Fixes bug where wrong editor gets removed when cancelling #185
+- Now works with custom backoffice URL #138
+
+## [1.2.0] - 2020-04-12
+- #173 Added ValueProcessors and added processor for Umbraco.Tags
+- #176 Enables client side validation
+- #182 Enables media tracking in 8.6
+
+## [1.1.0] - 2019-12-11
+- Changed the size attribute on grid editors to enable the new medium size in Umbraco 8.4 #167
+- Adds class to the preview container, so it's easier to target with custom css 47c8f5d
+- Check for culture variation when picking content types #154 f5453db c19a93f
+- Added implementation of Alias property #160
+
+## [1.0.0] - 2019-08-20
+- Uses Infinite Editing (editorService) for editing DTGE content, instead of overlays.
+- Adds option to set dialog (infinite editor) size from grid editor config.
+- Adds Content Template aka Blueprints support for DTGE items.
+- Updates default placeholder for DTGEs without previews enabled.
+- 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.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
+[1.2.0]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.1.0...1.2.0
+[1.1.0]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.0.0...1.1.0
+[1.0.0]: https://github.com/skttl/umbraco-doc-type-grid-editor/releases/tag/1.0.0

appveyor.yml

@@ -1,7 +1,7 @@
 image: Visual Studio 2017
 
 # version format
-version: 1.2.3.{build}
+version: 1.2.4.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta

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

@@ -1,4 +1,4 @@
-angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.GridEditors.DocTypeGridEditor", [
+angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.GridEditors.DocTypeGridEditor", [
 
     "$scope",
     "$rootScope",
@@ -239,14 +239,16 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT
         "blueprintConfig",
         "contentEditingHelper",
         "serverValidationManager",
+        "$routeParams",
 
-        function ($scope, $interpolate, formHelper, contentResource, dtgeResources, dtgeUtilityService, blueprintConfig, contentEditingHelper, serverValidationManager) {
+        function ($scope, $interpolate, formHelper, contentResource, dtgeResources, dtgeUtilityService, blueprintConfig, contentEditingHelper, serverValidationManager, $routeParams) {
 
             var vm = this;
             vm.submit = submit;
             vm.close = close;
             vm.loading = true;
             vm.blueprintConfig = blueprintConfig;
+            vm.saveButtonState = "init";
 
             function cleanup() {
                 if ($scope.model.node && $scope.model.node.id > 0) {
@@ -265,10 +267,15 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT
 
             function submit() {
                 if ($scope.model.submit) {
+                    vm.saveButtonState = "busy";
                     $scope.model.node.name = "Dtge Temp: " + $scope.model.node.key;
                     $scope.model.node.variants[0].name = $scope.model.node.name
                     $scope.model.node.variants[0].save = true;
 
+                    // Reset route create to prevent showing up the changed content dialog
+                    var routeParamsCreate = $routeParams.create;
+                    $routeParams.create = undefined;
+
                     // save the content as a blueprint, to trigger validation
                     var args = {
                         saveMethod: contentResource.saveBlueprint,
@@ -282,10 +289,14 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT
 
                     contentEditingHelper.contentEditorPerformSave(args).then(function (data) {
                         $scope.model.submit($scope.model);
+                        // Reset original value of $routeParams.create
+                        $routeParams.create = routeParamsCreate;
                     },
-                    function (err) {
-                        // cleanup the blueprint immediately
-                        cleanup();
+                        function (err) {
+                            // Set original value of $routeParams.create
+                            $routeParams.create = routeParamsCreate;
+                            // cleanup the blueprint immediately
+                            cleanup();
                     });
                 }
             }

src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Views/doctypegrideditor.dialog.html

@@ -107,6 +107,7 @@
                 </umb-button>
                 <umb-button type="button"
                             button-style="action"
+                            state="vm.saveButtonState"
                             label-key="general_submit"
                             shortcut="ctrl+s"
                             ng-if="dialogMode == 'edit'"