[Release] Version 0.0.3 (#251)

* [Fix] Various bug fixes (#236)

* [Fix] Prevent RCD email from breaking into two lines (#237)

* [Feature] Add date of birth filter to permit holders page (#238)

* [Fix] Convert patient condition field to checkbox field (#239)

* Convert patient condition field to checkbox field

* Fix build error

* [Improvement] Add error logging, improve error handling (#240)

* Add error logging, improve error handling

* Replace GraphQL hooks with custom implementation

* [Feature] Build privacy policy and terms and conditions pages (#241)

* Create privacy policy and ToC pages

* Fix links in ToC pages

* [Fix] Fix replacement application expiry date (#242)

* [Fix] Disable GraphQL playground in production (#244)

* [Fix] Remove GQL playground redirect (#245)

* [Improvement] Various fixes (#246)

* [Fix] Fix homepage RCD emails (#247)

* [Fix] Get most recent permit by latest expiry date (#248)

* [Fix] Fix various applications issues (#250)

Author: OustanDing

components/admin/permit-holders/app-history/Card/AppHistoryRecord.tsx

@@ -40,7 +40,7 @@ const AppHistoryRecord: FC<Props> = ({ permit }) => {
               Request Type: {titlecase(type)}
             </Text>
             <Text as="p" textStyle="body-regular">
-              Expired on: {formatDate(expiryDate)}
+              Expiry date: {formatDate(expiryDate)}
             </Text>
           </HStack>
         </VStack>

components/admin/requests/Header.tsx

@@ -17,6 +17,7 @@ type RequestHeaderProps = {
   readonly paidThroughShopify?: boolean;
   readonly shopifyOrderID?: string;
   readonly shopifyOrderNumber?: string;
+  readonly permitExpiry: Date | null;
   readonly temporaryPermitExpiry: Date | null;
   readonly reasonForRejection?: string;
 };
@@ -30,6 +31,7 @@ type RequestHeaderProps = {
  * @param paidThroughShopify If the permit fee was paid through Shopify
  * @param shopifyOrderID Order ID of Shopify payment if paid through Shopify
  * @param shopifyOrderNumber Order number of Shopify payment if paid through Shopify
+ * @param permitExpiry Permit expiry if application is complete
  * @param temporaryPermitExpiry Permit expiry if application is for a temporary permit
  * @param reasonForRejection Reason for rejecting application
  */
@@ -41,12 +43,26 @@ export default function RequestHeader({
   paidThroughShopify,
   shopifyOrderID,
   shopifyOrderNumber,
+  permitExpiry,
   temporaryPermitExpiry,
   reasonForRejection,
 }: RequestHeaderProps) {
   const displayShopifyUrl = paidThroughShopify && shopifyOrderID && shopifyOrderNumber;
   const shopifyOrderUrl = `https://${process.env.NEXT_PUBLIC_SHOPIFY_DOMAIN}/admin/orders/${shopifyOrderID}`;
 
+  let expiryDateText: string | null;
+  if (applicationStatus === 'COMPLETED' && !!permitExpiry) {
+    expiryDateText = `Expiry date: ${formatDateYYYYMMDD(permitExpiry)}`;
+  } else if (permitType === 'TEMPORARY' && !!temporaryPermitExpiry) {
+    expiryDateText = `This permit will expire: ${formatDateYYYYMMDD(temporaryPermitExpiry)}`;
+  } else if (permitType === 'PERMANENT') {
+    expiryDateText = `This permit will expire: ${formatDateYYYYMMDD(
+      getPermanentPermitExpiryDate()
+    )} (expected)`;
+  } else {
+    expiryDateText = null;
+  }
+
   return (
     <Box textAlign="left">
       <NextLink href="/admin" passHref>
@@ -96,13 +112,7 @@ export default function RequestHeader({
             </Flex>
             <HStack justifyContent="flex-end">
               <Text textStyle="caption" as="p" mt="12px">
-                {permitType === 'TEMPORARY' && !!temporaryPermitExpiry
-                  ? `This permit will expire: ${formatDateYYYYMMDD(temporaryPermitExpiry)}`
-                  : permitType === 'PERMANENT'
-                  ? `This permit will expire: ${formatDateYYYYMMDD(
-                      getPermanentPermitExpiryDate()
-                    )} (expected)`
-                  : null}
+                {expiryDateText}
               </Text>
             </HStack>
           </VStack>

lib/applications/resolvers.ts

@@ -74,6 +74,8 @@ export const application: Resolver<
       newApplication: true,
       renewalApplication: true,
       replacementApplication: true,
+      applicant: true,
+      permit: true,
     },
   });
 

pages/admin/request/[id].tsx

@@ -60,6 +60,7 @@ const Request: NextPage<Props> = ({ id: idString }: Props) => {
       appMailed,
       reviewRequestCompleted,
     },
+    permit,
   } = data.application;
 
   // Whether all application processing steps are completed
@@ -87,6 +88,7 @@ const Request: NextPage<Props> = ({ id: idString }: Props) => {
           paidThroughShopify={paidThroughShopify}
           shopifyOrderID={shopifyConfirmationNumber || undefined}
           shopifyOrderNumber={shopifyOrderNumber || undefined}
+          permitExpiry={permit && permit.expiryDate}
           temporaryPermitExpiry={temporaryPermitExpiry || null}
           reasonForRejection={rejectedReason || undefined}
         />

tools/admin/requests/view-request.ts

@@ -5,6 +5,7 @@ import {
   Invoice,
   Applicant,
   QueryApplicationArgs,
+  Permit,
 } from '@lib/graphql/types';
 
 // Queries an Application by ID along with the associated permit, replacement, applicationProcessing, and applicant
@@ -40,6 +41,9 @@ export const GET_APPLICATION_QUERY = gql`
       applicant {
         id
       }
+      permit {
+        expiryDate
+      }
     }
   }
 `;
@@ -75,5 +79,6 @@ export type GetApplicationResponse = {
     };
     applicant: Pick<Applicant, 'id'>;
     temporaryPermitExpiry?: Date;
+    permit: Pick<Permit, 'expiryDate'> | null;
   };
 };