Develop

src/components/action-buttons/approve-button-homologation/index.tsx

@@ -1,11 +1,9 @@
-import { useCallback, useState } from 'react';
-import { FaPlus, FaTrash } from 'react-icons/fa';
+import { useState } from 'react';
+import { FaTrash } from 'react-icons/fa';
 import {
  Box,
  Button,
  Flex,
- Grid,
- Divider,
  Heading,
  Popover,
  PopoverAnchor,
@@ -18,16 +16,15 @@
  Text,
  useDisclosure,
 } from '@chakra-ui/react';
-import { Controller, useFieldArray, useForm } from 'react-hook-form';
+import { Controller, useForm } from 'react-hook-form';
 import { ActionButtonProps } from '../types';
 import { ActionButton } from '..';
 import { Input } from '@/components/form-fields/input';
-import { DeleteButton } from '../delete-button';
 import { IssuePayloadOpen } from '@/features/issues/types';
 import { parseSelectedDatetime } from '@/utils/format-date';
 
 interface ApproveButtonProps<Data> extends ActionButtonProps<Data> {
- handleApproveHomolog: (justify: string) => void;
+ handleApproveHomolog: (justify: string, dateTime: Date) => void;
  passDateTime: Date;
 }
 
@@ -45,7 +42,7 @@
  const { isOpen, onOpen, onClose } = useDisclosure();
  const [justification] = useState('');
 
  const [isLoading, setIsLoading] = useState(false);
 
  const { control, watch, register } = useForm<IssuePayloadOpen>({
  defaultValues: {
@@ -53,22 +50,7 @@
  },
  });
 
- const { fields, append, remove } = useFieldArray({
- control,
- shouldUnregister: true,
- name: 'problem_types_payload',
- });
-
- const handleAddDate = useCallback(() => {
- append({ label: '', value: '' });
- }, [append]);
-
- const handleRemoveDate = useCallback(
- (index: number) => () => {
- remove(index);
- },
- [remove]
- );
+ const dateTime = watch('dateTime');
 
  return (
  <Popover isOpen={isOpen} onOpen={onOpen} onClose={onClose} placement="auto">
@@ -84,6 +66,7 @@
  {...props}
  />
  </PopoverAnchor>
+
  <PopoverContent
  height="200%"
  width="150%"
@@ -126,13 +109,12 @@
  }) => (
  <>
  <Input
- {...register('dateTime', {
- required: 'Campo obrigatório',
- })}
+ {...register('dateTime')}
  label="Data do Evento"
  type="datetime-local"
  name="dateTime"
  id="dateTime"
+ min={parseSelectedDatetime(String(new Date()))}
  onChange={onChange}
  ref={ref}
  onBlur={onBlur}
@@ -145,85 +127,16 @@
  )}
  />
  </Box>
- <Box>
- <Flex gap={4} alignItems="center" my="0.5rem">
- <Text>Alertas</Text>
- </Flex>
- <Divider mb={4} mt={1} />
- <Grid
- templateColumns="repeat(auto-fill, minmax(220px, 1fr))"
- gap={6}
- >
- {fields?.map((field, index) => {
- return (
- <Flex key={field.id} gap={1}>
- <Controller
- control={control}
- name="alerts"
- rules={{
- min: {
- value: new Date().toISOString(),
- message: 'Informe uma data no futuro.',
- },
- required: 'Informe a data ou exclua o alerta',
- }}
- render={({
- field: { onChange, onBlur, ref, value },
- fieldState: { error },
- }) => (
- <Box w="full">
- <Input
- label="alert_dates"
- type="date"
- name={`alert_dates.${index}.date`}
- id={`alert_dates.${index}.date`}
- onChange={onChange}
- min={new Date().toISOString()}
- ref={ref}
- onBlur={onBlur}
- w="full"
- value={value?.[0]?.toISOString() || ''}
- />
- <Text color="red.400" mt=".5rem">
- {error ? error.message : null}
- </Text>
- </Box>
- )}
- />
-
- <DeleteButton
- label={`Alerta ${index + 1}`}
- onClick={handleRemoveDate(index)}
- variant="ghost"
- alignSelf="flex-end"
- _hover={{
- backgroundColor: 'blackAlpha.300',
- }}
- />
- </Flex>
- );
- })}
- </Grid>
- <Flex my="0.3rem">
- <ActionButton
- label="Adicionar Alerta"
- icon={<FaPlus />}
- variant="outline"
- disabled
- color="primary"
- tooltipProps={{
- placement: 'bottom',
- }}
- onClick={handleAddDate}
- />
- </Flex>
- </Box>
  </PopoverBody>
 
  <PopoverFooter borderBottomRadius="base" border={0} bg="blackAlpha.300">
  <Flex justifyContent="space-between">
  <Button
- onClick={() => props.handleApproveHomolog(justification)}
+ // only push dateTime if it is bigger than now
+
+ onClick={() =>
+ props.handleApproveHomolog(justification, dateTime)
+ }
  colorScheme="green"
  variant="solid"
  size="lg"

src/components/side-bar/index.tsx

