Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

trim content before ready check #1511

Merged
merged 3 commits into from
Sep 20, 2024
Merged

trim content before ready check #1511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02e3f96
Update sub sub email language (#1499)
andieswift Sep 4, 2024
e46999b
ensure subsequent submission is only for users with access to submit …
bflynn-cms Sep 17, 2024
4b70570
trim content before ready check for addl info (#1509)
bflynn-cms Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions services/app-api/email/CMSSubsequentSubmissionNotice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ export const CMSSubsequentSubmissionNotice = async (data, config) => {
its details by clicking on its ID number.
</li>
</ul>
<br>
<p>If the contents of this email seem suspicious, do not open them, and instead forward this email to <a href="mailto:[email protected]">[email protected]</a>.</p>
<p>Thank you!</p>
`,
};
Expand Down
2 changes: 1 addition & 1 deletion services/app-api/email/stateSubsequentSubmissionReceipt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const stateSubsequentSubmissionReceipt = (data, config) => {
config.typeLabel
} ${data.componentId}:</p>
${formatPackageDetails(data, config)}
<p>If you have questions or did not expect this email, please contact <a href="mailto:[email protected]">[email protected]</a>.</p>
<p>If you have any questions or did not expect this email, please contact your CPOC.</p>
<p>Thank you.</p>`,
};
};
5 changes: 3 additions & 2 deletions services/app-api/utils/actionDelegate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ function getDefaultActions(
break;
case Workflow.ONEMAC_STATUS.PENDING_CONCURRENCE:
case Workflow.ONEMAC_STATUS.PENDING_APPROVAL:
if (userRole.canAccessForms)
if (userRole.canAccessForms) {
actions.push(Workflow.PACKAGE_ACTION.WITHDRAW);
actions.push(Workflow.PACKAGE_ACTION.SUBSEQUENT_SUBMISSION);
actions.push(Workflow.PACKAGE_ACTION.SUBSEQUENT_SUBMISSION);
}
break;
case Workflow.ONEMAC_STATUS.RAI_ISSUED:
if (userRole.canAccessForms)
Expand Down
5 changes: 4 additions & 1 deletion services/ui-src/src/page/OneMACForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,10 @@ const OneMACForm: React.FC<{ formConfig: OneMACFormConfig }> = ({
);

const isAdditionalInformationReady: boolean = Boolean(
formConfig.addlInfoRequired ? oneMacFormData.additionalInformation : true
formConfig.addlInfoRequired
? oneMacFormData.additionalInformation &&
oneMacFormData.additionalInformation.trim().length > 0
: true
);

setIsSubmissionReady(
Expand Down
Loading