Revert "[Release] Version 0.0.9 (#321)"

This reverts commit 6fb599c.
uwblueprint · Oct 10, 2023 · 389df7b · 389df7b
1 parent 6fb599c
commit 389df7b
Show file tree

Hide file tree

Showing 54 changed files with 149 additions and 1,073 deletions.
diff --git a/.nvmrc b/.nvmrc
diff --git a/components/admin/permit-holders/Header.tsx b/components/admin/permit-holders/Header.tsx
@@ -1,4 +1,3 @@
-import { useRouter } from 'next/router';
 import {
   Alert,
   AlertIcon,
@@ -19,7 +18,6 @@ import { ChevronDownIcon, ChevronLeftIcon } from '@chakra-ui/icons'; // Chakra U
 import Link from 'next/link'; // Link
 import { ApplicantStatus } from '@lib/graphql/types';
 import PermitHolderStatusBadge from '@components/admin/PermitHolderStatusBadge';
-import ConfirmDeleteApplicantModal from '@components/admin/permit-holders/table/ConfirmDeleteApplicantModal';
 import SetPermitHolderToInactiveModal from '@components/admin/permit-holders/table/ConfirmSetInactiveModal';
 import SetPermitHolderToActiveModal from '@components/admin/permit-holders/table/ConfirmSetActiveModal';
 import AdditionalNotesModal from '@components/admin/permit-holders/additional-notes/Modal';
@@ -39,22 +37,13 @@ export default function PermitHolderHeader({
   applicant: { id, name, status, inactiveReason, notes },
   refetch,
 }: PermitHolderHeaderProps) {
-  const router = useRouter();
-
   // Set Permit Holder Inactive/Active modal state
   const {
     isOpen: isSetPermitHolderStatusModalOpen,
     onOpen: onOpenSetPermitHolderStatusModal,
     onClose: onCloseSetPermitHolderStatusModal,
   } = useDisclosure();
 
-  // Delete applicant modal state
-  const {
-    isOpen: isDeleteApplicantModalOpen,
-    onOpen: onOpenDeleteApplicantModal,
-    onClose: onCloseDeleteApplicantModal,
-  } = useDisclosure();
-
   // Additional notes modal state
   const {
     isOpen: isNotesModalOpen,
@@ -108,13 +97,6 @@ export default function PermitHolderHeader({
                       >
                         {`Set as ${status === 'ACTIVE' ? 'Inactive' : 'Active'}`}
                       </MenuItem>
-                      <MenuItem
-                        color="text.critical"
-                        textStyle="button-regular"
-                        onClick={onOpenDeleteApplicantModal}
-                      >
-                        {'Delete Permit Holder'}
-                      </MenuItem>
                     </MenuList>
                   </Menu>
                 </Box>
@@ -161,17 +143,6 @@ export default function PermitHolderHeader({
           onClose={onCloseSetPermitHolderStatusModal}
         />
       )}
-      <ConfirmDeleteApplicantModal
-        isOpen={isDeleteApplicantModalOpen}
-        applicantId={id}
-        refetch={() => {
-          /* Do not refetch, redirect to permit holders page */
-        }}
-        onClose={() => {
-          onCloseDeleteApplicantModal();
-          router.push('/admin/permit-holders');
-        }}
-      />
 
       {/* Additional notes modal */}
       <AdditionalNotesModal

diff --git a/components/admin/permit-holders/permit-holder-information/Card.tsx b/components/admin/permit-holders/permit-holder-information/Card.tsx
@@ -139,7 +139,7 @@ export default function PermitHolderInformationCard(props: PersonalInformationPr
             Date of Birth: {formatDateYYYYMMDD(new Date(dateOfBirth))}
           </Text>
           <Text as="p" textStyle="body-regular">
-            Gender: {gender === 'OTHER' && otherGender ? otherGender : titlecase(gender)}
+            Gender: {gender === 'OTHER' ? otherGender : titlecase(gender)}
           </Text>
         </VStack>
 

diff --git a/components/admin/permit-holders/permit-holder-information/EditModal.tsx b/components/admin/permit-holders/permit-holder-information/EditModal.tsx
@@ -76,7 +76,6 @@ export default function EditUserInformationModal({
           }}
           validationSchema={permitHolderInformationSchema}
           onSubmit={handleSubmit}
-          validateOnMount
         >
           {({ values, isValid }) => (
             <Form noValidate>

diff --git a/components/admin/permit-holders/table/ConfirmDeleteApplicantModal.tsx b/components/admin/permit-holders/table/ConfirmDeleteApplicantModal.tsx
diff --git a/components/admin/requests/Header.tsx b/components/admin/requests/Header.tsx
@@ -1,33 +1,15 @@
-import { useRouter } from 'next/router';
-import {
-  Alert,
-  AlertIcon,
-  Box,
-  Button,
-  Flex,
-  HStack,
-  Link,
-  Menu,
-  MenuButton,
-  MenuItem,
-  MenuList,
-  Text,
-  useDisclosure,
-  VStack,
-} from '@chakra-ui/react'; // Chakra UI
-import { ChevronDownIcon, ChevronLeftIcon } from '@chakra-ui/icons'; // Chakra UI icon
+import { Box, Flex, HStack, Text, Link, VStack, Alert, AlertIcon } from '@chakra-ui/react'; // Chakra UI
+import { ChevronLeftIcon } from '@chakra-ui/icons'; // Chakra UI icon
 import NextLink from 'next/link'; // Link
 import RequestStatusBadge from '@components/admin/RequestStatusBadge'; // Request status badge
 import ShopifyBadge from '@components/admin/ShopifyBadge';
 import PermitTypeBadge from '@components/admin/PermitTypeBadge';
-import ConfirmDeleteRequestModal from './delete/ConfirmDeleteRequestModal';
 import { ApplicationStatus, ApplicationType, PermitType } from '@lib/graphql/types';
 import { titlecase } from '@tools/string';
 import { formatDateYYYYMMDD, formatDateYYYYMMDDLocal } from '@lib/utils/date';
 import { getPermanentPermitExpiryDate } from '@lib/utils/permit-expiry';
 
 type RequestHeaderProps = {
-  readonly id: number;
   readonly applicationType: ApplicationType;
   readonly permitType: PermitType;
   readonly createdAt: Date;
@@ -42,7 +24,6 @@ type RequestHeaderProps = {
 
 /**
  * Header of View Request page
- * @param id Application id
  * @param applicationType Type of application
  * @param permitType Type of permit
  * @param createdAt Date permit was created at
@@ -55,7 +36,6 @@ type RequestHeaderProps = {
  * @param reasonForRejection Reason for rejecting application
  */
 export default function RequestHeader({
-  id,
   applicationType,
   permitType,
   createdAt,
@@ -75,8 +55,6 @@ export default function RequestHeader({
     expiryDateText = `Expiry date: ${formatDateYYYYMMDD(permitExpiry)}`;
   } else if (permitType === 'TEMPORARY' && !!temporaryPermitExpiry) {
     expiryDateText = `This permit will expire: ${formatDateYYYYMMDD(temporaryPermitExpiry)}`;
-  } else if (applicationType === 'REPLACEMENT' && !!permitExpiry) {
-    expiryDateText = `This permit will expire: ${formatDateYYYYMMDD(permitExpiry)}`;
   } else if (permitType === 'PERMANENT') {
     expiryDateText = `This permit will expire: ${formatDateYYYYMMDD(
       getPermanentPermitExpiryDate()
@@ -85,15 +63,6 @@ export default function RequestHeader({
     expiryDateText = null;
   }
 
-  const router = useRouter();
-
-  // Delete application modal state
-  const {
-    isOpen: isDeleteApplicationModalOpen,
-    onOpen: onOpenDeleteApplicationModal,
-    onClose: onCloseDeleteApplicationModal,
-  } = useDisclosure();
-
   return (
     <Box textAlign="left">
       <NextLink href="/admin" passHref>
@@ -119,27 +88,6 @@ export default function RequestHeader({
                 Received on {formatDateYYYYMMDDLocal(createdAt)} at{' '}
                 {createdAt.toLocaleTimeString('en-CA')}
               </Text>
-              <Menu>
-                <MenuButton
-                  as={Button}
-                  rightIcon={<ChevronDownIcon />}
-                  height="30px"
-                  bg="background.gray"
-                  _hover={{ bg: 'background.grayHover' }}
-                  color="black"
-                >
-                  <Text textStyle="caption">More Actions</Text>
-                </MenuButton>
-                <MenuList>
-                  <MenuItem
-                    color="text.critical"
-                    textStyle="button-regular"
-                    onClick={onOpenDeleteApplicationModal}
-                  >
-                    {'Delete Request'}
-                  </MenuItem>
-                </MenuList>
-              </Menu>
             </HStack>
             {displayShopifyUrl && (
               <Text textStyle="caption" as="p">
@@ -179,17 +127,6 @@ export default function RequestHeader({
             </Text>
           </Alert>
         )}
-        <ConfirmDeleteRequestModal
-          isOpen={isDeleteApplicationModalOpen}
-          applicationId={id}
-          refetch={() => {
-            /* Do not refetch, redirect to main page */
-          }}
-          onClose={() => {
-            onCloseDeleteApplicationModal();
-            router.push('/admin');
-          }}
-        />
       </VStack>
     </Box>
   );

diff --git a/components/admin/requests/additional-questions/EditModal.tsx b/components/admin/requests/additional-questions/EditModal.tsx
@@ -61,7 +61,6 @@ export default function EditAdditionalInformationModal({
           initialValues={{ additionalInformation: additionalInformation }}
           validationSchema={editAdditionalQuestionsSchema}
           onSubmit={handleSubmit}
-          validateOnMount
         >
           {({ values, isValid }) => (
             <Form style={{ width: '100%' }} noValidate>