Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions middlewares/topBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ async function getProjectStatusGlobal(req) {
async function getInfo(req, res, next) {
req.topBar = [];

await getJobStatus(req);
await getSessionStatus(req);
await getHostStatus(req);
await getProjectStatusGlobal(req);
await Promise.all([
getJobStatus(req),
getSessionStatus(req),
getHostStatus(req),
getProjectStatusGlobal(req),
]);

next();
}
Expand Down
17 changes: 16 additions & 1 deletion routes/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,22 @@ router.get('/job/:id', topBar.getInfo, jobs.getJob, dependencies.getJobDependenc
});

// project page with id
router.get('/project/:id', topBar.getInfo, projects.getProject, projects.getJobsOfProject, dependencies.getProjectDependencies, (req, res) => {
router.get('/project/:id', async (req, res, next) => {
try {
const wrap = (fn) => new Promise(
(resolve, reject) => fn(req, res, (err) => (err ? reject(err) : resolve())),
);
await Promise.all([
wrap(topBar.getInfo),
wrap(projects.getProject),
wrap(projects.getJobsOfProject),
wrap(dependencies.getProjectDependencies),
]);
next();
} catch (error) {
next(error);
}
}, (req, res) => {
res.render('pages/project', {
topBar: req.topBar,
id: req.params.id,
Expand Down
Loading