From 77792ede2e4ac456cb7e6ea23dcb3b3ceab6831d Mon Sep 17 00:00:00 2001 From: Toph Allen Date: Mon, 19 May 2025 17:19:40 -0400 Subject: [PATCH 1/3] remove metrics/proc call from app --- extensions/publisher-command-center/app.py | 17 +++++------------ .../src/components/ContentsComponent.js | 2 +- .../src/components/Processes.js | 6 +----- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/extensions/publisher-command-center/app.py b/extensions/publisher-command-center/app.py index 31d28658..f420c619 100644 --- a/extensions/publisher-command-center/app.py +++ b/extensions/publisher-command-center/app.py @@ -47,14 +47,9 @@ def get_visitor_client(token: str | None) -> connect.Client: async def contents(posit_connect_user_session_token: str = Header(None)): visitor = get_visitor_client(posit_connect_user_session_token) - response = client.get("metrics/procs") - processes = response.json() - contents = visitor.me.content.find() for content in contents: - content["processes"] = [ - process for process in processes if content["guid"] == process["app_guid"] - ] + content["active_jobs"] = [job for job in content.jobs if job["status"] == 0] return contents @@ -74,12 +69,10 @@ async def get_content_processes( visitor = get_visitor_client(posit_connect_user_session_token) # Assert the viewer has access to the content - assert visitor.content.get(content_id) - - response = client.get("metrics/procs") - processes = response.json() - - return [process for process in processes if process.get("app_guid") == content_id] + content = visitor.content.get(content_id) + # make a list of the iterable: + active_jobs = [job for job in content.jobs if job["status"] == 0] + return active_jobs @app.delete("/api/contents/{content_id}/processes/{process_id}") diff --git a/extensions/publisher-command-center/src/components/ContentsComponent.js b/extensions/publisher-command-center/src/components/ContentsComponent.js index ae7e9dbb..82315b97 100644 --- a/extensions/publisher-command-center/src/components/ContentsComponent.js +++ b/extensions/publisher-command-center/src/components/ContentsComponent.js @@ -72,7 +72,7 @@ const ContentsComponent = { "td", m(Languages, content) ), - m("td", content?.processes.length), + m("td", content?.active_jobs?.length), m("td", format(content["last_deployed_time"], "MMM do, yyyy")), m("td", format(content["created_time"], "MMM do, yyyy")), m( diff --git a/extensions/publisher-command-center/src/components/Processes.js b/extensions/publisher-command-center/src/components/Processes.js index 3a0f154d..211c15e5 100644 --- a/extensions/publisher-command-center/src/components/Processes.js +++ b/extensions/publisher-command-center/src/components/Processes.js @@ -103,8 +103,6 @@ export default { m("th", { scope: "col" }, ""), m("th", { scope: "col" }, "Id"), m("th", { scope: "col" }, "Started"), - m("th", { scope: "col" }, "CPUs"), - m("th", { scope: "col" }, "Memory"), m("th", { scope: "col" }, "Hostname"), ]), ), @@ -116,7 +114,7 @@ export default { "td.text-center.py-2", m(StopButton, { content_id: vnode.attrs.id, - process_id: process?.job_key, + process_id: process?.key, }), ), m("td", process?.pid), @@ -124,8 +122,6 @@ export default { "td", formatDistanceToNow(process?.start_time, { addSuffix: true }), ), - m("td", Number(process?.cpu_current).toFixed(2)), - m("td", filesize(process?.ram)), m("td", process?.hostname), ]); }), From c9f81149b39a16246d10126bba83ec883c9bfde1 Mon Sep 17 00:00:00 2001 From: Toph Allen Date: Mon, 19 May 2025 17:19:51 -0400 Subject: [PATCH 2/3] rebuild and update manifest --- extensions/publisher-command-center/manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/publisher-command-center/manifest.json b/extensions/publisher-command-center/manifest.json index 38c6eccd..cb167231 100644 --- a/extensions/publisher-command-center/manifest.json +++ b/extensions/publisher-command-center/manifest.json @@ -22,7 +22,7 @@ "checksum": "a162a98758867a701ce693948ffdfa67" }, "app.py": { - "checksum": "0e5df52143323d9ae49cf77c51298cde" + "checksum": "92709c50369eca0216b8e121cd87c94c" }, "dist/assets/fa-brands-400.808443ae.ttf": { "checksum": "15d54d142da2f2d6f2e90ed1d55121af" @@ -51,11 +51,11 @@ "dist/assets/index.0c2ac2eb.css": { "checksum": "96fb5a8d93644a29ece62d52354fbc73" }, - "dist/assets/index.835b2c40.js": { - "checksum": "52e8175304138c1ef6d18c808dcb4b04" + "dist/assets/index.3b47d0e1.js": { + "checksum": "b7a54352e0a5437ef97c8d3202983dac" }, "dist/index.html": { - "checksum": "a3cf0e03275e2436d932280af100438c" + "checksum": "a64aa56406944bd2184562c18bfc3b4e" } }, "extension": { From 51c4d70a15da7dedc980e75c826a69cb33dcc7bd Mon Sep 17 00:00:00 2001 From: Toph Allen Date: Mon, 19 May 2025 17:41:31 -0400 Subject: [PATCH 3/3] update version number --- extensions/publisher-command-center/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/publisher-command-center/manifest.json b/extensions/publisher-command-center/manifest.json index cb167231..ac29b4c9 100644 --- a/extensions/publisher-command-center/manifest.json +++ b/extensions/publisher-command-center/manifest.json @@ -68,6 +68,6 @@ "API Publishing", "OAuth Integrations" ], - "version": "0.0.2" + "version": "0.0.3" } }