PROD-2643 PROD-2619 PROD-2620 PROD-2760 PROD-2644 Fix the issues in self-service -> dev #371

asadath1395 · 2022-10-20T18:39:41Z

Fixes the following issues

PROD-2643 Wrong icon shown for bug hunt self-service
PROD-2619 Fix the back button on the first page is opening the previously visited page, not the Start Work page
PROD-2620 Fix when opening bug hunt drafts after opening another work type's draft, the bug hunt drafts cannot be opened
PROD-2760 Fix issues with Timeline status in Bug hunt work
PROD-2644 Fix unable to proceed to pay if user submits the contact support form

…he previously visited page, not the Start Work page

…ther work type's draft, the bug hunt drafts cannot be opened

brooketopcoder · 2022-10-20T18:44:45Z

I updated the PR name to match our preferred convention. For future ref, I added more info to the README: https://github.com/topcoder-platform/platform-ui#pull-requests

brooketopcoder

Excellent work @asadath1395 !

All my comments are super nit-picky. Let me know if you have any questions, etc.

brooketopcoder · 2022-10-20T18:47:40Z

src-ts/lib/icon-wrapper/IconWrapper.module.scss

+@import '../styles/includes';
+
+.iconWrapper {
+  height: 48px;


let's either use use the icon size mixins for the wrapper or the $space-mxx var

@mixin icon-mxx; or height: $space-mxx; width: $space-mxx;

brooketopcoder · 2022-10-20T18:47:52Z

src-ts/lib/icon-wrapper/IconWrapper.module.scss

+  width: 48px;
+  margin: 0 $space-lg $space-lg $space-lg;
+  background: $tc-grad12;
+  border-radius: 24px;


let's use the space var here too

brooketopcoder · 2022-10-20T18:48:41Z

src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx

    BugHuntFormConfig.buttons.primaryGroup[1].onClick = () => { setAction('submit') }
    if (BugHuntFormConfig.buttons.secondaryGroup) {
-        BugHuntFormConfig.buttons.secondaryGroup[0].onClick = () => { navigate(-1) }
+        BugHuntFormConfig.buttons.secondaryGroup[0].onClick = () => { navigate('/self-service/wizard') }


All routes should be defined in work.routes.tsx

brooketopcoder · 2022-10-20T18:52:01Z

src-ts/lib/icon-wrapper/index.tsx

@@ -0,0 +1,17 @@
+import classNames from 'classnames'


Let's move this directory to be nested in the svgs directory and rename the component file IconWrapper.tsx.

brooketopcoder · 2022-10-20T18:53:07Z

src-ts/tools/work/work-service-price/WorkServicePrice.tsx

 import { FC } from 'react'

 import { IconOutline, textFormatMoneyLocaleString, Tooltip } from '../../../lib'
+import IconWrapper from '../../../lib/icon-wrapper'


We need to add a barrel file to the icon-wrapper directory and export the component from the parent /lib directory:

src-ts/lib/svgs/icon-wrapper/index.ts

export { default as IconWrapper } from './icon-wrapper'

src-ts/lib/svgs/index.ts

export * from './icon-wrapper'

src-ts/tools/work/work-service-price/WorkServicePrice.tsx

import { IconOutline, IconWrapper, textFormatMoneyLocaleString, Tooltip } from '../../../lib'

brooketopcoder · 2022-10-20T18:58:11Z

src-ts/tools/work/work-table/work-table-title-renderer/WorkTableTitleRenderer.tsx

-import { FC, SVGProps } from 'react'
-
+import { IconOutline } from '../../../../lib'
+import IconWrapper from '../../../../lib/icon-wrapper'


See prior comment about exporting/importing from the /lib/index.ts

src-ts/tools/work/work-table/work-table-title-renderer/WorkTableTitleRenderer.tsx

brooketopcoder · 2022-10-20T19:04:33Z

src-ts/tools/work/work-table/work-table-title-renderer/WorkTableTitleRenderer.tsx

-    WorkTypeCategoryDataIcon,
-    WorkTypeCategoryDesignIcon,
-    WorkTypeCategoryUnknownIcon,
+  Work,


Weird--not sure why it changed the tabbing from 4 spaces to 2 spaces here, but 4 was correct.

brooketopcoder · 2022-10-20T19:07:56Z

src-ts/tools/work/work-table/work-table-title-renderer/WorkTableTitleRenderer.tsx

+          Icon = (
+            <IconWrapper
+              className={styles['qa-icon']}
+              icon={<IconOutline.BadgeCheckIcon width={48} height={48} />}


The Icon wrapper already assigns a height/width to the svg element using a css mixin, which is the preferred method, so there is no need to specify them here.

brooketopcoder · 2022-10-20T19:09:31Z

src/IntakeForm.jsx

 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";


Anything to do w/routes should be defined in src-ts/tools/work/work.routes.tsx.

…ontact support form

asadath1395 · 2022-10-21T06:41:35Z

@brooketopcoder Appreciate you for taking the time to review this PR. I will resolve all PR comments. Fyi i have added one more bug fix to this PR as its all part of the challenge. Please review

asadath1395 · 2022-10-21T13:53:58Z

@brooketopcoder I have addressed all the comments. Please re-review. Thanks

brooketopcoder

@asadath1395 Thanks for addressing all my comments. I have 1 more question...

src-ts/lib/form/form-functions/form.functions.ts

asadath1395 added 4 commits October 21, 2022 00:05

PROD-2643 #comment Wrong icon shown for bug hunt self-service

7087c70

PROD-2619 #comment Fix the back button on the first page is opening t…

85cbfd6

…he previously visited page, not the Start Work page

PROD-2620 #comment Fix when opening bug hunt drafts after opening ano…

398fde6

…ther work type's draft, the bug hunt drafts cannot be opened

PROD-2760 #comment Fix issues with Timeline status in Bug hunt work

3467c18

asadath1395 requested review from brooketopcoder and mmattlin October 20, 2022 18:40

brooketopcoder changed the title ~~Fix the issues in self-service~~ PROD-2643 PROD-2619 PROD-2620 PROD-2760 Fix the issues in self-service -> dev Oct 20, 2022

brooketopcoder assigned asadath1395 Oct 20, 2022

Fix lint errors

866683d

brooketopcoder suggested changes Oct 20, 2022

View reviewed changes

PROD-2644 #comment Fix unable to proceed to pay if user submits the c…

d50324d

…ontact support form

asadath1395 changed the title ~~PROD-2643 PROD-2619 PROD-2620 PROD-2760 Fix the issues in self-service -> dev~~ PROD-2643 PROD-2619 PROD-2620 PROD-2760 PROD-2644 Fix the issues in self-service -> dev Oct 21, 2022

Fix PR comments and fix lint errors

64e6363

asadath1395 requested a review from brooketopcoder October 21, 2022 13:54

brooketopcoder suggested changes Oct 21, 2022

View reviewed changes

src-ts/lib/form/form-functions/form.functions.ts Outdated Show resolved Hide resolved

Remove the pristine field

c476a22

asadath1395 requested a review from brooketopcoder October 21, 2022 17:10

brooketopcoder approved these changes Oct 21, 2022

View reviewed changes

nikolay83 merged commit 3ff6aed into dev Oct 21, 2022

asadath1395 removed their assignment Nov 11, 2023

PROD-2643 PROD-2619 PROD-2620 PROD-2760 PROD-2644 Fix the issues in self-service -> dev #371

PROD-2643 PROD-2619 PROD-2620 PROD-2760 PROD-2644 Fix the issues in self-service -> dev #371

Uh oh!

Conversation

asadath1395 commented Oct 20, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

brooketopcoder commented Oct 20, 2022

Uh oh!

brooketopcoder left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

asadath1395 commented Oct 21, 2022

Uh oh!

asadath1395 commented Oct 21, 2022

Uh oh!

brooketopcoder left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

asadath1395 commented Oct 20, 2022 •

edited

Loading