feat: version 1 finalized

JasonCrk · Nov 26, 2023 · 3a4966f · 3a4966f
1 parent 384fda5
commit 3a4966f
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 60 deletions.
diff --git a/src/components/ConnectionItem.component.tsx b/src/components/ConnectionItem.component.tsx
@@ -22,8 +22,8 @@ const ConnectionItem: FC<Connection> = ({ id, user }) => {
     mutate: mutateRemoveConnection,
   } = useMutation({
     mutationFn: removeConnection,
-    onSuccess: ({ message }) => {
-      queryClient.invalidateQueries({ queryKey: ['network'] })
+    onSuccess: async ({ message }) => {
+      await queryClient.invalidateQueries({ queryKey: ['network'] })
       showAlert({
         message,
         type: 'success',

diff --git a/src/components/EditProfileModal.component.tsx b/src/components/EditProfileModal.component.tsx
@@ -27,8 +27,8 @@ const EditProfileModal: FC<Props> = ({ accountId, accountAbout }) => {
 
   const { isPending, mutate: mutateEditProfile } = useMutation({
     mutationFn: updateProfile,
-    onSuccess: ({ message }) => {
-      queryClient.invalidateQueries({ queryKey: ['profile', accountId] })
+    onSuccess: async ({ message }) => {
+      await queryClient.invalidateQueries({ queryKey: ['profile', accountId] })
       showAlert({
         message,
         type: 'success',

diff --git a/src/components/EventCard.component.tsx b/src/components/EventCard.component.tsx
@@ -39,12 +39,12 @@ const EventCard: FC<Props> = ({
   const queryClient = useQueryClient()
   const { showAlert } = useAlerts()
 
-  const handleCancelEvent = () => {
-    queryClient.invalidateQueries({ queryKey: ['home'] })
+  const handleCancelEvent = async () => {
+    await queryClient.invalidateQueries({ queryKey: ['home'] })
   }
 
-  const handleDeleteEvent = (message: string) => {
-    queryClient.invalidateQueries({ queryKey: ['home'] })
+  const handleDeleteEvent = async (message: string) => {
+    await queryClient.invalidateQueries({ queryKey: ['home'] })
     showAlert({
       message,
       type: 'success',

diff --git a/src/components/Input.component.tsx b/src/components/Input.component.tsx
@@ -39,15 +39,16 @@ const Input: FC<Props> = ({
           className={`form-control ${fullWidth && 'w-100'} mb-1 ${
             isError && 'is-invalid'
           }`}
-          {...props}
           {...register(name, {
             setValueAs: value => {
               if (props.type === 'number') return parseInt(value)
-              if (props.type === 'datetime-local' && value)
-                return new Date(value).toISOString()
+              // if (props.type === 'datetime-local') {
+              //   return new Date(value).toISOString()
+              // }
               return value
             },
           })}
+          {...props}
         />
       </div>
       {isError && <p className='text-danger mb-0'>{errorMessage}</p>}

diff --git a/src/components/Select.component.tsx b/src/components/Select.component.tsx
@@ -34,6 +34,7 @@ const Select: FC<Props> = ({
           {label}
         </label>
       )}
+
       <select
         id={id}
         className={`form-select ${isError && 'is-invalid'}`}
@@ -44,6 +45,7 @@ const Select: FC<Props> = ({
         <option value={''}>{defaultOption}</option>
         {!isLoading && options()}
       </select>
+
       {isError && <p className='text-danger mb-0'>{errorMessage}</p>}
     </div>
   )

diff --git a/src/components/SelectCategory.component.tsx b/src/components/SelectCategory.component.tsx
@@ -31,6 +31,18 @@ const SelectCategory: FC<Props> = ({
     refetchOnMount: false,
   })
 
+  if (isLoading)
+    return (
+      <>
+        <label className='form-label'>
+          Categorías
+          <select className='form-select'>
+            <option value={''}>Cargando...</option>
+          </select>
+        </label>
+      </>
+    )
+
   return (
     <Select
       id='selectCategory'
@@ -44,19 +56,16 @@ const SelectCategory: FC<Props> = ({
       isError={isError}
       options={() => (
         <>
-          {categories?.data.map(category => (
-            <option
-              key={category.id}
-              value={isIdValue ? category.id : category.name}
-              selected={
-                isIdValue
-                  ? selectProps.defaultValue === category.id
-                  : selectProps.defaultValue === category.name
-              }
-            >
-              {category.name}
-            </option>
-          ))}
+          {!isLoading &&
+            categories &&
+            categories.data.map(category => (
+              <option
+                key={category.id}
+                value={isIdValue ? category.id : category.name}
+              >
+                {category.name}
+              </option>
+            ))}
         </>
       )}
       {...selectProps}

diff --git a/src/models/category.model.ts b/src/models/category.model.ts
@@ -1,9 +1,9 @@
 export interface Category {
   id: string
   name: string
-  picture: string
+  icon: string
 }
 
 export type CategoryId = Category['id']
 export type CategoryName = Category['name']
-export type CategoryPicture = Category['picture']
+export type CategoryPicture = Category['icon']
diff --git a/src/models/event.model.ts b/src/models/event.model.ts
@@ -105,13 +105,13 @@ export interface EventDetails extends Event {
 }
 
 export interface UpdateEvent {
-  name?: EventName
-  description?: EventDescription
-  category?: CategoryId
-  local?: EventLocal
-  visibility?: EventVisibility
-  realizationDate?: EventRealizationDate
-  finishDate?: EventFinishDate
+  name: EventName
+  description: EventDescription
+  category: CategoryId
+  local: EventLocal
+  visibility: EventVisibility
+  realizationDate: EventRealizationDate
+  finishDate: EventFinishDate
 }
 
 export interface SearchEventsParticipatingParams {

diff --git a/src/pages/CreateEvent.page.tsx b/src/pages/CreateEvent.page.tsx
@@ -128,6 +128,7 @@ function CreateEvent() {
             <Input
               label='Realization date'
               name='realizationDate'
+              min={new Date().toUTCString()}
               register={register}
               type='datetime-local'
               errorMessage={errors.realizationDate?.message}
@@ -138,6 +139,7 @@ function CreateEvent() {
             <Input
               label='Finish date'
               name='finishDate'
+              min={new Date().toUTCString()}
               type='datetime-local'
               register={register}
               errorMessage={errors.finishDate?.message}

diff --git a/src/pages/EditEvent.page.tsx b/src/pages/EditEvent.page.tsx
@@ -28,6 +28,13 @@ function EditEvent() {
 
   const navigate = useNavigate()
 
+  const { data: event, isLoading: isLoadingEvent } = useQuery({
+    queryKey: ['eventDetails', eventId],
+    queryFn: () => getEventById(eventId!),
+    refetchOnWindowFocus: false,
+    enabled: !!eventId && eventId !== undefined,
+  })
+
   const {
     handleSubmit,
     register,
@@ -37,14 +44,7 @@ function EditEvent() {
     resolver: zodResolver(updateEventSchemaValidation),
   })
 
-  const { data: event, isLoading: isLoadingEvent } = useQuery({
-    queryKey: ['eventDetails', eventId],
-    queryFn: () => getEventById(eventId!),
-    refetchOnWindowFocus: false,
-    enabled: eventId !== undefined,
-  })
-
-  const { mutate: mutateUpdateEvent, isPending: isPendingUpdateEvent } =
+  const { isPending: isPendingUpdateEvent, mutate: mutateUpdateEvent } =
     useMutation({
       mutationFn: updateEvent,
       onSuccess: ({ message }) => {

diff --git a/src/pages/EventDetails.page.tsx b/src/pages/EventDetails.page.tsx
@@ -39,6 +39,7 @@ function EventDetails() {
   const { isLoading, data: event } = useQuery({
     queryKey: ['eventDetails', eventId],
     queryFn: () => getEventById(eventId!),
+    enabled: !!eventId && eventId != undefined,
     refetchOnWindowFocus: false,
   })
 
@@ -149,7 +150,7 @@ function EventDetails() {
           <div className='d-flex flex-wrap gap-2 mb-3'>
             <Tag
               color='primary'
-              icon={event.category.picture}
+              icon={event.category.icon}
               name={event.category.name}
             />
 

diff --git a/src/pages/UserProfile.page.tsx b/src/pages/UserProfile.page.tsx
@@ -41,8 +41,10 @@ function UserProfile() {
   const { mutate: mutateUpdateProfile, isPending: isPendingUpdateAccount } =
     useMutation({
       mutationFn: updateProfile,
-      onSuccess: ({ message }) => {
-        queryClient.invalidateQueries({ queryKey: ['profile', accountId] })
+      onSuccess: async ({ message }) => {
+        await queryClient.invalidateQueries({
+          queryKey: ['profile', accountId],
+        })
         showAlert({
           message,
           type: 'success',
@@ -54,8 +56,10 @@ function UserProfile() {
   const { mutate: mutateSendInvitation, isPending: isPendingSendInvitation } =
     useMutation({
       mutationFn: sendInvitation,
-      onSuccess: ({ message }) => {
-        queryClient.invalidateQueries({ queryKey: ['profile', accountId] })
+      onSuccess: async ({ message }) => {
+        await queryClient.invalidateQueries({
+          queryKey: ['profile', accountId],
+        })
         showAlert({
           message,
           type: 'success',

diff --git a/src/validations/event.validation.ts b/src/validations/event.validation.ts
@@ -41,16 +41,13 @@ export const createEventSchemaValidation = z
         invalid_type_error: 'Must be a datetime',
         required_error: 'The realization date is required',
       })
-      .datetime({ message: 'Invalid realization date' })
       .refine(realizationDate => new Date(realizationDate) > new Date(), {
         message: 'The realization date must be a greater than the current date',
       }),
-    finishDate: z
-      .string({
-        invalid_type_error: 'Must be a datetime',
-        required_error: 'The finish date is required',
-      })
-      .datetime({ message: 'Invalid finish date' }),
+    finishDate: z.string({
+      invalid_type_error: 'Must be a datetime',
+      required_error: 'The finish date is required',
+    }),
   })
   .refine(
     ({ realizationDate, finishDate }) =>
@@ -103,16 +100,13 @@ export const updateEventSchemaValidation = z
         invalid_type_error: 'Must be a datetime',
         required_error: 'The realization date is required',
       })
-      .datetime({ message: 'Invalid realization date' })
       .refine(realizationDate => new Date(realizationDate) > new Date(), {
         message: 'The realization date must be a greater than the current date',
       }),
-    finishDate: z
-      .string({
-        invalid_type_error: 'Must be a datetime',
-        required_error: 'The finish date is required',
-      })
-      .datetime({ message: 'Invalid finish date' }),
+    finishDate: z.string({
+      invalid_type_error: 'Must be a datetime',
+      required_error: 'The finish date is required',
+    }),
   })
   .refine(
     ({ realizationDate, finishDate }) =>