From 0e3b7dd3d49dca93368b2a2a1ad1a20e3ca59f4b Mon Sep 17 00:00:00 2001 From: leekelleher Date: Tue, 23 Nov 2021 13:11:23 +0000 Subject: [PATCH 1/5] Data List - Umbraco Content by XPath bug https://our.umbraco.com/packages/backoffice-extensions/contentment/contentment-feedback/107355-error-when-publishing-document I can only assume that since Umbraco v8.16.0, the addition of the `IDisposible` interface to several services has meant that what would previously be accessible (at a later point in the scope/life-cycle) is no longer available. So with any lazily-evaluated LINQ results (particularly for the Content cache) would need to be eagerly-evaluated, hence the `.ToList()` call here. --- .../DataList/DataSources/UmbracoContentXPathDataListSource.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Community.Contentment/DataEditors/DataList/DataSources/UmbracoContentXPathDataListSource.cs b/src/Umbraco.Community.Contentment/DataEditors/DataList/DataSources/UmbracoContentXPathDataListSource.cs index e6cfa604..ca3c1cad 100644 --- a/src/Umbraco.Community.Contentment/DataEditors/DataList/DataSources/UmbracoContentXPathDataListSource.cs +++ b/src/Umbraco.Community.Contentment/DataEditors/DataList/DataSources/UmbracoContentXPathDataListSource.cs @@ -106,7 +106,8 @@ public IEnumerable GetItems(Dictionary 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(); } } From 849f4fd1317bafbff75822100b857f9b98a524e4 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Tue, 23 Nov 2021 13:14:04 +0000 Subject: [PATCH 2/5] Incremented version number, v2.2.2 --- VERSION | 2 +- .../Umbraco.Community.Contentment.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index fae692e4..7e541aec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.1 \ No newline at end of file +2.2.2 \ No newline at end of file diff --git a/src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj b/src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj index 519754b0..fa412e07 100644 --- a/src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj +++ b/src/Umbraco.Community.Contentment/Umbraco.Community.Contentment.csproj @@ -7,7 +7,7 @@ Contentment for Umbraco Contentment, a collection of components for Umbraco 8. umbraco - 2.2.1 + 2.2.2 Umbrella Inc Ltd Lee Kelleher 2019 © Lee Kelleher From 3d9f2779d286433a9ab8ab31ea50f2942b744262 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Tue, 23 Nov 2021 13:16:56 +0000 Subject: [PATCH 3/5] Telemetry - removed the version build number Cherry picked commit 74b11fbc2d8409ecba55327b51c615c7e9897e50 --- .../Telemetry/ContentmentTelemetryComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Community.Contentment/Telemetry/ContentmentTelemetryComponent.cs b/src/Umbraco.Community.Contentment/Telemetry/ContentmentTelemetryComponent.cs index e202d5de..90b44cd4 100644 --- a/src/Umbraco.Community.Contentment/Telemetry/ContentmentTelemetryComponent.cs +++ b/src/Umbraco.Community.Contentment/Telemetry/ContentmentTelemetryComponent.cs @@ -113,7 +113,7 @@ array[0] is JObject item && 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, }; From fa36289576293272ab958eb031eb9eda36518db1 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Mon, 8 Nov 2021 14:01:12 +0000 Subject: [PATCH 4/5] :eyes: Optimized --- docs/assets/img/foo.png | Bin 0 -> 2393 bytes .../DataEditors/_/_dev-mode.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 docs/assets/img/foo.png diff --git a/docs/assets/img/foo.png b/docs/assets/img/foo.png new file mode 100644 index 0000000000000000000000000000000000000000..1615efba4c03f59bf799e815fd30f1c2a0fb37b4 GIT binary patch literal 2393 zcma)8`#;m)AD@qza&4?A_iZ-PL}M-847ucfpNKuM3X@AR_uQImZXsg1?UPF`iEi$f zxn!ylMIveBvfOfsET8xHKlq-<nAt8ao;SdM}6bc0fSFc{ZdGlsOM8w^@caxKoy}Z0eMn)zlCyk7Z3=IuWpFWMj zU=$P-E?&Ionv|3TXa`il;qbt~Kt)Bx@bGYFXJ-@&1)zC)dIITyBi7c|4h{|gtc;9|qoX50 zOixb_*bNE_5)cpo=)qvHo}L~+zOAioc6N4FRu-L32M7QuAP@+!4tRw`B6&RC{{H^% z?(W{+9*4u}?Cb=x$Hm2MZ*OzC+|A9+)zwuXvZ$yiKR-V@IvPM&TwMI}FLhU%tc$Z>)XjeR=P;FA0x~mi4gx-RNq;r*IlHvL^O|bwS01V?A-ct z3biw)iSk={W3Nb~F?U2=!CP+r7AbXVE}i8!Uei9^=fC>r4Zbnb+r}Uk0fBFAQ_fR( z;|q(@-xc!K)^fi6ttkAU#1Abf#~fXi^lvF{h&B4Sf=Wk#Xy8$fq9Z!Pcqr$8&{P3!&5TAwI;?>K~gVjTnha zt}3bKFPv3Z`DrC%{?;3j=1;Mxa|#7o9-Mp0pQUeHGsI{TLdTyw>2Mz8Yu$OIyAYNy zzuvRLWeYV2N1pF8bNOesB>RlDY`5uV<^vNWLJRjZ@k!H=Qpx~gHc8I;JTHI{5$@KE zq>QliPNc4Hl*WqmNS|?yf(~E%I5@oa%;(neI?J{gy01qT=|e*0p?-Z?yQNRH4dF@#@)4Dhor!DkXJMJ`k!F0{EmA#AM+Bq)d7N8nw=Oh z&2(qXGoI~7r$)Y=&%mn9BV#Sbi~6>5yxxzwlX61YNW_)*!w0Pk_(CLE&MFVHd3{6>kp?xE-3vjXk21-XgCxL;_EnR3{G~K$4HCd~`20UTg0Qe#|Hd67I(zGbG0% zBBdvq0<1H+Ol>yP(+*rEIBZ8hn5`KwWIlbv(25uTixWIrMW1lss=lh964Uf<&0A&r z_kjgzw8P_&u7Vjqt)+S|nrQN(3fiRJMbA_<4eX7(|LU#x!YD?;clkhK)PwMu599EH z#@O($%90zRP1bAmz0NYtdAP}zCika5^nD&s8+{$^tsi@Pg=lD22ey%h_{J9FH)o?OxWb!ky_ zbBm^Tq39%MzU`6ym50^_E#C!`EYMBwK3&JCsR;_mvKDhPhYi@Euyj5N)$ov4FLq}R zxVyOp9WUKrR1jTkZ5u+?O8HZ+5oO8Nn^}o|4p05UOg0~?`2?>_wd%tC$bZ}R_EPGN z5CQrLV@Sj87we--3FP8; zr8u@z@5-6uCm6Ni#d-_sfgOG7aQxJFWUQ;Zlb|Z;W6TkO6}FU8tYqe)nHy?p_WM?= z^s3_L-m?6eA1g>i=3JLHANK;Es-i}5&#vk@$6u+8yoq$YbZ_q2#d16R9Jo)-Uh2sW z*rf0y_)J0_-@5N??b*f-u}acoLfqg$|F={Y+_g=CnKp2lnst4DPAI^_|F<5l!sDKfH!Toskp_^FxQmVz_Iy^k%|pxeH_Anmj}ZyThj z-&aRzhs&OWwkT?Q>Nxtooe1^9&-d|z$b_4+sc7lMigF4@M~vlQ*>Y95=jF5M?Poil zXFMOd954x$l?s~fE6d2vQWnTx6(3`xBsb(^IK-OOlOYHxt`69%kEYaa=AR@weD5CA z(dB8lABrJU{%(sU;SvfN7FD7WQF*k3kKV}{ugDEnhABuz6wojV*0lBbWbN~PV literal 0 HcmV?d00001 diff --git a/src/Umbraco.Community.Contentment/DataEditors/_/_dev-mode.js b/src/Umbraco.Community.Contentment/DataEditors/_/_dev-mode.js index 9c2fc200..dc2d2d4f 100644 --- 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: "\"Lee" + template: "\"Lee" }); From 0491e05ac349112b2555688291c750764359635a Mon Sep 17 00:00:00 2001 From: leekelleher Date: Tue, 23 Nov 2021 13:19:21 +0000 Subject: [PATCH 5/5] Telemetry - exclude empty Umbraco ID (cherry picked from commit e20381f806c53532ec8e4c7ccf23d89b56aacdf7) # Conflicts: # src/Umbraco.Community.Contentment/Notifications/ContentmentTelemetryNotification.cs --- .../Telemetry/ContentmentTelemetryComponent.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Community.Contentment/Telemetry/ContentmentTelemetryComponent.cs b/src/Umbraco.Community.Contentment/Telemetry/ContentmentTelemetryComponent.cs index 90b44cd4..74075235 100644 --- 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