Fix PR comments and fix lint errors

asadath1395 · asadath1395 · commit 64e63635bad3 · 2022-10-21T19:22:17.000+05:30
diff --git a/src-ts/lib/form/form-functions/form.functions.ts b/src-ts/lib/form/form-functions/form.functions.ts
@@ -72,7 +72,7 @@ export async function onSubmitAsync<T>(
 ): Promise<void> {
 
     event.preventDefault()
-    event.stopPropagation();
+    event.stopPropagation()
 
     const { groups, shortName, successMessage }: FormDefinition = formDef
     const inputs: Array<FormInputModel> = getFormInputFields(groups || [])
diff --git a/src-ts/lib/form/form-input.model.ts b/src-ts/lib/form/form-input.model.ts
@@ -28,7 +28,6 @@ export interface FormInputModel {
     dirty?: boolean
     disabled?: boolean
     error?: string
-    pristine?: boolean
     readonly events?: ReadonlyArray<InputEvent>
     readonly fileConfig?: {
         readonly acceptFileType?: string
@@ -44,6 +43,7 @@ export interface FormInputModel {
     readonly notTabbable?: boolean
     options?: ReadonlyArray<FormRadioButtonOption>
     readonly placeholder?: string
+    pristine?: boolean
     readonly spellCheck?: boolean
     readonly title?: string
     touched?: boolean
diff --git a/src-ts/lib/svgs/icon-wrapper/IconWrapper.module.scss b/src-ts/lib/svgs/icon-wrapper/IconWrapper.module.scss
@@ -1,11 +1,11 @@
-@import '../styles/includes';
+@import '../../styles/includes';
 
 .iconWrapper {
-  height: 48px;
-  width: 48px;
+  @include icon-mxx;
+
   margin: 0 $space-lg $space-lg $space-lg;
   background: $tc-grad12;
-  border-radius: 24px;
+  border-radius: $space-xxl;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -15,4 +15,3 @@
     color: $tc-white;
   }
 }
-
diff --git a/src-ts/lib/svgs/icon-wrapper/IconWrapper.tsx b/src-ts/lib/svgs/icon-wrapper/IconWrapper.tsx
diff --git a/src-ts/lib/svgs/icon-wrapper/index.ts b/src-ts/lib/svgs/icon-wrapper/index.ts
@@ -0,0 +1 @@
+export { default as IconWrapper } from './IconWrapper'
diff --git a/src-ts/lib/svgs/index.ts b/src-ts/lib/svgs/index.ts
@@ -37,3 +37,4 @@ export {
     GitlabIcon,
     GithubIcon
 }
+export * from './icon-wrapper'
diff --git a/src-ts/tools/index.ts b/src-ts/tools/index.ts
@@ -28,4 +28,5 @@ export {
     WorkTypeCategoryUnknownIcon,
     WorkTypeConfigs,
     BugHuntIntakeForm,
+    bugHuntRoute
 } from './work'
diff --git a/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx b/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx
@@ -29,7 +29,7 @@ import {
 } from '../../../work-lib'
 import { WorkServicePrice } from '../../../work-service-price'
 import { WorkTypeBanner } from '../../../work-type-banner'
-import { dashboardRoute } from '../../../work.routes'
+import { dashboardRoute, selfServiceStartRoute } from '../../../work.routes'
 import IntakeFormsBreadcrumb from '../intake-forms-breadcrumb/IntakeFormsBreadcrumb'
 
 import { BugHuntFormConfig } from './bug-hunt.form.config'
@@ -52,7 +52,7 @@ const BugHuntIntakeForm: React.FC = () => {
     BugHuntFormConfig.buttons.primaryGroup[0].hidden = !isLoggedIn
     BugHuntFormConfig.buttons.primaryGroup[1].onClick = () => { setAction('submit') }
     if (BugHuntFormConfig.buttons.secondaryGroup) {
-        BugHuntFormConfig.buttons.secondaryGroup[0].onClick = () => { navigate('/self-service/wizard') }
+        BugHuntFormConfig.buttons.secondaryGroup[0].onClick = () => { navigate(selfServiceStartRoute) }
     }
 
     const [challenge, setChallenge]: [Challenge | undefined, Dispatch<SetStateAction<Challenge | undefined>>] = useState()
diff --git a/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/bug-hunt.form.config.tsx b/src-ts/tools/work/work-self-service/intake-forms/bug-hunt/bug-hunt.form.config.tsx
@@ -41,9 +41,9 @@ export const BugHuntFormConfig: FormDefinition = {
                 {
                     hideInlineErrors: true,
                     label: 'Project title',
-                    pristine: true,
                     name: ChallengeMetadataName.projectTitle,
                     placeholder: 'Enter a descriptive title',
+                    pristine: true,
                     type: 'text',
                     validators: [
                         {
diff --git a/src-ts/tools/work/work-service-price/WorkServicePrice.tsx b/src-ts/tools/work/work-service-price/WorkServicePrice.tsx
@@ -1,7 +1,6 @@
 import { FC } from 'react'
 
-import { IconOutline, textFormatMoneyLocaleString, Tooltip } from '../../../lib'
-import IconWrapper from '../../../lib/icon-wrapper'
+import { IconOutline, IconWrapper, textFormatMoneyLocaleString, Tooltip } from '../../../lib'
 
 import styles from './WorkServicePrice.module.scss'
 
diff --git a/src-ts/tools/work/work-table/work-table-title-renderer/WorkTableTitleRenderer.tsx b/src-ts/tools/work/work-table/work-table-title-renderer/WorkTableTitleRenderer.tsx
@@ -1,11 +1,10 @@
-import { IconOutline } from '../../../../lib'
-import IconWrapper from '../../../../lib/icon-wrapper'
+import { IconOutline, IconWrapper } from '../../../../lib'
 import {
-  Work,
-  WorkTypeCategory,
-  WorkTypeCategoryDataIcon,
-  WorkTypeCategoryDesignIcon,
-  WorkTypeCategoryUnknownIcon,
+    Work,
+    WorkTypeCategory,
+    WorkTypeCategoryDataIcon,
+    WorkTypeCategoryDesignIcon,
+    WorkTypeCategoryUnknownIcon,
 } from '../../work-lib'
 
 import styles from './WorkTableTitleRenderer.module.scss'
@@ -27,7 +26,7 @@ function WorkTableTitleRenderer(data: Work): JSX.Element {
           Icon = (
             <IconWrapper
               className={styles['qa-icon']}
-              icon={<IconOutline.BadgeCheckIcon width={48} height={48} />}
+              icon={<IconOutline.BadgeCheckIcon />}
             />
           )
           break
diff --git a/src-ts/tools/work/work.routes.tsx b/src-ts/tools/work/work.routes.tsx
@@ -20,6 +20,7 @@ export const rootRoute: string = '/work'
 export const selfServiceRootRoute: string = '/self-service'
 export const selfServiceStartRoute: string = `${selfServiceRootRoute}/wizard`
 export const dashboardRoute: string = `${rootRoute}/dashboard`
+export const bugHuntRoute: string = 'bug-hunt/'
 
 export function workDashboardRoute(active: string): string {
 return `${dashboardRoute}/${active}`
@@ -82,23 +83,23 @@ export const workRoutes: Array<PlatformRoute> = [
             // Bug Hunt
             {
                 element: <BugHuntIntakeForm />,
-                route: `bug-hunt/basic-info`,
+                route: `${bugHuntRoute}basic-info`,
             },
             {
                 element: <BugHuntIntakeForm />,
-                route: `bug-hunt/basic-info/:workId`,
+                route: `${bugHuntRoute}basic-info/:workId`,
             },
             {
                 element: <Review />,
-                route: `bug-hunt/review`,
+                route: `${bugHuntRoute}review`,
             },
             {
                 element: <Review />,
-                route: `bug-hunt/review/:workId`,
+                route: `${bugHuntRoute}review/:workId`,
             },
             {
                 element: <WorkLoginPrompt previousPageUrl={WorkIntakeFormRoutes[WorkType.bugHunt]['basicInfo']} />,
-                route: `bug-hunt/login-prompt/:retUrl`,
+                route: `${bugHuntRoute}login-prompt/:retUrl`,
             },
             // General
             {
diff --git a/src/IntakeForm.jsx b/src/IntakeForm.jsx
@@ -20,7 +20,6 @@ import { INTAKE_FORM_ROUTES as FIND_ME_DATA_INTAKE_FORM_ROUTES } from "./constan
 import { INTAKE_FORM_ROUTES as DATA_ADVISORY_INTAKE_FORM_ROUTES } from "./constants/products/DataAdvisory";
 import { INTAKE_FORM_ROUTES as WEBSITE_DESIGN_INTAKE_FORM_ROUTES } from "./constants/products/WebsiteDesign";
 import { INTAKE_FORM_ROUTES as WEBSITE_DESIGN_LEGACY_INTAKE_FORM_ROUTES } from "./constants/products/WebsiteDesignLegacy";
-import { BUG_HUNT_ROUTE } from "./constants/products/BugHunt";
 import { getIntakeFormChallenges } from "./services/challenge";
 import SelectWorkType from "./routes/SelectWorkType";
 import DataExploration from "./routes/Products/DataExploration";
@@ -29,7 +28,7 @@ import WebsiteDesign from "./routes/Products/WebsiteDesign";
 import DataAdvisory from "./routes/Products/DataAdvisory";
 import WebsiteDesignLegacy from "./routes/Products/WebsiteDesignLegacy";
 
-import { profileContext, WorkType } from "../src-ts";
+import { profileContext, WorkType, bugHuntRoute } from "../src-ts";
 
 export default function IntakeForm() {
 
@@ -143,7 +142,7 @@ export default function IntakeForm() {
   };
 
   const syncSavedData = (savedData) => {
-    const isBugHuntRoute = location.pathname.indexOf(BUG_HUNT_ROUTE) > -1
+    const isBugHuntRoute = location.pathname.indexOf(`/${bugHuntRoute}`) > -1
     if (!savedData || isBugHuntRoute) return;
     const { form, progress } = savedData;
     if (form) dispatch(saveForm(form));
diff --git a/src/constants/products/BugHunt/index.js b/src/constants/products/BugHunt/index.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { default as IconWrapper } from './IconWrapper'`
Original file line number	Diff line number	Diff line change
`@@ -37,3 +37,4 @@ export {`
`37`	`37`	`GitlabIcon,`
`38`	`38`	`GithubIcon`
`39`	`39`	`}`
	`40`	`+export * from './icon-wrapper'`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ export const BugHuntFormConfig: FormDefinition = {`
`41`	`41`	`{`
`42`	`42`	`hideInlineErrors: true,`
`43`	`43`	`label: 'Project title',`
`44`		`- pristine: true,`
`45`	`44`	`name: ChallengeMetadataName.projectTitle,`
`46`	`45`	`placeholder: 'Enter a descriptive title',`
	`46`	`+ pristine: true,`
`47`	`47`	`type: 'text',`
`48`	`48`	`validators: [`
`49`	`49`	`{`