Merge pull request #321 from topcoder-platform/feat/GAME-82

QA fixes badge create page GAME-82

Author: kkartunov

src-ts/lib/form/Form.tsx

@@ -35,6 +35,7 @@ interface FormProps<ValueType, RequestType> {
     readonly onChange?: (inputs: ReadonlyArray<FormInputModel>) => void,
     readonly onSuccess?: () => void
     readonly requestGenerator: (inputs: ReadonlyArray<FormInputModel>) => RequestType
+    readonly resetFormAfterSave?: boolean
     readonly resetFormOnUnmount?: boolean
     readonly save: (value: RequestType) => Promise<void>
 }
@@ -120,16 +121,21 @@ const Form: <ValueType extends any, RequestType extends any>(props: FormProps<Va
             setFormDef({ ...formDef })
             setInputs(formGetInputFields(formDef.groups || []))
             setFormKey(Date.now())
+            setFormError(undefined)
         }
 
         async function onSubmitAsync(event: FormEvent<HTMLFormElement>): Promise<void> {
             const values: RequestType = props.requestGenerator(inputs)
             formOnSubmitAsync<RequestType>(props.action || 'submit', event, formDef, values, props.save, props.onSuccess)
                 .then(() => {
-                    setFormKey(Date.now())
-                    formOnReset(inputs, props.formValues)
-                    setFormDef({ ...formDef })
-                    setInputs(formGetInputFields(formDef.groups || []))
+                    if (!props.resetFormAfterSave) {
+                        setFormKey(Date.now())
+                        formOnReset(inputs, props.formValues)
+                        setFormDef({ ...formDef })
+                        setInputs(formGetInputFields(formDef.groups || []))
+                    } else {
+                        onReset()
+                    }
                 })
                 .catch((error: string | undefined) => {
                     setFormError(error)

src-ts/lib/form/form-groups/form-input/input-textarea/InputTextarea.module.scss

@@ -12,4 +12,10 @@
     margin-left: calc(-1 * $border);
     overflow: hidden;
     padding: $border;
-}
+
+    &::placeholder {
+        color: $black-60;
+        opacity: 1;
+        text-transform: none;
+    }
+}

src-ts/tools/gamification-admin/game-lib/modals/badge-created-modal/BadgeCreatedModal.tsx

@@ -49,7 +49,7 @@ const BadgeCreatedModal: FC<BadgeCreatedModalProps> = (props: BadgeCreatedModalP
                         <Button
                             label='Create a new badge'
                             buttonStyle='secondary'
-                            onClick={() => window.location.reload()}
+                            onClick={onClose}
                         />
                     </div>
                 </div>

src-ts/tools/gamification-admin/pages/create-badge/create-badge-form/CreateBadgeForm.tsx

@@ -42,6 +42,7 @@ const CreateBadgeForm: FC<CreateBadgeFormProps> = (props: CreateBadgeFormProps)
         <Form
             formDef={props.formDef}
             requestGenerator={generateRequest}
+            resetFormAfterSave={true}
             resetFormOnUnmount={true}
             save={saveAsync}
         />