Merge pull request #1 from UmbHost/develop

Updated dependencies

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/Lang/en.xml

@@ -25,6 +25,8 @@
         <key alias="copyContentBlock">Copy content block</key>
         <key alias="createContentTemplate">Create content template...</key>
 
+        <key alias="missingElementType">This content is not supported for this configuration.</key>
+
         <!-- Data List -->
         <key alias="labelDataSource">Data source</key>
         <key alias="labelListEditor">List editor</key>

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/components/blocks-editor.html

@@ -11,7 +11,9 @@
 <div class="contentment umb-block-list">
     <div class="umb-block-list__wrapper">
         <div ui-sortable="vm.sortableOptions" ng-model="vm.ngModel">
-            <div class="umb-block-list__block" ng-repeat="item in vm.ngModel track by $index">
+            <div class="umb-block-list__block"
+                 ng-repeat="item in vm.ngModel track by $index"
+                 ng-class="{'__fade': vm.populate(item, $index, 'disabled') === true}">
 
                 <div class="umb-block-list__block--view" ng-if="!vm.previews[item.key]">
                     <button type="button"
@@ -32,7 +34,7 @@
                 </div>
 
                 <div class="umb-block-list__block--actions">
-                    <button ng-repeat="btn in vm.blockActions[$index]" type="button" class="btn-reset umb-outline action" title="{{btn.label}}" ng-click="btn.method()">
+                    <button ng-repeat="btn in vm.blockActions[item.key]" type="button" class="btn-reset umb-outline action" title="{{btn.label}}" ng-click="btn.method()">
                         <umb-icon icon="icon-{{btn.icon}}" class="icon"></umb-icon>
                         <span class="sr-only" ng-bind="btn.label"></span>
                     </button>

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/components/cards-editor.html

@@ -13,7 +13,7 @@
     <div class="umb-block-card-grid" ui-sortable="vm.sortableOptions" ng-model="vm.ngModel">
         <div class="umb-block-card"
              ng-repeat="item in vm.ngModel track by $index"
-             ng-class="{'__fade': vm.populate(item, $index, 'disabled') === true}"
+             ng-class="{'__fade': vm.populate(item, $index, 'disabled') === true, '__no-edit': vm.canEdit(item, $index) === false}"
              ng-click="vm.edit($index)">
             <div class="__showcase" ng-style="vm.populateStyle(item, $index, 'cardStyle')">
                 <div class="__icon" ng-if="_icon = vm.populate(item, $index, 'icon')">
@@ -32,7 +32,7 @@
                         class="btn-reset __action umb-outline"
                         title="{{btn.label}}"
                         ng-click="btn.method(); $event.stopPropagation();"
-                        ng-repeat="btn in vm.blockActions[$index]">
+                        ng-repeat="btn in vm.blockActions[item.key]">
                     <umb-icon icon="icon-{{btn.icon}}" class="icon"></umb-icon>
                     <span class="sr-only" ng-bind="btn.label"></span>
                 </button>

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/components/stack-editor.html

@@ -37,8 +37,8 @@ <h5 ng-bind="vm.populate(item, $index, 'name')"></h5>
                         <umb-icon icon="icon-trash" class="icon"></umb-icon>
                     </button>
                 </li>
-                <li class="lk-content-blocks__action--item" ng-if="vm.blockActions[$index]">
-                    <umb-property-actions actions="vm.blockActions[$index]"></umb-property-actions>
+                <li class="lk-content-blocks__action--item" ng-if="vm.blockActions[item.key]">
+                    <umb-property-actions actions="vm.blockActions[item.key]"></umb-property-actions>
                 </li>
             </ul>
 

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/editors/buttons.html

@@ -5,7 +5,7 @@
                 ng-repeat="item in vm.items"
                 ng-class="{ 'umb-button--selected' : item.selected }"
                 label="{{vm.hideName === false ? item.name : null}}"
-                title="{{item.name}}"
+                title="{{vm.hideName === true ? item.name : ''}}{{item.description == '' ? '' : (vm.hideName ? (', ' + item.description) : item.description)}}"
                 icon="{{vm.hideIcon === false ? (item.icon || vm.defaultIcon) + vm.iconExtras : null}}"
                 disabled="item.disabled">
     </umb-button>

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/editors/content-blocks.html

@@ -6,8 +6,7 @@
                               allow-remove="vm.allowRemove"
                               allow-sort="vm.allowSort"
                               display-mode="vm.displayMode"
-                              get-item-icon="vm.populateIcon"
-                              get-item-name="vm.populateName"
+                              get-item="vm.populate"
                               on-add="vm.add"
                               on-edit="vm.edit"
                               on-remove="vm.remove"

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/editors/data-list.preview.html

@@ -17,6 +17,13 @@
         </div>
         <div ng-switch-when="loaded">
 
