update

apps/hcdc-access-service/src/app/auth/use-case/populate-context.ts

@@ -17,8 +17,14 @@ export class AuthPopulateContextUseCase {
   ) {}
 
   async execute(input: AuthPayload): Promise<AuthContextData> {
+    const { user, ability } = await this.createUserAbility(input.userId)
+
+    return { user, ability }
+  }
+
+  async createUserAbility(userId: string) {
     const user = await this.userRepository.findOne({
-      filter: { _id: input.userId },
+      filter: { _id: userId },
       populates: [
         { path: 'roles', fields: ['permissions'] satisfies (keyof Role)[] },
       ],

apps/hcdc-access-service/src/domain/auth/utils.ts

@@ -60,6 +60,7 @@ export function authorizePopulates<TEntity extends BaseEntity>(
   for (const populate of populates) {
     const { subject, action } = authMapping(populate.path)
     const authMatchObj = accessibleBy(ability, action)[subject]
+
     if (populate.match) {
       let matchObject: FilterQuery<TEntity>
 

apps/hcdc-web-app/src/components/form/FormDateRangePicker/index.tsx

@@ -0,0 +1,55 @@
+import { OutlinedInputProps } from '@mui/material'
+import { Control, Path, FieldValues } from 'react-hook-form'
+
+import { FormDateTimePicker } from '../FormDateTimePicker'
+
+export type FormDateRangePickerProps<T extends FieldValues = FieldValues> =
+  Omit<OutlinedInputProps, 'name'> & {
+    fromDateName: Path<T>
+    toDateName: Path<T>
+    label: string
+    control: Control<T>
+    disableError?: boolean
+  }
+
+export function FormDateRangePicker<
+  TFieldValues extends FieldValues = FieldValues,
+>({
+  fromDateName,
+  toDateName,
+  control,
+  disableError = false,
+  ...outlinedInputProps
+}: FormDateRangePickerProps<TFieldValues>) {
+  const fromDate = control._getWatch(fromDateName) as Date
+  const toDate = control._getWatch(fromDateName) as Date
+
+  return (
+    <>
+      <FormDateTimePicker
+        {...outlinedInputProps}
+        sx={[
+          {
+            mr: 2,
+          },
+          ...(Array.isArray(outlinedInputProps.sx)
+            ? outlinedInputProps.sx
+            : [outlinedInputProps.sx]),
+        ]}
+        control={control}
+        name={fromDateName}
+        dateOnly
+        label="Từ ngày"
+        disableError={disableError}
+      />
+      <FormDateTimePicker
+        {...outlinedInputProps}
+        control={control}
+        name={fromDateName}
+        dateOnly
+        label="Đến ngày"
+        disableError={disableError}
+      />
+    </>
+  )
+}