forked from longtao.wu/droboticflow
🐛 Resolve project member names independently of account picker
This commit is contained in:
parent
883f47ff0e
commit
3253400370
28
docs/project-member-display.md
Normal file
28
docs/project-member-display.md
Normal file
@ -0,0 +1,28 @@
|
||||
# Project member display
|
||||
|
||||
Project membership reads now return `userName`, `userEmail`, and `userStatus`
|
||||
(`active`, `disabled`, or `missing`) alongside the existing fields. These are
|
||||
response-only fields; membership storage and mutation contracts are unchanged.
|
||||
|
||||
The API first applies existing organization/project and supplier visibility,
|
||||
then performs one organization-scoped batch lookup for the visible user IDs.
|
||||
Mongo projects only ID, name, email, and status. Passwords and account settings
|
||||
are neither loaded by that lookup nor returned. Missing or cross-tenant user
|
||||
references return empty display fields and `missing`; disabled identities retain
|
||||
their name with an explicit status.
|
||||
|
||||
The member table, name search and role editor use this response directly.
|
||||
The add-member candidate directory is independent and cannot change table names.
|
||||
Loading and errors are explicit, with a retry button. Switching projects clears
|
||||
selection/editor state and ignores late responses from the previous project.
|
||||
|
||||
Validation:
|
||||
- `go test ./internal/api ./internal/store -run 'TestProjectMember|TestSupplierManagerMaintains|TestProjectSupplier' -count=1`
|
||||
- `npm run lint:web` and `npm run build:web`
|
||||
- `node tests/browser/project-members-display.mjs` (Vite on 127.0.0.1:5174;
|
||||
installed Chrome via Playwright; isolated GET fixtures)
|
||||
- Full frontend suite: 571 pass, 10 pre-existing failures, identical to the
|
||||
unmodified 883f47ff baseline.
|
||||
- `TestProjectMemberDisplayLiveFixture` is opt-in. It creates only its own test
|
||||
organization/accounts and supports disabling those accounts after live QA.
|
||||
It does not modify customer identities or task assignments.
|
||||
107
internal/api/project_member_display_live_test.go
Normal file
107
internal/api/project_member_display_live_test.go
Normal file
@ -0,0 +1,107 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"context"
|
||||
"droboticflow/internal/domain"
|
||||
"droboticflow/internal/store"
|
||||
"fmt"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
"go.mongodb.org/mongo-driver/mongo/options"
|
||||
"net/http"
|
||||
"os"
|
||||
"regexp"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// Explicitly opt-in isolated tenant fixture. Never edits customer accounts/projects.
|
||||
func TestProjectMemberDisplayLiveFixture(t *testing.T) {
|
||||
if os.Getenv("MEMBER_DISPLAY_FIXTURE") != "1" {
|
||||
t.Skip("explicit isolated fixture only")
|
||||
}
|
||||
nonce := os.Getenv("MEMBER_DISPLAY_NONCE")
|
||||
if !regexp.MustCompile(`^2026[0-9a-z]{8,24}$`).MatchString(nonce) {
|
||||
t.Fatal("invalid nonce")
|
||||
}
|
||||
orgID, projectID := "org-member-display-"+nonce, "project-member-display-"+nonce
|
||||
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
|
||||
defer cancel()
|
||||
var ds store.Store
|
||||
if os.Getenv("MEMBER_DISPLAY_MODE") == "local" {
|
||||
ds = store.NewMemoryStore()
|
||||
} else {
|
||||
c, e := mongo.Connect(ctx, options.Client().ApplyURI(os.Getenv("MONGO_URI")))
|
||||
if e != nil {
|
||||
t.Fatal("mongo connection")
|
||||
}
|
||||
defer c.Disconnect(context.Background())
|
||||
ds = store.NewMongoStore(c.Database(os.Getenv("MONGO_DB")))
|
||||
}
|
||||
must := func(e error) {
|
||||
t.Helper()
|
||||
if e != nil {
|
||||
t.Fatal(e)
|
||||
}
|
||||
}
|
||||
ids := []string{"admin", "manager", "a", "b", "disabled"}
|
||||
if os.Getenv("MEMBER_DISPLAY_MODE") == "cleanup" {
|
||||
for _, id := range ids {
|
||||
u, e := ds.GetUser(ctx, "user-member-"+nonce+"-"+id)
|
||||
must(e)
|
||||
if u != nil {
|
||||
if u.OrganizationID != orgID {
|
||||
t.Fatal("cleanup scope")
|
||||
}
|
||||
u.Status = domain.UserStatusDisabled
|
||||
must(ds.UpsertUser(ctx, *u))
|
||||
}
|
||||
}
|
||||
fmt.Println("MEMBER_FIXTURE_ACCOUNTS_DISABLED")
|
||||
return
|
||||
}
|
||||
existing, e := ds.GetOrganization(ctx, orgID)
|
||||
must(e)
|
||||
if existing != nil {
|
||||
t.Fatal("fixture already exists")
|
||||
}
|
||||
password := os.Getenv("MEMBER_DISPLAY_PASSWORD")
|
||||
if len(password) < 20 {
|
||||
t.Fatal("ephemeral password required")
|
||||
}
|
||||
hash, e := hashPassword(password)
|
||||
must(e)
|
||||
must(ds.UpsertOrganization(ctx, domain.OrganizationRecord{ID: orgID, Name: "成员展示隔离验收", Slug: "member-display-" + nonce, Status: domain.OrganizationStatusActive, CreatedAt: nowISO()}))
|
||||
must(ds.UpsertProject(ctx, domain.ProjectRecord{ID: projectID, OrganizationID: orgID, Name: "成员展示隔离验收", Status: domain.ProjectStatusActive, CreatedAt: nowISO()}))
|
||||
for _, suffix := range []string{"a", "b"} {
|
||||
must(ds.UpsertSupplier(ctx, domain.SupplierRecord{ID: "supplier-" + nonce + "-" + suffix, OrganizationID: orgID, Name: "测试供应商" + suffix, Status: "active", CreatedAt: nowISO()}))
|
||||
}
|
||||
for _, id := range ids {
|
||||
role := domain.UserRoleAnnotator
|
||||
if id == "admin" {
|
||||
role = domain.UserRoleAdmin
|
||||
}
|
||||
if id == "manager" {
|
||||
role = domain.UserRoleSupplierManager
|
||||
}
|
||||
status := domain.UserStatusActive
|
||||
if id == "disabled" {
|
||||
status = domain.UserStatusDisabled
|
||||
}
|
||||
suffix := "a"
|
||||
if id == "b" {
|
||||
suffix = "b"
|
||||
}
|
||||
userID := "user-member-" + nonce + "-" + id
|
||||
must(ds.UpsertUser(ctx, domain.UserRecord{ID: userID, OrganizationID: orgID, Name: "验收成员" + id, Email: id + "-" + nonce + "@example.invalid", Role: role, Status: status, SupplierID: "supplier-" + nonce + "-" + suffix, PasswordHash: hash, CreatedAt: nowISO()}))
|
||||
if id != "admin" {
|
||||
must(ds.UpsertProjectMember(ctx, domain.ProjectMemberRecord{ID: "member-" + nonce + "-" + id, OrganizationID: orgID, ProjectID: projectID, UserID: userID, SupplierID: "supplier-" + nonce + "-" + suffix, Roles: []domain.AnnotationAssignmentRole{domain.AnnotationRoleAnnotator}, CreatedAt: nowISO()}))
|
||||
}
|
||||
}
|
||||
must(ds.UpsertProjectMember(ctx, domain.ProjectMemberRecord{ID: "member-" + nonce + "-missing", OrganizationID: orgID, ProjectID: projectID, UserID: "missing-" + nonce, SupplierID: "supplier-" + nonce + "-a", Roles: []domain.AnnotationAssignmentRole{domain.AnnotationRoleAnnotator}, CreatedAt: nowISO()}))
|
||||
fmt.Println("MEMBER_FIXTURE_READY " + projectID)
|
||||
if os.Getenv("MEMBER_DISPLAY_MODE") == "local" {
|
||||
must(ds.UpsertUser(ctx, domain.UserRecord{ID: "local-fixture-root", IsSuperAdmin: true, Role: domain.UserRoleAdmin, Status: domain.UserStatusActive, PasswordHash: hash}))
|
||||
t.Setenv("DROBOTICFLOW_REQUIRE_SESSION_AUTH", "true")
|
||||
must(http.ListenAndServe("127.0.0.1:3001", NewHandler(ds, nil)))
|
||||
}
|
||||
}
|
||||
121
internal/api/project_member_display_test.go
Normal file
121
internal/api/project_member_display_test.go
Normal file
@ -0,0 +1,121 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"droboticflow/internal/domain"
|
||||
"droboticflow/internal/store"
|
||||
"github.com/go-chi/chi/v5"
|
||||
)
|
||||
|
||||
type memberDisplayStore struct {
|
||||
store.Store
|
||||
ids []string
|
||||
calls int
|
||||
fail bool
|
||||
}
|
||||
|
||||
func (s *memberDisplayStore) ListProjectMemberUsers(ctx context.Context, org string, ids []string) ([]domain.UserRecord, error) {
|
||||
s.calls++
|
||||
s.ids = append([]string{}, ids...)
|
||||
if s.fail {
|
||||
return nil, errors.New("directory unavailable")
|
||||
}
|
||||
return s.Store.ListProjectMemberUsers(ctx, org, ids)
|
||||
}
|
||||
|
||||
func TestProjectMemberDisplayScopedBatch(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ds := store.NewMemoryStore()
|
||||
project, err := ds.CreateProject(ctx, domain.CreateProjectInput{OrganizationID: "display-org", Name: "Display"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, u := range []domain.UserRecord{
|
||||
{ID: "a", OrganizationID: "display-org", Name: "成员甲", Email: "a@example.test", PasswordHash: "never-return", Status: domain.UserStatusActive},
|
||||
{ID: "b", OrganizationID: "display-org", Name: "成员乙", Email: "b@example.test", Status: domain.UserStatusDisabled},
|
||||
{ID: "foreign", OrganizationID: "other-org", Name: "禁止泄露", Email: "private@example.test"},
|
||||
} {
|
||||
if err := ds.UpsertUser(ctx, u); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
for _, id := range []string{"a", "b", "missing", "foreign"} {
|
||||
supplier := "supplier-a"
|
||||
if id == "b" {
|
||||
supplier = "supplier-b"
|
||||
}
|
||||
if err := ds.UpsertProjectMember(ctx, domain.ProjectMemberRecord{ID: "m-" + id, OrganizationID: "display-org", ProjectID: project.ID, UserID: id, SupplierID: supplier, Roles: []domain.AnnotationAssignmentRole{domain.AnnotationRoleAnnotator}}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
wrapped := &memberDisplayStore{Store: ds}
|
||||
server := &server{store: wrapped}
|
||||
request := func(user domain.UserRecord) *httptest.ResponseRecorder {
|
||||
req := httptest.NewRequest(http.MethodGet, "/api/projects/"+project.ID+"/members", nil)
|
||||
rc := chi.NewRouteContext()
|
||||
rc.URLParams.Add("id", project.ID)
|
||||
c := context.WithValue(req.Context(), chi.RouteCtxKey, rc)
|
||||
c = context.WithValue(c, authContextKey{}, &authenticatedPrincipal{User: user, Organization: domain.OrganizationRecord{ID: "display-org"}})
|
||||
rec := httptest.NewRecorder()
|
||||
server.handleProjectMembersList(rec, req.WithContext(c))
|
||||
return rec
|
||||
}
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
user domain.UserRecord
|
||||
count int
|
||||
}{
|
||||
{"admin", domain.UserRecord{ID: "admin", Role: domain.UserRoleAdmin}, 4},
|
||||
{"supplier", domain.UserRecord{ID: "manager", Role: domain.UserRoleSupplierManager, SupplierID: "supplier-a"}, 3},
|
||||
{"ordinary", domain.UserRecord{ID: "a", Role: domain.UserRoleAnnotator}, 1},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
wrapped.calls = 0
|
||||
rec := request(tc.user)
|
||||
if rec.Code != 200 {
|
||||
t.Fatalf("status %d: %s", rec.Code, rec.Body.String())
|
||||
}
|
||||
var body struct {
|
||||
Items []projectMemberView `json:"items"`
|
||||
}
|
||||
if err := json.Unmarshal(rec.Body.Bytes(), &body); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(body.Items) != tc.count || len(wrapped.ids) != tc.count || wrapped.calls != 1 {
|
||||
t.Fatalf("items=%d ids=%v calls=%d", len(body.Items), wrapped.ids, wrapped.calls)
|
||||
}
|
||||
for _, m := range body.Items {
|
||||
switch m.UserID {
|
||||
case "a":
|
||||
if m.UserName != "成员甲" || m.UserEmail != "a@example.test" || m.UserStatus != "active" {
|
||||
t.Fatalf("display %+v", m)
|
||||
}
|
||||
case "b":
|
||||
if m.UserStatus != "disabled" || m.UserName != "成员乙" {
|
||||
t.Fatalf("disabled %+v", m)
|
||||
}
|
||||
default:
|
||||
if m.UserStatus != "missing" || m.UserName != "" || m.UserEmail != "" {
|
||||
t.Fatalf("missing/foreign %+v", m)
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, private := range []string{"passwordHash", "never-return", "禁止泄露", "private@example.test"} {
|
||||
if strings.Contains(rec.Body.String(), private) {
|
||||
t.Fatalf("leaked %s", private)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
wrapped.fail = true
|
||||
if rec := request(domain.UserRecord{ID: "admin", Role: domain.UserRoleAdmin}); rec.Code != 500 {
|
||||
t.Fatalf("directory failure must fail visibly: %d", rec.Code)
|
||||
}
|
||||
}
|
||||
@ -134,6 +134,14 @@ func (server *server) handleSupplierCreate(writer http.ResponseWriter, request *
|
||||
renderJSON(writer, http.StatusCreated, item)
|
||||
}
|
||||
|
||||
// Display data belongs to the read response, not the persisted membership.
|
||||
type projectMemberView struct {
|
||||
domain.ProjectMemberRecord
|
||||
UserName string `json:"userName"`
|
||||
UserEmail string `json:"userEmail"`
|
||||
UserStatus string `json:"userStatus"`
|
||||
}
|
||||
|
||||
func (server *server) handleProjectMembersList(writer http.ResponseWriter, request *http.Request) {
|
||||
projectID := strings.TrimSpace(chi.URLParam(request, "id"))
|
||||
project, err := server.store.GetProject(request.Context(), projectID)
|
||||
@ -158,7 +166,31 @@ func (server *server) handleProjectMembersList(writer http.ResponseWriter, reque
|
||||
}
|
||||
}
|
||||
sort.Slice(filtered, func(left, right int) bool { return filtered[left].CreatedAt < filtered[right].CreatedAt })
|
||||
renderJSON(writer, http.StatusOK, map[string]any{"items": filtered})
|
||||
ids := make([]string, 0, len(filtered))
|
||||
for _, member := range filtered {
|
||||
ids = append(ids, member.UserID)
|
||||
}
|
||||
users, err := server.store.ListProjectMemberUsers(request.Context(), project.OrganizationID, ids)
|
||||
if err != nil {
|
||||
renderError(writer, http.StatusInternalServerError, err)
|
||||
return
|
||||
}
|
||||
directory := make(map[string]domain.UserRecord, len(users))
|
||||
for _, user := range users {
|
||||
directory[user.ID] = user
|
||||
}
|
||||
result := make([]projectMemberView, 0, len(filtered))
|
||||
for _, member := range filtered {
|
||||
view := projectMemberView{ProjectMemberRecord: member, UserStatus: "missing"}
|
||||
if user, ok := directory[member.UserID]; ok {
|
||||
view.UserName, view.UserEmail, view.UserStatus = user.Name, user.Email, string(user.Status)
|
||||
if view.UserStatus == "" {
|
||||
view.UserStatus = "active"
|
||||
}
|
||||
}
|
||||
result = append(result, view)
|
||||
}
|
||||
renderJSON(writer, http.StatusOK, map[string]any{"items": result})
|
||||
}
|
||||
|
||||
func (server *server) saveProjectMember(writer http.ResponseWriter, request *http.Request, principal *authenticatedPrincipal, project *domain.ProjectRecord, member *domain.ProjectMemberRecord, payload projectMemberInput, created bool) {
|
||||
|
||||
@ -2071,6 +2071,22 @@ func (store *MemoryStore) ListUsersByOrganization(_ context.Context, organizatio
|
||||
return items, nil
|
||||
}
|
||||
|
||||
// ListProjectMemberUsers returns only display fields for the requested organization members.
|
||||
func (store *MemoryStore) ListProjectMemberUsers(_ context.Context, organizationID string, ids []string) ([]domain.UserRecord, error) {
|
||||
store.mu.Lock()
|
||||
defer store.mu.Unlock()
|
||||
items := make([]domain.UserRecord, 0, len(ids))
|
||||
seen := map[string]bool{}
|
||||
for _, id := range ids {
|
||||
user, ok := store.users[id]
|
||||
if ok && !seen[id] && organizationMatches(user.OrganizationID, organizationID) {
|
||||
items = append(items, domain.UserRecord{ID: user.ID, Name: user.Name, Email: user.Email, Status: user.Status})
|
||||
seen[id] = true
|
||||
}
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
func (store *MemoryStore) GetUser(_ context.Context, id string) (*domain.UserRecord, error) {
|
||||
store.mu.Lock()
|
||||
defer store.mu.Unlock()
|
||||
|
||||
@ -1982,6 +1982,19 @@ func (store *MongoStore) ListUsersByOrganization(ctx context.Context, organizati
|
||||
return decodeMany[domain.UserRecord](ctx, cursor)
|
||||
}
|
||||
|
||||
// ListProjectMemberUsers uses one scoped query and never loads credential fields.
|
||||
func (store *MongoStore) ListProjectMemberUsers(ctx context.Context, organizationID string, ids []string) ([]domain.UserRecord, error) {
|
||||
if len(ids) == 0 {
|
||||
return []domain.UserRecord{}, nil
|
||||
}
|
||||
filter := bson.M{"$and": bson.A{orgCompatibilityFilter(organizationID), bson.M{"id": bson.M{"$in": ids}}}}
|
||||
cursor, err := store.users.Find(ctx, filter, options.Find().SetProjection(bson.M{"_id": 0, "id": 1, "name": 1, "email": 1, "status": 1}))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return decodeMany[domain.UserRecord](ctx, cursor)
|
||||
}
|
||||
|
||||
func (store *MongoStore) GetUser(ctx context.Context, id string) (*domain.UserRecord, error) {
|
||||
var item domain.UserRecord
|
||||
err := store.users.FindOne(ctx, bson.M{"id": id}).Decode(&item)
|
||||
|
||||
@ -227,6 +227,7 @@ type Store interface {
|
||||
|
||||
ListUsers(context.Context) ([]domain.UserRecord, error)
|
||||
ListUsersByOrganization(context.Context, string) ([]domain.UserRecord, error)
|
||||
ListProjectMemberUsers(context.Context, string, []string) ([]domain.UserRecord, error)
|
||||
GetUser(context.Context, string) (*domain.UserRecord, error)
|
||||
FindUserByEmail(context.Context, string) (*domain.UserRecord, error)
|
||||
CreateUser(context.Context, domain.CreateUserInput) (*domain.UserRecord, error)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { useEffect, useMemo, useRef, useState } from "react";
|
||||
import { Check, Edit3, Loader2, Search, Trash2, UserPlus, Users, RefreshCw } from "lucide-react";
|
||||
import { usersApi } from "../services/api/users";
|
||||
import type { ProjectMember, ProjectMemberRole, Supplier, User } from "../types";
|
||||
@ -16,6 +16,10 @@ function rolesText(roles: ProjectMemberRole[]) {
|
||||
return roles.map((role) => roleOptions.find((item) => item.value === role)?.label || role).join("、");
|
||||
}
|
||||
|
||||
function memberName(member: ProjectMember) {
|
||||
return member.userName?.trim() || (member.userStatus === "disabled" ? "已停用账号" : "成员资料缺失");
|
||||
}
|
||||
|
||||
export function ProjectMembersPanel({
|
||||
projectId,
|
||||
users,
|
||||
@ -27,6 +31,10 @@ export function ProjectMembersPanel({
|
||||
canManage: boolean;
|
||||
onCountChange?: (count: number) => void;
|
||||
}) {
|
||||
const requestGeneration = useRef(0);
|
||||
const [loadedProjectId, setLoadedProjectId] = useState("");
|
||||
const [loadingMembers, setLoadingMembers] = useState(true);
|
||||
const [memberError, setMemberError] = useState("");
|
||||
const [members, setMembers] = useState<ProjectMember[]>([]);
|
||||
const [candidateUsers, setCandidateUsers] = useState<User[]>(users);
|
||||
const [refreshingUsers, setRefreshingUsers] = useState(false);
|
||||
@ -59,32 +67,46 @@ export function ProjectMembersPanel({
|
||||
const [editing, setEditing] = useState<ProjectMember | null>(null);
|
||||
|
||||
const reload = async () => {
|
||||
const generation = ++requestGeneration.current;
|
||||
setLoadingMembers(true);
|
||||
setMemberError("");
|
||||
try {
|
||||
const [nextMembers, nextSuppliers] = await Promise.all([projectsApi.listMembers(projectId), suppliersApi.list()]);
|
||||
if (generation !== requestGeneration.current) return;
|
||||
setMembers(nextMembers);
|
||||
setSuppliers(nextSuppliers);
|
||||
setLoadedProjectId(projectId);
|
||||
onCountChange?.(nextMembers.length);
|
||||
} catch (cause) {
|
||||
setError(getActionErrorMessage(cause, "加载项目成员失败"));
|
||||
if (generation !== requestGeneration.current) return;
|
||||
setMemberError(getActionErrorMessage(cause, "加载项目成员失败"));
|
||||
} finally {
|
||||
if (generation === requestGeneration.current) setLoadingMembers(false);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
setSelectedIds([]);
|
||||
setAddOpen(false);
|
||||
setEditing(null);
|
||||
void reload();
|
||||
return () => {
|
||||
requestGeneration.current++;
|
||||
};
|
||||
}, [projectId]);
|
||||
|
||||
const visibleMembers = useMemo(() => {
|
||||
const normalized = query.trim().toLowerCase();
|
||||
if (loadedProjectId !== projectId || loadingMembers || memberError) return [];
|
||||
return members.filter((member) => {
|
||||
if (roleFilter !== "all" && !member.roles.includes(roleFilter)) return false;
|
||||
if (!normalized) return true;
|
||||
const user = candidateUsers.find((item) => item.id === member.userId);
|
||||
const supplier = suppliers.find((item) => item.id === member.supplierId);
|
||||
return `${user?.name || ""} ${user?.email || ""} ${supplier?.name || ""} ${rolesText(member.roles)}`
|
||||
return `${memberName(member)} ${member.userEmail || ""} ${member.userId} ${supplier?.name || ""} ${rolesText(member.roles)}`
|
||||
.toLowerCase()
|
||||
.includes(normalized);
|
||||
});
|
||||
}, [members, query, roleFilter, suppliers, candidateUsers]);
|
||||
}, [members, query, roleFilter, suppliers, loadedProjectId, projectId, loadingMembers, memberError]);
|
||||
|
||||
const toggleRole = (role: ProjectMemberRole, target = draft, setTarget = setDraft) => {
|
||||
setTarget((current) => ({
|
||||
@ -272,6 +294,14 @@ export function ProjectMembersPanel({
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
{memberError ? (
|
||||
<div role="alert" className="rounded-lg border border-red-500/30 px-4 py-3 text-sm text-red-600">
|
||||
{memberError}
|
||||
<button type="button" onClick={() => void reload()} className="ml-3 underline">
|
||||
重新加载成员
|
||||
</button>
|
||||
</div>
|
||||
) : null}
|
||||
{error && !addOpen && !editing ? (
|
||||
<div className="rounded-lg border border-red-500/30 bg-red-500/10 px-4 py-3 text-sm text-red-600 dark:text-red-200">
|
||||
{error}
|
||||
@ -302,7 +332,6 @@ export function ProjectMembersPanel({
|
||||
</thead>
|
||||
<tbody className="divide-y divide-[#2a2b2f]">
|
||||
{visibleMembers.map((member) => {
|
||||
const user = candidateUsers.find((item) => item.id === member.userId);
|
||||
const supplier = suppliers.find((item) => item.id === member.supplierId);
|
||||
return (
|
||||
<tr
|
||||
@ -311,13 +340,13 @@ export function ProjectMembersPanel({
|
||||
data-testid="project-member-row"
|
||||
data-member-id={member.id}
|
||||
data-user-id={member.userId}
|
||||
data-user-email={user?.email || ""}
|
||||
data-user-email={member.userEmail || ""}
|
||||
>
|
||||
{canManage ? (
|
||||
<td className="px-4 py-4">
|
||||
<input
|
||||
type="checkbox"
|
||||
aria-label={`选择成员 ${user?.email || member.userId}`}
|
||||
aria-label={`选择成员 ${member.userEmail || member.userId}`}
|
||||
data-testid={`project-member-select-${member.id}`}
|
||||
checked={selectedIds.includes(member.id)}
|
||||
onChange={(event) =>
|
||||
@ -329,8 +358,16 @@ export function ProjectMembersPanel({
|
||||
</td>
|
||||
) : null}
|
||||
<td className="px-5 py-4">
|
||||
<div className="font-medium text-[color:var(--app-text)]">{user?.name || member.userId}</div>
|
||||
<div className="mt-0.5 text-xs text-gray-500">{user?.email || member.userId}</div>
|
||||
<div className="font-medium text-[color:var(--app-text)]">
|
||||
{memberName(member)}
|
||||
{member.userStatus === "disabled" && member.userName ? (
|
||||
<span className="ml-2 text-xs text-gray-500">已停用</span>
|
||||
) : null}
|
||||
</div>
|
||||
{(!member.userName?.trim() || member.userStatus === "missing") && member.userEmail ? (
|
||||
<div className="text-xs text-gray-500">账号 ID:{member.userId}</div>
|
||||
) : null}
|
||||
<div className="mt-0.5 text-xs text-gray-500">{member.userEmail || member.userId}</div>
|
||||
</td>
|
||||
<td className="px-5 py-4 text-slate-600 dark:text-gray-300">
|
||||
{supplier?.name || member.supplierId || "历史归属待补齐"}
|
||||
@ -354,7 +391,7 @@ export function ProjectMembersPanel({
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setEditing({ ...member, roles: [...member.roles] })}
|
||||
aria-label={`编辑成员 ${user?.email || member.userId}`}
|
||||
aria-label={`编辑成员 ${member.userEmail || member.userId}`}
|
||||
className="rounded border border-[#2a2b2f] p-1.5 text-gray-300"
|
||||
>
|
||||
<Edit3 className="h-3.5 w-3.5" />
|
||||
@ -363,7 +400,7 @@ export function ProjectMembersPanel({
|
||||
type="button"
|
||||
onClick={() => void remove(member)}
|
||||
disabled={saving}
|
||||
aria-label={`移出成员 ${user?.email || member.userId}`}
|
||||
aria-label={`移出成员 ${member.userEmail || member.userId}`}
|
||||
className="rounded border border-red-500/20 p-1.5 text-red-300"
|
||||
>
|
||||
<Trash2 className="h-3.5 w-3.5" />
|
||||
@ -377,7 +414,13 @@ export function ProjectMembersPanel({
|
||||
{visibleMembers.length === 0 ? (
|
||||
<tr>
|
||||
<td colSpan={canManage ? 5 : 4} className="px-6 py-12 text-center text-gray-500">
|
||||
当前项目还没有成员。
|
||||
{loadingMembers || (loadedProjectId !== projectId && !memberError)
|
||||
? "正在加载成员…"
|
||||
: memberError
|
||||
? "成员加载失败,请重试。"
|
||||
: members.length === 0
|
||||
? "当前项目还没有成员。"
|
||||
: "没有符合筛选条件的成员。"}
|
||||
</td>
|
||||
</tr>
|
||||
) : null}
|
||||
@ -497,9 +540,7 @@ export function ProjectMembersPanel({
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<div className="mt-4 text-sm text-gray-300">
|
||||
{candidateUsers.find((user) => user.id === editing.userId)?.name || editing.userId}
|
||||
</div>
|
||||
<div className="mt-4 text-sm text-gray-300">{memberName(editing)}</div>
|
||||
)}
|
||||
<div className="mt-4 text-sm text-slate-600 dark:text-gray-300" data-testid="project-member-supplier">
|
||||
<div className="mb-1 text-xs">供应商(继承员工账号,不可更改)</div>
|
||||
|
||||
@ -1790,6 +1790,9 @@ export interface Supplier {
|
||||
}
|
||||
|
||||
export interface ProjectMember {
|
||||
userName?: string;
|
||||
userEmail?: string;
|
||||
userStatus?: "active" | "disabled" | "missing";
|
||||
id: string;
|
||||
organizationId: string;
|
||||
projectId: string;
|
||||
|
||||
113
tests/browser/project-members-display.mjs
Normal file
113
tests/browser/project-members-display.mjs
Normal file
@ -0,0 +1,113 @@
|
||||
// Isolated browser regression against the actual component; no business writes.
|
||||
import { chromium } from "playwright";
|
||||
import assert from "node:assert/strict";
|
||||
import fs from "node:fs/promises";
|
||||
const base = process.env.MEMBER_TEST_URL || "http://127.0.0.1:5174";
|
||||
const output = process.env.MEMBER_TEST_OUTPUT || "/tmp/project-members-display-qa";
|
||||
await fs.mkdir(output, { recursive: true });
|
||||
const browser = await chromium.launch({ channel: "chrome", headless: true });
|
||||
try {
|
||||
const page = await browser.newPage({ viewport: { width: 1280, height: 800 } });
|
||||
const errors = [],
|
||||
requests = [];
|
||||
let fail = false;
|
||||
page.on("pageerror", (e) => errors.push(e.message));
|
||||
const member = (id, name, status = "active") => ({
|
||||
id: "m-" + id,
|
||||
projectId: "demo",
|
||||
userId: id,
|
||||
userName: name,
|
||||
userEmail: name ? id + "@example.test" : "",
|
||||
userStatus: status,
|
||||
supplierId: "supplier",
|
||||
roles: ["annotator"],
|
||||
});
|
||||
await page.route("**/api/**", async (route) => {
|
||||
const path = new URL(route.request().url()).pathname;
|
||||
if (!path.startsWith("/api/")) return route.continue();
|
||||
assert.equal(route.request().method(), "GET");
|
||||
requests.push(path);
|
||||
let items = [];
|
||||
if (path.endsWith("/members")) {
|
||||
if (fail) return route.fulfill({ status: 500, json: { error: "成员资料查询失败" } });
|
||||
if (path.includes("/slow/")) await new Promise((r) => setTimeout(r, 500));
|
||||
items = path.includes("/other/")
|
||||
? [member("other", "其他项目成员")]
|
||||
: [member("u1", "成员张三"), member("u2", "成员李四", "disabled"), member("missing", "", "missing")];
|
||||
}
|
||||
if (path === "/api/suppliers") items = [{ id: "supplier", name: "测试供应商" }];
|
||||
if (path === "/api/users")
|
||||
items = [{ id: "u1", name: "候选列表不同姓名", email: "u1@example.test", role: "annotator" }];
|
||||
return route.fulfill({ json: { items } });
|
||||
});
|
||||
await page.route("**/__member_test", (route) =>
|
||||
route.fulfill({
|
||||
contentType: "text/html; charset=utf-8",
|
||||
body: `<!doctype html><html><head><meta charset="utf-8"><title>成员显示验证</title></head><body><div id="root"></div><script type="module">
|
||||
import RefreshRuntime from '/@react-refresh';RefreshRuntime.injectIntoGlobalHook(window);window.$RefreshReg$=()=>{};window.$RefreshSig$=()=>t=>t;window.__vite_plugin_react_preamble_installed__=true;
|
||||
const R=await import('/node_modules/.vite/deps/react.js');const React=R.default||R;const D=await import('/node_modules/.vite/deps/react-dom_client.js');const root=(D.createRoot||D.default.createRoot)(document.getElementById('root'));const {ProjectMembersPanel}=await import('/src/components/ProjectMembersPanel.tsx');
|
||||
window.renderFixture=(projectId='demo',canManage=true)=>root.render(React.createElement(ProjectMembersPanel,{projectId,canManage,users:[{id:'admin',name:'管理员'}]}));window.renderFixture();
|
||||
</script></body></html>`,
|
||||
}),
|
||||
);
|
||||
await page.goto(base + "/__member_test");
|
||||
const row = page.locator('[data-user-id="u1"]');
|
||||
await row.waitFor();
|
||||
assert.match(await row.innerText(), /成员张三/);
|
||||
assert.equal(requests.includes("/api/users"), false);
|
||||
assert.match(await page.locator('[data-user-id="u2"]').innerText(), /已停用/);
|
||||
assert.match(await page.locator('[data-user-id="missing"]').innerText(), /成员资料缺失/);
|
||||
await page.screenshot({ path: output + "/first-load.png" });
|
||||
await page.getByTestId("project-member-search").fill("张三");
|
||||
assert.equal(await page.getByTestId("project-member-row").count(), 1);
|
||||
await page.getByTestId("project-member-search").fill("");
|
||||
await Promise.all([
|
||||
page.waitForResponse((r) => new URL(r.url()).pathname === "/api/users"),
|
||||
page.getByTestId("project-member-add").click(),
|
||||
]);
|
||||
assert.match(await row.innerText(), /成员张三/);
|
||||
assert.doesNotMatch(await row.innerText(), /候选列表不同姓名/);
|
||||
await page.getByRole("button", { name: "关闭", exact: true }).click();
|
||||
await page.reload();
|
||||
await row.waitFor();
|
||||
assert.match(await row.innerText(), /成员张三/);
|
||||
await page.evaluate(() => window.renderFixture("demo", false));
|
||||
assert.equal(await page.getByTestId("project-member-add").count(), 0);
|
||||
assert.match(await row.innerText(), /成员张三/);
|
||||
fail = true;
|
||||
await page.evaluate(() => window.renderFixture("failure", false));
|
||||
await page.getByRole("button", { name: "重新加载成员" }).waitFor();
|
||||
assert.equal(await page.getByTestId("project-member-row").count(), 0);
|
||||
fail = false;
|
||||
await page.getByRole("button", { name: "重新加载成员" }).click();
|
||||
await row.waitFor();
|
||||
await Promise.all([
|
||||
page.waitForRequest((r) => r.url().includes("/slow/members")),
|
||||
page.evaluate(() => window.renderFixture("slow", true)),
|
||||
]);
|
||||
await page.evaluate(() => window.renderFixture("other", true));
|
||||
await page.locator('[data-user-id="other"]').waitFor();
|
||||
await page.waitForTimeout(650);
|
||||
assert.equal(await page.getByTestId("project-member-row").count(), 1);
|
||||
assert.match(await page.getByTestId("project-member-row").innerText(), /其他项目成员/);
|
||||
assert.deepEqual(errors, []);
|
||||
const proof = {
|
||||
passed: true,
|
||||
scenarios: [
|
||||
"initial names without directory request",
|
||||
"name search",
|
||||
"disabled and missing identities",
|
||||
"candidate isolation",
|
||||
"reload",
|
||||
"read-only member",
|
||||
"failure and retry",
|
||||
"stale project response",
|
||||
],
|
||||
requests,
|
||||
errors,
|
||||
};
|
||||
await fs.writeFile(output + "/result.json", JSON.stringify(proof, null, 2));
|
||||
console.log(JSON.stringify(proof, null, 2));
|
||||
} finally {
|
||||
await browser.close();
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user