Merge pull request #186 from leekelleher/dev/v2.2.2

Preparing v2.2.2 release
leekelleher · Nov 23, 2021 · 6f246f0 · 6f246f0
2 parents 502280e + 0491e05
commit 6f246f0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.1
+2.2.2
diff --git a/docs/assets/img/foo.png b/docs/assets/img/foo.png
diff --git a/...mmunity.Contentment/DataEditors/DataList/DataSources/UmbracoContentXPathDataListSource.cs b/...mmunity.Contentment/DataEditors/DataList/DataSources/UmbracoContentXPathDataListSource.cs
@@ -106,7 +106,8 @@ public IEnumerable<DataListItem> GetItems(Dictionary<string, object> config)
                             Icon = ContentTypeCacheHelper.TryGetIcon(x.ContentType.Alias, out var icon, _contentTypeService) == true ? icon : UmbConstants.Icons.Content,
                             Description = x.TemplateId > 0 ? x.Url() : string.Empty,
                             Disabled = x.IsPublished() == false,
-                        });
+                        })
+                        .ToList();
                 }
             }
 

diff --git a/src/Umbraco.Community.Contentment/DataEditors/_/_dev-mode.js b/src/Umbraco.Community.Contentment/DataEditors/_/_dev-mode.js
@@ -50,5 +50,5 @@ angular.module("umbraco.services").factory("Umbraco.Community.Contentment.Servic
 ]);
 
 angular.module("umbraco.directives").component("leeWasHere", {
-    template: "<img ng-src=\"data:image/png;base64,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\" alt=\"Lee was here\">"
+    template: "<img ng-src=\"data:image/png;base64,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\" alt=\"Lee was here\">"
 });
diff --git a/src/Umbraco.Community.Contentment/Telemetry/ContentmentTelemetryComponent.cs b/src/Umbraco.Community.Contentment/Telemetry/ContentmentTelemetryComponent.cs
@@ -52,6 +52,15 @@ private void DataTypeService_Saved(IDataTypeService sender, SaveEventArgs<IDataT
                 return;
             }
 
+            var umbracoId = Guid.TryParse(_umbracoSettings.BackOffice.Id, out var telemetrySiteIdentifier) == true
+                ? telemetrySiteIdentifier
+                : Guid.Empty;
+
+            if (umbracoId.Equals(Guid.Empty) == true)
+            {
+                return;
+            }
+
             foreach (var entity in e.SavedEntities)
             {
                 if (entity.EditorAlias.InvariantStartsWith(Constants.Internals.DataEditorAliasPrefix) == true)
@@ -103,17 +112,13 @@ array[0] is JObject item &&
                             }
                         }
 
-                        var umbracoId = Guid.TryParse(_umbracoSettings.BackOffice.Id, out var telemetrySiteIdentifier) == true
-                            ? telemetrySiteIdentifier
-                            : Guid.Empty;
-
                         // No identifiable details, just a quick call home.
                         var data = new
                         {
                             dataType = entity.Key,
                             editorAlias = entity.EditorAlias.Substring(Constants.Internals.DataEditorAliasPrefix.Length),
                             umbracoId = umbracoId,
-                            umbracoVersion = UmbracoVersion.SemanticVersion.ToString(),
+                            umbracoVersion = UmbracoVersion.SemanticVersion.ToSemanticString(),
                             contentmentVersion = ContentmentVersion.SemanticVersion.ToString(),
                             dataTypeConfig = dataTypeConfig,
                         };

diff --git a/src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj b/src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj
@@ -7,7 +7,7 @@
     <Title>Contentment for Umbraco</Title>
     <Description>Contentment, a collection of components for Umbraco 8.</Description>
     <PackageTags>umbraco</PackageTags>
-    <Version>2.2.1</Version>
+    <Version>2.2.2</Version>
     <Company>Umbrella Inc Ltd</Company>
     <Authors>Lee Kelleher</Authors>
     <Copyright>2019 © Lee Kelleher</Copyright>