Interim Fixes

Author: lrljoe

CHANGELOG.md

@@ -204,7 +204,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - In LaravelLivewireTablesEvent, change the type to Illuminate\Contracts\Auth\Authenticatable by @khwadj in https://github.com/rappasoft/laravel-livewire-tables/pull/1963
 - Fix for Search Field Attribute Defaults by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1962
 - Fix Filter Pills Icon - Tailwind by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1961
-- Add filterComponents into queryString to ensure they're maintained by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1957
+- Add appliedFilters into queryString to ensure they're maintained by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1957
 - Reset Current Page on "Per Page" changing by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1953
 
 ### New Features
@@ -302,7 +302,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 
 ## [v3.4.8] - 2024-08-18
 ### New Features
-- Add an event dispatch for Filter Was Set when filterComponents is updated by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1861
+- Add an event dispatch for Filter Was Set when appliedFilters is updated by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1861
 
 ## [v3.4.7] - 2024-08-18
 ### Bug Fixes
@@ -483,7 +483,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
 - Fix collapsing columns not respecting view point collapse points by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1665
 
 ### Tweaks
-- Migrate "updated" Search and FilterComponents calls to WithSearch and WithFilters by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1666
+- Migrate "updated" Search and appliedFilters calls to WithSearch and WithFilters by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1666
 - Allow nullable search/filter values by @lrljoe in https://github.com/rappasoft/laravel-livewire-tables/pull/1666
 
 ## [v3.2.0] - 2024-01-04
@@ -697,7 +697,7 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
             - DateFilter & DateTimeFilter fully support setFilterDefaultValue
             - MultiSelectFilter & MultiSelectDropdownFilter both support setFirstOption()
             - There are now two arrays relating to Filters:
-                - A wireable one ($filterComponents)
+                - A wireable one ($appliedFilters)
                 - An unwired one - only keeps track of those filters that have a value ($appliedFilters).  This is what is bound to the query string, and populates the filters on mount if they are present in the query string.
 
         - Livewire 3 Specific

phpstan.neon

@@ -14,9 +14,9 @@ parameters:
     reportUnmatchedIgnoredErrors: false
     ignoreErrors:
         - identifier: argument.type
+        - identifier: argument.templateType
         - identifier: new.static
         - identifier: trait.unused
-        - identifier: deadCode.unreachable
         - identifier: booleanNot.alwaysTrue
           paths:
             - src/Views/Columns/Traits/HasDataTableComponent.php
@@ -26,19 +26,23 @@ parameters:
             - src/Traits/Helpers/CustomisationsHelpers.php
             - src/Traits/Helpers/QueryHelpers.php
             - src/Views/Columns/Traits/HasSlot.php
-            - src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
         - identifier: instanceof.alwaysTrue
           paths:
+            - src/Traits/Helpers/ColumnHelpers.php
             - src/Views/Columns/Traits/HasFooter.php
             - src/Views/Columns/Traits/HasSecondaryHeader.php
         - identifier: function.alreadyNarrowedType
           paths: 
-            - src/Views/Columns/Traits/Helpers/ArrayColumnHelpers.php
-            - src/Features/AutoInjectRappasoftAssets.php
-            - src/Traits/WithBulkActions.php
-            - src/Views/Actions/Traits/HasActionAttributes.php
             - src/Views/Filters/MultiSelectDropdownFilter.php
             - src/Views/Filters/Traits/HasOptions.php
-            - src/Views/Traits/Core/HasTheme.php
             - src/Views/Traits/Core/HasView.php
+        - identifier: missingType.generics
+          paths:
+            - src/Traits/WithData.php
+        - identifier: empty.offset
+          paths:
+            - src/Traits/Filters/Helpers/FilterMenuHelpers.php
+        - identifier: isset.offset
+          paths:
+            - src/Traits/Filters/Helpers/FilterMenuHelpers.php
         - message: '# \$view of function view expects view-string\|null, string given.#'

