Skip to content

fix(portal): added company id on buyer column #868

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

Open
xuelianhan007 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix(portal): added company id on buyer column #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
514b0fc
added companyId
xuelianhan007 Dec 29, 2025
bd0011c
fixed unit test
xuelianhan007 Dec 29, 2025
6340466
fixed unit test
xuelianhan007 Dec 29, 2025
1b5eed3
fixed unit test
xuelianhan007 Dec 29, 2025
ad186f2
added styles for buyer column
xuelianhan007 Dec 31, 2025
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
1 change: 1 addition & 0 deletions kraken-app/kraken-app-portal/src/__test__/pages/EnvironmentActivityLog/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ test("EnvironmentActivityLog page", () => {
path: "test",
method: "test",
buyerName: "test",
companyId: "test",
queryParameters: {},
headers: {},
request: {},
Expand Down
1 change: 1 addition & 0 deletions ...mentActivityLog/components/ActivityDetailModal/ActivityDetailItem/__test__/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const mockActivity: IActivityLog = {
path: "/test-path",
method: "GET",
buyerName: "company",
companyId: "company-id",
queryParameters: { param1: "value1" },
headers: { header1: "value1" },
request: { param1: "value1", param2: "value2" },
Expand Down
9 changes: 7 additions & 2 deletions ...app-portal/src/pages/EnvironmentActivityLog/components/EnvironmentActivityTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,14 @@ const EnvironmentActivityTable = (props: EnvironmentActivityTablePropsType) => {
},
{
key: "buyerName",
title: "Buyer name",
title: "Buyer information",
width: 200,
render: (log: IActivityLog) => log.buyerName,
render: (_value, log: IActivityLog) => (
<Flex className={styles.productSpec}>
<p>{log.buyerName}</p>
<p>{log.companyId}</p>
</Flex>
),
},
{
key: "status",
Expand Down
12 changes: 12 additions & 0 deletions kraken-app/kraken-app-portal/src/pages/EnvironmentActivityLog/index.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,15 @@
background-color: #f5f5f5;
}
}

.productSpec {
display: flex;
flex-direction: column;
align-items: flex-start;

p {
text-align: left !important;
line-height: 1.2;
margin: 0;
}
}
2 changes: 1 addition & 1 deletion kraken-app/kraken-app-portal/src/pages/EnvironmentActivityLog/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ const EnvironmentActivityLog = () => {
fetchBuyerList
}
onChange={handleChange}
placeholder="Please select buyer"
placeholder="Please search by buyer id"
notFoundContent={
'No results found'
}
Expand Down
1 change: 1 addition & 0 deletions kraken-app/kraken-app-portal/src/utils/types/env.type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export interface IActivityLog {
path: string;
method: string;
buyerName: string;
companyId: string;
queryParameters: Record<string, any>;
headers: Record<string, any>;
request: Record<string, any>;
Expand Down
1 change: 1 addition & 0 deletions ...va-sdk-core/src/main/java/com/consoleconnect/kraken/operator/core/dto/ApiActivityLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class ApiActivityLog extends AbstractHttpModel {
private String clientId;
private String buyer;
private String buyerId;
private String companyId;
private String buyerName;
private String productType;
private String workflowStatus;
Expand Down
2 changes: 2 additions & 0 deletions .../src/main/java/com/consoleconnect/kraken/operator/core/service/ApiActivityLogService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ public Paging<ApiActivityLog> search(LogSearchRequest logSearchRequest, Pageable
UnifiedAsset.getFacets(buyerAssetDto, BuyerOnboardFacets.class);
apiActivityLog.setBuyerName(
facets.getBuyerInfo() == null ? "" : facets.getBuyerInfo().getCompanyName());
apiActivityLog.setCompanyId(
facets.getBuyerInfo() == null ? "" : facets.getBuyerInfo().getBuyerId());
}
return apiActivityLog;
});
Expand Down
Loading