Merge pull request #169 from amosproj/fix/#166-explorer-does-show-all…

…-container-entries-from-the-sql-table Fix/#166 explorer does show all container entries from the sql table
amosproj · Jun 20, 2023 · 90ce174 · 90ce174
2 parents b6f82d0 + 1eb21bc
commit 90ce174
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/Explorer/cypress.config.ts b/Explorer/cypress.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from "cypress";
 
 export default defineConfig({
   e2e: {
+    baseUrl: "http://localhost:3000",
     setupNodeEvents(/*on, config*/) {
       // implement node event listeners here
     },

diff --git a/Explorer/cypress/e2e/cypress_test.cy.js b/Explorer/cypress/e2e/cypress_test.cy.js
@@ -1,7 +1,7 @@
 describe("Navigation", () => {
   it("should navigate to the about page", () => {
     // Start from cypress_test_1
-    cy.visit("http://localhost:3001/cypress_test/cypress_test_1");
+    cy.visit("/cypress_test/cypress_test_1");
 
     // Find a link with an href attribute containing "cypress_test_2" and click it
     cy.get('a[href*="cypress_test_2"]').click();

diff --git a/Explorer/src/lib/db.ts b/Explorer/src/lib/db.ts
@@ -70,7 +70,17 @@ export async function getContainerDetails(
 
 export async function getContainerList(): Promise<ContainerList> {
   const res = await pool.query(
-    "SELECT * FROM containers order by timestamp DESC"
+    // returns entry with the last timestamp for every unique (name, pod_id)
+    `SELECT
+        *
+    FROM (
+        SELECT
+            *,
+            RANK() OVER (PARTITION BY name, pod_id ORDER BY timestamp DESC) AS rank
+        FROM
+            containers) t
+    WHERE
+        t.rank = 1`
   );
   const containers: ContainerData[] = res.rows;
   return containers;