Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @gtr)

-- commits line 2 at r1:
Nit: you can't use Fixes because it still needs to be done on CC Console, so this should be Part Of, and you should include on the commit message

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 51 at r1 (raw file):

  calculateActiveFilters,
} from "src/queryFilter";
import { nodeRegions } from "src/transactionsPage/transactions.fixture";

fixture files are used for testing, if you need a new struct type, it should be created on another location

Nice work!
What happens when you're on Database details and change from tables to grants?

Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @gtr)

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 372 at r2 (raw file):

      {
        app: filters.app,
        timeNumber: filters.timeNumber,

you don't need to sync values that you don't actually show filters for

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 415 at r2 (raw file):

        table => {
          if (regionsSelected.length == 0 && nodesSelected.length == 0) return true;
          if (isTenant) return true;

why is returning true for tenants?

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 752 at r2 (raw file):

    const activeFilters = calculateActiveFilters(filters);

    const nodes = isTenant

tenants will have a list of nodes, we just don't show nodes info when is tenant, we hide that and show only region info

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 758 at r2 (raw file):

        .sort();

    const regions = isTenant

tenants do have regions

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 51 at r2 (raw file):

  handleFiltersFromQueryString
} from "../queryFilter";
import { merge} from "lodash";

nit: you need the space after merge

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 413 at r2 (raw file):

      {
        app: filters.app,
        timeNumber: filters.timeNumber,

ditto: sync only the values you're using on this filter

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 447 at r2 (raw file):

        db => {
          if (regionsSelected.length == 0 && nodesSelected.length == 0) return true;
          if (isTenant) return true;

same question: why returning true on this case?

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 599 at r2 (raw file):

  render(): React.ReactElement {
    this.columns.find(c => c.name === "nodeRegions").showByDefault = true;

curious: why this change?

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 620 at r2 (raw file):

        .sort();

    console.log("nodes:", Object.keys(nodeRegions).join(","));

remove this log

pkg/ui/workspaces/db-console/src/views/databases/databasesPage/redux.spec.ts line 201 at r2 (raw file):

      lastError: null,
      name: "system",
      nodes: [],

if you want to test, you should add actual values for the cases where it loaded and have no error

Good question! My most recent update makes it so that when you're on the Database details page and change from tables to grants, the filters component gets hidden. The search box still works because it looks at the table name column.

Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @maryliag)

-- commits line 2 at r1:

Done.

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 51 at r1 (raw file):

Good catch! I added a selector for nodeRegions in the Redux layer.

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 372 at r2 (raw file):

Removed all the values except nodes and regions.

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 415 at r2 (raw file):

I was under the assumption that if the cluster is a tenant cluster, then the node/region would be irrelevant. Removed this line.

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 752 at r2 (raw file):

Oh okay, got it! I removed the isTenant check for this line but added a check to the Filter's showNodes option to only show nodes when it is not a tenant and then the length of the nodes is greater than 1:

showNodes={!isTenant && nodes.length > 1}

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 758 at r2 (raw file):

Fixed.

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 51 at r2 (raw file):

Done.

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 413 at r2 (raw file):

Done.

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 447 at r2 (raw file):

Removed this line.

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 599 at r2 (raw file):

I left this in by accident! Reverted back.

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 620 at r2 (raw file):

Done.

Code quote:

console.log("

pkg/ui/workspaces/db-console/src/views/databases/databasesPage/redux.spec.ts line 201 at r2 (raw file):

I added test cases for different nodes:

driver.assertDatabaseProperties("system", {
    ...
    nodes: [1, 2, 4],
    ...
    nodesByRegionString: "undefined(n1,n2,n4)",
    ...
 });

But I am unable to define a region; currently it displays undefined.

Reviewed 3 of 6 files at r1, 1 of 3 files at r2, 6 of 6 files at r3, all commit messages.
Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @gtr)

-- commits line 4 at r3:
tip: if you just type #68826 github automatically creates the link for you, so you don't need to worry

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 415 at r2 (raw file):

The line is still here :)

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 413 at r2 (raw file):

Still seeing all the non-used value

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 447 at r2 (raw file):

Still seeing

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 611 at r3 (raw file):

    } = this.props;

    console.log("databasesPage.isTenant =", isTenant);

remove this log

pkg/ui/workspaces/db-console/src/views/databases/databasesPage/redux.spec.ts line 380 at r3 (raw file):

});

// function makeStateWithNodeRegions() {

remove unused function/comment

Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @maryliag)

-- commits line 4 at r3:

Got it! I had done this on the GitHub's description but not the git commit comment.

pkg/ui/workspaces/cluster-ui/src/databaseDetailsPage/databaseDetailsPage.tsx line 415 at r2 (raw file):

Oops, deleted.

Code quote:

if (isTenant) return true;

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 413 at r2 (raw file):

Done.

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 447 at r2 (raw file):

Done.

Code quote:

 if (isTenant) return true;

pkg/ui/workspaces/cluster-ui/src/databasesPage/databasesPage.tsx line 611 at r3 (raw file):

Done.

pkg/ui/workspaces/db-console/src/views/databases/databasesPage/redux.spec.ts line 380 at r3 (raw file):

Done.

Code quote:

makeStateWithNodeRegions()

The value for isTenant is only set when the page comes from CC on the props, but we don't set it when coming from DB console, this way the value will be undefined and when doing checks of isTenant? it will only be true when coming from CC, but undefined from DB console.
Because we only use on the page itself, we don't need to worry about setting a value for DB console, but now because you changed some of the functions definitions/parameter on the redux file, then you indeed need to hard code a value to be passed on.

Reviewed 10 of 10 files at r4, 1 of 1 files at r5, all commit messages.
Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @gtr)