SQuiz/frontPanel
3
0
Fork 0
Code Issues 18 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'staging'

Browse Source 
страница тарифов получает все листы, амо обрабатывает ошибку вопросов

See merge request frontend/squiz!354
This commit is contained in:
Nastya 2024-07-10 20:57:30 +00:00
commit e210480920
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pages/IntegrationsPage/IntegrationsModal/AmoCRMModal.tsx
View File

@ -129,11 +129,14 @@ export const AmoCRMModal: FC<IntegrationsModalProps> = ({ isModalOpen, handleClo
if (type === "question") { if (type === "question") {
const q = questions.find(e => e.backendId === Number(id)) const q = questions.find(e => e.backendId === Number(id))
console.log(q)
console.log(questions)
console.log(id)
setSelectedQuestions((prevState) => ({ setSelectedQuestions((prevState) => ({
...prevState, ...prevState,
[scope]: [...prevState[scope as QuestionKeys], { [scope]: [...prevState[scope as QuestionKeys], {
id, id,
title: q.title, title: q?.title || "вопрос",
entity: scope, entity: scope,
}], }],
})); }));

4
src/pages/Tariffs/Tariffs.tsx
View File

@ -73,8 +73,8 @@ function TariffPage() {
tariffsList.push(...tariffsResponse.tariffs); tariffsList.push(...tariffsResponse.tariffs);
for (let page = 2; page <= tariffsResponse.totalPages; page += 1) { for (let page = 0; page <= tariffsResponse.totalPages; page += 1) {
const [tariffsResult] = await getTariffs(1); const [tariffsResult] = await getTariffs(page);
if (tariffsResult) { if (tariffsResult) {
tariffsList.push(...tariffsResult.tariffs); tariffsList.push(...tariffsResult.tariffs);