feat: 1421 refactor text

frontend/cypress/fixtures/aclass-reg-form.json

@@ -49,11 +49,11 @@
   },
   "extraction": {
     "extrationTitle": "Extraction information",
-    "extrationSubtitle": "Enter the extractory agency information and extraction's star and end dates for this seedlot",
+    "extrationSubtitle": "Enter the extractory agency information and extraction's start and end dates for this seedlot",
     "storageTitle": "Temporary seed storage",
-    "storageSubtitle": "Enter the seed storage agency information and storage's star and end dates for this seedlot",
-    "extractionCheckboxText": "The extractory agency is the Tree Seed Center (TSC)",
-    "storageCheckboxText": "The seed storage agency is the Tree Seed Center (TSC)",
+    "storageSubtitle": "Enter the seed storage agency information and storage's start and end dates for this seedlot",
+    "extractionCheckboxText": "The extractory agency is the Tree Seed Centre (TSC)",
+    "storageCheckboxText": "The seed storage agency is the Tree Seed Centre (TSC)",
     "agencyErrorMsg": "Please enter a valid acronym that identifies the agency",
     "agencyValidationMsg": "Agency validation failed. Please retry verification",
     "locationErrorMsg": "This location code is not valid for the selected agency, please enter a valid one or change the agency",

frontend/src/__test__/components/ExtractionAndStorageStep.test.tsx

@@ -41,9 +41,9 @@ describe.skip('Extraction and Storage Step test', () => {
   it('should have the correct labels', () => {
     const content = {
       title: 'Extraction information',
-      subtitle: 'Enter the extractory agency information and extraction’s star and end dates for this seedlot',
+      subtitle: 'Enter the extractory agency information and extraction’s start and end dates for this seedlot',
       titleTemporary: 'Temporary seed storage',
-      subtitleTemporary: 'Enter the seed storage agency information and storage’s star and end dates for this seedlot'
+      subtitleTemporary: 'Enter the seed storage agency information and storage’s start and end dates for this seedlot'
     }
     const titleBox = component.getElementsByClassName('extraction-information-title')[0];
     expect(titleBox).toHaveTextContent(content.title);

frontend/src/components/ApplicantAgencyFields/ClientSearchModal/ClientSearchFields.tsx

@@ -24,10 +24,10 @@ const ClientSearchFields = ({
       <Column sm={4} md={4} lg={16} xlg={16}>
         <p className="client-modal-description">
           Search for a specific client or agency, you can search by name, acronym or number.
-          To view more information about the client, you can
+          To view more information about the client,
           {' '}
           <Link to="">
-            go to client search screen.
+            go to the client search screen.
           </Link>
         </p>
       </Column>

frontend/src/components/BCHeader/constants.ts

@@ -64,7 +64,7 @@ export const navItems = [
         disabled: true
       },
       {
-        name: 'Tree seed center',
+        name: 'Tree seed centre',
         icon: 'Enterprise',
         link: '#',
         disabled: true

frontend/src/components/PageTitle/index.tsx

@@ -16,7 +16,7 @@ import './styles.scss';
 
 interface PageTitleProps {
   title: string;
-  subtitle: string | React.ReactNode;
+  subtitle?: string | React.ReactNode;
   enableFavourite?: boolean;
   activity?: string;
 }

frontend/src/components/SeedlotRegistrationSteps/CollectionStep/index.tsx

@@ -301,16 +301,18 @@ const CollectionStep = ({ isReview }: CollectionStepProps) => {
                   id={state.selectedCollectionCodes.id}
                 >
                   {
-                    (coneCollectionMethodsQuery.data as MultiOptionsObj[]).map((method) => (
-                      <Checkbox
-                        key={method.code}
-                        id={`cone-collection-method-checkbox-${method.code}`}
-                        name={method.label}
-                        labelText={method.description}
-                        readOnly={isFormSubmitted && !isReview}
-                        checked={state.selectedCollectionCodes.value.includes(method.code)}
-                        onChange={() => handleCollectionMethods(method.code)}
-                      />
+                    (coneCollectionMethodsQuery.data as MultiOptionsObj[])
+                      .sort((a,b) => a.description.localeCompare(b.description))
+                      .map((method) => (
+                        <Checkbox
+                          key={method.code}
+                          id={`cone-collection-method-checkbox-${method.code}`}
+                          name={method.label}
+                          labelText={method.description}
+                          readOnly={isFormSubmitted && !isReview}
+                          checked={state.selectedCollectionCodes.value.includes(method.code)}
+                          onChange={() => handleCollectionMethods(method.code)}
+                        />
                     ))
                   }
                 </CheckboxGroup>

frontend/src/components/SeedlotRegistrationSteps/ExtractionAndStorageStep/constants.ts

@@ -5,7 +5,7 @@ export const DATE_FORMAT = 'Y/m/d';
 export const extractorAgencyFields: AgencyTextPropsType = {
   useDefaultCheckbox: {
     name: 'extractor-use-tsc',
-    labelText: 'The extractory agency is the Tree Seed Center (TSC)'
+    labelText: 'The extractory agency is the Tree Seed Centre (TSC)'
   },
   agencyInput: {
     titleText: 'Extractory agency acronym',
@@ -20,7 +20,7 @@ export const extractorAgencyFields: AgencyTextPropsType = {
 export const storageAgencyFields: AgencyTextPropsType = {
   useDefaultCheckbox: {
     name: 'storage-use-tsc',
-    labelText: 'The seed storage agency is the Tree Seed Center (TSC)'
+    labelText: 'The seed storage agency is the Tree Seed Centre (TSC)'
   },
   agencyInput: {
     titleText: 'Seed storage agency acronym',
@@ -35,7 +35,7 @@ export const storageAgencyFields: AgencyTextPropsType = {
 export const inputText = {
   extractionTitle: {
     titleText: 'Extraction information',
-    subtitleText: 'Enter the extractory agency information and extraction\'s star and end dates for this seedlot'
+    subtitleText: 'Enter the extractory agency information and extraction\'s start and end dates for this seedlot'
   },
   date: {
     extraction: {

frontend/src/components/SeedlotRegistrationSteps/ParentTreeStep/UploadFileModal/constants.ts

@@ -10,7 +10,7 @@ const textConfig = {
   uploadedFileIconDesc: 'Delete file',
   notification: {
     title: 'Note:',
-    description: 'When uploading a file all previously filled data within the table will be replaced'
+    description: 'When uploading a file, all previously filled data in the table will be replaced.'
   },
   buttons: {
     cancel: 'Cancel',

frontend/src/components/SeedlotRegistrationSteps/ParentTreeStep/constants.tsx

@@ -145,16 +145,16 @@ const getPageText = () => ({
   errorDescription,
   coneTab: {
     tabTitle: 'Cone and pollen count',
-    tableDescription: "Enter the estimative of Cone and pollen count for the orchard's seedlot (*required)",
+    tableDescription: "Enter the cone and pollen count estimate for the orchard's seedlot (*required)",
     toggleName: 'Show breeding value',
     cleanModalHeading: getCleanTableDesc('Cone and pollen count')
   },
   successTab: {
     tabTitle: 'SMP success on parent',
-    tableDescription: "Enter the estimative of SMP success for the orchard's seedlot",
+    tableDescription: "Enter the SMP success estimate for the orchard's seedlot",
     toggleName: 'Show SMP mix used on parent',
     cleanModalHeading: getCleanTableDesc('SMP success on parent'),
-    defaultCheckBoxDesc: 'Enter the same SMP success on parent or Non-orchard pollen contaminant to all parent trees',
+    defaultCheckBoxDesc: 'Enter the same SMP success on parent or non-orchard pollen contaminant to all parent trees',
     smpInputLabel: 'SMP Success on parent (%)',
     pollenCotamInputLabel: 'Non-orchard pollen contaminant (%)'
   },
@@ -689,8 +689,7 @@ export const SummarySectionConfig = {
     }
   },
   mixTab: {
-    title: 'Breeding value SMP mix used',
-    description: 'Check the breeding value of SMP mix used on parent',
+    title: 'Breeding value SMP mix used on parent',
     infoItems: {
       parentsOutside: {
         name: 'Number of SMP parents from outside',

frontend/src/components/SeedlotRegistrationSteps/ParentTreeStep/index.tsx

@@ -471,8 +471,7 @@ const ParentTreeStep = ({ isReviewDisplay, isReviewRead }: ParentTreeStepProps)
               <>
                 <DetailSection>
                   <DescriptionBox
-                    header="Breeding value of SMP mix used"
-                    description="Check the breeding value of SMP mix used on parent"
+                    header="Breeding value of SMP mix used on parent"
                   />
                   <InfoSection
                     infoItems={
@@ -492,7 +491,7 @@ const ParentTreeStep = ({ isReviewDisplay, isReviewRead }: ParentTreeStepProps)
                     {/* -------- SMP mix mean geospatial data -------- */}
                     <Row className="info-section-sub-title">
                       <DescriptionBox
-                        header="SMP Mix geospatial summary"
+                        header="SMP mix geospatial summary"
                       />
                     </Row>
                     {

frontend/src/components/SeedlotRegistrationSteps/SubmitModal/constants.ts

@@ -9,8 +9,8 @@ const inputText = {
     checkboxLabelText: 'I hereby declare that the information provided in this application is true and correct, and that I am the owner of the seedlot or have been authorized by the owner(s) of the seedlot to submit this application.',
     notification: {
       title: 'Review the form:',
-      subtitle: 'Please, be sure to review the content and check if everything is correct with your seedlot registration.',
-      link: 'Go to first step and review the form'
+      subtitle: 'Please review this form to ensure the information is correct for this seedlot registration.',
+      link: 'Click here to go back to the first step.'
     }
   }
 };

frontend/src/config/FavouriteActivitiyMap.ts

@@ -16,7 +16,6 @@ const FavouriteActivityMap: Record<string, FavActivityType> = {
     type: 'registerAClass',
     image: 'TaskAdd',
     header: 'Create A-class seedlot',
-    description: 'Register a new A-class seedlot',
     link: ROUTES.SEEDLOTS_A_CLASS_CREATION,
     highlighted: false
   },

frontend/src/types/FavActivityTypes.ts

@@ -3,7 +3,7 @@ export type FavActivityType = {
   type: string;
   image: string;
   header: string;
-  description: string;
+  description?: string;
   link: string;
   highlighted: boolean;
 }

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

@@ -71,7 +71,6 @@ const CreateAClass = () => {
       <Row className="page-title-row">
         <PageTitle
           title="Create A-class seedlot"
-          subtitle="Register a new A-class seedlot"
           enableFavourite
           activity="registerAClass"
         />

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

@@ -95,7 +95,7 @@ const SeedlotCreatedFeedback = () => {
                   size="lg"
                   className="btn-scf"
                 >
-                  Seedlot's main screen
+                  Seedlots main screen
                 </Button>
               </Column>
             </Row>