Added jobs count to dashboard #2585

TueeNguyen · 2021-12-08T22:33:42Z

Issue This PR Addresses

This fixes issue #2414 which is also a follow up of PR #2541

Type of Change

Bugfix: Change which fixes an issue
New Feature: Change which adds functionality
Documentation Update: Change which improves documentation
UI: Change which improves UI

Description

Added jobCountCard.hbs to display jobs in feeds queue in the backend
Added to src/api/status/src/js a new file queue-stats.js to fetch queue's information using posts API posts/feeds/info

To test this feature:

Added * or http://localhost/v1/posts/feeds/info to connectSrc in server.js
Change the fetch url in queue/index.js to http://localhost/v1/posts/feeds/info
Run pnpm run services:start posts in root folder and npm run dev in api/status, you'll get feeds/info initial response
(Optional) Run all services pnpm run services:start and pnpm start to start the backend feeds queue. Reload to see changes

2021-12-09.13-31-08.mp4

Checklist

Quality: This PR builds and passes our npm test and works locally
Tests: This PR includes thorough tests or an explanation of why it does not
Screenshots: This PR includes screenshots or GIFs of the changes made or an explanation of why it does not (if applicable)
Documentation: This PR includes updated/added documentation to user exposed functionality or configuration variables are added/changed or an explanation of why it does not(if applicable)

gitpod-io · 2021-12-08T22:33:44Z

manekenpix · 2021-12-09T02:09:46Z

src/api/posts/test/feeds.test.js

+      const resKeys = Object.keys(resBody.queueInfo);
+      for (let i = 0; i < resKeys.length; i += 1) {
+        if (allKeys.indexOf(resKeys[i]) < 0 || typeof resBody.queueInfo[resKeys[i]] !== 'number') {
+          bool = false;
+          break;
+        }
+      }


Suggested change

const resKeys = Object.keys(resBody.queueInfo);

for (let i = 0; i < resKeys.length; i += 1) {

if (allKeys.indexOf(resKeys[i]) < 0 || typeof resBody.queueInfo[resKeys[i]] !== 'number') {

bool = false;

break;

}

}

