fix rebase

Signed-off-by: wambuipixel <kiokowambui015@gmail.com>

Author: wambui-pixel

app/(app)/chat/page.tsx

@@ -1,11 +1,14 @@
 import type { InvitationsPage, User } from "@absmach/magistrala-sdk";
 import ChatPage from "@/components/chat/chat-page";
+import { FetchData } from "@/lib/actions";
 import { ListChannels } from "@/lib/channels";
 import { GetWorkspaceInvitations } from "@/lib/invitations";
+import { RequestOptions } from "@/lib/magistrala";
 import { getServerSession } from "@/lib/nextauth";
 import { UserProfile } from "@/lib/users";
 import { ListWorkspaces, ListWorkspaceUsers } from "@/lib/workspace";
-import type { Member } from "@/types/entities";
+import { UserRole } from "@/types/auth";
+import { EntityType, type Member } from "@/types/entities";
 
 export type Props = {
   searchParams?: Promise<{
@@ -29,24 +32,46 @@ export default async function Page({ searchParams }: Props) {
   });
   const searchParamsValue = await searchParams;
   const status = searchParamsValue?.status || "pending";
-  const inviResponse = await GetWorkspaceInvitations({
-    offset: 0,
-    limit: 100,
-    state: status,
-  });
+  const isAdmin = session?.user.role === UserRole.Admin;
+  let inviResponse;
+  if (isAdmin) {
+    inviResponse = await GetWorkspaceInvitations({
+      offset: 0,
+      limit: 100,
+      state: status,
+    });
+  }
   const dmChannelResponse = await ListChannels({
     queryParams: { offset: 0, limit: 1, tag: "dm" },
   });
   const dmChannelId = dmChannelResponse?.data?.channels?.[0]?.id;
   const user = await UserProfile(session.accessToken);
 
+  const getWorkspaceUsers = ({ id, queryParams }: RequestOptions) => {
+    return ListWorkspaceUsers(id!, queryParams);
+  };
+
+  const initMembers = await FetchData(
+    EntityType.Member,
+    {
+      offset: 0,
+      limit: 20,
+      status: "enabled",
+    },
+    getWorkspaceUsers,
+    workspaceId,
+  );
+
   return (
     <ChatPage
       session={session}
       members={memResponse.data?.members as Member[]}
-      invitationsPage={inviResponse?.data as InvitationsPage}
+      invitationsPage={
+        isAdmin ? (inviResponse?.data as InvitationsPage) : undefined
+      }
       dmChannelId={dmChannelId as string}
       user={user.data as User}
+      initMembers={initMembers}
     />
   );
 }

app/auth/page.tsx

