From f6771dafd321ef213c74ef2d3379cb72fc02f28c Mon Sep 17 00:00:00 2001 From: asift798 Date: Fri, 4 Mar 2022 15:00:56 +0530 Subject: [PATCH] fixed search filter is not working --- .../scripts/admin/components/modal-components/BackupModal.vue | 2 +- .../components/modal-components/ExchangeRateProviderModal.vue | 4 +++- .../scripts/admin/components/modal-components/ItemModal.vue | 4 ++-- .../admin/components/modal-components/disks/DoSpacesDisk.vue | 1 + .../admin/views/installation/Step8CompanyPreferences.vue | 4 ++-- resources/scripts/admin/views/settings/AccountSetting.vue | 2 +- resources/scripts/admin/views/settings/BackupSetting.vue | 2 +- resources/scripts/admin/views/settings/PreferencesSetting.vue | 4 ++-- resources/scripts/admin/views/users/Create.vue | 1 + resources/scripts/components/base/BaseItemSelect.vue | 2 +- 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/resources/scripts/admin/components/modal-components/BackupModal.vue b/resources/scripts/admin/components/modal-components/BackupModal.vue index c3376f69..88e6fc04 100644 --- a/resources/scripts/admin/components/modal-components/BackupModal.vue +++ b/resources/scripts/admin/components/modal-components/BackupModal.vue @@ -51,7 +51,7 @@ label="name" value-prop="id" :placeholder="$t('settings.disk.select_disk')" - track-by="id" + track-by="name" object /> diff --git a/resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue b/resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue index 01b21ca5..b466ca64 100644 --- a/resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue +++ b/resources/scripts/admin/components/modal-components/ExchangeRateProviderModal.vue @@ -38,6 +38,7 @@ label="key" :searchable="true" :invalid="v$.currentExchangeRate.driver.$error" + track-by="key" @update:modelValue="resetCurrency" @input="v$.currentExchangeRate.driver.$touch()" /> @@ -60,6 +61,7 @@ :options="serverOptions" :invalid="v$.currencyConverter.type.$error" label="value" + track-by="value" @update:modelValue="resetCurrency" /> @@ -104,8 +106,8 @@ :invalid="v$.currentExchangeRate.currencies.$error" label="code" track-by="code" + open-direction="top" @input="v$.currentExchangeRate.currencies.$touch()" - openDirection="top" /> diff --git a/resources/scripts/admin/components/modal-components/ItemModal.vue b/resources/scripts/admin/components/modal-components/ItemModal.vue index 5270394a..3bd55096 100644 --- a/resources/scripts/admin/components/modal-components/ItemModal.vue +++ b/resources/scripts/admin/components/modal-components/ItemModal.vue @@ -50,7 +50,7 @@ :can-clear="false" :placeholder="$t('items.select_a_unit')" searchable - track-by="id" + track-by="name" /> @@ -67,7 +67,7 @@ :can-deselect="false" :can-clear="false" searchable - track-by="id" + track-by="name" object /> diff --git a/resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue b/resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue index c6bdb80b..0dd83e4c 100644 --- a/resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue +++ b/resources/scripts/admin/components/modal-components/disks/DoSpacesDisk.vue @@ -35,6 +35,7 @@ searchable label="name" :can-deselect="false" + track-by="name" @update:modelValue="onChangeDriver(data)" /> diff --git a/resources/scripts/admin/views/installation/Step8CompanyPreferences.vue b/resources/scripts/admin/views/installation/Step8CompanyPreferences.vue index b0e03781..ad40e60e 100644 --- a/resources/scripts/admin/views/installation/Step8CompanyPreferences.vue +++ b/resources/scripts/admin/views/installation/Step8CompanyPreferences.vue @@ -48,7 +48,7 @@ value-prop="code" :placeholder="$tc('settings.preferences.select_language')" class="w-full" - track-by="code" + track-by="name" :searchable="true" :invalid="v$.currentPreferences.language.$error" /> @@ -95,7 +95,7 @@ label="key" value-prop="value" :placeholder="$tc('settings.preferences.select_time_zone')" - track-by="value" + track-by="key" :searchable="true" :invalid="v$.currentPreferences.time_zone.$error" /> diff --git a/resources/scripts/admin/views/settings/AccountSetting.vue b/resources/scripts/admin/views/settings/AccountSetting.vue index b7fdeede..3b7b8262 100644 --- a/resources/scripts/admin/views/settings/AccountSetting.vue +++ b/resources/scripts/admin/views/settings/AccountSetting.vue @@ -75,7 +75,7 @@ :options="globalStore.config.languages" label="name" value-prop="code" - track-by="code" + track-by="name" open-direction="top" /> diff --git a/resources/scripts/admin/views/settings/BackupSetting.vue b/resources/scripts/admin/views/settings/BackupSetting.vue index a7ad76ef..f62e348b 100644 --- a/resources/scripts/admin/views/settings/BackupSetting.vue +++ b/resources/scripts/admin/views/settings/BackupSetting.vue @@ -23,7 +23,7 @@ v-model="filters.selected_disk" :content-loading="isFetchingInitialData" :options="getDisksOptions" - track-by="id" + track-by="name" :placeholder="$t('settings.disk.select_disk')" label="name" :searchable="true" diff --git a/resources/scripts/admin/views/settings/PreferencesSetting.vue b/resources/scripts/admin/views/settings/PreferencesSetting.vue index 71914be7..6c46f645 100644 --- a/resources/scripts/admin/views/settings/PreferencesSetting.vue +++ b/resources/scripts/admin/views/settings/PreferencesSetting.vue @@ -40,7 +40,7 @@ label="name" value-prop="code" class="w-full" - track-by="code" + track-by="name" :searchable="true" :invalid="v$.language.$error" /> @@ -79,7 +79,7 @@ :options="globalStore.dateFormats" label="display_date" value-prop="carbon_format_value" - track-by="carbon_format_value" + track-by="display_date" searchable :invalid="v$.carbon_date_format.$error" class="w-full" diff --git a/resources/scripts/admin/views/users/Create.vue b/resources/scripts/admin/views/users/Create.vue index 41d91650..e909601f 100644 --- a/resources/scripts/admin/views/users/Create.vue +++ b/resources/scripts/admin/views/users/Create.vue @@ -70,6 +70,7 @@ searchable :can-deselect="false" class="w-full" + track-by="name" /> diff --git a/resources/scripts/components/base/BaseItemSelect.vue b/resources/scripts/components/base/BaseItemSelect.vue index 21ec5726..e5955a54 100644 --- a/resources/scripts/components/base/BaseItemSelect.vue +++ b/resources/scripts/components/base/BaseItemSelect.vue @@ -30,7 +30,7 @@ v-model="itemSelect" :content-loading="contentLoading" value-prop="id" - track-by="id" + track-by="name" :invalid="invalid" preserve-search :initial-search="itemData.name"