Upgraded uSync on v12 demo site

Updated and re-exported all schema and content.
leekelleher · Oct 9, 2023 · d1274d9 · d1274d9
1 parent d1599cc
commit d1274d9
Show file tree

Hide file tree

Showing 68 changed files with 605 additions and 410 deletions.
diff --git a/src/Umbraco.Cms.12.x/Umbraco.Cms.12.x.csproj b/src/Umbraco.Cms.12.x/Umbraco.Cms.12.x.csproj
@@ -10,8 +10,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms" Version="12.0.0-rc2" />
-        <PackageReference Include="uSync" Version="11.2.0" />
+        <PackageReference Include="Umbraco.Cms" Version="12.0.0" />
+        <PackageReference Include="uSync" Version="12.2.0" />
         <ProjectReference Include="..\Umbraco.Community.Contentment\Umbraco.Community.Contentment.csproj" />
     </ItemGroup>
 

diff --git a/src/Umbraco.Cms.12.x/ValueConverters/ApiContentBlocksValueConverter.cs b/src/Umbraco.Cms.12.x/ValueConverters/ApiContentBlocksValueConverter.cs
@@ -50,7 +50,7 @@ public PropertyCacheLevel GetDeliveryApiPropertyCacheLevel(IPublishedPropertyTyp
     public Type GetDeliveryApiPropertyValueType(IPublishedPropertyType propertyType)
         => typeof(IEnumerable<IApiElement>);
 
-    public object? ConvertIntermediateToDeliveryApiObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object? inter, bool preview)
+    public object? ConvertIntermediateToDeliveryApiObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object? inter, bool preview, bool expanding)
     {
         var items = ConvertIntermediateToObject(owner, propertyType, referenceCacheLevel, inter, preview) as IEnumerable<IPublishedElement>;
 

diff --git a/src/Umbraco.Cms.12.x/appsettings-schema.Umbraco.Cms.json b/src/Umbraco.Cms.12.x/appsettings-schema.Umbraco.Cms.json
@@ -1483,21 +1483,21 @@
       "properties": {
         "Commands": {
           "type": "array",
-          "description": "HTML RichText Editor TinyMCE Commands\n            ",
+          "description": "HTML RichText Editor TinyMCE Commands.\n            ",
           "items": {
             "$ref": "#/definitions/RichTextEditorCommand"
           }
         },
         "Plugins": {
           "type": "array",
-          "description": "HTML RichText Editor TinyMCE Plugins\n            ",
+          "description": "HTML RichText Editor TinyMCE Plugins.\n            ",
           "items": {
             "type": "string"
           }
         },
         "CustomConfig": {
           "type": "object",
-          "description": "HTML RichText Editor TinyMCE Custom Config\n            ",
+          "description": "HTML RichText Editor TinyMCE Custom Config.\n            ",
           "additionalProperties": {
             "type": "string"
           }
@@ -1508,7 +1508,7 @@
         },
         "InvalidElements": {
           "type": "string",
-          "description": "Invalid HTML elements for RichText Editor\n            ",
+          "description": "Invalid HTML elements for RichText Editor.\n            ",
           "default": "font"
         }
       }

diff --git a/src/Umbraco.Cms.12.x/appsettings-schema.usync.json b/src/Umbraco.Cms.12.x/appsettings-schema.usync.json
@@ -113,11 +113,6 @@
             "type": "string"
           }
         },
-        "SignalRRoot": {
-          "type": "string",
-          "description": "location of SignalR hub script",
-          "default": ""
-        },
         "EnableHistory": {
           "type": "boolean",
           "description": "Should the history view be on of off ? ",
@@ -157,6 +152,11 @@
         "HideAddOns": {
           "type": "string",
           "description": "list of addon (tabs) you don't want to show inside uSync dashboard.\n            "
+        },
+        "DisableNotificationSuppression": {
+          "type": "boolean",
+          "description": "turns of use of the Notifications.Supress method, so notifications\nfire after every item is imported.\n            ",
+          "default": "false"
         }
       }
     },
@@ -248,6 +248,10 @@
           "description": "Override the group the handler belongs too.",
           "default": ""
         },
