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.

Sign up for GitHub

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

ui: show txn fingerprint details page with unspecified app #107742

Merged
merged 1 commit into from
Jul 28, 2023
Merged

ui: show txn fingerprint details page with unspecified app #107742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 61 additions & 22 deletions pkg/ui/workspaces/cluster-ui/src/transactionDetails/transactionDetailsUtils.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,68 @@ import { shuffle } from "lodash";
import Long from "long";

describe("getTxnFromSqlStatsTxns", () => {
//TODO
it("should return the first txn with the fingerprint ID and app name specified", () => {
const app = "cockroach";
const txns = [
{ id: 1, app: "hello_world" },
{ id: 2, app },
{ id: 3, app: "cockrooch" },
{ id: 3, app },
{ id: 4, app: "my_app" },
].map(txn =>
mockTxnStats({
stats_data: {
transaction_fingerprint_id: Long.fromInt(txn.id),
app: txn.app,
},
}),
);
it.each([
[
[
{ id: 1, app: "hello_world" },
{ id: 2, app: "cockroach" },
{ id: 3, app: "" },
{ id: 3, app: "cockroach" },
{ id: 3, app: "cockroach" },
{ id: 3, app: "my_app" },
{ id: 4, app: "my_app" },
],
"3", // fingerprint id
["cockroach", "my_app"], // app name
3, // Expected idx.
],
[
[
{ id: 1, app: "hello_world" },
{ id: 2, app: "cockroach_app" },
{ id: 3, app: "" },
{ id: 3, app: "cockroach" },
{ id: 3, app: "my_app" },
{ id: 4, app: "my_app" },
],
"3", // fingerprint id
["cockroach", "my_app"], // app name
3, // Expected idx.
],
[
[
{ id: 1, app: "hello_world" },
{ id: 2, app: "cockroach" },
{ id: 2, app: "cockrooch" },
{ id: 3, app: "cockroach" },
{ id: 4, app: "my_app" },
],
"2", // fingerprint id
null, // app names
1, // Expected idx.
],
])(
"should return the first txn with the fingerprint ID and app name specified",
(
txnsToMock,
fingerprintID: string,
apps: string[] | null,
expectedIdx: number,
) => {
const txns = txnsToMock.map((txn: { id: number; app: string }) =>
mockTxnStats({
stats_data: {
transaction_fingerprint_id: Long.fromInt(txn.id),
app: txn.app,
},
}),
);

const expectedTxn = txns[3];
const txn = getTxnFromSqlStatsTxns(txns, "3", [app]);
expect(txn).toEqual(expectedTxn);
});
const expectedTxn = txns[expectedIdx];
const txn = getTxnFromSqlStatsTxns(txns, fingerprintID, apps);
expect(txn).toEqual(expectedTxn);
},
);

it("should return null if no txn can be found", () => {
const txns = [1, 2, 3, 4, 5, 6].map(txn =>
Expand All @@ -60,7 +100,6 @@ describe("getTxnFromSqlStatsTxns", () => {
[null, "123", null],
[null, null, ["app"]],
[[mockTxnStats()], null, null],
[[mockTxnStats()], "123", null],
[[mockTxnStats()], "123", []],
[[mockTxnStats()], null, ["app"]],
[[mockTxnStats()], "", ["app"]],
Expand Down
4 changes: 2 additions & 2 deletions pkg/ui/workspaces/cluster-ui/src/transactionDetails/transactionDetailsUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ export const getTxnFromSqlStatsTxns = (
txnFingerprintID: string | null,
apps: string[] | null,
): Transaction | null => {
if (!txns?.length || !apps?.length || !txnFingerprintID) {
if (!txns?.length || !txnFingerprintID) {
return null;
}

return txns.find(
txn =>
txn.stats_data.transaction_fingerprint_id.toString() ===
txnFingerprintID &&
(apps.length ? apps.includes(txn.stats_data.app ?? unset) : true),
(apps?.length ? apps.includes(txn.stats_data.app ?? unset) : true),
);
};

Expand Down
9 changes: 6 additions & 3 deletions pkg/ui/workspaces/cluster-ui/src/transactionsTable/transactionsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,12 @@ interface TransactionLinkTargetProps {
export const TransactionLinkTarget = (
props: TransactionLinkTargetProps,
): string => {
const searchParams = propsToQueryString({
[appNamesAttr]: [props.application],
});
let searchParams = "";
if (props.application != null) {
searchParams = propsToQueryString({
[appNamesAttr]: [props.application],
});
}

return `/transaction/${props.transactionFingerprintId}?${searchParams}`;
};
Expand Down