From 9ff167e18dbe8ac986dd3658a0aac6582b6e20af Mon Sep 17 00:00:00 2001 From: Rama Priyanto Date: Mon, 10 Feb 2025 08:25:10 +0700 Subject: [PATCH] fix:auth, mapping level --- app/auth/page.tsx | 12 +-- .../master-user-level/mapping-user-level.tsx | 96 ++++++++++--------- 2 files changed, 57 insertions(+), 51 deletions(-) diff --git a/app/auth/page.tsx b/app/auth/page.tsx index cf09ce9..68a0430 100644 --- a/app/auth/page.tsx +++ b/app/auth/page.tsx @@ -10,14 +10,14 @@ export default function AuthPage() { // console.log("isAuthenticated : ", isAuthenticated); - const [hasMounted, setHasMounted] = useState(false); + // const [hasMounted, setHasMounted] = useState(false); - useEffect(() => { - setHasMounted(true); - }, []); + // useEffect(() => { + // setHasMounted(true); + // }, []); - // Render - if (!hasMounted) return null; + // // Render + // if (!hasMounted) return null; return ( // isAuthenticated == "true" ? diff --git a/components/table/master/master-user-level/mapping-user-level.tsx b/components/table/master/master-user-level/mapping-user-level.tsx index 12274e1..bd01979 100644 --- a/components/table/master/master-user-level/mapping-user-level.tsx +++ b/components/table/master/master-user-level/mapping-user-level.tsx @@ -13,6 +13,7 @@ interface CSVRow { id: string; parent: string; name: string; + slug: string; level_number: string; group: string; } @@ -38,13 +39,14 @@ export default function MappingUserLevel() { if (temp[0] !== "") { temp[4].replace("/r", ""); - + console.log("tempppp", temp); const rowData: CSVRow = { id: temp[0], parent: temp[1], name: temp[2], - level_number: temp[3], - group: temp[4].replace("\r", ""), + slug: temp[3], + level_number: temp[4], + group: temp[5].replace("\r", ""), }; if (i <= 3) { console.log("i", rowData); @@ -77,49 +79,53 @@ export default function MappingUserLevel() { let level2 = undefined; for (let i = 0; i < parsedData.length; i++) { - const temp = parsedData[i]; - if (temp.level_number === "2") { - const request = { - aliasName: temp.group, - isActive: true, - levelNumber: 2, - name: temp.name, - parentLevelId: level1, - provinceId: 0, - }; - const res = await createUserLevel(request); - if (res?.error) { - break; + if (i < 4) { + const temp = parsedData[i]; + if (temp.level_number === "2") { + const request = { + aliasName: temp.slug, + group: temp.group, + isActive: true, + levelNumber: 2, + name: temp.name, + parentLevelId: level1, + provinceId: 0, + }; + const res = await createUserLevel(request); + if (res?.error) { + break; + } + level2 = res?.data?.data?.id; + } else if (temp.level_number === "3") { + const request = { + aliasName: temp.slug, + group: temp.group, + isActive: true, + levelNumber: 3, + name: temp.name, + parentLevelId: level2, + provinceId: 0, + }; + const res = await createUserLevel(request); + if (res?.error) { + break; + } + } else { + const request = { + aliasName: temp.slug, + group: temp.group, + isActive: true, + levelNumber: 1, + name: temp.name, + parentLevelId: 0, + provinceId: 0, + }; + const res = await createUserLevel(request); + if (res?.error) { + break; + } + level1 = res?.data?.data?.id; } - level2 = res?.data?.data?.id; - } else if (temp.level_number === "3") { - const request = { - aliasName: temp.group, - isActive: true, - levelNumber: 3, - name: temp.name, - parentLevelId: level2, - provinceId: 0, - }; - console.log("reqqq", request); - const res = await createUserLevel(request); - if (res?.error) { - break; - } - } else { - const request = { - aliasName: temp.group, - isActive: true, - levelNumber: 1, - name: temp.name, - parentLevelId: 0, - provinceId: 0, - }; - const res = await createUserLevel(request); - if (res?.error) { - break; - } - level1 = res?.data?.data?.id; } } }