Merge pull request #15 from asepindrak/dev

Dev

Author: asepindrak

.changeset/sour-plums-flash.md

@@ -0,0 +1,5 @@
+---
+"commitflow": patch
+---
+
+fix: isAdmin from create workspace

backend/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "commitflow-api",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Backend CommitFlow",
   "author": "asepindrak",
   "private": false,

backend/package.json

@@ -129,6 +129,8 @@ export class ProjectManagementService {
           name: user?.name ?? "",
           email: user?.email ?? null,
           phone: user?.phone ?? null,
+          photo: user.photo ?? null,
+          isAdmin: true,
         },
       });
     }

backend/src/project-management/project-management.service.ts

@@ -4,7 +4,7 @@
   "author": "asepindrak",
   "private": false,
   "license": "MIT",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "type": "module",
   "scripts": {
     "dev": "vite --host 0.0.0.0",

frontend/package-lock.json

@@ -170,7 +170,7 @@ export default function EditProfileModal({
                 Edit Profile
               </h3>
               <p className="text-xs text-gray-500 dark:text-gray-400">
-                Update member details
+                Update user details
               </p>
             </div>
 

frontend/package.json

@@ -58,6 +58,7 @@ export default function ProjectManagement({
   const [team, setTeam] = useState<TeamMember[]>(() => initialTeam);
   const [showProfileMenu, setShowProfileMenu] = useState(false);
   const [showEditProfile, setShowEditProfile] = useState(false);
+  const [showEditMember, setShowEditMember] = useState(false);
   const [editMember, setEditMember] = useState<TeamMember | null>(null);
   const teamMemberId = useAuthStore((s) => s.teamMemberId);
   const [workspaces, setWorkspaces] = useState<Workspace[]>([]);
@@ -87,12 +88,16 @@ export default function ProjectManagement({
   const logout = useAuthStore((s) => s.logout);
   console.log(user);
   console.log(currentMember?.name);
-  const userWorkspace = user?.members.filter(
-    (item: any) => item.workspaceId === activeWorkspaceId
+  const userWorkspace = team.filter(
+    (item: any) =>
+      item.workspaceId === activeWorkspaceId && item.userId === userId
   );
+
+  console.log("userWorkspace", userWorkspace);
   const userWorkspaceActive =
     userWorkspace.length > 0 ? userWorkspace[0] : user;
 
+  // alert(userWorkspaceActive.isAdmin);
   const isAdmin = userWorkspaceActive?.isAdmin ?? false;
   console.log("userWorkspace", userWorkspaceActive);
   if (!userWorkspaceActive?.photo) {
@@ -166,10 +171,11 @@ export default function ProjectManagement({
   };
 
   const openEditProfileTeam = async (member: any) => {
+    console.log("member", member);
     setShowProfileMenu(false);
     setEditMember(member ?? null);
 
-    setShowEditProfile(true);
+    setShowEditMember(true);
   };
 
   const handleSync = async () => {
@@ -2258,7 +2264,7 @@ export default function ProjectManagement({
                     ) : (
                       <div className="w-full h-full bg-gradient-to-r from-purple-500 to-indigo-500 flex items-center justify-center">
                         <span className="font-semibold text-white text-sm">
-                          {userInitial}
+                          {userInitial.toUpperCase()}
                         </span>
                       </div>
                     )}
@@ -2474,8 +2480,8 @@ export default function ProjectManagement({
       />
 
       <EditMemberModal
-        open={showEditProfile}
-        onClose={() => setShowEditProfile(false)}
+        open={showEditMember}
+        onClose={() => setShowEditMember(false)}
         member={editMember}
         onSave={handleSaveMember}
         dark={dark}

frontend/src/components/EditProfileModal.tsx

@@ -244,7 +244,7 @@ export default function Sidebar({
       setActiveWorkspaceId(idToSet);
       setShowCreateWorkspace(false);
       // avoid forced reload often, but keep original behaviour if needed:
-      // window.location.reload();
+      window.location.reload();
     } catch (err: any) {
       console.error("create workspace error", err);
       toast.dark(err?.message ?? "Failed to create workspace");

frontend/src/components/ProjectManagement.tsx

@@ -50,6 +50,7 @@ export function normalizeTeamInput(raw: any[] = []): TeamMember[] {
         photo: t.photo,
         workspaceId: t.workspaceId,
         userId: t.userId,
+        isAdmin: t.isAdmin,
       };
     }
     // fallback for weird values (null/undefined/empty)