Object.keys(resBody.queueInfo).forEach((key) =>

if (!allKeys.includes(key) || typeof key !== 'number')

return false;

(didn't test it, but it's probably something very close to this)

I used every instead of forEach because forEach doesn't support break or return

humphd · 2021-12-09T14:16:16Z

This needs a rebase to update for changes to posts and status.

Kevan-Y

LGTM, nice feature

Andrewnt219

The dashboard LGTM. Not quite sure how to review the backend.

src/api/status/src/js/queue-stats.js

TueeNguyen · 2021-12-10T04:16:26Z

The dashboard LGTM. Not quite sure how to review the backend.

The backend is ok except for some test refactoring, I’ve got the backend approved in another PR

humphd · 2021-12-10T13:56:51Z

Where is this at? It says "Draft"

src/api/status/src/js/queue-stats.js

humphd · 2021-12-14T19:04:28Z

This needs to be rebased to pick up the changes in affected files, and I'd like to see it get finished asap so we can land it this week. Can I get an update please @TueNguyen2911?

TueeNguyen · 2021-12-14T19:06:38Z

Of course, I'll rebase this this afternoon after my last final! Sorry for the delay

TueeNguyen · 2021-12-14T23:40:27Z

@humphd, I've rebased it, can you take a look?

Andrewnt219

LGTM 👍.

Kevan-Y · 2021-12-15T17:05:03Z

src/api/status/src/js/queue-stats.js

+
+module.exports = async function getJobCount() {
+  try {
+    const data = await fetch(`${process.env.POST_URL}/feeds/info`, { method: 'GET' });


Suggested change

const data = await fetch(`${process.env.POST_URL}/feeds/info`, { method: 'GET' });

const data = await fetch(`${process.env.POSTS_URL}/feeds/info`, { method: 'GET' });

Kevan-Y

LGMT, great job 👍

src/api/posts/test/feeds.test.js

src/api/status/src/js/queue-stats.js

Andrewnt219 · 2021-12-15T21:02:28Z

src/api/posts/test/feeds.test.js

+      return Object.keys(resBody.queueInfo).every((key) => {
+        if (!allKeys.includes(key) || typeof resBody.queueInfo[key] !== 'number') {
+          return false;


Suggested change

return Object.keys(resBody.queueInfo).every((key) => {

if (!allKeys.includes(key) || typeof resBody.queueInfo[key] !== 'number') {

return false;

return Object.keys(resBody.queueInfo).every((key) => allKeys.includes(key) && typeof resBody.queueInfo[key] === 'number')

This can be shorted. Affirmative is usually easier to read too.

Sorry, I missed this part in the previous review.

No worries, thank you for the suggestion

humphd

R+ with CI passing.

TueeNguyen · 2021-12-15T22:42:56Z

Thanks!

vercel bot deployed to Preview December 8, 2021 22:33 View deployment

manekenpix reviewed Dec 9, 2021

View reviewed changes

TueeNguyen changed the title ~~Added jobs count to a~~ Added jobs count to dashboard Dec 9, 2021

TueeNguyen force-pushed the issue-2414-2 branch from 45ab3af to 135aefd Compare December 9, 2021 18:35

vercel bot deployed to Preview December 9, 2021 18:35 View deployment

TueeNguyen force-pushed the issue-2414-2 branch from 135aefd to 8832133 Compare December 9, 2021 18:37

vercel bot deployed to Preview December 9, 2021 18:37 View deployment

TueeNguyen force-pushed the issue-2414-2 branch from 8832133 to f11210e Compare December 9, 2021 18:43

vercel bot deployed to Preview December 9, 2021 18:43 View deployment

vercel bot deployed to Preview December 9, 2021 19:07 View deployment

vercel bot deployed to Preview December 9, 2021 19:08 View deployment

vercel bot deployed to Preview December 10, 2021 00:09 View deployment

vercel bot deployed to Preview December 10, 2021 00:10 View deployment

humphd requested review from manekenpix, Kevan-Y and Andrewnt219 December 10, 2021 00:54

Kevan-Y approved these changes Dec 10, 2021

View reviewed changes

Andrewnt219 reviewed Dec 10, 2021

View reviewed changes

Kevan-Y reviewed Dec 10, 2021

View reviewed changes

src/api/status/src/js/queue-stats.js Outdated Show resolved Hide resolved

Kevan-Y mentioned this pull request Dec 10, 2021

Fix fetch url between microservices + Fix sidebar root path links + cache github info #2590

Merged

8 tasks

Kevan-Y requested changes Dec 11, 2021

View reviewed changes

src/api/status/src/js/queue-stats.js Outdated Show resolved Hide resolved

TueeNguyen self-assigned this Dec 12, 2021

TueeNguyen force-pushed the issue-2414-2 branch from 54b53f3 to 7ba97dd Compare December 14, 2021 23:28

vercel bot deployed to Preview December 14, 2021 23:28 View deployment

Andrewnt219 requested a review from Kevan-Y December 15, 2021 15:36

Andrewnt219 previously approved these changes Dec 15, 2021

View reviewed changes

Kevan-Y requested changes Dec 15, 2021

View reviewed changes

TueeNguyen dismissed Andrewnt219’s stale review via 0705797 December 15, 2021 18:15

TueeNguyen force-pushed the issue-2414-2 branch from 7ba97dd to 0705797 Compare December 15, 2021 18:15

vercel bot deployed to Preview December 15, 2021 18:15 View deployment

Kevan-Y previously approved these changes Dec 15, 2021

View reviewed changes

humphd requested changes Dec 15, 2021

View reviewed changes

src/api/posts/test/feeds.test.js Outdated Show resolved Hide resolved

src/api/status/src/js/queue-stats.js Outdated Show resolved Hide resolved

Andrewnt219 suggested changes Dec 15, 2021

View reviewed changes

Added jobCount to status dashboard

1eaf75e

TueeNguyen dismissed Kevan-Y’s stale review via 1eaf75e December 15, 2021 21:42

TueeNguyen force-pushed the issue-2414-2 branch from 0705797 to 1eaf75e Compare December 15, 2021 21:42

vercel bot deployed to Preview December 15, 2021 21:43 View deployment

humphd approved these changes Dec 15, 2021

View reviewed changes

Andrewnt219 approved these changes Dec 15, 2021

View reviewed changes

Andrewnt219 merged commit 3c9dd6d into Seneca-CDOT:master Dec 15, 2021

Added jobs count to dashboard #2585

Added jobs count to dashboard #2585

TueeNguyen commented Dec 8, 2021 •

edited

gitpod-io bot commented Dec 8, 2021

manekenpix Dec 9, 2021 •

edited

TueeNguyen Dec 9, 2021

humphd commented Dec 9, 2021

Kevan-Y left a comment

Andrewnt219 left a comment

TueeNguyen commented Dec 10, 2021

humphd commented Dec 10, 2021

humphd commented Dec 14, 2021

TueeNguyen commented Dec 14, 2021

TueeNguyen commented Dec 14, 2021

Andrewnt219 left a comment

Kevan-Y Dec 15, 2021

Kevan-Y left a comment

Andrewnt219 Dec 15, 2021

Andrewnt219 Dec 15, 2021

TueeNguyen Dec 15, 2021

humphd left a comment

TueeNguyen commented Dec 15, 2021

	const data = await fetch(`${process.env.POST_URL}/feeds/info`, { method: 'GET' });
	const data = await fetch(`${process.env.POSTS_URL}/feeds/info`, { method: 'GET' });

Added jobs count to dashboard #2585

Added jobs count to dashboard #2585

Conversation

TueeNguyen commented Dec 8, 2021 • edited

Issue This PR Addresses

Type of Change

Description

To test this feature:

Checklist

gitpod-io bot commented Dec 8, 2021

manekenpix Dec 9, 2021 • edited

Choose a reason for hiding this comment

TueeNguyen Dec 9, 2021

Choose a reason for hiding this comment

humphd commented Dec 9, 2021

Kevan-Y left a comment

Choose a reason for hiding this comment

Andrewnt219 left a comment

Choose a reason for hiding this comment

TueeNguyen commented Dec 10, 2021

humphd commented Dec 10, 2021

humphd commented Dec 14, 2021

TueeNguyen commented Dec 14, 2021

TueeNguyen commented Dec 14, 2021

Andrewnt219 left a comment

Choose a reason for hiding this comment

Kevan-Y Dec 15, 2021

Choose a reason for hiding this comment

Kevan-Y left a comment

Choose a reason for hiding this comment

Andrewnt219 Dec 15, 2021

Choose a reason for hiding this comment

Andrewnt219 Dec 15, 2021

Choose a reason for hiding this comment

TueeNguyen Dec 15, 2021

Choose a reason for hiding this comment

humphd left a comment

Choose a reason for hiding this comment

TueeNguyen commented Dec 15, 2021

TueeNguyen commented Dec 8, 2021 •

edited

manekenpix Dec 9, 2021 •

edited