diff --git a/static/focus.js b/static/focus.js index 4b43735..3eaf194 100644 --- a/static/focus.js +++ b/static/focus.js @@ -5,37 +5,30 @@ const API = { buhForms: "/api3/buh", }; -function run() { - sendRequest(API.organizationList, (orgOgrns) => { - const ogrns = orgOgrns.join(","); - sendRequest(`${API.orgReqs}?ogrn=${ogrns}`, (requisites) => { - const orgsMap = reqsToMap(requisites); - sendRequest(`${API.analytics}?ogrn=${ogrns}`, (analytics) => { - addInOrgsMap(orgsMap, analytics, "analytics"); - sendRequest(`${API.buhForms}?ogrn=${ogrns}`, (buh) => { - addInOrgsMap(orgsMap, buh, "buhForms"); - render(orgsMap, orgOgrns); - }); - }); - }); - }); +async function run() { + const orgOgrns = await sendRequest(API.organizationList); + const ogrns = orgOgrns.join(","); + const [orgReqs, analytics, buhForms] = await Promise.all([ + sendRequest(`${API.orgReqs}?ogrn=${ogrns}`), + sendRequest(`${API.analytics}?ogrn=${ogrns}`), + sendRequest(`${API.buhForms}?ogrn=${ogrns}`), + ]); + const orgsMap = reqsToMap(orgReqs); + addInOrgsMap(orgsMap, analytics, "analytics"); + addInOrgsMap(orgsMap, buhForms, "buhForms"); + render(orgsMap, orgOgrns); } run(); -function sendRequest(url, callback) { - const xhr = new XMLHttpRequest(); - xhr.open("GET", url, true); - - xhr.onreadystatechange = function () { - if (xhr.readyState === XMLHttpRequest.DONE) { - if (xhr.status === 200) { - callback(JSON.parse(xhr.response)); - } - } - }; - - xhr.send(); +async function sendRequest(url) { + const response = await fetch(url, { method: "GET" }); + if (response.ok) { + return response.json(); + } + const error = `${response.status} ${response.statusText}`; + alert(error); + return Promise.reject(error); } function reqsToMap(requisites) {