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

Fix sortOrder for scorecardQuestions & make error more visible

Author: vas3a

src/apps/review/src/pages/scorecards/EditScorecardPage/EditScorecardPage.module.scss

@@ -88,6 +88,17 @@
     .headerArea {
         background: #0F172A;
         color: $tc-white;
+
+        :global(.input-error) {
+            font-family: "Nunito Sans", sans-serif;
+            background: #E2CBC0;
+            width: max-content;
+            padding: 0 $sp-2;
+            border-radius: 2px;
+            font-size: 14px;
+            line-height: 20px;
+            font-weight: bold;
+        }
     }
 
     .contentArea {
@@ -103,6 +114,17 @@
     .headerArea {
         background: $teal-160;
         color: $tc-white;
+
+        :global(.input-error) {
+            font-family: "Nunito Sans", sans-serif;
+            background: #E2CBC0;
+            width: max-content;
+            padding: 0 $sp-2;
+            border-radius: 2px;
+            font-size: 14px;
+            line-height: 20px;
+            font-weight: bold;
+        }
     }
 
     .contentArea {

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

@@ -69,8 +69,9 @@ const ScorecardQuestionForm: FC<ScorecardQuestionFormProps> = props => {
     })
 
     const handleRemove = useCallback(async (index: number, field: any) => {
+        const fieldName = field.name ? field.name : `Question ${props.sectionIndex}.${index + 1}`
         if (!await ctx.confirm({
-            content: `Are you sure you want to remove "${field.name ? field.name : `Question ${index + 1}`}" question?`,
+            content: `Are you sure you want to remove "${fieldName}" question?`,
             title: 'Confirm Remove Question',
         })) {
             return
@@ -82,7 +83,7 @@ const ScorecardQuestionForm: FC<ScorecardQuestionFormProps> = props => {
     const handleAddQuestion = useCallback(() => {
         formQuestionsArray.append({
             ...getEmptyScorecardQuestion(),
-            sortOrder: Math.max(...formQuestionsArray.fields.map(f => get(f, 'sortOrder', 0))) + 1,
+            sortOrder: (Math.max(0, ...formQuestionsArray.fields.map(f => get(f, 'sortOrder', 0))) || 0) + 1,
         })
     }, [formQuestionsArray])