Merge branch 'develop' of github.com:socialappslab/denguechatPlus-web…

… into develop

src/components/dialog/AssignMembersDialog.tsx

@@ -5,17 +5,17 @@ import { useTranslation } from 'react-i18next';
 
 import { useSnackbar } from 'notistack';
 
+import { zodResolver } from '@hookform/resolvers/zod';
+import useAxios from 'axios-hooks';
+import { deserialize, ExistingDocumentObject } from 'jsonapi-fractal';
+import { useEffect, useState } from 'react';
+import { ErrorResponse } from 'react-router-dom';
 import { TEAM_MEMBER_ROLE } from '@/constants';
 import useUpdateMutation from '@/hooks/useUpdateMutation';
 import { FormSelectOption, Member } from '@/schemas';
 import { Team } from '@/schemas/entities';
 import { UpdateTeam, UpdateTeamInputType, updateTeamSchema } from '@/schemas/update';
 import FormMultipleSelect from '@/themed/form-multiple-select/FormMultipleSelect';
-import { zodResolver } from '@hookform/resolvers/zod';
-import useAxios from 'axios-hooks';
-import { deserialize, ExistingDocumentObject } from 'jsonapi-fractal';
-import { useEffect, useState } from 'react';
-import { ErrorResponse } from 'react-router-dom';
 import { IUser } from '../../schemas/auth';
 import { Button } from '../../themed/button/Button';
 import { FormInput } from '../../themed/form-input/FormInput';

src/components/list/TeamsList.tsx

@@ -1,10 +1,9 @@
-import useStateContext from '@/hooks/useStateContext';
-import { Member } from '@/schemas';
-import { Team } from '@/schemas/entities';
-import Button from '@/themed/button/Button';
 import { Dialog } from '@mui/material';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import useStateContext from '@/hooks/useStateContext';
+import { Team } from '@/schemas/entities';
+import Button from '@/themed/button/Button';
 import { HeadCell } from '../../themed/table/DataTable';
 import { AssignMembersDialog } from '../dialog/AssignMembersDialog';
 import FilteredDataTable from './FilteredDataTable';
@@ -22,6 +21,12 @@ function headCells(isAdmin: boolean): HeadCell<Team>[] {
       sortable: true,
       filterable: true,
     },
+    {
+      id: 'city',
+      label: 'city',
+      filterable: true,
+      sortable: true,
+    },
     {
       id: 'sector',
       label: 'sector',
@@ -35,10 +40,9 @@ function headCells(isAdmin: boolean): HeadCell<Team>[] {
       sortable: true,
     },
     {
-      id: 'members',
-      label: 'members',
+      id: 'memberCount',
+      label: 'memberCount',
       filterable: false,
-      render: (row) => <span key={row.id}>{row.members.map((m: Member) => `${m.fullName}`).join(', ')}</span>,
       sortKey: 'members',
     },
     {

src/i18n/locales/en/translation.json

@@ -77,7 +77,8 @@
     "wedge": "Wedge",
     "members": "Members",
     "leader": "Leader",
-    "memberCount": "Number of members"
+    "memberCount": "Number of members",
+    "city": "City"
   },
   "options": {
     "notDefined": "Not Defined",

src/i18n/locales/es/translation.json

@@ -76,7 +76,8 @@
     "wedge": "Cuña",
     "members": "Miembros",
     "leader": "Líder",
-    "memberCount": "Número de miembros"
+    "memberCount": "Número de miembros",
+    "city": "Ciudad"
   },
   "options": {
     "notDefined": "No definido",

src/i18n/locales/pt/translation.json

@@ -76,7 +76,8 @@
     "wedge": "Subsetor",
     "members": "Membros",
     "leader": "Líder",
-    "memberCount": "Número de membros"
+    "memberCount": "Número de membros",
+    "city": "Cidade"
   },
   "options": {
     "notDefined": "Não definido",

src/schemas/entities.ts

@@ -35,6 +35,7 @@ export interface Role extends BaseEntity {
 export interface Team extends BaseEntity {
   organization: Organization;
   sector: string;
+  city: string;
   wedge: string;
   leader: string;
   members: Member[];