+        "CreateClean": {
+          "type": "boolean",
+          "description": "create a corresponding _clean file for this export \n            "
+        },
         "Settings": {
           "type": "object",
           "description": "Additional settings for the handler",

diff --git a/src/Umbraco.Cms.12.x/uSync/v9/Content/home.config b/src/Umbraco.Cms.12.x/uSync/v9/Content/home.config
@@ -20,7 +20,18 @@
     "key": "9e4594dc-fa80-4a1a-8643-938791218b8a",
     "icon": "icon-navigation-bottom color-blue-grey",
     "value": {
-      "footerMenu": "[{\"name\":\"Contentment source code repository\",\"target\":\"_blank\",\"url\":\"https://github.com/leekelleher/umbraco-contentment\"},{\"name\":\"Contentment project page\",\"target\":\"_blank\",\"url\":\"https://our.umbraco.com/packages/backoffice-extensions/contentment/\"}]"
+      "footerMenu": [
+        {
+          "name": "Contentment source code repository",
+          "target": "_blank",
+          "url": "https://github.com/leekelleher/umbraco-contentment"
+        },
+        {
+          "name": "Contentment project page",
+          "target": "_blank",
+          "url": "https://our.umbraco.com/packages/backoffice-extensions/contentment/"
+        }
+      ]
     }
   }
 ]]]></Value>
@@ -46,7 +57,12 @@
     "value": {
       "heading": "Welcome",
       "intro": "<p>This is some <strong>introduction</strong> text.</p>",
-      "link": "[{\"name\":\"Click here to go to the Data List page.\",\"udi\":\"umb://document/3f755f025f6e42cca7ea4b769e3232b2\"}]"
+      "link": [
+        {
+          "name": "Click here to go to the Data List page.",
+          "udi": "umb://document/3f755f025f6e42cca7ea4b769e3232b2"
+        }
+      ]
     }
   },
   {

diff --git a/src/Umbraco.Cms.12.x/uSync/v9/Content/test-content.config b/src/Umbraco.Cms.12.x/uSync/v9/Content/test-content.config
@@ -8,16 +8,19 @@
     <CreateDate>2022-09-01T18:32:23</CreateDate>
     <NodeName Default="Test - Content" />
     <SortOrder>3</SortOrder>
-    <Published Default="false" />
+    <Published Default="true" />
     <Schedule />
     <Template Key="575d2bbb-c517-4da5-afb3-4ff778c0815d">contentPage</Template>
   </Info>
   <Properties>
+    <image>
+      <Value><![CDATA[umb://media/0ab0cc1a6e3e4b5bbf205a4a5f0710ab]]></Value>
+    </image>
     <pageBlocks>
-      <Value><![CDATA[[]]]></Value>
+      <Value><![CDATA[]]></Value>
     </pageBlocks>
     <pageModules>
-      <Value><![CDATA[[]]]></Value>
+      <Value><![CDATA[]]></Value>
     </pageModules>
     <umbracoNaviHide>
       <Value><![CDATA[0]]></Value>

diff --git a/src/Umbraco.Cms.12.x/uSync/v9/Content/test-misc.config b/src/Umbraco.Cms.12.x/uSync/v9/Content/test-misc.config
@@ -29,9 +29,19 @@
   }
 ]]]></Value>
     </dataListItems>
+    <dataPickerUmbracoContent>
+      <Value><![CDATA[[
+  "umb://document/b31b9022676544e795251f9aac85cc5f",
+  "umb://document/3f755f025f6e42cca7ea4b769e3232b2",
+  "umb://document/f584df3eeffe42698cf41366a03f4fff"
+]]]></Value>
+    </dataPickerUmbracoContent>
     <iconPicker>
       <Value><![CDATA[icon-science color-grey]]></Value>
     </iconPicker>
