Data list's toggle all button now selects maximum possible entries (#…

…6816) Co-authored-by: Jason Varga <jason@pixelfear.com>
statamic · Nov 1, 2022 · 7a3cfb7 · 7a3cfb7
1 parent 7ce9b4d
commit 7a3cfb7
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/resources/js/components/collections/Listing.vue b/resources/js/components/collections/Listing.vue
@@ -1,5 +1,5 @@
 <template>
-    <data-list :columns="columns" :rows="rows">
+    <data-list ref="dataList" :columns="columns" :rows="rows">
         <div class="card p-0" slot-scope="{ filteredRows: rows }">
             <data-list-table :rows="rows">
                 <template slot="cell-title" slot-scope="{ row: collection }">

diff --git a/resources/js/components/data-list/HasFilters.js b/resources/js/components/data-list/HasFilters.js
@@ -70,8 +70,8 @@ export default {
         },
 
         unselectAllItems() {
-            if (this.$refs.toggleAll) {
-                this.$refs.toggleAll.uncheckAllItems();
+            if (this.$refs.dataList) {
+                this.$refs.dataList.clearSelections();
             }
         },
 

diff --git a/resources/js/components/data-list/ToggleAll.vue b/resources/js/components/data-list/ToggleAll.vue
@@ -8,22 +8,20 @@
 export default {
     inject: ['sharedState'],
     computed: {
-        allItemsChecked() {
-            if (this.sharedState.rows.length === 0) return false;
-
-            return this.sharedState.selections.length === this.sharedState.rows.length;
-        },
         anyItemsChecked() {
             return this.sharedState.selections.length > 0;
         },
     },
     methods: {
         toggle() {
-            this.anyItemsChecked ? this.uncheckAllItems() : this.checkAllItems()
+            this.anyItemsChecked ? this.uncheckAllItems() : this.checkMaximumAmountOfItems()
         },
 
-        checkAllItems() {
-            this.sharedState.selections = _.values(_.map(this.sharedState.rows, item => item.id))
+        checkMaximumAmountOfItems() {
+            this.sharedState.selections = _.chain(this.sharedState.rows)
+                .map(item => item.id)
+                .first(this.sharedState.maxSelections ?? Infinity)
+                .value()
         },
 
         uncheckAllItems() {

diff --git a/resources/js/components/entries/Listing.vue b/resources/js/components/entries/Listing.vue
@@ -7,6 +7,7 @@
 
         <data-list
             v-if="!initializing"
+            ref="dataList"
             :rows="items"
             :columns="columns"
             :sort="false"

diff --git a/resources/js/components/inputs/relationship/Selector.vue b/resources/js/components/inputs/relationship/Selector.vue
@@ -8,6 +8,7 @@
 
         <data-list
             v-if="!initializing"
+            ref="dataList"
             :rows="items"
             :columns="columns"
             :sort="false"

diff --git a/resources/js/components/terms/Listing.vue b/resources/js/components/terms/Listing.vue
@@ -7,6 +7,7 @@
 
         <data-list
             v-if="!initializing"
+            ref="dataList"
             :rows="items"
             :columns="columns"
             :sort="false"

diff --git a/resources/js/components/users/Listing.vue b/resources/js/components/users/Listing.vue
@@ -7,6 +7,7 @@
 
         <data-list
             v-if="!initializing"
+            ref="dataList"
             :columns="columns"
             :rows="items"
             :sort="false"