diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue index 39ebfe540..a57e2c01c 100644 --- a/src/components/CreateNewPostcodeForm.vue +++ b/src/components/CreateNewPostcodeForm.vue @@ -2,7 +2,6 @@ import { reactive, ref } from 'vue'; import { useI18n } from 'vue-i18n'; -import FetchData from 'components/FetchData.vue'; import VnRow from 'components/ui/VnRow.vue'; import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelectProvince from 'src/components/VnSelectProvince.vue'; @@ -21,14 +20,11 @@ const postcodeFormData = reactive({ provinceFk: null, townFk: null, }); -const townsFetchDataRef = ref(false); const townFilter = ref({}); const countriesRef = ref(false); const provincesOptions = ref([]); -const townsOptions = ref([]); const town = ref({}); -const countryFilter = ref({}); function onDataSaved(formData) { const newPostcode = { @@ -51,7 +47,6 @@ async function setCountry(countryFk, data) { data.townFk = null; data.provinceFk = null; data.countryFk = countryFk; - await fetchTowns(); } // Province @@ -60,22 +55,11 @@ async function setProvince(id, data) { const newProvince = provincesOptions.value.find((province) => province.id == id); if (newProvince) data.countryFk = newProvince.countryFk; postcodeFormData.provinceFk = id; - await fetchTowns(); } async function onProvinceCreated(data) { postcodeFormData.provinceFk = data.id; } -function provinceByCountry(countryFk = postcodeFormData.countryFk) { - return provincesOptions.value - .filter((province) => province.countryFk === countryFk) - .map(({ id }) => id); -} - -// Town -async function handleTowns(data) { - townsOptions.value = data; -} function setTown(newTown, data) { town.value = newTown; data.provinceFk = newTown?.provinceFk ?? newTown; @@ -88,18 +72,6 @@ async function onCityCreated(newTown, formData) { formData.townFk = newTown; setTown(newTown, formData); } -async function fetchTowns(countryFk = postcodeFormData.countryFk) { - if (!countryFk) return; - const provinces = postcodeFormData.provinceFk - ? [postcodeFormData.provinceFk] - : provinceByCountry(); - townFilter.value.where = { - provinceFk: { - inq: provinces, - }, - }; - await townsFetchDataRef.value?.fetch(); -} async function filterTowns(name) { if (name !== '') { @@ -108,22 +80,11 @@ async function filterTowns(name) { like: `%${name}%`, }, }; - await townsFetchDataRef.value?.fetch(); } }