From 825c2d8f160ce7e9586f230911d7fc2818779311 Mon Sep 17 00:00:00 2001 From: JieunSon96 Date: Thu, 8 Aug 2024 16:50:02 -0700 Subject: [PATCH 1/5] remove console.log --- .../FOI/customComponents/ContactApplicant/util.tsx | 6 +----- .../request_api/email_templates/applicant_cover.html | 7 +++++++ 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 request-management-api/request_api/email_templates/applicant_cover.html diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx index 5af821dc6..c06bde808 100644 --- a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx +++ b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx @@ -5,7 +5,6 @@ import { fetchDocumentPage, fetchDocumentPageFlags } from "../../../../apiManage export const renderTemplate = (template: string, content: string, params: Array) => { let newTemplate = template.replace("{{content}}", content); - console.log("renderTemplate안에 newTemplate : ",newTemplate) return applyVariables(newTemplate, params); } @@ -159,7 +158,6 @@ const getMappedValue = (property: string, propertykey: string) => { // Function to map extension reason id to its textual representation (PB and OIPC combined) const mapSectionWithExtensionReasonId = (extensionReasonId: number) => { - console.log("extensionReasonId : ",extensionReasonId) switch (extensionReasonId) { case 1: case 6: @@ -219,7 +217,6 @@ const displayFeeEstimateInfo = (data: any[]): string => { const dateSent = result.created_at || ""; const datePaid = getFullFeePaidDate(data) || ""; const dateWaiverDecision = getFeeWaiverDecisionDate(data) || ""; - console.log("Fee dateSent: "+dateSent, "/ Fee datePaid:",datePaid," / Fee dateWaiverDecision:",dateWaiverDecision) htmlString = `

Fee Estimate: Yes

