feat: 1361 add cancel button at seedlot review page #1452

craigyu · 2024-07-25T22:54:24Z

Description

Closes #1361
!mportant:
Need to nuke the a-class-seedlot-save table, or these changes will cause trouble with existing drafts

Not described in the issue:
Refactored the behaviour of A-Class seedlot Context and ApplicantAgencyFields, the idea is let one component to handle the data fetching, the component displays the client acronym but stores client number. Renamed things from agency to client so it's consistent with forest client api.

Renamed to ClientAndCodeInput
default checkbox prop is now optional

Changelog

New

react-beforeunload allows confirmation before url change
Back to review / Back button on Seedlot Review page
Modal that confirms user's action
shameless plugin with my own photo 🥷

Changed

ApplicantAgencyFields -> ClientAndCodeInput
New pictogram for Review Seedlot card (NOT Seedlot Review)
Cypress tests

Removed

None

How was this tested?

🧠 Not needed
👀 Eyeball
🤖 Added tests

What gif/image best describes this PR or how it makes you feel?

Thanks for the PR!

Deployments, as required, will be available below:

Please create PRs in draft mode. Mark as ready to enable:

Analysis Workflow

After merge, new images are deployed in:

Merge Workflow

…w-page

craigyu · 2024-07-29T17:45:09Z

fixing Cypress test atm

…1-add-cancel-button-at-seedlot-review-page # Conflicts: # frontend/src/components/LotApplicantAndInfoForm/constants.ts # frontend/src/components/LotApplicantAndInfoForm/index.tsx # frontend/src/components/SeedlotRegistrationSteps/CollectionStep/index.tsx # frontend/src/components/SeedlotRegistrationSteps/ExtractionAndStorageStep/index.tsx # frontend/src/components/SeedlotRegistrationSteps/InterimStep/index.tsx # frontend/src/components/SeedlotReviewSteps/ApplicantAndSeedlot/Read/index.tsx # frontend/src/components/SeedlotReviewSteps/Collection/Read/index.tsx # frontend/src/components/SeedlotReviewSteps/ExtractionStorage/Read/index.tsx # frontend/src/components/SeedlotReviewSteps/Interim/Read/index.tsx # frontend/src/components/SeedlotReviewSteps/Ownership/Read/index.tsx

mgaseta

LGTM!
Added only one small mark-up.

frontend/src/views/Seedlot/ContextContainerClassA/index.tsx

RMCampos

Great job! Some typos, nothing more.

🥇 🚀

RMCampos · 2024-07-31T16:31:11Z

frontend/src/components/LotApplicantAndInfoForm/constants.ts

 import { ComboBoxPropsType } from './definitions';

