fix(workspaces): improve workspace's UI and UX

This commit is contained in:
2026-03-15 02:04:07 +08:00
parent a35426c5c8
commit ccada5e45b
4 changed files with 558 additions and 431 deletions

View File

@@ -1,13 +1,16 @@
import React, { useState, useEffect, useRef, Fragment } from 'react';
import { useNavigate } from 'react-router-dom';
import { useBlocker, useNavigate } from 'react-router-dom';
import { useTranslation } from '../hooks/useTranslation';
import { AlertCircle, UserPlus, Trash2, Shield } from 'lucide-react';
import { AlertCircle, UserPlus, Trash2, Shield, Loader2 } from 'lucide-react';
import { Dialog, Transition } from '@headlessui/react';
import { toast } from 'sonner';
import { createWorkspace } from '../api/workspaces';
import { searchUserByExactMobile, type SearchedUser } from '../api/users';
import { useAppContext } from '../context/AppContext';
import { Button } from '../components/ui/button';
import { Input } from '../components/ui/input';
import { Select } from '../components/ui/Select';
import { TextAreaInput } from '../components/ui/TextAreaInput';
const toEnglishDigits = (str: string) => {
return str.replace(/[۰-۹]/g, (d) => '۰۱۲۳۴۵۶۷۸۹'.indexOf(d).toString())
@@ -52,6 +55,25 @@ export default function WorkspaceCreate() {
const [memberIdToDelete, setMemberIdToDelete] = useState<string | null>(null);
const searchTimeoutRef = useRef<NodeJS.Timeout>();
const hasUnsavedChanges = name.trim() !== '' || description.trim() !== '' || members.length > 0;
useEffect(() => {
const handleBeforeUnload = (e: BeforeUnloadEvent) => {
if (hasUnsavedChanges && !isSaving) {
e.preventDefault();
e.returnValue = '';
}
};
window.addEventListener('beforeunload', handleBeforeUnload);
return () => window.removeEventListener('beforeunload', handleBeforeUnload);
}, [hasUnsavedChanges, isSaving]);
useBlocker(({ currentLocation, nextLocation }) => {
if (hasUnsavedChanges && !isSaving && currentLocation.pathname !== nextLocation.pathname) {
return !window.confirm(t.confirmLeave || "You have unsaved changes. Are you sure you want to leave?");
}
return false;
});
useEffect(() => {
if (searchTimeoutRef.current) clearTimeout(searchTimeoutRef.current);
@@ -101,7 +123,7 @@ export default function WorkspaceCreate() {
description,
members: members.map(m => ({ user_id: m.user.id, role: m.role }))
};
const newWorkspace = await createWorkspace({ name, description });
const newWorkspace = await createWorkspace(payload);
window.dispatchEvent(new CustomEvent('workspace_created', {
detail: newWorkspace
@@ -152,181 +174,210 @@ export default function WorkspaceCreate() {
setMembers(members.map(m => m.localId === localId ? { ...m, role: newRole as any } : m));
};
// Creator has full rights to manage members before creating
const canManageMembers = true;
const isFirstOwner = true;
return (
<div className="max-w-2xl mx-auto p-6 space-y-6">
<h1 className="text-2xl font-bold text-slate-900 dark:text-white mb-6">
<div className="absolute inset-0 flex flex-col p-4 sm:p-6 bg-slate-50 dark:bg-slate-900 overflow-hidden">
<h1 className="text-2xl font-bold text-slate-900 dark:text-white mb-4 sm:mb-6 shrink-0">
{t.workspace?.createTitle || "Create Workspace"}
</h1>
<form onSubmit={handleSubmit} className="bg-white dark:bg-slate-900 rounded-xl p-6 border border-slate-200 dark:border-slate-800">
<div className="mb-4">
<label className="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
{t.workspace?.nameLabel || "Name"}
</label>
<input
type="text"
value={name}
onChange={(e) => setName(e.target.value)}
className="w-full px-4 py-2 border border-slate-300 dark:border-slate-700 rounded-lg bg-transparent text-slate-900 dark:text-white focus:ring-2 focus:ring-blue-500"
required
/>
<div className="flex flex-col lg:flex-row gap-4 sm:gap-6 flex-1 min-h-0">
<div className="w-full lg:w-1/3 lg:max-w-md flex flex-col shrink-0 overflow-y-auto bg-white dark:bg-slate-900 rounded-xl border border-slate-200 dark:border-slate-800 shadow-sm">
<form onSubmit={handleSubmit} className="flex flex-col h-full p-6">
<div className="mb-4">
<label className="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
{t.workspace?.nameLabel || "Name"}
</label>
<Input
type="text"
value={name}
onChange={(e) => setName(e.target.value)}
placeholder={t.workspace?.namePlaceholder || "e.g. My Company"}
className="w-full px-4 py-2 border border-slate-300 dark:border-slate-700 rounded-lg bg-transparent text-slate-900 dark:text-white focus:ring-2 focus:ring-blue-500"
required
/>
</div>
<div className="mb-6">
<label className="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
{t.workspace?.descriptionLabel || "Description"}
</label>
<TextAreaInput
value={description}
onChange={(e) => setDescription(e.target.value)}
placeholder={t.workspace?.descriptionPlaceholder || "Optional description..."}
className="w-full px-4 py-2 border border-slate-300 dark:border-slate-700 rounded-lg bg-transparent text-slate-900 dark:text-white focus:ring-2 focus:ring-blue-500 h-32 resize-none"
/>
</div>
<div className="mt-auto pt-6 flex justify-end gap-3 border-t border-slate-100 dark:border-slate-800 shrink-0">
<Button
type="button"
variant="ghost"
onClick={() => navigate('/workspaces')}
>
{t.actions?.cancel || "Cancel"}
</Button>
<Button
type="submit"
disabled={isSaving || !name.trim()}
>
{isSaving ? (t.workspace?.loading || "Saving...") : (t.workspace?.create || "Create")}
</Button>
</div>
</form>
</div>
<div className="mb-6">
<label className="block text-sm font-medium text-slate-700 dark:text-slate-300 mb-1">
{t.workspace?.descriptionLabel || "Description"}
</label>
<textarea
value={description}
onChange={(e) => setDescription(e.target.value)}
placeholder={t.workspace?.descriptionPlaceholder || "Optional description..."}
className="w-full px-4 py-2 border border-slate-300 dark:border-slate-700 rounded-lg bg-transparent text-slate-900 dark:text-white focus:ring-2 focus:ring-blue-500 h-32 resize-none"
/>
</div>
<div className="flex justify-end gap-3">
<Button
type="button"
variant="ghost"
onClick={() => navigate('/workspaces')}
>
{t.workspace?.cancel || "Cancel"}
</Button>
<Button
type="submit"
disabled={isSaving || !name.trim()}
>
{isSaving ? (t.workspace?.loading || "Saving...") : (t.workspace?.create || "Create")}
</Button>
</div>
</form>
<div className="bg-white dark:bg-slate-900 rounded-xl p-6 border border-slate-200 dark:border-slate-800">
<h2 className="text-lg font-semibold text-slate-900 dark:text-white mb-4">{ t.workspace?.members || "Members" }</h2>
{canManageMembers && (
<div className="mb-6 space-y-3">
<input
type="text"
placeholder={t.workspace?.searchMemberPlaceholder || "Search user by exact mobile number..."}
value={searchQuery}
onChange={(e) => setSearchQuery(toEnglishDigits(e.target.value))}
className="w-full px-4 py-2 border border-slate-300 dark:border-slate-700 rounded-lg bg-transparent text-slate-900 dark:text-white focus:ring-2 focus:ring-blue-500"
dir="auto"
/>
<div className="w-full lg:w-2/3 flex-1 flex flex-col min-h-100 lg:min-h-0 bg-white dark:bg-slate-900 rounded-xl border border-slate-200 dark:border-slate-800 shadow-sm overflow-hidden">
<div className="p-6 shrink-0 border-b border-slate-100 dark:border-slate-800 bg-white dark:bg-slate-900 z-10">
<h2 className="text-lg font-semibold text-slate-900 dark:text-white mb-4">
{ t.workspace?.members || "Members" }
</h2>
{isSearching && <p className="text-sm text-slate-500">{t.workspace?.searching || "Searching..."}</p>}
{searchError && !isSearching && (
<div className="flex items-center gap-2 p-3 text-sm text-red-600 dark:text-red-400 bg-red-50 dark:bg-red-500/10 rounded-lg border border-red-100 dark:border-red-500/20">
<AlertCircle className="w-4 h-4" />
{t.workspace?.userNotFound || "No user found with this exact number."}
</div>
)}
{searchResult && !isSearching && (
<div className="flex flex-col sm:flex-row items-start sm:items-center gap-3 p-3 bg-blue-50 dark:bg-blue-500/10 border border-blue-200 dark:border-blue-500/30 rounded-lg">
<div className="flex items-center gap-3 flex-1 w-full">
{searchResult.profile_picture ? (
<img src={searchResult.profile_picture} alt={searchResult.first_name} className="w-10 h-10 rounded-full object-cover" />
) : (
<div className="w-10 h-10 rounded-full bg-blue-200 dark:bg-blue-900/50 flex items-center justify-center text-blue-700 dark:text-blue-300 font-bold text-sm">
{searchResult.first_name?.[0] || "U"}
{canManageMembers && (
<div className="space-y-3">
<div className="relative w-full">
{isSearching && (
<div className="absolute top-1/2 -translate-y-1/2 left-auto right-3 pointer-events-none">
<Loader2 className="h-5 w-5 text-blue-500 animate-spin" />
</div>
)}
<div className="flex-1 min-w-0">
<p className="text-sm font-medium text-slate-900 dark:text-slate-100 truncate">
{searchResult.first_name} {searchResult.last_name}
</p>
<p className="text-xs text-slate-500 dark:text-slate-400 truncate">
{toPersianNum(searchResult.mobile)}
</p>
</div>
<Input
type="tel"
placeholder={t.workspace?.searchMemberPlaceholder || "Search user by exact mobile number..."}
value={searchQuery}
onChange={(e) => {
const englishDigits = toEnglishDigits(e.target.value);
if (/\D/.test(englishDigits)) {
toast.warning(t.workspace?.onlyNumbersAllowed || "Only numbers are allowed.");
}
const numbersOnly = englishDigits.replace(/\D/g, '');
setSearchQuery(numbersOnly);
}}
className="w-full px-4 pe-10 border border-slate-300 dark:border-slate-700 rounded-lg bg-transparent text-slate-900 dark:text-white focus:ring-2 focus:ring-blue-500"
/>
</div>
<div className="flex items-center gap-2 w-full sm:w-auto mt-2 sm:mt-0">
<select
value={newMemberRole}
onChange={(e) => setNewMemberRole(e.target.value as any)}
className="flex-1 sm:flex-none text-sm bg-white dark:bg-slate-800 border border-slate-300 dark:border-slate-700 rounded-md px-2 py-1.5 outline-none focus:ring-2 focus:ring-blue-500 text-slate-700 dark:text-slate-300"
>
{isFirstOwner && <option value="owner">{t.workspace?.roles?.owner || "Owner"}</option>}
<option value="admin">{t.workspace?.roles?.admin || "Admin"}</option>
<option value="member">{t.workspace?.roles?.member || "Member"}</option>
<option value="guest">{t.workspace?.roles?.guest || "Guest"}</option>
</select>
<Button
type="button"
size="sm"
onClick={handleAddMember}
disabled={members.some(m => m.user?.id === searchResult.id)}
className="gap-1.5"
>
<UserPlus className="w-4 h-4" />
{members.some(m => m.user?.id === searchResult.id)
? (t.workspace?.userAlreadyAdded || "Added")
: (t.workspace?.addMember || "Add")}
</Button>
</div>
{isSearching && <p className="text-sm text-slate-500">{t.workspace?.searching || "Searching..."}</p>}
{searchError && !isSearching && (
<div className="flex items-center gap-2 p-3 text-sm text-red-600 dark:text-red-400 bg-red-50 dark:bg-red-500/10 rounded-lg border border-red-100 dark:border-red-500/20">
<AlertCircle className="w-4 h-4" />
{t.workspace?.userNotFound || "No user found with this exact number."}
</div>
)}
{searchResult && !isSearching && (
<div className="flex flex-col sm:flex-row items-start sm:items-center gap-3 p-3 bg-blue-50 dark:bg-blue-500/10 border border-blue-200 dark:border-blue-500/30 rounded-lg">
<div className="flex items-center gap-3 flex-1 w-full">
{searchResult.profile_picture ? (
<img src={searchResult.profile_picture} alt={searchResult.first_name} className="w-10 h-10 rounded-full object-cover shadow-sm" />
) : (
<div className="w-10 h-10 rounded-full bg-blue-200 dark:bg-blue-900/50 flex items-center justify-center text-blue-700 dark:text-blue-300 font-bold text-sm shadow-sm">
{searchResult.first_name?.[0] || "U"}
</div>
)}
<div className="flex-1 min-w-0">
<p className="text-sm font-medium text-slate-900 dark:text-slate-100 truncate">
{searchResult.first_name} {searchResult.last_name}
</p>
<p className="text-xs text-slate-500 dark:text-slate-400 truncate">
{toPersianNum(searchResult.mobile)}
</p>
</div>
</div>
<div className="flex items-center gap-2 w-full sm:w-auto mt-2 sm:mt-0">
<Select
value={newMemberRole}
onChange={(val) => setNewMemberRole(val as any)}
options={[
...(isFirstOwner ? [{ value: "owner", label: t.workspace?.roles?.owner || "Owner" }] : []),
{ value: "admin", label: t.workspace?.roles?.admin || "Admin" },
{ value: "member", label: t.workspace?.roles?.member || "Member" },
{ value: "guest", label: t.workspace?.roles?.guest || "Guest" },
]}
className="flex-1 sm:flex-none"
buttonClassName="w-full sm:w-[110px] px-3 py-1.5 text-sm"
/>
<Button
type="button"
size="sm"
onClick={handleAddMember}
disabled={members.some(m => m.user?.id === searchResult.id)}
className="gap-1.5"
>
<UserPlus className="w-4 h-4" />
{members.some(m => m.user?.id === searchResult.id)
? (t.workspace?.userAlreadyAdded || "Added")
: (t.workspace?.addMember || "Add")}
</Button>
</div>
</div>
)}
</div>
)}
</div>
)}
<div className="space-y-3">
{members.map((m) => {
return (
<div key={m.localId} className="flex flex-col sm:flex-row sm:items-center justify-between p-3 border border-slate-200 dark:border-slate-800 rounded-lg gap-3">
<div className="flex items-center gap-3">
{m.user?.profile_picture ? (
<img src={m.user?.profile_picture} alt={m.user?.first_name} className="w-10 h-10 rounded-full object-cover" />
) : (
<div className="w-10 h-10 rounded-full bg-slate-100 dark:bg-slate-800 flex items-center justify-center text-slate-600 dark:text-slate-400 font-bold text-sm">
{m.user?.first_name?.[0] || m.user?.last_name?.[0] || "U"}
{/* لیست اعضا (با قابلیت اسکرول) */}
<div className="flex-1 overflow-y-auto p-6 space-y-3 bg-slate-50/30 dark:bg-slate-900/30">
{members.map((m) => {
return (
<div key={m.localId} className="flex flex-col sm:flex-row sm:items-center justify-between p-3 bg-white dark:bg-slate-900 border border-slate-200 dark:border-slate-800 rounded-lg gap-3 shadow-sm hover:border-blue-200 dark:hover:border-blue-800 transition-colors">
<div className="flex items-center gap-3">
{m.user?.profile_picture ? (
<img src={m.user?.profile_picture} alt={m.user?.first_name} className="w-10 h-10 rounded-full object-cover shadow-sm" />
) : (
<div className="w-10 h-10 rounded-full bg-slate-100 dark:bg-slate-800 flex items-center justify-center text-slate-600 dark:text-slate-400 font-bold text-sm shadow-sm">
{m.user?.first_name?.[0] || m.user?.last_name?.[0] || "U"}
</div>
)}
<div>
<p className="text-sm font-medium text-slate-900 dark:text-slate-100">
{`${m.user?.first_name || ''} ${m.user?.last_name || ''}`.trim() || 'Unknown'}
</p>
<p className="text-xs text-slate-500">{toPersianNum(m.user?.mobile)}</p>
</div>
)}
<div>
<p className="text-sm font-medium text-slate-900 dark:text-slate-100">
{`${m.user?.first_name || ''} ${m.user?.last_name || ''}`.trim() || 'Unknown'}
</p>
<p className="text-xs text-slate-500">{toPersianNum(m.user?.mobile)}</p>
</div>
<div className="flex items-center gap-3 self-end sm:self-auto">
<Select
value={m.role}
onChange={(val) => handleChangeRole(m.localId, val)}
options={[
...(isFirstOwner ? [{ value: "owner", label: t.workspace?.roles?.owner || "Owner" }] : []),
{ value: "admin", label: t.workspace?.roles?.admin || "Admin" },
{ value: "member", label: t.workspace?.roles?.member || "Member" },
{ value: "guest", label: t.workspace?.roles?.guest || "Guest" },
]}
buttonClassName="w-[110px] px-3 py-1.5 text-sm"
/>
<Button
type="button"
variant="ghost"
size="icon"
onClick={() => openDeleteModal(m.localId)}
className="h-8 w-8 text-slate-400 hover:text-red-500 hover:bg-red-50 dark:hover:bg-red-500/10"
title={t.workspace?.removeMemberTitle || "Remove member"}
>
<Trash2 className="w-4 h-4" />
</Button>
</div>
</div>
<div className="flex items-center gap-3 self-end sm:self-auto">
<select
value={m.role}
onChange={(e) => handleChangeRole(m.localId, e.target.value)}
className="text-sm bg-slate-50 dark:bg-slate-800 border border-slate-200 dark:border-slate-700 rounded-md px-2 py-1 outline-none focus:ring-2 focus:ring-blue-500 text-slate-700 dark:text-slate-300"
>
{isFirstOwner && <option value="owner">{t.workspace?.roles?.owner || "Owner"}</option>}
<option value="admin">{t.workspace?.roles?.admin || "Admin"}</option>
<option value="member">{t.workspace?.roles?.member || "Member"}</option>
<option value="guest">{t.workspace?.roles?.guest || "Guest"}</option>
</select>
<Button
type="button"
variant="ghost"
size="icon"
onClick={() => openDeleteModal(m.localId)}
className="h-8 w-8 text-slate-400 hover:text-red-500 hover:bg-red-50 dark:hover:bg-red-500/10"
title={t.workspace?.removeMemberTitle || "Remove member"}
>
<Trash2 className="w-4 h-4" />
</Button>
</div>
);
})}
{members.length === 0 && (
<div className="flex flex-col items-center justify-center py-10 text-slate-500">
<Shield className="w-12 h-12 mb-3 text-slate-200 dark:text-slate-700" />
<p className="text-sm">
{t.workspace?.noMembers || "No members added yet."}
</p>
</div>
);
})}
{members.length === 0 && (
<p className="text-sm text-center text-slate-500 py-4">
{t.workspace?.noMembers || "No members added yet."}
</p>
)}
)}
</div>
</div>
</div>
@@ -367,13 +418,13 @@ export default function WorkspaceCreate() {
variant="secondary"
onClick={() => setIsDeleteDialogOpen(false)}
>
{t.workspace?.cancel || "Cancel"}
{t.actions?.cancel || "Cancel"}
</Button>
<Button
variant="destructive"
onClick={handleDeleteMember}
>
{t.workspace?.delete || "Delete"}
{t.actions?.delete || "Delete"}
</Button>
</div>
</Dialog.Panel>