From 68d3ff4789daa70e7647c2fc259e6e7be00edc39 Mon Sep 17 00:00:00 2001 From: James Date: Fri, 5 Jun 2020 17:30:00 -0400 Subject: [PATCH] optimizes usePayloadAPI --- src/client/hooks/usePayloadAPI.js | 12 ++++++------ src/fields/validations.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/client/hooks/usePayloadAPI.js b/src/client/hooks/usePayloadAPI.js index 7a458eadc2..29d20d2753 100644 --- a/src/client/hooks/usePayloadAPI.js +++ b/src/client/hooks/usePayloadAPI.js @@ -16,17 +16,17 @@ const usePayloadAPI = (url, options = {}) => { const [isError, setIsError] = useState(false); const locale = useLocale(); + const search = queryString.stringify({ + locale, + ...params, + }, { depth: 10 }); + useEffect(() => { const fetchData = async () => { setIsError(false); setIsLoading(true); try { - const search = queryString.stringify({ - locale, - ...params, - }, { depth: 10 }); - const response = await requests.get(`${url}?${search}`); const json = await response.json(); setData(json); @@ -38,7 +38,7 @@ const usePayloadAPI = (url, options = {}) => { }; if (url) fetchData(); - }, [url, locale, params, onLoad]); + }, [url, locale, search, onLoad]); return [{ data, isLoading, isError }, { setParams }]; }; diff --git a/src/fields/validations.js b/src/fields/validations.js index 3b91d6c32f..59977ebe28 100644 --- a/src/fields/validations.js +++ b/src/fields/validations.js @@ -133,7 +133,7 @@ const optionsToValidatorMap = { return true; }, select: (value) => { - if (value) return true; + if (value && value.length > 0) return true; return 'This field is required.'; }, flexible: async (value, options) => {