Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-23.1: ui: extend search logic on insights page #107762

Merged
merged 1 commit into from Jul 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 43 additions & 0 deletions pkg/ui/workspaces/cluster-ui/src/insights/utils.spec.ts
Expand Up @@ -214,6 +214,26 @@ describe("test workload insights utils", () => {
"no results",
);
expect(filtered.length).toEqual(0);

filtered = filterTransactionInsights(
[
...txnsWithQueries,
mockTxnInsightEvent({ sessionID: "my-uniq-session-id-11223344" }),
mockTxnInsightEvent({
stmtExecutionIDs: ["statement-exec-id-11223344"],
}),
mockTxnInsightEvent({
transactionExecutionID: "txn-exec-id-11223344",
}),
mockTxnInsightEvent({
transactionFingerprintID: "txn-fingerprint-id-11223344",
}),
],
{ app: "" },
INTERNAL_APP_PREFIX,
"11223344",
);
expect(filtered.length).toEqual(4);
});

it("should filter txns given a mix of requirements", () => {
Expand Down Expand Up @@ -344,6 +364,29 @@ describe("test workload insights utils", () => {
"no results",
);
expect(filtered.length).toEqual(0);

filtered = filterStatementInsights(
[
...stmtsWithQueries,
mockStmtInsightEvent({
transactionFingerprintID: "txn-fingerprint-id-11223344",
}),
mockStmtInsightEvent({
transactionExecutionID: "txn-exec-id-11223344",
}),
mockStmtInsightEvent({ sessionID: "session-id-11223344" }),
mockStmtInsightEvent({
statementFingerprintID: "stmt-fingerprint-id-11223344",
}),
mockStmtInsightEvent({
statementExecutionID: "stmt-exec-id-11223344",
}),
],
{ app: "" },
INTERNAL_APP_PREFIX,
"11223344",
);
expect(filtered.length).toEqual(5);
});

it("should filter txns given a mix of requirements", () => {
Expand Down
18 changes: 16 additions & 2 deletions pkg/ui/workspaces/cluster-ui/src/insights/utils.ts
Expand Up @@ -72,7 +72,13 @@ export const filterTransactionInsights = (

filteredTransactions = filteredTransactions.filter(
txn =>
txn.transactionExecutionID.toLowerCase()?.includes(search) ||
[
txn.transactionExecutionID,
txn.transactionFingerprintID,
txn.sessionID,
]
.concat(txn.stmtExecutionIDs)
.some(id => id.toLowerCase()?.includes(search)) ||
txn.query.toLowerCase().includes(search),
);
}
Expand Down Expand Up @@ -220,12 +226,20 @@ export const filterStatementInsights = (
),
);
}

if (search) {
search = search.toLowerCase();
filteredStatements = filteredStatements.filter(
stmt =>
!search ||
stmt.statementExecutionID.toLowerCase()?.includes(search) ||
// Search results in all ID columns of StmtInsightEvent.
[
stmt.sessionID,
stmt.transactionExecutionID,
stmt.transactionFingerprintID,
stmt.statementExecutionID,
stmt.statementFingerprintID,
].some(s => s.toLowerCase()?.includes(search)) ||
stmt.query?.toLowerCase().includes(search),
);
}
Expand Down