Skip to content

Commit 9341c03

Browse files
committed
fix: log
1 parent 1904610 commit 9341c03

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

src/components/organisms/deployments/sessions/tabs/activities/singleActivityInfo.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { triggerEvent } from "@src/hooks";
77
import { SessionActivity } from "@src/interfaces/models";
88

99
import { Button } from "@components/atoms";
10-
import { JsonViewer, ValueRenderer } from "@components/molecules";
10+
import { JsonViewer } from "@components/molecules";
1111

1212
import { ArrowLeft, Close } from "@assets/image/icons";
1313

@@ -66,7 +66,12 @@ export const SingleActivityInfo = ({
6666
)}
6767

6868
<div className="mb-4 mt-8 font-bold">{t("returnValues")}</div>
69-
<ValueRenderer value={activity.returnValue?.value} />
69+
70+
{activity.returnValue?.value && Object.keys(activity.returnValue.value).length ? (
71+
<JsonViewer isCollapsed={true} value={activity.returnValue.value} />
72+
) : (
73+
<div>{t("noReturnValuesFound")}</div>
74+
)}
7075
</div>
7176
</div>
7277
</div>

src/models/activity.model.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,19 @@ export function convertSessionLogRecordsProtoToActivitiesModel(
8484

8585
if (callAttemptComplete.result?.value) {
8686
try {
87-
const parsedValue = safeParseSingleProtoValue(callAttemptComplete.result.value);
88-
currentActivity.returnValue =
89-
parsedValue || ({ type: "object", value: {} } as DeepProtoValueResult);
87+
let parsedValue = safeParseSingleProtoValue(callAttemptComplete.result.value);
88+
89+
if (typeof parsedValue === "string") {
90+
try {
91+
parsedValue = JSON.parse(parsedValue);
92+
} catch {
93+
parsedValue = { value: parsedValue };
94+
}
95+
}
96+
97+
currentActivity.returnValue = parsedValue
98+
? { type: "object", value: parsedValue }
99+
: { type: "object", value: {} };
90100
} catch {
91101
currentActivity.returnValue = { type: "object", value: {} } as DeepProtoValueResult;
92102
}

0 commit comments

Comments
 (0)