+    <iconPickerSmall>
+      <Value><![CDATA[icon-science color-black]]></Value>
+    </iconPickerSmall>
     <socialLinks>
       <Value><![CDATA[[
   {

diff --git a/src/Umbraco.Cms.12.x/uSync/v9/ContentTypes/contentpage.config b/src/Umbraco.Cms.12.x/uSync/v9/ContentTypes/contentpage.config
@@ -17,6 +17,7 @@
     <Folder>Pages</Folder>
     <Compositions>
       <Composition Key="189438e2-a3e1-4e2f-aa4b-3f4179c3889e">pageBlocksProperty</Composition>
+      <Composition Key="f2e98428-2f70-43d3-a597-32ac494a0ded">pageImageProperty</Composition>
       <Composition Key="e5694cca-22c5-4b9f-a10a-0a4d315c7a7d">pageModulesProperty</Composition>
       <Composition Key="e6be904d-d5e5-4367-90e0-b6ad1a121168">pageNavigationUrlNameProperty</Composition>
       <Composition Key="0fb17206-c09d-4485-929d-38ca2fa8a34f">pageNavigationVisibilityProperty</Composition>

diff --git a/src/Umbraco.Cms.12.x/uSync/v9/ContentTypes/testmiscpage.config b/src/Umbraco.Cms.12.x/uSync/v9/ContentTypes/testmiscpage.config
@@ -39,6 +39,22 @@
       <ValidationRegExpMessage></ValidationRegExpMessage>
       <LabelOnTop>false</LabelOnTop>
     </GenericProperty>
+    <GenericProperty>
+      <Key>a290a9de-0b71-49b7-9572-0bf541525469</Key>
+      <Name>Data Picker - Umbraco Content</Name>
+      <Alias>dataPickerUmbracoContent</Alias>
+      <Definition>5023550b-f4ae-4e05-94c6-79abc5266c23</Definition>
+      <Type>Umbraco.Community.Contentment.DataPicker</Type>
+      <Mandatory>false</Mandatory>
+      <Validation></Validation>
+      <Description><![CDATA[]]></Description>
+      <SortOrder>10</SortOrder>
+      <Tab Alias="dataPicker">Data Picker</Tab>
+      <Variations>Nothing</Variations>
+      <MandatoryMessage></MandatoryMessage>
+      <ValidationRegExpMessage></ValidationRegExpMessage>
+      <LabelOnTop>false</LabelOnTop>
+    </GenericProperty>
     <GenericProperty>
       <Key>0ec1844a-2609-41af-a23c-e785fdef96e5</Key>
       <Name>Icon Picker</Name>
@@ -167,6 +183,13 @@
       <Type>Tab</Type>
       <SortOrder>-50</SortOrder>
     </Tab>
+    <Tab>
+      <Key>d08808c6-3be8-454b-a646-67c2e30ff2c8</Key>
+      <Caption>Data Picker</Caption>
+      <Alias>dataPicker</Alias>
+      <Type>Tab</Type>
+      <SortOrder>-60</SortOrder>
+    </Tab>
     <Tab>
       <Key>e1176c1d-7a9b-4cb7-b9f3-4b54e726573f</Key>
       <Caption>Icons</Caption>

diff --git a/src/Umbraco.Cms.12.x/uSync/v9/DataTypes/ContentmentDataListRenderPosition.config b/src/Umbraco.Cms.12.x/uSync/v9/DataTypes/ContentmentDataListRenderPosition.config
@@ -11,7 +11,7 @@
       "key": "Umbraco.Community.Contentment.DataEditors.EnumDataListSource, Umbraco.Community.Contentment",
       "value": {
         "enumType": [
-          "Umbraco.Cms.11.x",
+          "Umbraco.Cms.12.x",
           "Umbraco.Cms.Web.Common.PublishedModels.RenderPosition"
         ]
       }

diff --git a/src/Umbraco.Cms.12.x/uSync/v9/DataTypes/ContentmentDataPickerUmbracoContent.config b/src/Umbraco.Cms.12.x/uSync/v9/DataTypes/ContentmentDataPickerUmbracoContent.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DataType Key="5023550b-f4ae-4e05-94c6-79abc5266c23" Alias="[Contentment] Data Picker - Umbraco Content" Level="2">
+  <Info>
+    <Name>[Contentment] Data Picker - Umbraco Content</Name>
+    <EditorAlias>Umbraco.Community.Contentment.DataPicker</EditorAlias>
+    <DatabaseType>Ntext</DatabaseType>
+    <Folder>Test+Data+Picker</Folder>
+  </Info>
+  <Config><![CDATA[{
+  "dataSource": [
+    {
+      "key": "Umbraco.Community.Contentment.DataEditors.UmbracoContentDataListSource, Umbraco.Community.Contentment",
+      "value": {
+        "parentNode": "umb://document/7c6bcf13fa7d4949b975ffb331ee0dcc"
+      }
+    }
+  ],
+  "displayMode": [
+    {
+      "key": "Umbraco.Community.Contentment.DataEditors.CardsDataPickerDisplayMode, Umbraco.Community.Contentment",
+      "value": {}
+    }
+  ],
+  "pageSize": 12,
+  "overlaySize": [
+    "medium"
+  ],
+  "maxItems": 0,
+  "enableDevMode": "1"
+}]]></Config>
+</DataType>
diff --git a/src/Umbraco.Cms.12.x/uSync/v9/DataTypes/UmbracoBlockList.config b/src/Umbraco.Cms.12.x/uSync/v9/DataTypes/UmbracoBlockList.config
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DataType Key="b2b919fc-be7c-4cd9-8e6a-1a33ad8e00a3" Alias="[Umbraco] Block List" Level="1">
+  <Info>
+    <Name>[Umbraco] Block List</Name>
+    <EditorAlias>Umbraco.BlockList</EditorAlias>
+    <DatabaseType>Ntext</DatabaseType>
+  </Info>
+  <Config><![CDATA[{
+  "Blocks": [
+    {
+      "backgroundColor": null,
+      "contentElementTypeKey": "24522ebf-901d-4aa2-a472-61b6181fd0e5",
+      "editorSize": "medium",
+      "forceHideContentEditorInOverlay": false,
+      "iconColor": null,
+      "label": null,
+      "settingsElementTypeKey": null,
+      "stylesheet": null,
+      "thumbnail": null,
+      "view": null
+    },
+    {
+      "backgroundColor": null,
+      "contentElementTypeKey": "55877ddd-640f-4d73-8b53-f8c671e8415a",
+      "editorSize": "medium",
+      "forceHideContentEditorInOverlay": false,
+      "iconColor": null,
+      "label": null,
+      "settingsElementTypeKey": null,
+      "stylesheet": null,
+      "thumbnail": null,
+      "view": null
+    }
+  ],
+  "MaxPropertyWidth": null,
+  "UseInlineEditingAsDefault": false,
+  "UseLiveEditing": false,
+  "UseSingleBlockMode": false,
+  "ValidationLimit": {
+    "max": null,
+    "min": null
+  }
+}]]></Config>
+</DataType>
diff --git a/src/Umbraco.Cms.12.x/uSync/v9/DataTypes/UmbracoMultipleTextstring.config b/src/Umbraco.Cms.12.x/uSync/v9/DataTypes/UmbracoMultipleTextstring.config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DataType Key="c0b4fb7d-436a-40fc-a5f2-dc88d868b1af" Alias="[Umbraco] Multiple Textstring" Level="2">
+  <Info>
+    <Name>[Umbraco] Multiple Textstring</Name>
+    <EditorAlias>Umbraco.MultipleTextstring</EditorAlias>
+    <DatabaseType>Ntext</DatabaseType>
+    <Folder>Test+Misc</Folder>
+  </Info>
+  <Config><![CDATA[{
+  "Maximum": 0,
+  "Minimum": 0
+}]]></Config>
+</DataType>
diff --git a/src/Umbraco.Cms.12.x/uSync/v9/Dictionary/contentpage.config b/src/Umbraco.Cms.12.x/uSync/v9/Dictionary/contentpage.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Dictionary Key="05b960dd-e5c0-4de1-b906-fd9b2b7056cb" Alias="ContentPage" Level="0">
+  <Info />
+  <Translations>
+    <Translation Language="da-DK"></Translation>
+    <Translation Language="en-US">My custom content page</Translation>
+    <Translation Language="nl-NL"></Translation>
+  </Translations>
+</Dictionary>
diff --git a/src/Umbraco.Cms.12.x/uSync/v9/Domains/_en-us.config b/src/Umbraco.Cms.12.x/uSync/v9/Domains/_en-us.config
@@ -4,5 +4,6 @@
     <IsWildcard>false</IsWildcard>
     <Language>en-US</Language>
     <Root Key="7c6bcf13-fa7d-4949-b975-ffb331ee0dcc">/Contentment/Home</Root>
+    <SortOrder>1</SortOrder>
   </Info>
 </Domain>
diff --git a/src/Umbraco.Cms.12.x/uSync/v9/Languages/da-dk.config b/src/Umbraco.Cms.12.x/uSync/v9/Languages/da-dk.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Language Key="00000406-0000-0000-0000-000000000000" Alias="da-DK" Level="0">
+  <Name>Danish (Denmark)</Name>
   <IsoCode>da-DK</IsoCode>
   <IsMandatory>false</IsMandatory>
   <IsDefault>false</IsDefault>

diff --git a/src/Umbraco.Cms.12.x/uSync/v9/Languages/en-us.config b/src/Umbraco.Cms.12.x/uSync/v9/Languages/en-us.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Language Key="00000409-0000-0000-0000-000000000000" Alias="en-US" Level="0">
+  <Name>English (United States)</Name>
   <IsoCode>en-US</IsoCode>
   <IsMandatory>false</IsMandatory>
   <IsDefault>true</IsDefault>

diff --git a/src/Umbraco.Cms.12.x/uSync/v9/Languages/nl-nl.config b/src/Umbraco.Cms.12.x/uSync/v9/Languages/nl-nl.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Language Key="00000413-0000-0000-0000-000000000000" Alias="nl-NL" Level="0">
+  <Name>Dutch (Netherlands)</Name>
   <IsoCode>nl-NL</IsoCode>
   <IsMandatory>false</IsMandatory>
   <IsDefault>false</IsDefault>

diff --git a/src/Umbraco.Cms.12.x/uSync/v9/usync.config b/src/Umbraco.Cms.12.x/uSync/v9/usync.config
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<uSync version="11.0.0.0" format="10.1.0" />
+<uSync version="12.2.0.0" format="10.7.0" />