@@ -5,9 +5,7 @@ export default function Page() {
     <div className="min-h-screen bg-gradient-to-br from-purple-600 to-blue-600 flex items-center justify-center p-4">
       <div className="bg-white rounded-lg shadow-xl p-8 w-full max-w-md">
         <div className="text-center mb-8">
-          <h1 className="text-3xl font-bold text-gray-900 mb-2">
-            MG Chat
-          </h1>
+          <h1 className="text-3xl font-bold text-gray-900 mb-2">MG Chat</h1>
           <p className="text-gray-600">Connect with your team</p>
         </div>
         <AuthForm />

app/chat/page.tsx

@@ -17,7 +17,7 @@ import { AddChannelRoleMembers } from "@/lib/roles";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { InfiniteSelect } from "../custom/infinite-select";
 import { EntityType } from "@/types/entities";
-import { ListDomainUsers } from "@/lib/workspace";
+import { ListWorkspaceUsers } from "@/lib/workspace";
 import { EntityFetchData } from "@/lib/actions";
 import { RequestOptions } from "@/lib/magistrala";
 import { ListChannelRoles } from "@/lib/roles";
@@ -33,14 +33,14 @@ export const AddRoleMembersDialog = ({
     channelId,
     chatName,
     initMembers,
-    domainId,
+    workspaceId,
 }: {
     open: boolean;
     setOpen: (open: boolean) => void;
     channelId: string;
     chatName: string;
     initMembers: EntityFetchData;
-    domainId: string;
+    workspaceId: string;
 }) => {
     const [processing, setProcessing] = useState(false);
     const form = useForm<z.infer<ReturnType<typeof addRoleMembersFormSchema>>>({
@@ -58,8 +58,8 @@ export const AddRoleMembersDialog = ({
         toast.loading("Adding chat member...", {
             id: toastId,
         });
-
         const roleResponse = await ListChannelRoles({
+            id: channelId,
             queryParams: { offset: 0, limit: 10 },
         });
 
@@ -114,7 +114,7 @@ export const AddRoleMembersDialog = ({
                                         field={field}
                                         initData={initMembers}
                                         entityType={EntityType.Member}
-                                        getData={(options: RequestOptions) => ListDomainUsers(domainId, options)}
+                                        getData={(options: RequestOptions) => ListWorkspaceUsers(workspaceId, options)}
                                         disableSearch={true}
                                     />
                                 </FormItem>

components/chat/add-members-dialog.tsx

@@ -17,12 +17,12 @@ export function ChatMenu({
     channelId,
     chatName,
     initMembers,
-    domainId,
+    workspaceId,
 }: {
     channelId: string;
     chatName: string;
     initMembers: EntityFetchData;
-    domainId: string;
+    workspaceId: string;
 }) {
     const [showMembersDialog, setShowMembersDialog] = useState(false);
     return (
@@ -52,7 +52,7 @@ export function ChatMenu({
                 channelId={channelId}
                 chatName={chatName}
                 initMembers={initMembers}
-                domainId={domainId}
+                workspaceId={workspaceId}
             />
         </>
     );

components/chat/chat-menu.tsx

@@ -3,15 +3,15 @@
 import { Sidebar } from "@/components/chat/sidebar/sidebar";
 import { ChatView } from "@/components/chat/chat-view";
 import { Session } from "@/types/auth";
-import { useState } from "react";
+import { InvalidEvent, useState } from "react";
 import { Member } from "@/types/entities";
 import { InvitationsPage, User } from "@absmach/magistrala-sdk";
 import { EntityFetchData } from "@/lib/actions";
 
 interface Props {
   session: Session;
   members: Member[];
-  invitationsPage: InvitationsPage;
+  invitationsPage?: InvitationsPage;
   dmChannelId: string;
   user: User;
   initMembers: EntityFetchData;
@@ -35,7 +35,7 @@ export default function ChatPage({ session, members, invitationsPage, dmChannelI
           setSelectedChannel={setSelectedChannel}
           setSelectedDM={setSelectedDM}
           members={members}
-          invitationsPage={invitationsPage}
+          invitationsPage={invitationsPage as InvitationsPage}
           dmChannelId={dmChannelId as string} 
           user={user}
         />

components/chat/chat-page.tsx

@@ -5,15 +5,16 @@ import { Button } from "@/components/ui/button";
 import { Menu, Hash, MessageCircle } from "lucide-react";
 import { MessageInput } from "./message-input";
 import { MessageList } from "./message-list";
-import { Channel, ChannelsPage, Client, User } from "@absmach/magistrala-sdk";
-import { ListChannelMembers, ListChannelRoles, ViewChannel } from "@/lib/channels";
+import { Channel, ChannelsPage, Client, MembersPage, User, UserBasicInfo } from "@absmach/magistrala-sdk";
+import { ListChannelMembers, ViewChannel } from "@/lib/channels";
 import { useWebSocket } from "../providers/socket-provider";
 import { Session } from "@/types/auth";
 import { UserProfile, ViewUser } from "@/lib/users";
 import { GetMessages } from "@/lib/messages";
 import { ChatMenu } from "./chat-menu";
 import { EntityFetchData } from "@/lib/actions";
 import { ListChannelRoleMembers, ListChannelRoles } from "@/lib/roles";
+import { RoleMembersPage } from "@/types/entities";
 
 interface Props {
   selectedChannel: string | null;
@@ -45,7 +46,7 @@ export function ChatView({
   const { workspace } = session;
   const [channelInfo, setChannelInfo] = useState<Channel | null>(null);
   const [dmUserInfo, setDmUserInfo] = useState<User | null>(null);
-  const [members, setMembers] = useState<UserBasicInfo[]>([]);
+  const [members, setMembers] = useState<RoleMembersPage>();
 
   useEffect(() => {
     const fetchMessages = async () => {
@@ -161,6 +162,7 @@ export function ChatView({
   useEffect(() => {
     const getMembers = async () => {
       const roleResponse = await ListChannelRoles({
+        id: selectedChannel as string,
         queryParams: { offset: 0, limit: 10 },
       });
 
@@ -178,7 +180,7 @@ export function ChatView({
       },
       );
       if (response.data) {
-        setMembers(response.data.members);
+        setMembers(response.data);
       }
     };
     getMembers();
@@ -200,7 +202,6 @@ export function ChatView({
     );
   }
 
-
   return (
     <div className="flex-1 flex flex-col bg-white">
       <div className="border-b px-4 py-3 flex items-center justify-between">
@@ -223,14 +224,14 @@ export function ChatView({
                 <h2 className="font-semibold text-gray-900">{channelInfo?.name}</h2>
                 {channelInfo?.tags?.includes("chat") && (
                   <p className="text-xs text-gray-500">
-                    {members?.length} {members?.length === 1 ? "member" : "members"}
+                    {members?.total} {members?.total === 1 ? "member" : "members"}
                   </p>
                 )}
               </div>
             </>
           )}
         </div>
-        <ChatMenu channelId={channelInfo?.id as string} chatName={channelInfo?.name as string} domainId={domain?.id as string} initMembers={initMembers} />
+        <ChatMenu channelId={channelInfo?.id as string} chatName={channelInfo?.name as string} workspaceId={workspace?.id as string} initMembers={initMembers} />
       </div>
 
       <div className="flex-1 flex flex-col">

components/chat/chat-view.tsx

@@ -68,7 +68,7 @@ export function CreateChannelDialog({ setRevalidate, workspaceId }: Props) {
       if (ruleResponse.error !== null) {
         toast.error(`Failed to create rule with error: ${ruleResponse.error}`, { id: toastId });
       } else {
-        const optionalActions = ["read", "publish", "subscribe", "view_role_users"];
+        const optionalActions = ["read", "publish", "subscribe", "view_role_users", "update", "manage_role"];
         const roleResponse = await CreateChannelRole(
           response?.data?.id as string,
           "chat-member",

components/chat/create-channel-dialog.tsx

@@ -6,7 +6,7 @@ import { Button } from "@/components/ui/button";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Separator } from "@/components/ui/separator";
 import { Hash } from "lucide-react";
-import { Session } from "@/types/auth";
+import { Session, UserRole } from "@/types/auth";
 import { NavUser } from "./nav-user";
 import { CreateChannelDialog } from "@/components/chat/create-channel-dialog";
 import { ListChannels } from "@/lib/channels";
@@ -44,6 +44,7 @@ export function Sidebar({
   const [revalidate, setRevalidate] = useState(false);
   const [directMessages, setDirectMessages] = useState<string | null>(null);
   const [invitations, setInvitations] = useState<Invitation[]>([]);
+  const isAdmin = session?.user.role === UserRole.Admin;
 
   const workspaceId = session.workspace?.id;
 
@@ -122,8 +123,8 @@ export function Sidebar({
             <p className="text-xs text-gray-300 truncate">{workspace?.route}</p>
           </div> 
         </Button>
-        <Settings workspaceId={workspace?.id as string} invitationsPage={invitationsPage} />
-        <NotificationsBell invitations={invitations} isSidebar={true} className="mt-4 ml-4"/>
+        {isAdmin &&  <Settings workspaceId={workspace?.id as string} invitationsPage={invitationsPage} /> }
+      <NotificationsBell invitations={invitations} isSidebar={true} className="mt-4 ml-4"/>
       </div>
 
       <ScrollArea className="flex-1">
@@ -201,7 +202,7 @@ export function Sidebar({
                 );
               })}
             </div>
-            <InviteMember workspaceId={workspaceId as string} />
+            {isAdmin && <InviteMember workspaceId={workspaceId as string} />}
           </div>
         </div>
       </ScrollArea>