@@ -291,8 +288,7 @@ const displayPBExtension = (requestExtensions:any): string => { // Check if there are any PB Extensions if (pbExtensions.length > 0) { const recentPBExtension = pbExtensions[0]; // Assuming the list is sorted by date with the most recent first - console.log("Most recent PB Extension:", recentPBExtension); - + // Extract variables for the HTML template const { extendedduedate, diff --git a/request-management-api/request_api/email_templates/applicant_cover.html b/request-management-api/request_api/email_templates/applicant_cover.html new file mode 100644 index 000000000..42d2ed4b4 --- /dev/null +++ b/request-management-api/request_api/email_templates/applicant_cover.html @@ -0,0 +1,7 @@ +

File:  292 - {{arcsNumber}}/{{axisRequestId}}

+

Subject: FOI Request {{axisRequestId}}

+

 

+

Please see the attached regarding your FOI request/consultation.  +

 

+

Thank you,

+

 

\ No newline at end of file From 27f83d6b0dfcd469ebb141539e0dc34cb425aef2 Mon Sep 17 00:00:00 2001 From: JieunSon96 Date: Fri, 9 Aug 2024 09:07:05 -0700 Subject: [PATCH 2/5] add generic cover email template --- .../customComponents/ContactApplicant/index.tsx | 14 ++++++++------ .../FOI/customComponents/ContactApplicant/util.tsx | 2 -- ...over.html => generic_cover_email_template.html} | 5 +++-- .../services/email/templates/templateconfig.py | 2 ++ 4 files changed, 13 insertions(+), 10 deletions(-) rename request-management-api/request_api/email_templates/{applicant_cover.html => generic_cover_email_template.html} (52%) diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx index 029808c78..f4b551c64 100644 --- a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx +++ b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx @@ -182,14 +182,16 @@ export const ContactApplicant = ({ } else if (['EXTENSIONS-PB'].includes(item.name)) { return getExtensionType(requestExtensions) === "PB"; } else if (['OIPCAPPLICANTCONSENTEXTENSION'].includes(item.name)) { - const check=getExtensionType(requestExtensions) === "OIPCAPPLICANTCONSENTEXTENSION" - return check; + const isApplicantConsent = getExtensionType(requestExtensions) === "OIPCAPPLICANTCONSENTEXTENSION" + return isApplicantConsent; } else if(['OIPCFIRSTTIMEEXTENSION'].includes(item.name)){ - const check2 = getExtensionType(requestExtensions) === "OIPCFIRSTTIMEEXTENSION" - return check2; + const isFirstTimeExtension = getExtensionType(requestExtensions) === "OIPCFIRSTTIMEEXTENSION" + return isFirstTimeExtension; } else if(['OIPCSUBSEQUENTTIMEEXTENSION'].includes(item.name)){ - const check3 = getExtensionType(requestExtensions) === "OIPCSUBSEQUENTTIMEEXTENSION" - return check3; + const isSubsequentTimeExtension = getExtensionType(requestExtensions) === "OIPCSUBSEQUENTTIMEEXTENSION" + return isSubsequentTimeExtension; + } else if(['GENERICCOVEREMAILTEMPLATE'].includes(item.name)){ + return true; } } diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx index c06bde808..6e7a38325 100644 --- a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx +++ b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx @@ -333,7 +333,6 @@ const displayOIPCExtension = (requestExtensions:any): string => { ); // Join the mapped reasons into a comma-separated string const reasonsString = mappedReasons.join(", "); - console.log("displayOIPCExtension : ",reasonsString) return reasonsString; } } @@ -351,7 +350,6 @@ const displayApplicantConsentSection = (requestExtensions:any, requestDetails:an // Check if there are any OIPC Extensions if (oipcExtensions.length > 0) { const recentOIPCExtension = oipcExtensions[0]; // Assuming the list is sorted by date with the most recent first - console.log("Most recent OIPC Extension:", recentOIPCExtension); // Extract variables for the HTML template const { extensionreson } = recentOIPCExtension; diff --git a/request-management-api/request_api/email_templates/applicant_cover.html b/request-management-api/request_api/email_templates/generic_cover_email_template.html similarity index 52% rename from request-management-api/request_api/email_templates/applicant_cover.html rename to request-management-api/request_api/email_templates/generic_cover_email_template.html index 42d2ed4b4..cc996adb5 100644 --- a/request-management-api/request_api/email_templates/applicant_cover.html +++ b/request-management-api/request_api/email_templates/generic_cover_email_template.html @@ -1,7 +1,8 @@ -

File:  292 - {{arcsNumber}}/{{axisRequestId}}

Subject: FOI Request {{axisRequestId}}

 

Please see the attached regarding your FOI request/consultation. 

 

Thank you,

-

 

\ No newline at end of file +

Information Access Operations | Ministry of Citizens' Services

+

www.gov.bc.ca/freedomofinformation

