Skip to content

Commit 8d2be0e

Browse files
authored
Merge pull request #24 from imbus/hotfix-fix-predefined-filters
Fixed predefined filters
2 parents 7e3bf70 + feb9afa commit 8d2be0e

File tree

4 files changed

+13
-109
lines changed

4 files changed

+13
-109
lines changed

public/js/dist/filterFormManager.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,32 +56,30 @@ export default class FilterFormManager {
5656
this.clearAll();
5757

5858
const promises = [];
59-
60-
for (const filter of response) {
61-
const {field, value} = filter;
59+
for (const [field, value] of Object.entries(response)) {
6260

6361
const input = this.inputs.find(input => input.key === field);
6462
if (!input) {
6563
console.warn(`No input found for key: ${field}`);
66-
Livewire.dispatch('showNotification', { type: 'error', message: '{{ trans('general.failed_to_apply_predefined_filter') }}'});
64+
Livewire.dispatch('showNotification', { type: 'error', message: "Failed to apply predefined filter" });
6765
continue;
6866
}
6967

7068
try {
7169
const result = input.setValue(value);
72-
// If the method returns a promise, store it
7370
if (result instanceof Promise) {
7471
promises.push(result);
7572
}
7673
} catch (err) {
7774
console.error(`Failed to set value for "${field}":`, err);
78-
Livewire.dispatch('showNotification', { type: 'error', message: '{{ trans('general.failed_to_apply_predefined_filter') }}'});
75+
Livewire.dispatch('showNotification', { type: 'error', message: 'Failed to apply predefined filter' });
7976
}
8077
}
8178

79+
8280
// Wait for all async setValue calls to complete
8381
await Promise.all(promises);
84-
setAdvancedSearchPanelFilterEnabledState(false);
82+
this.setAdvancedSearchPanelFilterEnabledState(false);
8583
}
8684

8785
setAdvancedSearchPanelFilterEnabledState(state) {

public/js/dist/filterFormManager.min.js

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

public/mix-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"/js/dist/apiService.min.js": "/js/dist/apiService.min.js?id=4e838fdc8aaf6a0de54c69b1b84f9669",
3737
"/js/dist/filterInputs.js": "/js/dist/filterInputs.js?id=5393e2463a9e58a8235174b8bc761fb7",
3838
"/js/dist/filterInputs.min.js": "/js/dist/filterInputs.min.js?id=5393e2463a9e58a8235174b8bc761fb7",
39-
"/js/dist/filterFormManager.js": "/js/dist/filterFormManager.js?id=62da86ad32e0e5f2bee581f8142c02dd",
40-
"/js/dist/filterFormManager.min.js": "/js/dist/filterFormManager.min.js?id=62da86ad32e0e5f2bee581f8142c02dd",
39+
"/js/dist/filterFormManager.js": "/js/dist/filterFormManager.js?id=e31fb00796585f25b6f2ff653a6d0398",
40+
"/js/dist/filterFormManager.min.js": "/js/dist/filterFormManager.min.js?id=e31fb00796585f25b6f2ff653a6d0398",
4141
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
4242
"/js/select2/i18n/ar.js": "/js/select2/i18n/ar.js?id=65aa8e36bf5da57ff4e3f22a835ab035",
4343
"/js/select2/i18n/az.js": "/js/select2/i18n/az.js?id=270c257daf8140a0cf23ad5de6f8ed1b",

resources/assets/js/advancedSearch/filterFormManager.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,32 +56,30 @@ export default class FilterFormManager {
5656
this.clearAll();
5757

5858
const promises = [];
59-
60-
for (const filter of response) {
61-
const {field, value} = filter;
59+
for (const [field, value] of Object.entries(response)) {
6260

6361
const input = this.inputs.find(input => input.key === field);
6462
if (!input) {
6563
console.warn(`No input found for key: ${field}`);
66-
Livewire.dispatch('showNotification', { type: 'error', message: '{{ trans('general.failed_to_apply_predefined_filter') }}'});
64+
Livewire.dispatch('showNotification', { type: 'error', message: "Failed to apply predefined filter" });
6765
continue;
6866
}
6967

7068
try {
7169
const result = input.setValue(value);
72-
// If the method returns a promise, store it
7370
if (result instanceof Promise) {
7471
promises.push(result);
7572
}
7673
} catch (err) {
7774
console.error(`Failed to set value for "${field}":`, err);
78-
Livewire.dispatch('showNotification', { type: 'error', message: '{{ trans('general.failed_to_apply_predefined_filter') }}'});
75+
Livewire.dispatch('showNotification', { type: 'error', message: 'Failed to apply predefined filter' });
7976
}
8077
}
8178

79+
8280
// Wait for all async setValue calls to complete
8381
await Promise.all(promises);
84-
setAdvancedSearchPanelFilterEnabledState(false);
82+
this.setAdvancedSearchPanelFilterEnabledState(false);
8583
}
8684

8785
setAdvancedSearchPanelFilterEnabledState(state) {

0 commit comments

Comments
 (0)