Updated dependencies and migrated

- kept [email protected] due to import-js/eslint-plugin-import#2682 - kept [email protected] due to bug with return types in fields/settings.ts - kept [email protected] due to issue with Merge type
mmtandoc · Feb 15, 2023 · a6b972d · a6b972d
1 parent 6caf89f
commit a6b972d
Show file tree

Hide file tree

Showing 6 changed files with 2,276 additions and 1,551 deletions.
diff --git a/components/risk-assessment/RiskAssessmentEntry/ExposureRisksInputs.tsx b/components/risk-assessment/RiskAssessmentEntry/ExposureRisksInputs.tsx
@@ -39,10 +39,18 @@ const ExposureRisksInputs = (props: ExposureRisksInputsProps) => {
     control: control,
   })
 
-  const { data: sdses, error: sdsError } = useSWR<SdsWithRelations[]>(
-    !sdsIds ? null : [sdsIds.map((id) => `/api/sds/${id}`)],
+  const {
+    data: sdses,
+    error: sdsError,
+    isLoading,
+  } = useSWR<SdsWithRelations[]>(
+    !sdsIds ? null : sdsIds.map((id) => `/api/sds/${id}`),
   )
 
+  if (sdsError) {
+    console.error(sdsError)
+  }
+
   const getHazardCategoriesByClasses = (...classNames: string[]) => {
     if (sdses === undefined) {
       return

diff --git a/components/risk-assessment/RiskAssessmentEntry/RationaleList.tsx b/components/risk-assessment/RiskAssessmentEntry/RationaleList.tsx
@@ -54,7 +54,7 @@ const RationaleList = ({
   const { data: safetyDatasheets, error: sdsesError } = useSWR<
     SdsWithRelations[],
     JsonError
-  >(sdsUrls.length > 0 ? [sdsUrls] : null)
+  >(sdsUrls.length > 0 ? sdsUrls : null)
 
   if (sdsesError) {
     console.log(sdsesError)

diff --git a/components/ui/forms/BooleanRadioGroup.tsx b/components/ui/forms/BooleanRadioGroup.tsx
@@ -38,8 +38,11 @@ export const RhfBooleanRadioGroup = <TFieldValues extends FieldValues>(
   } = props
 
   let customValidate:
-    | Validate<PathValue<TFieldValues, Path<TFieldValues>>>
-    | Record<string, Validate<PathValue<TFieldValues, Path<TFieldValues>>>>
+    | Validate<PathValue<TFieldValues, Path<TFieldValues>>, TFieldValues>
+    | Record<
+        string,
+        Validate<PathValue<TFieldValues, Path<TFieldValues>>, TFieldValues>
+      >
     | undefined
 
   // If rules.required is true, then create custom validate function for workaround