@@ -48,7 +48,7 @@ export const SideBar = memo(() => {
  label="Notificações"
  pathname="/notificacoes"
  icon={AiOutlineBell}
- allowedUsersPath={['ADMIN', 'BASIC', 'USER']}
+ allowedUsersPath={['ADMIN', 'BASIC']}
  />
  </Box>
  <Box shadow="xl" p=".5rem">

src/components/side-bar/sidebar-notification/index.tsx

@@ -67,7 +67,7 @@ export const SideBarNotification = memo(
  style={{
  opacity:
  filteredNotifications?.length === 0 ||
- user.profile !== 'BASIC'
+ user.profile === 'USER'
  ? 0
  : 1,
  }}

src/config/routes/Routes.tsx

@@ -20,6 +20,7 @@ import { RegistrarAgendamento } from '@/pages/agendamento_externo/index';
 import { AgendamentosAbertos } from '@/pages/agendamentos_abertos';
 import { DefaultLayoutOpen } from '@/components/layout/default-layout-open';
 import { Notificacoes } from '@/pages/notificacoes';
+import { NotificacaoAdmin } from '@/pages/notificacoes/notificacoes_admin';
 
 export function Router() {
  return (
@@ -157,6 +158,14 @@ export function Router() {
  </RequireAuth>
  }
  />
+ <Route
+ path="notificacoes/notificacoes_admin"
+ element={
+ <RequireAuth>
+ <NotificacaoAdmin />
+ </RequireAuth>
+ }
+ />
  </Route>
  {/* ROTAS PUBLICAS */}
  <Route path="/login" element={<Login />} />

src/features/alerts/components/alert-item-manager/alert-item-manager.spec.tsx

@@ -0,0 +1,98 @@
+import {
+ screen,
+ render,
+ waitFor,
+ act,
+ fireEvent,
+} from '@testing-library/react';
+import { vi } from 'vitest';
+import { AlertItemManager } from '.';
+import { Alert } from '../../type';
+
+const mockedNotification: Alert = {
+ id: '1',
+ sourceEmail: '[email protected]',
+ sourceName: 'name',
+ targetName: 'targetName',
+ targetEmail: '[email protected]',
+ message: 'message',
+ status: 'unsolved',
+ pendency: 'pending',
+ read: false,
+ createdAt: new Date(),
+};
+
+const mockedNotificationSolved = {
+ ...mockedNotification,
+ status: 'solved',
+ read: true,
+};
+
+const mockedNotificationPending = {
+ ...mockedNotification,
+ status: 'pending',
+ read: true,
+};
+
+const mockedOnDelete = vi.fn(() => {});
+
+describe('AlertItemManager', () => {
+ it('should render correctly', async () => {
+ render(
+ <AlertItemManager
+ alert={mockedNotification}
+ onDelete={mockedOnDelete}
+ isDeleting={false}
+ />
+ );
+
+ const targetNameResult = screen.getByText(mockedNotification.targetName);
+ expect(targetNameResult).toBeInTheDocument();
+ });
+
+ it('should render correctly status pending', async () => {
+ render(
+ <AlertItemManager
+ alert={mockedNotificationPending}
+ onDelete={mockedOnDelete}
+ isDeleting={false}
+ />
+ );
+
+ const targetNameResult = screen.getByText(
+ mockedNotificationPending.targetName
+ );
+ expect(targetNameResult).toBeInTheDocument();
+ });
+
+ it('should render correctly status solved', async () => {
+ render(
+ <AlertItemManager
+ alert={mockedNotificationSolved}
+ onDelete={mockedOnDelete}
+ isDeleting={false}
+ />
+ );
+
+ const targetNameResult = screen.queryByText(
+ mockedNotificationSolved.targetName
+ );
+ expect(targetNameResult).toBeInTheDocument();
+ });
+
+ it('should be able to delete a alert', async () => {
+ const { queryByLabelText } = render(
+ <AlertItemManager
+ alert={mockedNotification}
+ onDelete={mockedOnDelete}
+ isDeleting={false}
+ />
+ );
+
+ const button = queryByLabelText('Alerta');
+ if (button) {
+ fireEvent.click(button);
+ expect(mockedOnDelete).toHaveBeenCalledWith();
+ }
+ });
+});

src/features/alerts/components/alert-modal/index.tsx

@@ -30,6 +30,8 @@ export function AlertModal({
  const [filterBasicUsers, setFilterBasicUsers] = useState(users || []);
  const { user } = useAuth();
 
+ const userAuth = useAuth();
+
  const handleSubmit = useCallback(
  async ({ target, message }: AlertPayload) => {
  const { label, value } = target;
@@ -62,10 +64,14 @@ export function AlertModal({
 
  useEffect(() => {
  if (users) {
- const filteredUsers = users.filter((user) => user.profile === 'BASIC');
+ const filteredUsers = users.filter(
+ (user) =>
+ (user.profile === 'BASIC' || user.profile === 'ADMIN') &&
+ user.email !== userAuth.user?.email
+ );
  setFilterBasicUsers(filteredUsers);
  }
- }, [users]);
+ }, [users, userAuth.user?.email]);
 
  return (
  <Modal title="Criar alerta" size="2xl" onClose={onClose} {...props}>