+ diff --git a/request-management-api/request_api/services/email/templates/templateconfig.py b/request-management-api/request_api/services/email/templates/templateconfig.py index c50d710a9..897838892 100644 --- a/request-management-api/request_api/services/email/templates/templateconfig.py +++ b/request-management-api/request_api/services/email/templates/templateconfig.py @@ -22,6 +22,8 @@ def gettemplatename(self, key): return "oipc_first_time_extension.html" elif key == "OIPCSUBSEQUENTTIMEEXTENSION": return "oipc_subsequent_time_extension.html" + elif key == "GENERICCOVEREMAILTEMPLATE": + return "generic_cover_email_template.html" else: logging.info("Unknown key") return None From 191217b46de8355c5b6aac65209a5f90a99118bd Mon Sep 17 00:00:00 2001 From: JieunSon96 Date: Fri, 9 Aug 2024 15:40:02 -0700 Subject: [PATCH 3/5] add migration file for generic cover template --- .../5b9b19213803_generic_cover_template.py | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 request-management-api/migrations/versions/5b9b19213803_generic_cover_template.py diff --git a/request-management-api/migrations/versions/5b9b19213803_generic_cover_template.py b/request-management-api/migrations/versions/5b9b19213803_generic_cover_template.py new file mode 100644 index 000000000..51b53a58f --- /dev/null +++ b/request-management-api/migrations/versions/5b9b19213803_generic_cover_template.py @@ -0,0 +1,32 @@ +"""empty message + +Revision ID: 5b9b19213803 +Revises: dc99ffc3a6f7 +Create Date: 2024-08-09 15:35:11.747935 + +""" +from alembic import op +import sqlalchemy as sa +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '5b9b19213803' +down_revision = 'dc99ffc3a6f7' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by FAlembic - please adjust! ### + op.execute(""" + INSERT INTO public."ApplicantCorrespondenceTemplates"( documenturipath, "name", description, active, "version", created_at, createdby, display) + VALUES + ('/TEMPLATES/EMAILS/generic_cover_email_template.html', 'GENERICCOVEREMAILTEMPLATE', 'Generic Cover Email Template', true, 1, now(), 'system', true); + commit;""") + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.execute("""delete from public."ApplicantCorrespondenceTemplates" act where name = 'GENERICCOVEREMAILTEMPLATE'; commit;""") + # ### end Alembic commands ### \ No newline at end of file From 1f6ae3b7aa04cf27e075d9446b9dbbb3a6f88b77 Mon Sep 17 00:00:00 2001 From: JieunSon96 Date: Fri, 9 Aug 2024 15:59:22 -0700 Subject: [PATCH 4/5] changed revision head --- .../src/apiManager/services/FOI/foiRecordServices.js | 2 +- .../components/FOI/customComponents/ContactApplicant/util.tsx | 1 - .../versions/5b9b19213803_generic_cover_template.py | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/forms-flow-web/src/apiManager/services/FOI/foiRecordServices.js b/forms-flow-web/src/apiManager/services/FOI/foiRecordServices.js index b29f3eac6..a436d2829 100644 --- a/forms-flow-web/src/apiManager/services/FOI/foiRecordServices.js +++ b/forms-flow-web/src/apiManager/services/FOI/foiRecordServices.js @@ -195,7 +195,7 @@ export const fetchDocumentPage = (ministryId, done) => { if (!ministryId) { return (dispatch) => {}; } - console.log("ministrY id : ",ministryId) + let apiUrl = replaceUrl( API.DOC_REVIEWER_REDACTED_DOCUMENT_RECORDS, "", diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx index 6e7a38325..2db465bd1 100644 --- a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx +++ b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx @@ -44,7 +44,6 @@ export const getExtensionType = (requestExtensions: any) => { if (latestExtension.extensionstatus === "Approved" && latestExtension.extensiontype === "OIPC") { return "OIPCAPPLICANTCONSENTEXTENSION"; } else if (latestExtension.extensionstatus === "Pending" && latestExtension.extensiontype === "OIPC") { - console.log("approvedOIPCExists : ",approvedOIPCExists) return approvedOIPCExists ? "OIPCSUBSEQUENTTIMEEXTENSION" : "OIPCFIRSTTIMEEXTENSION"; } else if (latestExtension.extensionstatus === "Approved" && latestExtension.extensiontype === "Public Body") { return "PB"; diff --git a/request-management-api/migrations/versions/5b9b19213803_generic_cover_template.py b/request-management-api/migrations/versions/5b9b19213803_generic_cover_template.py index 51b53a58f..327290d6f 100644 --- a/request-management-api/migrations/versions/5b9b19213803_generic_cover_template.py +++ b/request-management-api/migrations/versions/5b9b19213803_generic_cover_template.py @@ -1,7 +1,7 @@ """empty message Revision ID: 5b9b19213803 -Revises: dc99ffc3a6f7 +Revises: 3e8203b24730 Create Date: 2024-08-09 15:35:11.747935 """ @@ -11,7 +11,7 @@ # revision identifiers, used by Alembic. revision = '5b9b19213803' -down_revision = 'dc99ffc3a6f7' +down_revision = '3e8203b24730' branch_labels = None depends_on = None From 7d6c995d446e8182f2abb3e895e45a5bbad0695f Mon Sep 17 00:00:00 2001 From: JieunSon96 Date: Tue, 13 Aug 2024 13:35:02 -0700 Subject: [PATCH 5/5] change to show on open state --- .../src/components/FOI/FOIRequest/FOIRequest.js | 2 +- .../FOI/customComponents/ContactApplicant/index.tsx | 8 ++++---- .../FOI/customComponents/ContactApplicant/util.tsx | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/forms-flow-web/src/components/FOI/FOIRequest/FOIRequest.js b/forms-flow-web/src/components/FOI/FOIRequest/FOIRequest.js index 508c81147..5ac90f196 100644 --- a/forms-flow-web/src/components/FOI/FOIRequest/FOIRequest.js +++ b/forms-flow-web/src/components/FOI/FOIRequest/FOIRequest.js @@ -1027,7 +1027,7 @@ const FOIRequest = React.memo(({ userDetail, openApplicantProfileModal }) => { return ( requestState !== StateEnum.intakeinprogress.name && requestState !== StateEnum.unopened.name && - requestState !== StateEnum.open.name && + //requestState !== StateEnum.open.name && requestState !== StateEnum.appfeeowing.name && requestDetails?.requestType === FOI_COMPONENT_CONSTANTS.REQUEST_TYPE_GENERAL) } diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx index f4b551c64..5c8dff860 100644 --- a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx +++ b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/index.tsx @@ -180,15 +180,15 @@ export const ContactApplicant = ({ if (['PAYONLINE', 'PAYOUTSTANDING'].includes(item.name)) { return !isFeeTemplateDisabled(currentCFRForm, item); } else if (['EXTENSIONS-PB'].includes(item.name)) { - return getExtensionType(requestExtensions) === "PB"; + return getExtensionType(requestDetails, requestExtensions) === "PB"; } else if (['OIPCAPPLICANTCONSENTEXTENSION'].includes(item.name)) { - const isApplicantConsent = getExtensionType(requestExtensions) === "OIPCAPPLICANTCONSENTEXTENSION" + const isApplicantConsent = getExtensionType(requestDetails, requestExtensions) === "OIPCAPPLICANTCONSENTEXTENSION" return isApplicantConsent; } else if(['OIPCFIRSTTIMEEXTENSION'].includes(item.name)){ - const isFirstTimeExtension = getExtensionType(requestExtensions) === "OIPCFIRSTTIMEEXTENSION" + const isFirstTimeExtension = getExtensionType(requestDetails, requestExtensions) === "OIPCFIRSTTIMEEXTENSION" return isFirstTimeExtension; } else if(['OIPCSUBSEQUENTTIMEEXTENSION'].includes(item.name)){ - const isSubsequentTimeExtension = getExtensionType(requestExtensions) === "OIPCSUBSEQUENTTIMEEXTENSION" + const isSubsequentTimeExtension = getExtensionType(requestDetails, requestExtensions) === "OIPCSUBSEQUENTTIMEEXTENSION" return isSubsequentTimeExtension; } else if(['GENERICCOVEREMAILTEMPLATE'].includes(item.name)){ return true; diff --git a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx index 2db465bd1..3d1dae2cf 100644 --- a/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx +++ b/forms-flow-web/src/components/FOI/customComponents/ContactApplicant/util.tsx @@ -30,7 +30,12 @@ export const getExtensiondetails = (requestExtensions:any, type: string) => { return ["","","","","","",""] } -export const getExtensionType = (requestExtensions: any) => { +export const getExtensionType = (requestDetails:any, requestExtensions: any) => { + + if (requestDetails.currentState === "Open") { + return "NA"; + } + if (!requestExtensions || requestExtensions.length === 0) { return "NA"; }