revert: restore production to the state before 730d0bd (PM/RBAC work moved to 'pm')
Their three commits (730d0bd,5a9b543,387edfb) reached production by push and auto-deployed.387edfbexpects a users.username column that the live database does not have, so POST /api/v1/auth/login was returning HTTP 500. Their schema changes never applied either (projects still has only id, name, description, start_date, pm_user_id, created_at), so nothing depends on the reverted code. This commit sets the tree back to exactlya02b3ea— verified with git diff against it — while keeping history linear: the work itself is preserved on 'pm' at387edfb.
This commit is contained in:
+9
-44
@@ -87,7 +87,7 @@ function handle401(path: string, res: Response): void {
|
||||
// ادمین/مدیر تدارکات بدون پارامتر (همهی پروژهها) باقی میماند.
|
||||
function activeProjectId(): string | null {
|
||||
const { user } = useAuthStore.getState();
|
||||
return user?.role === "supervisor" || user?.role === "pm" ? user.project_id : null;
|
||||
return user?.role === "pm" ? user.project_id : null;
|
||||
}
|
||||
|
||||
function projectQuery(projectId?: string | null): string {
|
||||
@@ -323,12 +323,6 @@ interface RawSupplier {
|
||||
interface RawProject {
|
||||
id: string;
|
||||
name: string;
|
||||
location?: string | null;
|
||||
project_manager?: string | null;
|
||||
description?: string | null;
|
||||
start_date?: string | null;
|
||||
status?: string | null;
|
||||
progress?: number | null;
|
||||
}
|
||||
interface RawSpec {
|
||||
attribute_key: string;
|
||||
@@ -1137,36 +1131,11 @@ export const api = {
|
||||
projects: {
|
||||
list: async (): Promise<Project[]> => {
|
||||
const raw = await getData<RawProject[]>(`/projects?page_size=${PAGE_SIZE}`);
|
||||
return raw.map((p) => ({
|
||||
id: p.id,
|
||||
name: p.name,
|
||||
location: p.location || "",
|
||||
project_manager: p.project_manager || "",
|
||||
description: p.description || "",
|
||||
start_date: p.start_date,
|
||||
status: p.status || "ACTIVE",
|
||||
progress: p.progress != null ? Number(p.progress) : 0,
|
||||
}));
|
||||
return raw.map((p) => ({ id: p.id, name: p.name }));
|
||||
},
|
||||
create: async (p: Project): Promise<Project> => {
|
||||
const raw = await postData<RawProject>("/projects", {
|
||||
name: p.name,
|
||||
location: p.location || "",
|
||||
project_manager: p.project_manager || "",
|
||||
description: p.description || "",
|
||||
});
|
||||
return {
|
||||
id: raw.id,
|
||||
name: raw.name,
|
||||
location: raw.location || "",
|
||||
project_manager: raw.project_manager || "",
|
||||
description: raw.description || "",
|
||||
status: raw.status || "ACTIVE",
|
||||
progress: raw.progress != null ? Number(raw.progress) : 0,
|
||||
};
|
||||
},
|
||||
delete: async (id: string): Promise<void> => {
|
||||
await deleteData(`/projects/${id}`);
|
||||
const raw = await postData<RawProject>("/projects", { name: p.name });
|
||||
return { id: raw.id, name: raw.name };
|
||||
},
|
||||
},
|
||||
|
||||
@@ -1556,11 +1525,10 @@ interface RawUnitL { id: number; code: string; name_fa: string | null; }
|
||||
export interface UserRow {
|
||||
id: string;
|
||||
casdoor_id: string;
|
||||
username?: string | null;
|
||||
first_name: string;
|
||||
last_name: string;
|
||||
phone: string | null;
|
||||
role: "pm" | "procurement_manager" | "admin" | "supervisor" | null;
|
||||
role: "pm" | "procurement_manager" | "admin" | null;
|
||||
role_label: string | null;
|
||||
project_id: string | null;
|
||||
project_name: string | null;
|
||||
@@ -1585,11 +1553,10 @@ export const apiV26 = {
|
||||
user: {
|
||||
id: string;
|
||||
casdoor_id: string;
|
||||
username?: string;
|
||||
first_name: string;
|
||||
last_name: string;
|
||||
phone: string | null;
|
||||
role: "pm" | "procurement_manager" | "admin" | "supervisor" | null;
|
||||
role: "pm" | "procurement_manager" | "admin" | null;
|
||||
role_label: string | null;
|
||||
project_id: string | null;
|
||||
project_name: string | null;
|
||||
@@ -1603,7 +1570,6 @@ export const apiV26 = {
|
||||
expires_in: res.data.expires_in,
|
||||
user: {
|
||||
...u,
|
||||
username: u.username || u.casdoor_id,
|
||||
display_name: `${u.first_name} ${u.last_name}`.trim() || u.casdoor_id,
|
||||
},
|
||||
};
|
||||
@@ -1623,15 +1589,14 @@ export const apiV26 = {
|
||||
users: {
|
||||
me: async (): Promise<import("../store/auth").AuthUser> => {
|
||||
const data = await getData<{
|
||||
id: string; casdoor_id: string; username?: string; first_name: string; last_name: string; phone: string | null;
|
||||
role: "pm" | "procurement_manager" | "admin" | "supervisor" | null; role_label: string | null;
|
||||
id: string; casdoor_id: string; first_name: string; last_name: string; phone: string | null;
|
||||
role: "pm" | "procurement_manager" | "admin" | null; role_label: string | null;
|
||||
project_id: string | null; project_name: string | null;
|
||||
projects?: { id: string; name: string }[];
|
||||
}>("/users/me");
|
||||
return {
|
||||
id: data.id,
|
||||
casdoor_id: data.casdoor_id,
|
||||
username: data.username || data.casdoor_id,
|
||||
first_name: data.first_name,
|
||||
last_name: data.last_name,
|
||||
phone: data.phone,
|
||||
@@ -1655,7 +1620,7 @@ export const apiV26 = {
|
||||
first_name: string; last_name?: string; phone?: string | null;
|
||||
casdoor_id?: string | null; role?: "pm" | "procurement_manager" | "admin" | null;
|
||||
}): Promise<UserRow> => postData<UserRow>("/users", body),
|
||||
updateRole: async (id: string, role: "pm" | "procurement_manager" | "admin" | "supervisor" | null): Promise<UserRow> =>
|
||||
updateRole: async (id: string, role: "pm" | "procurement_manager" | "admin" | null): Promise<UserRow> =>
|
||||
patchData<UserRow>(`/users/${id}`, { role }),
|
||||
assignProject: async (id: string, projectId: string | null): Promise<UserRow> =>
|
||||
postData<UserRow>(`/users/${id}/project`, { project_id: projectId }),
|
||||
|
||||
Reference in New Issue
Block a user