+            <div class="umb-readonlyvalue" ng-if="vm.property.config.items.length > 30">
+                <details class="umb-property-editor--limit-width alert" ng-class="{ 'alert-danger': vm.property.config.items.length >= 50, 'alert-warning': vm.property.config.items.length < 50 }">
+                    <summary>There are <strong ng-bind="vm.property.config.items.length"></strong> items avaliable in this data source.</summary>
+                    <p>To avoid an unpleasant editor experience or lagging browser performance, please consider trying the <strong>Data Picker</strong> property editor, as it has been designed with improved performance in mind, with support for search querying and pagination.</p>
+                </details>
+            </div>
+
             <umb-tabs-nav ng-if="vm.tabs"
                           tabs="vm.tabs"
                           on-tab-change="vm.changeTab(tab)">

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/editors/data-picker.html

@@ -0,0 +1,17 @@
+<div ng-class="vm.uniqueId" ng-controller="Umbraco.Community.Contentment.DataEditors.DataPicker.Controller as vm">
+    <umb-load-indicator ng-if="vm.loading === true"></umb-load-indicator>
+    <contentment-items-editor ng-if="vm.loading === false"
+                              ng-model="model.value"
+                              add-button-label-key="vm.addButtonLabelKey"
+                              allow-add="vm.allowAdd"
+                              allow-edit="vm.allowEdit"
+                              allow-remove="vm.allowRemove"
+                              allow-sort="vm.allowSort"
+                              default-icon="vm.defaultIcon"
+                              display-mode="vm.displayMode"
+                              get-item="vm.populate"
+                              on-add="vm.add"
+                              on-remove="vm.remove"
+                              property-actions="vm.propertyActions">
+    </contentment-items-editor>
+</div>

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/editors/data-picker.overlay.html

@@ -0,0 +1,101 @@
+<div class="contentment lk-overlay" ng-controller="Umbraco.Community.Contentment.Overlays.DataPicker.Controller as vm">
+    <umb-editor-view>
+
+        <umb-editor-header name="vm.title"
+                           name-locked="true"
+                           hide-alias="true"
+                           hide-icon="true"
+                           hide-description="true">
+        </umb-editor-header>
+
+        <umb-editor-container>
+
+            <div class="umb-control-group">
+                <div class="form-search">
+                    <umb-search-filter input-id="contentment-datapicker-search"
+                                       model="vm.searchOptions.query"
+                                       label-key="placeholders_search"
+                                       text="Type to search..."
+                                       on-change="vm.search()"
+                                       css-class="w-100"
+                                       auto-focus="true">
+                    </umb-search-filter>
+                </div>
+            </div>
+
+            <umb-load-indicator ng-show="vm.loading === true"></umb-load-indicator>
+
+            <div class="umb-block-card-grid" ng-if="vm.listType === 'cards'" ng-show="vm.loading === false && vm.items.length !== 0">
+                <div class="umb-block-card"
+                     ng-repeat="item in vm.items"
+                     ng-class="{'--isOpen': vm.isSelected(item)}"
+                     ng-click="vm.select(item, $event)">
+                    <div class="__showcase"
+                         ng-style="_img = vm.getImage(item)">
+                        <div class="__icon" ng-if="!_img">
+                            <umb-icon icon="{{item.icon || vm.defaultIcon}}"></umb-icon>
+                        </div>
+                    </div>
+                    <div class="__info">
+                        <div class="__name" ng-bind="item.name"></div>
+                        <div class="__subname" ng-bind="item.description"></div>
+                    </div>
+                    <div class="__actions"></div>
+                </div>
+            </div>
+
+            <umb-box ng-if="vm.listType !== 'cards'" ng-show="vm.loading === false && vm.items.length !== 0">
+                <umb-box-content>
+                    <ul class="umb-actions umb-actions-child">
+                        <li class="umb-action" ng-class="{ '-disabled': item.disabled }" ng-repeat="item in vm.items">
+                            <button type="button" class="umb-action-link umb-outline btn-reset" ng-click="vm.select(item, $event)">
+                                <div ng-if="vm.enableMultiple"
+                                     ng-class="{'umb-checkmark--checked': vm.isSelected(item)}"
+                                     class="umb-checkmark umb-checkmark--m umb-outline">
+                                    <umb-icon ng-if="vm.isSelected(item)" icon="icon-check"></umb-icon>
+                                </div>
+                                <umb-icon icon="{{item.icon || vm.defaultIcon}}" class="large icon"></umb-icon>
+                                <span class="menu-label">
+                                    <span ng-bind="item.name"></span>
+                                    <small ng-bind="item.description"></small>
+                                </span>
+                            </button>
+                        </li>
+                    </ul>
+                </umb-box-content>
+            </umb-box>
+
+            <div class="flex justify-center" ng-show="vm.searchOptions.totalPages > 0 && vm.loading === false">
+                <umb-pagination page-number="vm.searchOptions.pageNumber"
+                                total-pages="vm.searchOptions.totalPages"
+                                on-change="vm.pagination(pageNumber)">
+                </umb-pagination>
+            </div>
+
+            <umb-empty-state ng-if="vm.loading === false && vm.searchOptions.query && vm.items.length === 0" position="center">
+                <localize key="general_searchNoResult">Sorry, we can not find what you are looking for.</localize>
+            </umb-empty-state>
+
+        </umb-editor-container>
+
+        <umb-editor-footer>
+            <umb-editor-footer-content-right>
+                <umb-button type="button"
+                            button-style="link"
+                            label-key="general_close"
+                            shortcut="esc"
+                            action="vm.close()">
+                </umb-button>
+                <umb-button ng-if="vm.enableMultiple"
+                            type="button"
+                            button-style="success"
+                            label-key="buttons_select"
+                            shortcut="ctrl+s"
+                            disabled="vm.allowSubmit === false"
+                            action="vm.submit()">
+                </umb-button>
+            </umb-editor-footer-content-right>
+        </umb-editor-footer>
+
+    </umb-editor-view>
+</div>

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/editors/icon-picker.html

