@concretecms/bedrock 1.5.2 → 1.5.4

package/assets/cms/components/file-manager/Chooser/Files.vue

@@ -25,8 +25,8 @@
                         <th></th>
                         <th></th>
                         <th>{{ i18n.id }}</th>
-                        <th :class="getSortColumnClassName('fv.fvTitle')">
-                            <a v-if="enableSort" href="#" @click.prevent="sortBy('fv.fvTitle')">{{ i18n.name }}</a>
+                        <th :class="getSortColumnClassName('name')">
+                            <a v-if="enableSort" href="#" @click.prevent="sortBy('name')">{{ i18n.name }}</a>
                             <span v-else>{{ i18n.name }}</span>
                         </th>
                         <th :class="getSortColumnClassName(dateSortColumn)">
@@ -99,7 +99,7 @@ export default {
         fileList: [],
         selectedFiles: [],
         sortByColumn: '',
-        sortByDirection: 'desc',
+        sortByDirection: 'asc',
         pagination: null,
         queryParams: {
             pagination_page: 'ccm_paging_p',
@@ -300,7 +300,7 @@ export default {
             })
         },
         sortBy(column) {
-            if (column === this.sortByColumn || (this.sortByColumn === '' && column === this.dateSortColumn)) {
+            if (column === this.sortByColumn || (this.sortByColumn === '' && column === 'name')) {
                 this.sortByDirection = this.sortByDirection === 'asc' ? 'desc' : 'asc'
             }
 
@@ -309,7 +309,7 @@ export default {
         getSortColumnClassName(column) {
             let className = ''
             if (this.enableSort) {
-                if (column === this.sortByColumn || (this.sortByColumn === '' && column === this.dateSortColumn)) {
+                if (column === this.sortByColumn || (this.sortByColumn === '' && column === 'name')) {
                     className = `ccm-results-list-active-sort-${this.sortByDirection}`
                 }
             }

package/assets/cms/components/groups/Chooser.vue

@@ -57,6 +57,11 @@ export default {
     components: {
     },
     props: {
+        filter: {
+            type: String,
+            required: false,
+            default: '' /* Values are either "" or "assign". If assign, we strip out faux-groups like "Guest" and "Registered Users" */
+        },
         mode: {
             type: String,
             required: false,
@@ -83,7 +88,7 @@ export default {
         treeID: function() {
             var my = this
             var removeNodesByKey = []
-            if (this.guestGroupTreeNodeID !== null && this.registeredGroupTreeNodeID !== null) {
+            if (this.filter === 'assign' && this.guestGroupTreeNodeID !== null && this.registeredGroupTreeNodeID !== null) {
                 removeNodesByKey.push(this.guestGroupTreeNodeID)
                 removeNodesByKey.push(this.registeredGroupTreeNodeID)
             }
@@ -148,7 +153,7 @@ export default {
                 url: CCM_DISPATCHER_FILENAME + '/ccm/system/group/chooser/search',
                 method: 'POST',
                 data: {
-                    filter: 'assign',
+                    filter: my.filter,
                     ccm_token: CCM_SECURITY_TOKEN,
                     keywords: my.searchKeywords
                 },

package/assets/cms/js/tree.js

@@ -139,9 +139,7 @@ ConcreteTree.prototype = {
             select: function (select, data) {
                 if (options.chooseNodeInForm) {
                     const keys = my.getSelectedNodeKeys(data.tree.getRootNode(), ajaxData.treeNodeSelectedIDs)
-                    if (keys.length) {
-                        options.onSelect(keys)
-                    }
+                    options.onSelect(keys)
                 }
             },
 
@@ -307,15 +305,18 @@ ConcreteTree.prototype = {
         })
     },
 
+    // Fancytree provides a selected keys array, but it doesn't include the children of closed categories.
+    // So we need to walk through the entire tree to get all selected nodes.
     getSelectedNodeKeys: function (node, selected) {
         var my = this
 
         // Initialize selected array
         selected = selected || []
 
-        // Remove keys that are not in the tree anymore
-        selected = selected.filter(function (key) {
-            return $.ui.fancytree.getTree(my.$element).getNodeByKey(parseInt(key)) !== null
+        // We need to remove 0 as a selected key, because sometimes it comes from php and means null.
+        // See: https://github.com/concretecms/concretecms/issues/12118
+        selected = selected.filter(function (value) {
+            return parseInt(value) > 0
         })
 
         // Walk through all child nodes

package/assets/icons/sprites.svg

@@ -146,11 +146,7 @@
                 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
             <g id="Page-1" stroke="none" stroke-width="1" fill-rule="evenodd">
                 <g id="Dialog---Add-Page-List" transform="translate(-1021.000000, -105.000000)">
-                    <mask id="mask-2" fill="white">
-                        <use xlink:href="#path-1"></use>
-                    </mask>
-                    <use id="Rectangle" fill-opacity="0.6" xlink:href="#path-1"></use>
-                    <g id="Group" mask="url(#mask-2)">
+                    <g id="Group">
                         <g transform="translate(315.000000, 80.000000)">
                             <g id="icons8-info-(1)" stroke-width="1" fill="none" fill-rule="evenodd"
                                transform="translate(706.000000, 25.000000)">

package/assets/navigation/js/frontend/top-navigation-bar.js

@@ -4,7 +4,7 @@
         if (window.innerWidth > 992) {
             document.querySelectorAll('.ccm-block-top-navigation-bar .nav-item').forEach(function(everyitem) {
                 everyitem.addEventListener('mouseover', function(e) {
-                    const linkElement = this.querySelector('a[data-bs-toggle]')
+                    const linkElement = this.querySelector('a[data-concrete-toggle]')
                     if (linkElement != null) {
                         const nextElement = linkElement.nextElementSibling
                         linkElement.classList.add('show')
@@ -12,7 +12,7 @@
                     }
                 })
                 everyitem.addEventListener('mouseleave', function(e) {
-                    const linkElement = this.querySelector('a[data-bs-toggle]')
+                    const linkElement = this.querySelector('a[data-concrete-toggle]')
                     if (linkElement != null) {
                         const nextElement = linkElement.nextElementSibling
                         linkElement.classList.remove('show')
@@ -21,7 +21,7 @@
                 })
             })
         } else {
-            $('a[data-bs-toggle]').on('click', function(e) {
+            $('a[data-concrete-toggle]').on('click', function(e) {
                 if (!$(this).hasClass('show')) {
                     e.preventDefault()
                     const $nextElement = $(this).next()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@concretecms/bedrock",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "The asset framework and dependencies for Concrete CMS.",
   "scripts": {
     "lint": "standardx \"**/*.{js,vue}\" && stylelint assets/**/*.{scss,vue}",