# fix

- PC: Loader chat
- QC: Auth , Profile, portofolio & user search
## No Issuue
git commit -m

src/app/dev/admin/layout.tsx

@@ -1,6 +1,6 @@
 import { AdminLayout } from "@/app_modules/admin/main_dashboard";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
-import { user_getOneById } from "@/app_modules/home/fun/get/get_one_user_by_id";
+import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
 import React from "react";
 
 export default async function Layout({
@@ -9,7 +9,7 @@ export default async function Layout({
   children: React.ReactNode;
 }) {
   const userId = await user_getOneUserId()
-  const dataUser = await user_getOneById(userId)
+  const dataUser = await user_getOneByUserId(userId)
   const userRole = dataUser?.masterUserRoleId
 
   return (

src/app/dev/colab/detail/group/[id]/page.tsx

@@ -1,5 +1,7 @@
 import adminColab_getOneRoomChatById from "@/app_modules/admin/colab/fun/get/get_one_room_chat_by_id";
 import { Colab_GroupChatView } from "@/app_modules/colab";
+import ColabViewChat from "@/app_modules/colab/detail/chat";
+import colab_V2getListMessageByRoomId from "@/app_modules/colab/fun/chat/get_message_by_room_id";
 import colab_getMessageByRoomId from "@/app_modules/colab/fun/get/room_chat/get_message_by_room_id";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 import _ from "lodash";
@@ -7,20 +9,30 @@ import _ from "lodash";
 export default async function Page({ params }: { params: { id: string } }) {
   const roomId = params.id;
   const userLoginId = await user_getOneUserId();
-  const dataRoom = (await adminColab_getOneRoomChatById({ roomId: roomId }))
+  const getData = (await adminColab_getOneRoomChatById({ roomId: roomId }))
     .data;
-  const selectRoom = _.omit(dataRoom, [
+  const dataRoom = _.omit(getData, [
     "ProjectCollaboration",
     "ProjectCollaboration_AnggotaRoomChat",
   ]);
-  let listMsg = await colab_getMessageByRoomId({roomId: roomId, page: 1});
+  let listMsg = await colab_getMessageByRoomId({ roomId: roomId, page: 1 });
+
+  // const listMessage = await colab_V2getListMessageByRoomId({
+  //   roomId: roomId,
+  //   page: 1,
+  // });
 
   return (
     <>
+      {/* <ColabViewChat
+        listMsg={listMsg as any}
+        dataRoom={dataRoom as any}
+        userLoginId={userLoginId}
+      /> */}
       <Colab_GroupChatView
         userLoginId={userLoginId}
         listMsg={listMsg}
-        selectRoom={selectRoom as any}
+        selectRoom={dataRoom as any}
       />
     </>
   );

src/app/dev/forum/forumku/[id]/layout.tsx

@@ -1,6 +1,6 @@
 import { LayoutForum_Forumku } from "@/app_modules/forum";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
-import { user_getOneById } from "@/app_modules/home/fun/get/get_one_user_by_id";
+import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
 import React from "react";
 
 export default async function Layout({
@@ -11,7 +11,7 @@ export default async function Layout({
   params: { id: string };
 }) {
   const authorId = params.id;
-  const dataAuthor = await user_getOneById(authorId);
+  const dataAuthor = await user_getOneByUserId(authorId);
 
   return (
     <>

src/app/dev/forum/forumku/[id]/page.tsx

@@ -2,14 +2,14 @@ import { Forum_Forumku } from "@/app_modules/forum";
 import { forum_getListPostingByAuhtorId } from "@/app_modules/forum/fun/get/get_list_posting_by_author_id";
 import { forum_countOneTotalKomentarById } from "@/app_modules/forum/fun/count/count_one_total_komentar_by_id";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
-import { user_getOneById } from "@/app_modules/home/fun/get/get_one_user_by_id";
+import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
 import _ from "lodash";
 import { forum_countPostingByAuthorId } from "@/app_modules/forum/fun/count/count_posting_by_author_id";
 
 export default async function Page({ params }: { params: { id: string } }) {
   const authorId = params.id;
   const userLoginId = await user_getOneUserId()
-  const dataAuthor = await user_getOneById(authorId);
+  const dataAuthor = await user_getOneByUserId(authorId);
   const auhtorSelectedData = _.omit(dataAuthor, [
     "Profile.email",
     "Profile.alamat",

src/app/dev/forum/main/layout.tsx

@@ -1,6 +1,6 @@
 import { LayoutForum_Main } from "@/app_modules/forum";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
-import { user_getOneById } from "@/app_modules/home/fun/get/get_one_user_by_id";
+import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
 import React from "react";
 
 export default async function Layout({
@@ -9,7 +9,7 @@ export default async function Layout({
   children: React.ReactNode;
 }) {
   const authorId = await user_getOneUserId();
-  const dataAuthor = await user_getOneById(authorId);
+  const dataAuthor = await user_getOneByUserId(authorId);
 
   return (
     <>

src/app/dev/home/layout.tsx

@@ -1,11 +1,11 @@
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 import { HomeLayout } from "@/app_modules/home";
-import { user_getOneById } from "@/app_modules/home/fun/get/get_one_user_by_id";
+import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
 import { redirect } from "next/navigation";
 
 export default async function Layout({ children }: { children: any }) {
   const userId = await user_getOneUserId();
-  const dataUser = await user_getOneById(userId);
+  const dataUser = await user_getOneByUserId(userId);
 
   return (
     <>

src/app/dev/home/page.tsx

@@ -3,22 +3,25 @@ import { cookies } from "next/headers";
 import { unsealData } from "iron-session";
 import _ from "lodash";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
-import { user_getOneById } from "@/app_modules/home/fun/get/get_one_user_by_id";
+import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
 import { redirect } from "next/navigation";
 import { RouterAdminDashboard } from "@/app/lib/router_hipmi/router_admin";
 import { RouterHome } from "@/app/lib/router_hipmi/router_home";
+import ComponentGlobal_V2_LoadingPage from "@/app_modules/component_global/loading_page_v2";
 
 export default async function Page() {
   const userId = await user_getOneUserId();
-  const dataUser = await user_getOneById(userId);
+  const dataUser = await user_getOneByUserId(userId);
 
   if (dataUser?.active === false) {
     return redirect(RouterHome.home_user_non_active);
   }
-  
+
   if (dataUser?.masterUserRoleId === "2" || dataUser?.masterUserRoleId === "3")
     return redirect(RouterAdminDashboard.splash_admin);
 
+  // if (dataUser?.Profile === null) return <ComponentGlobal_V2_LoadingPage />;
+
   // await new Promise((a, b) => {
   //   setTimeout(a, 4000);
   // });

src/app/dev/katalog/[id]/page.tsx

@@ -12,13 +12,13 @@ import { funGetListPortofolio } from "@/app_modules/katalog/portofolio/fun/get/g
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 import { Profile_getOneById } from "@/app_modules/katalog/profile/fun/get/get_one_profile";
 import { Profile_getOneProfileAndUserById } from "@/app_modules/katalog/profile/fun/get/get_one_user_profile";
-import { user_getOneById } from "@/app_modules/home/fun/get/get_one_user_by_id";
+import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
 const config = yaml.parse(fs.readFileSync("config.yaml").toString());
 
 export default async function Page({ params }: { params: { id: string } }) {
   let profileId = params.id;
   const authorId = await user_getOneUserId();
-  const dataUser = await user_getOneById(authorId)
+  const dataUser = await user_getOneByUserId(authorId)
   const listPorto = await funGetListPortofolio(profileId);
   const dataProfile = await Profile_getOneProfileAndUserById(profileId);
 

src/app/dev/profile/create/[id]/page.tsx

@@ -1,10 +0,0 @@
-import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
-import { CreateProfile } from "@/app_modules/katalog/profile";
-
-export default async function Page({params}: {params: {id: string}}) {
-    const userId = await user_getOneUserId()
-
-    return <>
-    <CreateProfile userId={userId}/>
-    </>
-}

src/app/dev/profile/create/page.tsx

@@ -0,0 +1,12 @@
+import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
+import { CreateProfile } from "@/app_modules/katalog/profile";
+
+export default async function Page() {
+  const userId = await user_getOneUserId();
+
+  return (
+    <>
+      <CreateProfile userId={userId} />
+    </>
+  );
+}

src/app/dev/user-not-active/page.tsx

@@ -2,12 +2,12 @@ import { RouterAdminDashboard } from "@/app/lib/router_hipmi/router_admin";
 import { RouterHome } from "@/app/lib/router_hipmi/router_home";
 import { user_getOneUserId } from "@/app_modules/fun_global/get_user_token";
 import { Home_UserNonActive } from "@/app_modules/home";
-import { user_getOneById } from "@/app_modules/home/fun/get/get_one_user_by_id";
+import { user_getOneByUserId } from "@/app_modules/home/fun/get/get_one_user_by_id";
 import { redirect } from "next/navigation";
 
 export default async function Page() {
   const userId = await user_getOneUserId();
-  const dataUser = await user_getOneById(userId);
+  const dataUser = await user_getOneByUserId(userId);
 
   if (dataUser?.active === true) {
     return redirect(RouterHome.main_home);

src/app/dev/user_search/main/page.tsx

@@ -2,7 +2,7 @@ import { UserSearch_MainView } from "@/app_modules/user_search";
 import { UserSearch_getListUser } from "@/app_modules/user_search/fun/get/get_list_user";
 
 export default async function Page() {
-  const listUser = await UserSearch_getListUser()
+  const listUser = await UserSearch_getListUser({ name: "" });
 
   return <UserSearch_MainView listUser={listUser as any} />;
 }