fix: conflicts with master branch

Author: fagundesjg

src/components/CardAboutShelter/utils.ts

@@ -1,18 +1,28 @@
-import { IUseSheltersData } from '@/hooks/useShelters/types';
-import { ICardAboutShelter } from './types';
+import { IUseShelterData } from '@/hooks/useShelter/types';
 
 const formatShelterAddressFields = (
-  shelter: ICardAboutShelter['shelter'] | IUseSheltersData
-) =>
-  [shelter.street, shelter.streetNumber, shelter.neighbourhood]
-    .filter(Boolean)
-    .join(', ');
+  payload: Partial<
+    Pick<IUseShelterData, 'street' | 'streetNumber' | 'neighbourhood'>
+  >
+): string => {
+  const { street, streetNumber, neighbourhood } = payload;
+  return [street, streetNumber, neighbourhood].filter(Boolean).join(', ');
+};
 
-export const checkAndFormatAddress = (
-  shelter: ICardAboutShelter['shelter'] | IUseSheltersData,
+const checkAndFormatAddress = (
+  payload: Partial<
+    Pick<
+      IUseShelterData,
+      'address' | 'city' | 'street' | 'streetNumber' | 'neighbourhood'
+    >
+  >,
   showCity = true
-) =>
-  shelter.address ??
-  `${formatShelterAddressFields(shelter)}${
-    showCity ? ` - ${shelter.city}` : ''
-  }`;
+): string => {
+  const { address, city, ...rest } = payload;
+  return (
+    address ??
+    `${formatShelterAddressFields(rest)}${showCity ? ` - ${city}` : ''}`
+  );
+};
+
+export { checkAndFormatAddress };

src/lib/utils.ts

@@ -1,8 +1,11 @@
+import { ShelterCategory, SupplyMeasure } from '@/hooks/useShelter/types';
 import { IUseSheltersDataSupplyData } from '@/hooks/useShelters/types';
+import { ShelterAvailabilityStatus } from '@/pages/Home/components/Filter/types';
 import {
   ShelterTagInfo,
   ShelterTagType,
 } from '@/pages/Home/components/ShelterListItem/types';
