latest revision

packages/browser-tests/cypress/integration/console/schema.spec.js

@@ -27,7 +27,7 @@ describe("questdb schema with working tables", () => {
       cy.getByDataHook("schema-table-title").should("contain", table);
     });
     cy.getByDataHook("schema-filter-suspended-button").should("not.exist");
-    cy.getByDataHook("schema-suspension-popover-trigger").should("not.exist");
+    cy.getByDataHook("schema-row-error-icon").should("not.exist");
   });
 
   it("should filter the table with input field", () => {
@@ -101,9 +101,11 @@ describe("questdb schema with suspended tables with Linux OS error codes", () =>
     cy.getByDataHook("schema-filter-suspended-button").click();
   });
 
-  it("should show the suspension dialog on click with details for btc_trades", () => {
-    cy.get('input[name="table_filter"]').click().type("btc_trades");
-    cy.getByDataHook("schema-suspension-dialog-trigger").click();
+  it("should show the suspension dialog on context menu click with details for btc_trades", () => {
+    cy.getByDataHook("schema-table-title").contains("btc_trades").rightclick();
+    cy.getByDataHook("table-context-menu-resume-wal")
+      .filter(":visible")
+      .click();
     cy.getByDataHook("schema-suspension-dialog").should(
       "have.attr",
       "data-table-name",
@@ -121,8 +123,10 @@ describe("questdb schema with suspended tables with Linux OS error codes", () =>
   });
 
   it("should resume WAL for btc_trades from the suspension popover", () => {
-    cy.get('input[name="table_filter"]').click().type("btc_trades");
-    cy.contains("Suspended").click();
+    cy.getByDataHook("schema-table-title").contains("btc_trades").rightclick();
+    cy.getByDataHook("table-context-menu-resume-wal")
+      .filter(":visible")
+      .click();
     cy.getByDataHook("schema-suspension-dialog-restart-transaction").click();
     cy.getByDataHook("schema-suspension-dialog-dismiss").click();
     cy.getByDataHook("schema-suspension-dialog").should("not.exist");
@@ -241,15 +245,19 @@ describe("materialized views", () => {
     cy.expandTables();
     cy.getByDataHook("schema-table-title").should("contain", "btc_trades");
     cy.expandMatViews();
-    cy.getByDataHook("schema-table-title").should("contain", "btc_trades_mv");
+    cy.getByDataHook("schema-matview-title").should("contain", "btc_trades_mv");
   });
 
   it("should show the base table and copy DDL for a materialized view", () => {
     cy.expandMatViews();
-    cy.getByDataHook("schema-table-title").contains("btc_trades_mv").click();
-    cy.getByDataHook("schema-info-title").contains("Query").should("exist");
-    cy.getByDataHook("copyable-value").should("exist").and("be.visible");
-    cy.getByDataHook("copy-value").should("exist").click({ force: true });
+    cy.getByDataHook("schema-matview-title").contains("btc_trades_mv").click();
+    cy.getByDataHook("base-table-name").contains("btc_trades").should("exist");
+    cy.getByDataHook("schema-matview-title")
+      .contains("btc_trades_mv")
+      .rightclick();
+    cy.getByDataHook("table-context-menu-copy-schema")
+      .filter(":visible")
+      .click();
 
     if (Cypress.isBrowser("electron")) {
       cy.window()
@@ -262,22 +270,30 @@ describe("materialized views", () => {
     }
   });
 
-  it("should show a warning icon when base table is dropped", () => {
-    cy.loadConsoleWithAuth();
-    cy.dropTable("btc_trades");
-    cy.wait(1000);
+  it("should show a warning icon and tooltip when the view is invalidated", () => {
+    cy.intercept({
+        method: "GET",
+        pathname: "/exec",
+        query: {
+          query: "materialized_views()",
+        },
+      },
+      (req) => {
+        req.continue((res) => {
+          // [view_name, refresh_type, base_table_name, last_refresh_timestamp, view_sql, view_table_dir_name, invalidation_reason, view_status, base_table_txn, applied_base_table_txn]
+          res.body.dataset[0][6] = "this is an invalidation reason";
+          res.body.dataset[0][7] = "invalid";
+          return res;
+        });
+      }
+    );
     cy.refreshSchema();
-
     cy.expandMatViews();
-    cy.getByDataHook("schema-table-title").contains("btc_trades_mv").click();
-
-    cy.get('[data-hook="base-table-warning"]')
-      .should("exist")
-      .trigger("mouseover");
+    cy.getByDataHook("schema-row-error-icon").trigger("mouseover");
 
     cy.getByDataHook("tooltip").should(
       "contain",
-      "Base table has been dropped"
+      "Materialized view is invalid: this is an invalidation reason"
     );
   });
 

packages/web-console/src/components/ContextMenu/MenuItem.tsx

@@ -29,28 +29,18 @@ import { color } from "../../utils"
 
 const StyledMenuItem = styled(ReactMenuItem)`
   color: ${color("foreground")};
+  padding: 0.5rem 1.5rem;
+  display: flex;
+  justify-content: space-between;
   cursor: pointer;
-  padding: 0.5rem 1rem;
 
   &:hover {
     background: ${color("selection")};
   }
 `
 
-const StyledDivider = styled(ReactMenuItem)`
-  background: ${color("foreground")};
-  height: 1px;
-  width: 100%;
-  margin: 0.5rem 0;
-  padding: 0 1rem;
-`
-
-type Props = {} & MenuItemProps
-
-const MenuItem = ({ children, divider, ...rest }: PropsWithChildren<Props>) => {
-  const Component = divider ? StyledDivider : StyledMenuItem
-
-  return <Component {...rest}>{children}</Component>
-}
+const MenuItem = ({ children, ...rest }: PropsWithChildren<MenuItemProps>) => (
+  <StyledMenuItem {...rest}>{children}</StyledMenuItem>
+)
 
 export default MenuItem

packages/web-console/src/components/Tree/index.tsx

@@ -27,7 +27,7 @@ import Row from "../../scenes/Schema/Row"
 import styled from "styled-components"
 import { WrapWithIf } from "../"
 
-export type TreeNodeKind = "column" | "table" | "folder" | "info"
+export type TreeNodeKind = "column" | "table" | "matview" | "folder"
 
 export type TreeNodeRenderParams = {
   toggleOpen: ToggleOpen
@@ -65,7 +65,7 @@ const Ul = styled.ul`
 
 const Li = styled.li`
   list-style: none;
-  padding: 0 1rem;
+  padding-left: 1rem;
 `
 
 const Leaf = (leaf: TreeNode) => {