timur.gorodetskiy/request-portal
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Правка ошибок #11

Merged
gorbenko.pavel merged 2 commits from fix-bug into main 2026-08-21 06:30:10 +00:00
Conversation 0 Commits 2 Files Changed 17
+57 -16
17 changed files with 57 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bf706907de - Show all commits
src/webparts/requestPortal/forms/Clearance/ClearanceForm.tsx
+2 -1
View File
@@ -26,6 +26,7 @@ import {
unassignedStepMessage
} from '../../shared/approval';
import { IRequestFormProps } from '../../models/types';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -79,7 +80,7 @@ const ClearanceForm: React.FC<IRequestFormProps> = ({
})
.catch((e) => {
if (alive) {
submit.setError(`Не удалось загрузить заявку №${editId}: ${(e as Error).message}`);
submit.setError(`Не удалось загрузить заявку №${editId}: ${friendlyErrorMessage(e)}`);
}
});
return () => {
src/webparts/requestPortal/forms/Clearance/ClearanceView.tsx
+2 -1
View File
@@ -13,6 +13,7 @@ import {
useRequestTypeId,
APPROVAL_PHASE
} from '../../shared/approval';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -105,7 +106,7 @@ const ClearanceView: React.FC<IClearanceViewProps> = ({ context, itemId, formKey
})
.catch((e) => {
if (alive) {
setError(`Не удалось загрузить заявку №${itemId}: ${(e as Error).message}`);
setError(`Не удалось загрузить заявку №${itemId}: ${friendlyErrorMessage(e)}`);
setLoading(false);
}
});
src/webparts/requestPortal/forms/RecruitingHire/RecruitingHireForm.tsx
+2 -1
View File
@@ -36,6 +36,7 @@ import {
IAttachmentInfo
} from '../../shared/attachments/attachments.service';
import { effectiveUserEmail } from '../../shared/impersonation';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import { IRequestFormProps } from '../../models/types';
import {
approvalListTitle,
@@ -91,7 +92,7 @@ const RecruitingHireForm: React.FC<IRequestFormProps> = ({
})
.catch((e) => {
if (alive) {
submit.setError(`Не удалось загрузить заявку №${editId}: ${(e as Error).message}`);
submit.setError(`Не удалось загрузить заявку №${editId}: ${friendlyErrorMessage(e)}`);
}
});
return () => {
src/webparts/requestPortal/forms/RecruitingHire/RecruitingHireView.tsx
+2 -1
View File
@@ -15,6 +15,7 @@ import {
} from '../../shared/approval';
import { navigate } from '../../shared/routing';
import { getAttachments, IAttachmentInfo } from '../../shared/attachments/attachments.service';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -117,7 +118,7 @@ const RecruitingHireView: React.FC<IRecruitingHireViewProps> = ({ context, itemI
})
.catch((e) => {
if (alive) {
setError(`Не удалось загрузить заявку №${itemId}: ${(e as Error).message}`);
setError(`Не удалось загрузить заявку №${itemId}: ${friendlyErrorMessage(e)}`);
setLoading(false);
}
});
src/webparts/requestPortal/forms/RecruitingSelection/RecruitingSelectionForm.tsx
+2 -1
View File
@@ -35,6 +35,7 @@ import {
IAttachmentInfo
} from '../../shared/attachments/attachments.service';
import { effectiveUserEmail } from '../../shared/impersonation';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import { IRequestFormProps } from '../../models/types';
import {
approvalListTitle,
@@ -88,7 +89,7 @@ const RecruitingSelectionForm: React.FC<IRequestFormProps> = ({
})
.catch((e) => {
if (alive) {
submit.setError(`Не удалось загрузить заявку №${editId}: ${(e as Error).message}`);
submit.setError(`Не удалось загрузить заявку №${editId}: ${friendlyErrorMessage(e)}`);
}
});
return () => {
src/webparts/requestPortal/forms/RecruitingSelection/RecruitingSelectionView.tsx
+2 -1
View File
@@ -13,6 +13,7 @@ import {
useRequestTypeId
} from '../../shared/approval';
import { getAttachments, IAttachmentInfo } from '../../shared/attachments/attachments.service';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -83,7 +84,7 @@ const RecruitingSelectionView: React.FC<IRecruitingSelectionViewProps> = ({ cont
})
.catch((e) => {
if (alive) {
setError(`Не удалось загрузить заявку №${itemId}: ${(e as Error).message}`);
setError(`Не удалось загрузить заявку №${itemId}: ${friendlyErrorMessage(e)}`);
setLoading(false);
}
});
src/webparts/requestPortal/forms/Ticket1C/Ticket1CForm.tsx
+2 -1
View File
@@ -35,6 +35,7 @@ import {
IAttachmentInfo
} from '../../shared/attachments/attachments.service';
import { effectiveUserEmail } from '../../shared/impersonation';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import { IRequestFormProps } from '../../models/types';
import {
approvalListTitle,
@@ -105,7 +106,7 @@ const Ticket1CForm: React.FC<IRequestFormProps> = ({
})
.catch((e) => {
if (alive) {
submit.setError(`Не удалось загрузить заявку №${editId}: ${(e as Error).message}`);
submit.setError(`Не удалось загрузить заявку №${editId}: ${friendlyErrorMessage(e)}`);
}
});
return () => {
src/webparts/requestPortal/forms/Ticket1C/Ticket1CView.tsx
+2 -1
View File
@@ -27,6 +27,7 @@ import {
REQUEST_STATUS
} from '../../shared/approval';
import { getAttachments, IAttachmentInfo } from '../../shared/attachments/attachments.service';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -122,7 +123,7 @@ const Ticket1CView: React.FC<ITicket1CViewProps> = ({ context, itemId, formKey,
})
.catch((e) => {
if (alive) {
setError(`Не удалось загрузить заявку №${itemId}: ${(e as Error).message}`);
setError(`Не удалось загрузить заявку №${itemId}: ${friendlyErrorMessage(e)}`);
setLoading(false);
}
});
src/webparts/requestPortal/forms/TmcTransfer/TmcTransferForm.tsx
+2 -1
View File
@@ -36,6 +36,7 @@ import {
IAttachmentInfo
} from '../../shared/attachments/attachments.service';
import { effectiveUserEmail } from '../../shared/impersonation';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import { IRequestFormProps } from '../../models/types';
import {
approvalListTitle,
@@ -104,7 +105,7 @@ const TmcTransferForm: React.FC<IRequestFormProps> = ({
})
.catch((e) => {
if (alive) {
submit.setError(`Не удалось загрузить заявку №${editId}: ${(e as Error).message}`);
submit.setError(`Не удалось загрузить заявку №${editId}: ${friendlyErrorMessage(e)}`);
}
});
return () => {
src/webparts/requestPortal/forms/TmcTransfer/TmcTransferView.tsx
+2 -1
View File
@@ -27,6 +27,7 @@ import {
APPROVAL_PHASE
} from '../../shared/approval';
import { getAttachments, IAttachmentInfo } from '../../shared/attachments/attachments.service';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -107,7 +108,7 @@ const TmcTransferView: React.FC<ITmcTransferViewProps> = ({ context, itemId, for
})
.catch((e) => {
if (alive) {
setError(`Не удалось загрузить заявку №${itemId}: ${(e as Error).message}`);
setError(`Не удалось загрузить заявку №${itemId}: ${friendlyErrorMessage(e)}`);
setLoading(false);
}
});
src/webparts/requestPortal/forms/UnpaidLeave/UnpaidLeaveForm.tsx
+2 -1
View File
@@ -25,6 +25,7 @@ import {
resolveWriteListId
} from '../../shared/approval';
import { IRequestFormProps } from '../../models/types';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -78,7 +79,7 @@ const UnpaidLeaveForm: React.FC<IRequestFormProps> = ({
})
.catch((e) => {
if (alive) {
submit.setError(`Не удалось загрузить заявку №${editId}: ${(e as Error).message}`);
submit.setError(`Не удалось загрузить заявку №${editId}: ${friendlyErrorMessage(e)}`);
}
});
return () => {
src/webparts/requestPortal/forms/UnpaidLeave/UnpaidLeaveView.tsx
+2 -1
View File
@@ -12,6 +12,7 @@ import {
notifyActiveStep,
useRequestTypeId
} from '../../shared/approval';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -77,7 +78,7 @@ const UnpaidLeaveView: React.FC<IUnpaidLeaveViewProps> = ({ context, itemId, for
})
.catch((e) => {
if (alive) {
setError(`Не удалось загрузить заявку №${itemId}: ${(e as Error).message}`);
setError(`Не удалось загрузить заявку №${itemId}: ${friendlyErrorMessage(e)}`);
setLoading(false);
}
});
src/webparts/requestPortal/forms/Vacation/VacationForm.tsx
+2 -1
View File
@@ -25,6 +25,7 @@ import {
unassignedStepMessage
} from '../../shared/approval';
import { IRequestFormProps } from '../../models/types';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -78,7 +79,7 @@ const VacationForm: React.FC<IRequestFormProps> = ({
})
.catch((e) => {
if (alive) {
submit.setError(`Не удалось загрузить заявку №${editId}: ${(e as Error).message}`);
submit.setError(`Не удалось загрузить заявку №${editId}: ${friendlyErrorMessage(e)}`);
}
});
return () => {
src/webparts/requestPortal/forms/Vacation/VacationView.tsx
+2 -1
View File
@@ -12,6 +12,7 @@ import {
notifyActiveStep,
useRequestTypeId
} from '../../shared/approval';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -77,7 +78,7 @@ const VacationView: React.FC<IVacationViewProps> = ({ context, itemId, formKey,
})
.catch((e) => {
if (alive) {
setError(`Не удалось загрузить заявку №${itemId}: ${(e as Error).message}`);
setError(`Не удалось загрузить заявку №${itemId}: ${friendlyErrorMessage(e)}`);
setLoading(false);
}
});
src/webparts/requestPortal/forms/WorkplaceSetup/WorkplaceSetupForm.tsx
+2 -1
View File
@@ -36,6 +36,7 @@ import {
IAttachmentInfo
} from '../../shared/attachments/attachments.service';
import { effectiveUserEmail } from '../../shared/impersonation';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import { IRequestFormProps } from '../../models/types';
import {
approvalListTitle,
@@ -93,7 +94,7 @@ const WorkplaceSetupForm: React.FC<IRequestFormProps> = ({
})
.catch((e) => {
if (alive) {
submit.setError(`Не удалось загрузить заявку №${editId}: ${(e as Error).message}`);
submit.setError(`Не удалось загрузить заявку №${editId}: ${friendlyErrorMessage(e)}`);
}
});
return () => {
src/webparts/requestPortal/forms/WorkplaceSetup/WorkplaceSetupView.tsx
+2 -1
View File
@@ -27,6 +27,7 @@ import {
APPROVAL_PHASE
} from '../../shared/approval';
import { getAttachments, IAttachmentInfo } from '../../shared/attachments/attachments.service';
import { friendlyErrorMessage } from '../../shared/diagnostics';
import {
approvalListTitle,
approvalListTitleForListId,
@@ -122,7 +123,7 @@ const WorkplaceSetupView: React.FC<IWorkplaceSetupViewProps> = ({ context, itemI
})
.catch((e) => {
if (alive) {
setError(`Не удалось загрузить заявку №${itemId}: ${(e as Error).message}`);
setError(`Не удалось загрузить заявку №${itemId}: ${friendlyErrorMessage(e)}`);
setLoading(false);
}
});
src/webparts/requestPortal/shared/diagnostics.ts
+25
View File
@@ -52,6 +52,31 @@ export function describeReason(reason: unknown): string {
}
}
// PnPjs/SharePoint кладёт в Error.message текст ответа сервера целиком —
// например: `Error making HttpClient request in queryable [404] ::>
// {"odata.error":{"message":{"value":"Элемент не существует..."}}}`. Пока это
// строка, а не распарсенный JSON, русские буквы в ней остаются как литеральные
// escape-последовательности `Эл...`, и в UI вместо кириллицы видно
// набор из "\u". Достаём odata.error.message.value через JSON.parse — сам
// парсер раскодирует escape-последовательности обратно в текст.
export function friendlyErrorMessage(e: unknown): string {
const message = e instanceof Error ? e.message : String(e);
const start = message.indexOf('{');
const end = message.lastIndexOf('}');
if (start !== -1 && end > start) {
try {
const parsed = JSON.parse(message.slice(start, end + 1)) as {
'odata.error'?: { message?: { value?: string } };
};
const value = parsed['odata.error']?.message?.value;
if (value) return value;
} catch {
// Тело не JSON (или не то, что ожидали) — отдаём исходное сообщение.
}
}
return message;
}
function logError(kind: string, reason: unknown): void {
console.error(`${PREFIX} ${kind}: ${describeReason(reason)}`);
// Стек и объект — отдельными аргументами: так консоль браузера даёт