+import { DonateOrderStatus } from '@/service/donationOrder/types';
 import { SupplyPriority } from '@/service/supply/types';
 import { type ClassValue, clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
@@ -11,41 +14,18 @@ function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
 
-/**
- * deprecated
- */
-function variantStatusPriority(priority: SupplyPriority) {
-  if (priority === SupplyPriority.Needing) return 'danger';
-  if (priority === SupplyPriority.Urgent) return 'warn';
-  if (priority === SupplyPriority.NotNeeded) return 'alert';
-  if (priority === SupplyPriority.Remaining) return 'success';
-}
-
-/**
- * deprecated
- */
-const colorStatusPriority = (priority: SupplyPriority) => {
-  if (priority === SupplyPriority.Needing) return 'bg-[#f69f9d]';
-  if (priority === SupplyPriority.Urgent) return 'bg-[#f8b993]';
-  if (priority === SupplyPriority.NotNeeded) return 'bg-[#f9cf8d]';
-  if (priority === SupplyPriority.Remaining) return 'bg-[#63bc43]';
-};
-
-/**
- * deprecated
- */
-function nameStatusPriority(priority: SupplyPriority) {
-  if (priority === SupplyPriority.Needing) return 'Precisa urgentimente';
-  if (priority === SupplyPriority.Urgent) return 'Precisa';
-  if (priority === SupplyPriority.NotNeeded) return 'Não preciso';
-  if (priority === SupplyPriority.Remaining) return 'Disponível para doação';
-}
-
-function getAvailabilityProps(
-  capacity?: number | null,
-  shelteredPeople?: number | null
-) {
-  if (capacity && (shelteredPeople || shelteredPeople === 0)) {
+function getAvailabilityProps(props: {
+  capacity?: number | null;
+  shelteredPeople?: number | null;
+  category: ShelterCategory;
+}) {
+  const { category, capacity, shelteredPeople } = props;
+  if (category === ShelterCategory.DistributionCenter) {
+    return {
+      availability: 'Centro de Distribuição',
+      className: 'text-green-600',
+    };
+  } else if (capacity && (shelteredPeople || shelteredPeople === 0)) {
     if (shelteredPeople < capacity)
       return {
         availability: 'Abrigo disponível',
@@ -64,7 +44,7 @@ function getAvailabilityProps(
 }
 
 const priorityOptions: Record<SupplyPriority, string> = {
-  [SupplyPriority.Urgent]: 'Necessita urgente',
+  [SupplyPriority.Urgent]: 'Precisa com urgência',
   [SupplyPriority.Needing]: 'Precisa',
   [SupplyPriority.Remaining]: 'Disponível para doação',
   [SupplyPriority.NotNeeded]: 'Não preciso',
@@ -76,38 +56,22 @@ function getSupplyPriorityProps(priority: SupplyPriority) {
     case SupplyPriority.NotNeeded:
       return {
         label,
-<<<<<<< HEAD
         className: 'bg-gray-200 text-gray-800',
-=======
-        className: 'bg-gray-200',
->>>>>>> 3d3f437 (merge: develop -> master (#91))
       };
     case SupplyPriority.Remaining:
       return {
         label,
-<<<<<<< HEAD
         className: 'bg-light-green text-green-800',
-=======
-        className: 'bg-light-green',
->>>>>>> 3d3f437 (merge: develop -> master (#91))
       };
     case SupplyPriority.Needing:
       return {
         label,
-<<<<<<< HEAD
         className: 'bg-light-orange text-orange-800',
-=======
-        className: 'bg-light-orange',
->>>>>>> 3d3f437 (merge: develop -> master (#91))
       };
     case SupplyPriority.Urgent:
       return {
         label,
-<<<<<<< HEAD
         className: 'bg-light-red text-red-800',
-=======
-        className: 'bg-light-red',
->>>>>>> 3d3f437 (merge: develop -> master (#91))
       };
   }
 }
@@ -157,7 +121,6 @@ function groupShelterSuppliesByTag(data: IUseSheltersDataSupplyData[]) {
       [category]: values.sort((a, b) => b.priority - a.priority),
     };
   }, initialGroup);
-<<<<<<< HEAD
 }
 
 function removeDuplicatesByField(
@@ -170,22 +133,57 @@ function removeDuplicatesByField(
       if (prev.some((p) => p[key] === current[key])) return prev;
       else return [...prev, current];
     }, []);
-=======
->>>>>>> 3d3f437 (merge: develop -> master (#91))
 }
 
+function normalizedCompare(a: string, b: string): boolean {
+  return a
+    .toLowerCase()
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')
+    .includes(
+      b
+        .toLowerCase()
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '')
+    );
+}
+
+function checkIsNull(v?: any | null) {
+  return v !== null && v !== undefined;
+}
+
+const SupplyMeasureMap: Record<SupplyMeasure, string> = {
+  Box: 'caixa(s)',
+  Kg: 'kg',
+  Litters: 'litro(s)',
+  Piece: 'peça(s)',
+  Unit: 'un',
+};
+
+const ShelterAvailabilityStatusMap: Record<ShelterAvailabilityStatus, string> =
+  {
+    available: 'Abrigo Disponivel',
+    unavailable: 'Abrigo Indisponivel',
+    waiting: 'Sem informação de disponibilidade',
+  };
+
+const DonationStatusMap: Record<DonateOrderStatus, string> = {
+  [DonateOrderStatus.Canceled]: 'Cancelado',
+  [DonateOrderStatus.Pending]: 'Pendente',
+  [DonateOrderStatus.Complete]: 'Entregue',
+};
+
 export {
   cn,
   getAvailabilityProps,
   group,
   getSupplyPriorityProps,
-  variantStatusPriority,
-  colorStatusPriority,
-  nameStatusPriority,
   priorityOptions,
   groupShelterSuppliesByTag,
-<<<<<<< HEAD
   removeDuplicatesByField,
-=======
->>>>>>> 3d3f437 (merge: develop -> master (#91))
-};
+  normalizedCompare,
+  checkIsNull,
+  SupplyMeasureMap,
+  ShelterAvailabilityStatusMap,
+  DonationStatusMap,
+};