fix: small typo fixes for FAP and Proposal templates (#743)

Co-authored-by: janosbabik <143906591+janosbabik@users.noreply.github.com>
UserOfficeProject · Sep 12, 2024 · ffe4bf8 · ffe4bf8
1 parent 7bd13fb
commit ffe4bf8
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 25 deletions.
diff --git a/apps/e2e/cypress/e2e/FAPs.cy.ts b/apps/e2e/cypress/e2e/FAPs.cy.ts
@@ -359,7 +359,7 @@ context('Fap reviews tests', () => {
 
       cy.contains(proposal1.title).parent().find('[type="checkbox"]').check();
 
-      cy.get("[aria-label='Assign proposals to Fap']").first().click();
+      cy.get("[aria-label='Assign proposals to FAP']").first().click();
 
       cy.get('[data-cy="fap-selection"] input').should(
         'not.have.class',

diff --git a/apps/e2e/cypress/e2e/proposalAdministration.cy.ts b/apps/e2e/cypress/e2e/proposalAdministration.cy.ts
@@ -241,7 +241,7 @@ context('Proposal administration tests', () => {
       cy.get('[data-cy="change-proposal-status"]').click();
 
       cy.get('[role="presentation"] .MuiDialogContent-root').as('dialog');
-      cy.get('@dialog').contains('Change proposal/s status');
+      cy.get('@dialog').contains('Change proposal(s) status');
 
       cy.get('@dialog')
         .find('#selectedStatusId-input')
@@ -271,7 +271,7 @@ context('Proposal administration tests', () => {
       cy.get('[data-cy="change-proposal-status"]').click();
 
       cy.get('[role="presentation"] .MuiDialogContent-root').as('dialog');
-      cy.get('@dialog').contains('Change proposal/s status');
+      cy.get('@dialog').contains('Change proposal(s) status');
 
       cy.get('@dialog')
         .find('#selectedStatusId-input')

diff --git a/apps/e2e/cypress/e2e/proposals.cy.ts b/apps/e2e/cypress/e2e/proposals.cy.ts
@@ -347,7 +347,7 @@ context('Proposal tests', () => {
         .find('input')
         .uncheck();
       cy.get('.MuiPopover-paper')
-        .contains('Fap')
+        .contains('FAP')
         .parent()
         .find('input')
         .uncheck();
@@ -366,7 +366,7 @@ context('Proposal tests', () => {
       );
       cy.get('[data-cy="officer-proposals-table"] table').should(
         'not.contain',
-        'Fap'
+        'FAP'
       );
 
       cy.get("[aria-label='Show Columns']").first().click();
@@ -376,7 +376,7 @@ context('Proposal tests', () => {
         .find('input')
         .check();
       cy.get('.MuiPopover-paper')
-        .contains('Fap')
+        .contains('FAP')
         .parent()
         .find('input')
         .check();
@@ -389,7 +389,7 @@ context('Proposal tests', () => {
       );
       cy.get('[data-cy="officer-proposals-table"] table').should(
         'contain',
-        'Fap'
+        'FAP'
       );
     });
 
@@ -620,7 +620,7 @@ context('Proposal tests', () => {
       cy.get('[data-cy="change-proposal-status"]').click();
 
       cy.get('[role="presentation"] .MuiDialogContent-root').as('dialog');
-      cy.get('@dialog').contains('Change proposal/s status');
+      cy.get('@dialog').contains('Change proposal(s) status');
 
       cy.get('@dialog')
         .find('#selectedStatusId-input')
@@ -644,7 +644,7 @@ context('Proposal tests', () => {
       cy.get('[data-cy="change-proposal-status"]').click();
 
       cy.get('[role="presentation"] .MuiDialogContent-root').as('dialog');
-      cy.get('@dialog').contains('Change proposal/s status');
+      cy.get('@dialog').contains('Change proposal(s) status');
 
       cy.get('@dialog')
         .find('#selectedStatusId-input')

diff --git a/apps/e2e/cypress/e2e/settings.cy.ts b/apps/e2e/cypress/e2e/settings.cy.ts
@@ -959,7 +959,7 @@ context('Settings tests', () => {
 
       cy.get('[type="checkbox"]').first().check();
 
-      cy.get("[aria-label='Assign proposals to Fap']").first().click();
+      cy.get("[aria-label='Assign proposals to FAP']").first().click();
 
       cy.get('[data-cy="fap-selection"] input').should(
         'not.have.class',

diff --git a/apps/frontend/src/components/call/AssignInstrumentsToCall.tsx b/apps/frontend/src/components/call/AssignInstrumentsToCall.tsx
@@ -89,7 +89,7 @@ const AssignInstrumentsToCall = ({
     { title: 'Short code', field: 'shortCode' },
     { title: 'Description', field: 'description' },
     {
-      title: 'Fap',
+      title: 'FAP',
       field: 'fap',
       render: (rowData: Instrument) => (
         <FapSelectionComponent {...rowData} onChange={onChange} />

diff --git a/apps/frontend/src/components/call/AssignedInstrumentsTable.tsx b/apps/frontend/src/components/call/AssignedInstrumentsTable.tsx
@@ -120,7 +120,7 @@ const AssignedInstrumentsTable = ({
       editable: 'never',
     },
     {
-      title: 'Fap',
+      title: 'FAP',
       field: 'fapId',
       editable: 'onUpdate',
       emptyValue: '-',

diff --git a/apps/frontend/src/components/call/CallGeneralInfo.tsx b/apps/frontend/src/components/call/CallGeneralInfo.tsx
@@ -330,7 +330,7 @@ const CallGeneralInfo = ({
       <FormControl fullWidth>
         <FormikUIAutocomplete
           name="templateId"
-          label="Call template"
+          label="Proposal template"
           loading={loadingTemplates}
           noOptionsText="No templates"
           items={templateOptions}
@@ -364,7 +364,7 @@ const CallGeneralInfo = ({
         <FormControl fullWidth>
           <FormikUIAutocomplete
             name="esiTemplateId"
-            label="ESI template"
+            label="Proposal ESI template"
             loading={loadingTemplates}
             noOptionsText="No templates"
             items={esiTemplateOptions}

diff --git a/apps/frontend/src/components/call/CallReviewsInfo.tsx b/apps/frontend/src/components/call/CallReviewsInfo.tsx
@@ -107,7 +107,7 @@ const CallReviewAndNotification = () => {
       </LocalizationProvider>
       <FormikUIAutocomplete
         name="faps"
-        label="Call Faps"
+        label="Call FAPs"
         multiple
         loading={loadingFaps}
         noOptionsText="No Faps"

diff --git a/apps/frontend/src/components/call/CallsTable.tsx b/apps/frontend/src/components/call/CallsTable.tsx
@@ -117,20 +117,20 @@ const CallsTable = ({ confirm }: WithConfirmProps) => {
       emptyValue: '-',
     },
     {
-      title: 'Call template',
+      title: 'Proposal template',
       field: 'template.name',
       emptyValue: '-',
     },
     {
-      title: '#' + i18n.format(t('instrument'), 'plural'),
+      title: '#' + i18n.format(t('Instrument'), 'plural'),
       render: (data) => data.instruments.length,
     },
     {
-      title: '#proposals',
+      title: '#Proposals',
       field: 'proposalCount',
     },
     {
-      title: '#faps',
+      title: '#FAPs',
       render: (data) => data.faps?.length,
     },
   ];

diff --git a/apps/frontend/src/components/fap/MeetingComponents/FapMeetingInstrumentsTable.tsx b/apps/frontend/src/components/fap/MeetingComponents/FapMeetingInstrumentsTable.tsx
@@ -208,7 +208,7 @@ const FapMeetingInstrumentsTable = ({
             },
             {
               title: 'Submit ' + i18n.format(t('instrument'), 'lowercase'),
-              description: `No further changes to Fap meeting decisions and rankings are possible after submission. Are you sure you want to submit the ${(rowData as InstrumentWithAvailabilityTime).name} ${t(
+              description: `No further changes to FAP meeting decisions and rankings are possible after submission. Are you sure you want to submit the ${(rowData as InstrumentWithAvailabilityTime).name} ${t(
                 'instrument'
               )}?`,
             }

diff --git a/apps/frontend/src/components/fap/MeetingComponents/ProposalViewModal/TechnicalReviewInfo.tsx b/apps/frontend/src/components/fap/MeetingComponents/ProposalViewModal/TechnicalReviewInfo.tsx
@@ -94,7 +94,7 @@ const OverwriteTimeAllocationDialog = ({
                 id="fapTimeAllocation"
                 type="number"
                 name="fapTimeAllocation"
-                label={`Time Allocation(${fapProposalArgs.proposal.call?.allocationTimeUnit}s)`}
+                label={`Time Allocation (${fapProposalArgs.proposal.call?.allocationTimeUnit}s)`}
                 value={values.fapTimeAllocation ?? ''}
                 onChange={(e: React.ChangeEvent<HTMLInputElement>) => {
                   setFieldValue(

diff --git a/apps/frontend/src/components/proposal/ChangeProposalStatus.tsx b/apps/frontend/src/components/proposal/ChangeProposalStatus.tsx
@@ -74,7 +74,7 @@ const ChangeProposalStatus = ({
                 padding: '22px 0 0',
               }}
             >
-              Change proposal/s status
+              Change proposal(s) status
             </Typography>
 
             <Grid container spacing={3}>

diff --git a/apps/frontend/src/components/proposal/ProposalTableInstrumentScientist.tsx b/apps/frontend/src/components/proposal/ProposalTableInstrumentScientist.tsx
@@ -186,7 +186,7 @@ const instrumentManagementColumns = (
 
 const FapReviewColumns = [
   { title: 'Final status', field: 'finalStatus', emptyValue: '-' },
-  { title: 'Fap', field: 'fapCode', emptyValue: '-', hidden: true },
+  { title: 'FAP', field: 'fapCode', emptyValue: '-', hidden: true },
 ];
 
 const proposalStatusFilter: Record<string, number> = {

diff --git a/apps/frontend/src/components/proposal/ProposalTableOfficer.tsx b/apps/frontend/src/components/proposal/ProposalTableOfficer.tsx
@@ -232,7 +232,7 @@ const FapReviewColumns = [
     hidden: true,
   },
   {
-    title: 'Fap',
+    title: 'FAP',
     field: 'faps.code',
     render: (rowData: ProposalViewData) =>
       fromArrayToCommaSeparated(rowData.faps?.map((fap) => fap.code)),
@@ -981,7 +981,7 @@ const ProposalTableOfficer = ({
           },
           {
             icon: GroupWorkIcon,
-            tooltip: 'Assign proposals to Fap',
+            tooltip: 'Assign proposals to FAP',
             onClick: () => {
               setOpenAssignment(true);
             },