@concretecms/bedrock 1.5.3 → 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/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/package.json

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