-export const agencyFieldsText = (isReview: boolean | undefined): AgencyTextPropsType => ({
+export const clientAndCodeInputText = (isReview: boolean | undefined): ClientAndCodeInputTextType => ({


lint issue:

~/Projects/nr-spar/frontend/src/components/LotApplicantAndInfoForm/constants.ts 5:1 error This line has a length of 103. Maximum allowed is 100 max-len

RMCampos · 2024-07-31T16:48:30Z

frontend/src/components/ClientAndCodeInput/index.tsx

+  /**
+   * Format the displayed location code
+   */
+  const formatDisplayedLocCode = (formatedCode: string) => {


typo: formated instead of formatted

RMCampos · 2024-07-31T16:48:54Z

frontend/src/components/ClientAndCodeInput/index.tsx

+  /**
+   * Format the displayed acronym
+   */
+  const formatDisplayedAcronym = (formatedAcronym: string) => {


typo: formated instead of formatted

RMCampos · 2024-07-31T16:49:13Z

frontend/src/components/ClientAndCodeInput/index.tsx

+  };
+
+  const handleLocationCodeBlur = (value: string) => {
+    const formatedCode = value ? formatLocationCode(value) : '';


typo: formated instead of formatted

RMCampos · 2024-07-31T16:55:10Z

frontend/src/components/SeedlotReviewSteps/AuditInfo/index.tsx

@@ -54,7 +54,7 @@ const AuditInfo = () => {
            id="last-updated-at"
            label="Last uptated at:"
            value={
-              seedlotData
+              seedlotData?.auditInformation.updateTimestamp


typo: uptated instead of updated (twice, lines 47 and 55. Not changed by you, tho)

RMCampos · 2024-07-31T16:59:45Z

frontend/src/views/Seedlot/SeedlotReview/styles.scss

      max-width: none;
      width: -webkit-fill-available;
    }
  }
+


question (non-blocking): I'm getting a warning at line 46, asking to define: Also define the standard property 'appearance' for compatibilityscss(vendorPrefix)

hmm, what's the suggested fix? does it have one?

ngunner15 · 2024-07-31T18:39:40Z

frontend/cypress/e2e/smoke-test/a-class-seedlot-reg-form-orchard.cy.ts

@@ -86,14 +87,23 @@ describe('A Class Seedlot Registration form, Orchard', () => {
      .contains('219 - VERNON - S - PRD')
      .click();

+    // Intercept the call before step 5 monuts


typo: mounts

ngunner15 · 2024-07-31T18:40:10Z

frontend/cypress/e2e/smoke-test/a-class-seedlot-reg-form-orchard.cy.ts

@@ -225,14 +235,22 @@ describe('A Class Seedlot Registration form, Orchard', () => {
      .contains('219 - VERNON - S - PRD')
      .click();

+    // Intercept the call before step 5 monuts


typo: mounts

ngunner15 · 2024-07-31T18:40:22Z

frontend/cypress/e2e/smoke-test/a-class-seedlot-reg-form-orchard.cy.ts

@@ -281,14 +299,22 @@ describe('A Class Seedlot Registration form, Orchard', () => {
      .contains('222 - VERNON - S - PRD')
      .click();

+    // Intercept the call before step 5 monuts


typo: mounts

ngunner15 · 2024-07-31T18:40:41Z

frontend/cypress/e2e/smoke-test/a-class-seedlot-reg-form-orchard.cy.ts

@@ -354,14 +380,22 @@ describe('A Class Seedlot Registration form, Orchard', () => {
    // Save changes
    cy.saveSeedlotRegFormProgress();

+    // Intercept the call before step 5 monuts


typo: mounts

craigyu · 2024-08-01T04:56:08Z

@RMCampos @ngunner15

Alright guys, it looks like I can't spell for 💩
here are the updates:

Typo and lint: 50ba266
Back modal update 2851cf9
Confirm modal when saving and update the status f6533f4
Also fixed a problem where ownership's default method of payment is sometimes not filled

ngunner15

LGTM!

RMCampos

LGTM 🚀

craigyu added 9 commits July 19, 2024 09:46

feat: replace image

462677c

fix: refactor useeffects, not working yet

d1185ca

feat: applicant agency fields refactor complete

0d988c3

fix: seedlot submit refactor

29ab89e

fix: collection step refactor complete

b230929

fix: ownership refactor

3b177a2

fix: refactor interim steps

5dd4883

fix: extraction refactor

b47ba5d

feat: confirm modal

b96b23e

craigyu added the front-end front-end related task label Jul 25, 2024

craigyu requested a review from ngunner15 July 25, 2024 22:54

craigyu self-assigned this Jul 25, 2024

craigyu requested review from RMCampos, mgaseta, DerekRoberts and SLDonnelly as code owners July 25, 2024 22:54

craigyu linked an issue Jul 25, 2024 that may be closed by this pull request

Add Cancel button at seedlot review page and Client + Code Refactor #1361

Closed

craigyu added 3 commits July 25, 2024 15:54

Merge branch 'main' into feat/1361-add-cancel-button-at-seedlot-revie…

f50513d

…w-page

Merge branch 'main' into feat/1361-add-cancel-button-at-seedlot-revie…

c5ed3c6

…w-page

fix: forest client data

2473f8f

craigyu changed the title ~~Feat/1361 add cancel button at seedlot review page~~ feat: 1361 add cancel button at seedlot review page Jul 29, 2024

craigyu added 4 commits July 30, 2024 10:18

fix: cypress tests

3bac28f

fix: cypress tests

b1573ea

fix: status check on seedlot submit button

9bc4979

mgaseta approved these changes Jul 31, 2024

View reviewed changes

frontend/src/views/Seedlot/ContextContainerClassA/index.tsx Outdated Show resolved Hide resolved

fix: query retry

0e09a81

RMCampos suggested changes Jul 31, 2024

View reviewed changes

ngunner15 reviewed Jul 31, 2024

View reviewed changes

craigyu added 3 commits July 31, 2024 19:32

fix: typo and lint

50ba266

fix: modal update

2851cf9

feat: confirm modal for status update

f6533f4

craigyu requested review from ngunner15 and RMCampos August 1, 2024 04:53

ngunner15 approved these changes Aug 1, 2024

View reviewed changes

craigyu added 3 commits August 1, 2024 10:25

fix: state update logic

e623403

fix: orchard step changes

0b7c4f3

fix: cypress tests

69d8b2e

craigyu closed this Aug 1, 2024

craigyu reopened this Aug 1, 2024

RMCampos approved these changes Aug 1, 2024

View reviewed changes

fix: cypress

259a3e8

craigyu merged commit c425394 into main Aug 1, 2024
27 of 28 checks passed

craigyu deleted the feat/1361-add-cancel-button-at-seedlot-review-page branch August 1, 2024 22:02

ngunner15 pushed a commit that referenced this pull request Aug 1, 2024

feat: 1361 add cancel button at seedlot review page (#1452)

16a8c73

craigyu linked an issue Aug 2, 2024 that may be closed by this pull request

Primary and Secondary Orchard selection #1459

Closed

RMCampos restored the feat/1361-add-cancel-button-at-seedlot-review-page branch September 13, 2024 17:50

DerekRoberts deleted the feat/1361-add-cancel-button-at-seedlot-review-page branch September 19, 2024 23:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: 1361 add cancel button at seedlot review page #1452

feat: 1361 add cancel button at seedlot review page #1452

craigyu commented Jul 25, 2024 •

edited by github-actions bot

Loading

craigyu commented Jul 29, 2024

mgaseta left a comment

RMCampos left a comment

RMCampos Jul 31, 2024

RMCampos Jul 31, 2024

RMCampos Jul 31, 2024

RMCampos Jul 31, 2024

RMCampos Jul 31, 2024

RMCampos Jul 31, 2024

craigyu Jul 31, 2024

ngunner15 Jul 31, 2024

ngunner15 Jul 31, 2024

ngunner15 Jul 31, 2024

ngunner15 Jul 31, 2024

craigyu commented Aug 1, 2024

ngunner15 left a comment

RMCampos left a comment

feat: 1361 add cancel button at seedlot review page #1452

feat: 1361 add cancel button at seedlot review page #1452

Conversation

craigyu commented Jul 25, 2024 • edited by github-actions bot Loading

Description

Changelog

New

Changed

Removed

How was this tested?

What gif/image best describes this PR or how it makes you feel?

craigyu commented Jul 29, 2024

mgaseta left a comment

Choose a reason for hiding this comment

RMCampos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

craigyu commented Aug 1, 2024

ngunner15 left a comment

Choose a reason for hiding this comment

RMCampos left a comment

Choose a reason for hiding this comment

craigyu commented Jul 25, 2024 •

edited by github-actions bot

Loading