fix query logic

Altinn · Oct 4, 2023 · aedebf8 · aedebf8
1 parent 7c75a70
commit aedebf8
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/hooks/queries/useCustomValidationConfig.ts b/src/hooks/queries/useCustomValidationConfig.ts
@@ -33,14 +33,18 @@ export const useCustomValidationConfig = (): UseQueryResult<IExpressionValidatio
   return useQuery(['fetchCustomValidationConfig', dataTypeId], () => fetchCustomValidationConfig(dataTypeId), {
     enabled: Boolean(dataTypeId?.length),
     onSuccess: (customValidationConfig) => {
-      if (!customValidationConfig) {
-        return;
+      if (customValidationConfig) {
+        const validationDefinition = resolveExpressionValidationConfig(customValidationConfig);
+        dispatch(CustomValidationActions.fetchCustomValidationsFulfilled(validationDefinition));
+      } else {
+        dispatch(CustomValidationActions.fetchCustomValidationsFulfilled(null));
       }
-      const validationDefinition = resolveExpressionValidationConfig(customValidationConfig);
-      dispatch(CustomValidationActions.fetchCustomValidationsFulfilled(validationDefinition));
     },
     onError: (error: AxiosError) => {
-      if (error.response?.status !== 404) {
+      if (error.response?.status === 404) {
+        dispatch(CustomValidationActions.fetchCustomValidationsRejected(null));
+        window.logWarn('App does not support custom validation using expressions');
+      } else {
         dispatch(CustomValidationActions.fetchCustomValidationsRejected(error));
         window.logError('Fetching validation configuration failed:\n', error);
       }