resources/js/partials/core/tools.js

@@ -2,10 +2,10 @@
 
 function tools() {
     Alpine.data('tools', (wire) => ({
-        filtersOpen: wire.entangle('filterSlideDownDefaultVisible'),
+        filtersOpen: wire.entangle('filterConfiguration.filterSlideDownDefaultVisible'),
         externalFilterPillsVals: wire.entangle('externalFilterPillsValues'),
         internalFilterPillsVals: wire.entangle('internalFilterPillsVals'),
-        showFilterPillLabel: [],
+        showFilterPillLabel: [], 
         filterPillsSeparator: ', ',
         showFilterPillsSection: true,
         resetSpecificFilter(filterKey)

resources/js/partials/core/tools.min.js

@@ -2,7 +2,7 @@
 
 function tools() {
     Alpine.data('tools', (wire) => ({
-        filtersOpen: wire.entangle('filterSlideDownDefaultVisible'),
+        filtersOpen: wire.entangle('filterConfiguration.filterSlideDownDefaultVisible'),
         externalFilterPillsVals: wire.entangle('externalFilterPillsValues'),
         internalFilterPillsVals: wire.entangle('internalFilterPillsVals'),
         showFilterPillLabel: [],

resources/js/partials/filter-boolean.js

@@ -1,7 +1,7 @@
 document.addEventListener('alpine:init', () => {
     Alpine.data('booleanFilter', (wire,filterKey,tableName,defaultValue) => ({
         switchOn: false, 
-        value: wire.entangle('filterComponents.'+filterKey).live, 
+        value: wire.entangle('appliedFilters.'+filterKey).live, 
         init() { 
             this.switchOn = false; 
             if (typeof this.value !== 'undefined') { 

resources/js/partials/filter-boolean.min.js

@@ -2,7 +2,7 @@
 
 function fpf() {
     Alpine.data('flatpickrFilter', (wire, filterKey, filterConfig, refLocation, locale) => ({
-        wireValues: wire.entangle('filterComponents.' + filterKey),
+        wireValues: wire.entangle('appliedFilters.' + filterKey),
         flatpickrInstance: flatpickr(refLocation, {
             mode: 'range',
             altFormat: filterConfig['altFormat'] ?? "F j, Y",
@@ -36,7 +36,7 @@ function fpf() {
                     window.childElementOpen = false;
                     window.filterPopoverOpen = false;
                     wireDateArray = { 'minDate': dates[0], 'maxDate': (typeof dates[2] === "undefined") ? dates[0] : dates[2] };
-                    wire.set('filterComponents.' + filterKey, wireDateArray);
+                    wire.set('appliedFilters.' + filterKey, wireDateArray);
                 }
 
             },

resources/js/partials/filter-date-range.js

@@ -1,15 +1,15 @@
 /*jshint esversion: 6 */
 export function nrf() {
     Alpine.data('numberRangeFilter', (wire, filterKey, parentElementPath, filterConfig, childElementRoot) => ({
-        allFilters: wire.entangle('filterComponents', false),
+        allFilters: wire.entangle('appliedFilters', false),
         originalMin: 0,
         originalMax: 100,
         filterMin: 0,
         filterMax: 100,
         currentMin: 0,
         currentMax: 100,
         hasUpdate: false,
-        wireValues: wire.entangle('filterComponents.' + filterKey, false),
+        wireValues: wire.entangle('appliedFilters.' + filterKey, false),
         defaultMin: filterConfig['minRange'],
         defaultMax: filterConfig['maxRange'],
         restrictUpdates: false,
@@ -60,7 +60,7 @@ export function nrf() {
             if (this.hasUpdate) {
                 this.hasUpdate = false;
                 this.wireValues = { 'min': this.filterMin, 'max': this.filterMax };
-                wire.set('filterComponents.' + filterKey, this.wireValues);
+                wire.set('appliedFilters.' + filterKey, this.wireValues);
             }
         },
         init() {