From 5f169bc0b1b621226b1f3903a08245ea4b0e5bfc Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Fri, 31 May 2024 17:24:48 +0800
Subject: [PATCH] UPDATE

---
 src/components/CreateGroup/UserAllocation.tsx |  3 ++-
 src/components/CreateStaff/CreateStaff.tsx    |  3 ---
 src/components/EditTeam/EditTeam.tsx          |  2 ++
 .../EditUserGroup/EditUserGroup.tsx           |  4 +--
 .../UserGroupSearch/UserGroupSearch.tsx       | 14 ++++++-----
 .../UserGroupSearchWrapper.tsx                |  3 +--
 src/i18n/en/team.json                         | 25 +++++++++++++++++++
 7 files changed, 40 insertions(+), 14 deletions(-)
 create mode 100644 src/i18n/en/team.json

diff --git a/src/components/CreateGroup/UserAllocation.tsx b/src/components/CreateGroup/UserAllocation.tsx
index 351303a..4a760dd 100644
--- a/src/components/CreateGroup/UserAllocation.tsx
+++ b/src/components/CreateGroup/UserAllocation.tsx
@@ -34,6 +34,7 @@ export interface Props {
 }
 
 const UserAllocation: React.FC<Props> = ({ users }) => {
+  console.log(users)
   const { t } = useTranslation();
   const {
     setValue,
@@ -42,7 +43,7 @@ const UserAllocation: React.FC<Props> = ({ users }) => {
     reset,
     resetField,
   } = useFormContext<CreateGroupInputs>();
-  const initialUsers = users.map((u) => ({ ...u })).sort((a, b) => a.id - b.id).filter((u) => u.groupId !== null);
+  const initialUsers = users.map((u) => ({ ...u })).sort((a, b) => a.id - b.id).filter((u) => u.groupId === null);
   const [filteredUsers, setFilteredUsers] = useState(initialUsers);
   const [selectedUsers, setSelectedUsers] = useState<typeof filteredUsers>(
     () => {
diff --git a/src/components/CreateStaff/CreateStaff.tsx b/src/components/CreateStaff/CreateStaff.tsx
index 85952db..2de9aa3 100644
--- a/src/components/CreateStaff/CreateStaff.tsx
+++ b/src/components/CreateStaff/CreateStaff.tsx
@@ -96,9 +96,6 @@ const CreateStaff: React.FC<formProps> = ({ combos }) => {
           if (data.phone2!.length > 0) {
             formProps.setError("phone2", { message: t("Please Enter Different Phone No.."), type: "required" })
           }
-          console.log(data.phone1)
-          console.log(data.emergContactPhone)
-          console.log(data.phone1 === data.emergContactPhone)
           formProps.setError("emergContactPhone", { message: t("Please Enter Different Phone No.."), type: "required" })
         }
         if (!regex_email.test(data.email)) {
diff --git a/src/components/EditTeam/EditTeam.tsx b/src/components/EditTeam/EditTeam.tsx
index f45d310..394d3c2 100644
--- a/src/components/EditTeam/EditTeam.tsx
+++ b/src/components/EditTeam/EditTeam.tsx
@@ -26,6 +26,8 @@ interface Props {
 
 const EditTeam: React.FC<Props> = async ({ staff, teamInfo }) => {
   const { team, staffIds } = teamInfo;
+  console.log(team.name)
+  // console.log(staffIds)
   const { t } = useTranslation();
   const formProps = useForm<CreateTeamInputs>();
   const searchParams = useSearchParams();
diff --git a/src/components/EditUserGroup/EditUserGroup.tsx b/src/components/EditUserGroup/EditUserGroup.tsx
index c443b4e..aff33c8 100644
--- a/src/components/EditUserGroup/EditUserGroup.tsx
+++ b/src/components/EditUserGroup/EditUserGroup.tsx
@@ -137,13 +137,13 @@ const EditUserGroup: React.FC<Props> = ({ users, auths, group }) => {
           {tabIndex === 1 && <AuthorityAllocation auth={auths!!}/>}
           {tabIndex === 2 && <UserAllocation users={users!!} />}
           <Stack direction="row" justifyContent="flex-end" gap={1}>
-          <Button
+          {/* <Button
               variant="text"
               startIcon={<RestartAlt />}
               onClick={resetGroup}
             >
               {t("Reset")}
-            </Button>
+            </Button> */}
             <Button
               variant="outlined"
               startIcon={<Close />}
diff --git a/src/components/UserGroupSearch/UserGroupSearch.tsx b/src/components/UserGroupSearch/UserGroupSearch.tsx
index 85f01c6..ed71e27 100644
--- a/src/components/UserGroupSearch/UserGroupSearch.tsx
+++ b/src/components/UserGroupSearch/UserGroupSearch.tsx
@@ -13,14 +13,14 @@ import { deleteUser } from "@/app/api/user/actions";
 import { deleteGroup } from "@/app/api/group/actions";
 
 interface Props {
-  users: UserGroupResult[];
+  groups: UserGroupResult[];
 }
 type SearchQuery = Partial<Omit<UserGroupResult, "id">>;
 type SearchParamNames = keyof SearchQuery;
 
-const UserGroupSearch: React.FC<Props> = ({ users }) => {
+const UserGroupSearch: React.FC<Props> = ({ groups }) => {
   const { t } = useTranslation();
-  const [filteredUser, setFilteredUser] = useState(users);
+  const [filteredGroups, setFilteredGroups] = useState(groups);
   const router = useRouter();
 
   const searchCriteria: Criterion<SearchParamNames>[] = useMemo(
@@ -51,6 +51,8 @@ const UserGroupSearch: React.FC<Props> = ({ users }) => {
     deleteDialog(async () => {
       await deleteGroup(group.id);
       successDialog(t("Delete Success"), t);
+      setFilteredGroups((prev) => prev.filter((obj) => obj.id !== group.id));
+
     }, t);
   }, []);
 
@@ -80,8 +82,8 @@ const UserGroupSearch: React.FC<Props> = ({ users }) => {
       <SearchBox
         criteria={searchCriteria}
         onSearch={(query) => {
-            setFilteredUser(
-              users.filter(
+            setFilteredGroups(
+              groups.filter(
                 (u) =>
                 u.name.toLowerCase().includes(query.name.toLowerCase()) &&
                 u.description.toLowerCase().includes(query.description.toLowerCase()) 
@@ -89,7 +91,7 @@ const UserGroupSearch: React.FC<Props> = ({ users }) => {
             )
         }}
       />
-      <SearchResults<UserGroupResult> items={filteredUser} columns={columns} />
+      <SearchResults<UserGroupResult> items={filteredGroups} columns={columns} />
     </>
   );
 };
diff --git a/src/components/UserGroupSearch/UserGroupSearchWrapper.tsx b/src/components/UserGroupSearch/UserGroupSearchWrapper.tsx
index 9f792ed..37e81b5 100644
--- a/src/components/UserGroupSearch/UserGroupSearchWrapper.tsx
+++ b/src/components/UserGroupSearch/UserGroupSearchWrapper.tsx
@@ -9,9 +9,8 @@ interface SubComponents {
 
 const UserGroupSearchWrapper: React.FC & SubComponents = async () => {
 const group = await fetchGroup()
-  console.log(group.records);
 
-  return <UserGroupSearch users={group.records} />;
+  return <UserGroupSearch groups={group.records} />;
 };
 
 UserGroupSearchWrapper.Loading = UserGroupSearchLoading;
diff --git a/src/i18n/en/team.json b/src/i18n/en/team.json
new file mode 100644
index 0000000..c4bb8d0
--- /dev/null
+++ b/src/i18n/en/team.json
@@ -0,0 +1,25 @@
+{
+    "Team": "Team",
+    "Team Info": "Team Info",
+    "Staff Allocation": "Staff Allocation",
+    "Create Team": "Create Team",
+    "Edit Team": "Edit Team",
+    "name": "Name",
+    "code": "Code",
+    "description": "Description",
+    "Team Description": "Team Description",
+    "edit": "edit",
+    "teamLead": "teamLead",
+    "Confirm": "Confirm",
+    "Cancel": "Cancel",
+    "delete": "delete",
+    "add": "add",
+    "remove": "remove",
+    "Staff Pool": "Staff Pool",
+    "Allocated Staff": "Allocated Staff",
+    "Staff Id": "Staff Id",
+    "Staff Name": "Staff Name",
+    "Position": "Position",
+    "Search by Staff Id, Name or Position.": "Search by Staff Id, Name or Position.",
+    "An error has occurred. Please try again later.": "An error has occurred. Please try again later"
+}
\ No newline at end of file