potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'mobilizon-fix-full-address-autocomplete-not-loading-result'

Browse source
This commit is contained in:
Thomas Citharel 2023-11-30 09:46:23 +01:00
parent ad597db271 49b070d939
commit 1a4c4b41e3
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/web/controllers/application_controller.ex
View file

@ -426,7 +426,7 @@ defmodule Mobilizon.Web.ApplicationController do
defp valid_uri?(url) do
uri = URI.parse(url)
uri.scheme != nil and uri.host =~ "."
uri.scheme != nil and (uri.host =~ "." or uri.host == "localhost")
end
@spec append_parameters(String.t(), Enum.t()) :: String.t()

20
src/components/Event/FullAddressAutoComplete.vue
View file

@ -318,9 +318,10 @@ const debounceDelay = computed(() =>
geocodingAutocomplete.value === true ? 200 : 2000
);
const { load: searchAddress } = useLazyQuery<{
searchAddress: IAddress[];
}>(ADDRESS);
const { load: searchAddressLoad, refetch: searchAddressRefetch } =
useLazyQuery<{
searchAddress: IAddress[];
}>(ADDRESS);
const asyncData = async (query: string): Promise<void> => {
console.debug("Finding addresses");
@ -338,13 +339,20 @@ const asyncData = async (query: string): Promise<void> => {
isFetching.value = true;
try {
const result = await searchAddress(undefined, {
const queryVars = {
query,
locale: locale,
type: props.resultType,
});
};
if (!result) return;
const result =
(await searchAddressLoad(undefined, queryVars)) ||
(await searchAddressRefetch(queryVars))?.data
if (!result) {
isFetching.value = false;
return;
}
console.debug("onAddressSearchResult", result.searchAddress);
addressData.value = result.searchAddress;
isFetching.value = false;