Merge pull request #1219 from topcoder-platform/PM-1504_edit-create-scorecard

fix scoorecard data fetch

Author: vas3a

src/apps/review/src/lib/hooks/useFetchScorecard.ts

@@ -1,5 +1,6 @@
 import { toast } from 'react-toastify'
 import { sortBy } from 'lodash'
+import { useMemo } from 'react'
 import useSWR, { SWRResponse } from 'swr'
 
 import { EnvironmentConfig } from '~/config'
@@ -36,10 +37,8 @@ export function useFetchScorecard(id: string | undefined, shouldRetry: boolean):
         },
     )
 
-    return {
-        error,
-        isValidating,
-        scorecard: data ? {
+    const scorecard = useMemo(() => (
+        data ? {
             ...data,
             scorecardGroups: sortBy(data.scorecardGroups.map(group => ({
                 ...group,
@@ -48,6 +47,12 @@ export function useFetchScorecard(id: string | undefined, shouldRetry: boolean):
                     questions: sortBy(section.questions, 'sortOrder'),
                 })), 'sortOrder'),
             })), 'sortOrder'),
-        } : data,
+        } : data
+    ), [data])
+
+    return {
+        error,
+        isValidating,
+        scorecard,
     }
 }

src/apps/review/src/pages/scorecards/EditScorecardPage/components/ScorecardQuestionForm.tsx

@@ -93,9 +93,10 @@ const ScorecardQuestionForm: FC<ScorecardQuestionFormProps> = props => {
     ) => {
         const [, type, min, max] = ev.target.value.match(/^([A-Za-z0-9_]+)(?:\((\d+)-(\d+)\))?$/) ?? []
 
-        form.setValue(field.name, type.toUpperCase(), { shouldValidate: true })
-        form.setValue(field.name.replace(/\.type$/, '.scaleMin'), Number(min) || 0, { shouldValidate: true })
-        form.setValue(field.name.replace(/\.type$/, '.scaleMax'), Number(max) || 0, { shouldValidate: true })
+        const options = { shouldDirty: true, shouldTouch: true, shouldValidate: true }
+        form.setValue(field.name, type.toUpperCase(), options)
+        form.setValue(field.name.replace(/\.type$/, '.scaleMin'), Number(min) || 0, options)
+        form.setValue(field.name.replace(/\.type$/, '.scaleMax'), Number(max) || 0, options)
     }, [form])
 
     return (