[Feature] Support search by permit ID on Permit Holders page (#307)

* [Feature] Support search by permit ID on Permit Holders page * Revert accidental processingFee type change
uwblueprint · Jul 30, 2023 · a837a72 · a837a72
1 parent cc0c308
commit a837a72
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/lib/applicants/resolvers.ts b/lib/applicants/resolvers.ts
@@ -79,6 +79,7 @@ export const applicants: Resolver<
       expiryDateRangeTo = undefined,
       search = undefined,
       dateOfBirth = undefined,
+      permitId = undefined,
     } = filter;
 
     let expiryDateUpperBound,
@@ -148,7 +149,11 @@ export const applicants: Resolver<
     // Permit status and expiry date range filters both look at the permit expiryDate.
     // For this reason we need to filter on expiryDate twice to take both filters in account.
     const permitFilter =
-      expiryDateLowerBound || expiryDateUpperBound || expiryDateRangeFrom || expiryDateRangeTo
+      expiryDateLowerBound ||
+      expiryDateUpperBound ||
+      expiryDateRangeFrom ||
+      expiryDateRangeTo ||
+      permitId
         ? {
             some: {
               AND: [
@@ -164,6 +169,11 @@ export const applicants: Resolver<
                     lte: expiryDateRangeTo?.toISOString(),
                   },
                 },
+                {
+                  rcdPermitId: {
+                    equals: permitId ?? undefined,
+                  },
+                },
               ],
             },
           }

diff --git a/lib/applicants/schema.ts b/lib/applicants/schema.ts
@@ -158,6 +158,7 @@ export default gql`
     expiryDateRangeTo: Date
     search: String
     dateOfBirth: Date
+    permitId: Int
     limit: Int
     offset: Int
   }

diff --git a/lib/graphql/types.ts b/lib/graphql/types.ts
@@ -63,6 +63,7 @@ export type ApplicantsFilter = {
   expiryDateRangeTo: Maybe<Scalars['Date']>;
   search: Maybe<Scalars['String']>;
   dateOfBirth: Maybe<Scalars['Date']>;
+  permitId: Maybe<Scalars['Int']>;
   limit: Maybe<Scalars['Int']>;
   offset: Maybe<Scalars['Int']>;
 };

diff --git a/pages/admin/permit-holders.tsx b/pages/admin/permit-holders.tsx
@@ -66,6 +66,7 @@ const PermitHolders: NextPage = () => {
   const [searchFilter, setSearchFilter] = useState<string>('');
   const { dateRange, addDayToDateRange, dateRangeString } = useDateRangePicker();
   const [dateOfBirthFilter, setDateOfBirthFilter] = useState('');
+  const [permitIdFilter, setPermitIdFilter] = useState<number | null>(null);
 
   // Pagination
   const [sortOrder, setSortOrder] = useState<SortOptions>([['name', SortOrder.ASC]]);
@@ -91,6 +92,7 @@ const PermitHolders: NextPage = () => {
           expiryDateRangeTo: dateRange.to?.getTime(),
           search: debouncedSearchFilter,
           dateOfBirth: dateOfBirthFilter || null,
+          permitId: permitIdFilter,
           offset: pageNumber * PAGE_SIZE,
           limit: PAGE_SIZE,
           order: sortOrder,
@@ -351,6 +353,28 @@ const PermitHolders: NextPage = () => {
                     _focus={{ border: 'none' }}
                   />
                 </HStack>
+                <HStack
+                  spacing="-12px"
+                  height="2.5rem"
+                  paddingLeft="16px"
+                  border="1px solid"
+                  borderColor="border.secondary"
+                  borderRadius="6px"
+                >
+                  <Text as="span" textStyle="button-semibold">
+                    Permit ID:
+                  </Text>
+                  <Input
+                    type="number"
+                    placeholder="Permit ID"
+                    fontSize="18px"
+                    width="184px"
+                    value={permitIdFilter !== null ? permitIdFilter : ''}
+                    onChange={event => setPermitIdFilter(event.target.valueAsNumber)}
+                    border="none"
+                    _focus={{ border: 'none' }}
+                  />
+                </HStack>
               </HStack>
               <HStack>
                 <Menu>