Skip to content

Commit 1d2b553

Browse files
lrljoelrljoe
committed
Major Reworks
1 parent 67ef255 commit 1d2b553

File tree

98 files changed

+1211
-535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1211
-535
lines changed

‎resources/js/partials/core/externalFilter.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ function externalFilter() {
1313
sendValueToPill(value)
1414
{
1515
let sentValue = this.removeHTMLTags(value);
16-
this.$dispatch('filterpillupdate', { tableName: this.tableName, filterKey: this.externalFilterKey, pillItem: sentValue });
16+
this.$dispatch('filterpillupdate', { dataTableFingerprint: this.dataTableFingerprint, filterKey: this.externalFilterKey, pillItem: sentValue });
1717
},
1818
overridePill(values)
1919
{
2020
let sentValue = this.removeHTMLTags(values);
21-
this.$dispatch('filterpillupdate', { tableName: this.tableName, filterKey: this.externalFilterKey, pillItem: sentValue });
21+
this.$dispatch('filterpillupdate', { dataTableFingerprint: this.dataTableFingerprint, filterKey: this.externalFilterKey, pillItem: sentValue });
2222
},
2323
syncItems(items) {
2424
this.pillValues = [];

‎resources/js/partials/core/externalFilter.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/js/partials/core/filterPills.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ function filterPills() {
5959
this.watchForUpdateEvent(event);
6060
},
6161
},
62-
checkEventIsValid(eventTableName, eventFilterKey)
62+
checkEventIsValid(eventdataTableFingerprint, eventFilterKey)
6363
{
64-
return ((this.tableName === eventTableName) && (this.localFilterKey === eventFilterKey));
64+
return ((this.dataTableFingerprint === eventdataTableFingerprint) && (this.localFilterKey === eventFilterKey));
6565
},
6666
watchForUpdateEvent(event)
6767
{
68-
if(this.checkEventIsValid(event.detail.tableName ?? '', event.detail.filterKey ?? ''))
68+
if(this.checkEventIsValid(event.detail.dataTableFingerprint ?? '', event.detail.filterKey ?? ''))
6969
{
7070
let eventPillItem = event.detail.pillItem ?? '';
7171
if(!this.shouldRenderAsHTML)

‎resources/js/partials/core/filterPills.min.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ function filterPills() {
5959
this.watchForUpdateEvent(event);
6060
},
6161
},
62-
checkEventIsValid(eventTableName, eventFilterKey)
62+
checkEventIsValid(eventdataTableFingerprint, eventFilterKey)
6363
{
64-
return ((this.tableName === eventTableName) && (this.localFilterKey === eventFilterKey));
64+
return ((this.dataTableFingerprint === eventdataTableFingerprint) && (this.localFilterKey === eventFilterKey));
6565
},
6666
watchForUpdateEvent(event)
6767
{
68-
if(this.checkEventIsValid(event.detail.tableName ?? '', event.detail.filterKey ?? ''))
68+
if(this.checkEventIsValid(event.detail.dataTableFingerprint ?? '', event.detail.filterKey ?? ''))
6969
{
7070
let eventPillItem = event.detail.pillItem ?? '';
7171
if(!this.shouldRenderAsHTML)

‎resources/js/partials/core/table.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function table() {
66
showBulkActionsAlpine: false,
77
primaryKeyName: '',
88
shouldBeDisplayed: wire.entangle('shouldBeDisplayed'),
9-
tableName: wire.entangle('tableName'),
9+
dataTableFingerprint: wire.entangle('dataTableFingerprint'),
1010
dataTableFingerprint: wire.entangle('dataTableFingerprint'),
1111
listeners: [],
1212
paginationCurrentCount: wire.entangle('paginationConfig.paginationCurrentCount'),
@@ -147,19 +147,19 @@ function table() {
147147
},
148148
showTable(event)
149149
{
150-
let eventTableName = event.detail.tableName ?? '';
150+
let eventdataTableFingerprint = event.detail.dataTableFingerprint ?? '';
151151
let eventTableFingerprint = event.detail.tableFingerpint ?? '';
152152

153-
if (((eventTableName ?? '') != '' && eventTableName === this.tableName) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) {
153+
if (((eventdataTableFingerprint ?? '') != '' && eventdataTableFingerprint === this.dataTableFingerprint) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) {
154154
this.shouldBeDisplayed = true;
155155
}
156156
},
157157
hideTable(event)
158158
{
159-
let eventTableName = event.detail.tableName ?? '';
159+
let eventdataTableFingerprint = event.detail.dataTableFingerprint ?? '';
160160
let eventTableFingerprint = event.detail.tableFingerpint ?? '';
161161

162-
if ((eventTableName != '' && eventTableName === this.tableName) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) {
162+
if ((eventdataTableFingerprint != '' && eventdataTableFingerprint === this.dataTableFingerprint) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) {
163163
this.shouldBeDisplayed = false;
164164
}
165165
},

‎resources/js/partials/core/table.min.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function table() {
99
indeterminateCheckbox: false,
1010
primaryKeyName: '',
1111
shouldBeDisplayed: wire.entangle('shouldBeDisplayed'),
12-
tableName: wire.entangle('tableName'),
12+
dataTableFingerprint: wire.entangle('dataTableFingerprint'),
1313
dataTableFingerprint: wire.entangle('dataTableFingerprint'),
1414
listeners: [],
1515
reorderEnabled: false,
@@ -74,19 +74,19 @@ function table() {
7474
},
7575
showTable(event)
7676
{
77-
let eventTableName = event.detail.tableName ?? '';
77+
let eventdataTableFingerprint = event.detail.dataTableFingerprint ?? '';
7878
let eventTableFingerprint = event.detail.tableFingerpint ?? '';
7979

80-
if (((eventTableName ?? '') != '' && eventTableName === this.tableName) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) {
80+
if (((eventdataTableFingerprint ?? '') != '' && eventdataTableFingerprint === this.dataTableFingerprint) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) {
8181
this.shouldBeDisplayed = true;
8282
}
8383
},
8484
hideTable(event)
8585
{
86-
let eventTableName = event.detail.tableName ?? '';
86+
let eventdataTableFingerprint = event.detail.dataTableFingerprint ?? '';
8787
let eventTableFingerprint = event.detail.tableFingerpint ?? '';
8888

89-
if ((eventTableName != '' && eventTableName === this.tableName) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) {
89+
if ((eventdataTableFingerprint != '' && eventdataTableFingerprint === this.dataTableFingerprint) || (eventTableFingerprint != '' && eventTableFingerpint === this.dataTableFingerprint)) {
9090
this.shouldBeDisplayed = false;
9191
}
9292
},

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
document.addEventListener('alpine:init', () => {
2-
Alpine.data('booleanFilter', (wire,filterKey,tableName,defaultValue) => ({
2+
Alpine.data('booleanFilter', (wire,filterKey,dataTableFingerprint,defaultValue) => ({
33
switchOn: false,
44
value: wire.entangle('appliedFilters.'+filterKey).live,
55
init() {
@@ -9,7 +9,7 @@ document.addEventListener('alpine:init', () => {
99
}
1010
this.listeners.push(
1111
Livewire.on('filter-was-set', (detail) => {
12-
if(detail.tableName == tableName && detail.filterKey == filterKey) {
12+
if(detail.dataTableFingerprint == dataTableFingerprint && detail.filterKey == filterKey) {
1313
this.switchOn = detail.value ?? defaultValue;
1414
}
1515
})

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/js/partials/filters/boolean.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
function newBf() {
44

5-
Alpine.data('newBooleanFilter', (wire,filterKey,tableName,defaultValue) => ({
5+
Alpine.data('newBooleanFilter', (wire,filterKey,dataTableFingerprint,defaultValue) => ({
66
booleanFilterKey: filterKey,
77
switchOn: false,
88
value: false,
@@ -42,7 +42,7 @@ function newBf() {
4242
console.log('detail');
4343
console.log(detail);
4444

45-
if(detail.tableName == tableName && detail.filterKey == this.booleanFilterKey) {
45+
if(detail.dataTableFingerprint == dataTableFingerprint && detail.filterKey == this.booleanFilterKey) {
4646
console.log('applies-to-this-table');
4747
console.log('typeof');
4848
console.log(typeof detail.value);

‎resources/views/components/bulk-actions/menu/body.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@aware([ 'tableName','isTailwind','isTailwind4','isBootstrap','isBootstrap4','isBootstrap5', 'localisationPath'])
1+
@aware([ 'dataTableFingerprint','isTailwind','isTailwind4','isBootstrap','isBootstrap4','isBootstrap5', 'localisationPath'])
22
{{-- This is used for the Bulk Actions Dropdown Menu Body --}}
33
<div :aria-expanded="open"
44
{{

0 commit comments

Comments
 (0)