@@ -22,7 +22,10 @@
             </ul>
         </div>
     </div>
-    <a class="lk-icon-picker-small" href="" ng-if="vm.size === 'small'" ng-click="vm.pick()" prevent-default>
-        <umb-icon icon="{{model.value}}" class="icon" ng-class="{ 'medium': vm.allowAdd === false, 'small icon-add': vm.allowAdd }"></umb-icon>
-    </a>
+    <button ng-if="vm.size === 'small'" type="button" class="btn-reset umb-panel-header-icon" ng-click="vm.pick()" ng-class="{'-placeholder': !model.value }" title="{{model.value}}">
+        <umb-icon icon="{{model.value}}" class="icon" ng-if="model.value"></umb-icon>
+        <span class="umb-panel-header-icon-text" ng-if="!model.value">
+            <localize key="settings_addIcon">Add icon</localize>
+        </span>
+    </button>
 </div>

UmbCheckout.StarterKit.Web/App_Plugins/Contentment/package.manifest

@@ -1,6 +1,7 @@
 {
     "name": "Contentment",
-    "version": "4.4.4",
+    "id": "Umbraco.Community.Contentment",
+    "version": "4.5.0",
     "css": [ "~/App_Plugins/Contentment/contentment.css" ],
     "javascript": [ "~/App_Plugins/Contentment/contentment.js" ]
 }

UmbCheckout.StarterKit.Web/UmbCheckout.StarterKit.Web.csproj

@@ -20,26 +20,26 @@
     <PackageReference Include="MetaMomentum" Version="2.2.0" />
     <PackageReference Include="NestingContently.Umbraco" Version="4.0.0" />
     <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-    <PackageReference Include="Our.Umbraco.Community.Contentment" Version="4.4.4" />
+    <PackageReference Include="Our.Umbraco.Community.Contentment" Version="4.5.0" />
     <PackageReference Include="Our.Umbraco.ConditionalDisplayers" Version="3.4.0" />
     <PackageReference Include="Our.Umbraco.TagHelpers" Version="1.2.0" />
     <PackageReference Include="Our.Umbraco.TheDashboard" Version="10.0.1" />
     <PackageReference Include="Our.Umbraco.UmbNav.Web" Version="2.0.8" />
     <PackageReference Include="ourHtagEditor" Version="2.0.1" />
-    <PackageReference Include="Skybrud.Umbraco.Redirects" Version="4.0.13" />
+    <PackageReference Include="Skybrud.Umbraco.Redirects" Version="4.0.17" />
     <PackageReference Include="System.ServiceModel.Syndication" Version="6.0.0" />
-    <PackageReference Include="UmbCheckout" Version="1.0.2" />
-    <PackageReference Include="UmbCheckout.Stripe" Version="1.0.1" />
-    <PackageReference Include="UmbCheckout.Stripe.uSync" Version="1.0.1" />
-    <PackageReference Include="UmbCheckout.uSync" Version="1.0.1" />
-    <PackageReference Include="Umbraco.Cms" Version="10.6.1" />
+    <PackageReference Include="UmbCheckout" Version="1.0.5" />
+    <PackageReference Include="UmbCheckout.Stripe" Version="1.0.5" />
+    <PackageReference Include="UmbCheckout.Stripe.uSync" Version="1.0.5" />
+    <PackageReference Include="UmbCheckout.uSync" Version="1.0.5" />
+    <PackageReference Include="Umbraco.Cms" Version="10.7.0" />
   </ItemGroup>
 
   <ItemGroup>
     <!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
     <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />
     <PackageReference Include="Umbraco.Community.CSPManager" Version="1.1.0-alpha" />
-    <PackageReference Include="uSync" Version="10.6.2" />
+    <PackageReference Include="uSync" Version="10.7.1" />
     <RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2.0.9" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))" />
   </ItemGroup>