Skip to content

Commit 668538f

Browse files
PR comments
1 parent 5b364a6 commit 668538f

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/components/projects/projectId/attributes/attributeId/ExecutionContainer.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default function ExecutionContainer(props: ExecutionContainerProps) {
4545
setRequestedSomething(false);
4646
props.setEnabledButton(false);
4747
setRunOn10HasError(sampleRecordsFinal.calculatedAttributes.length > 0 ? false : true);
48-
if (currentAttributesRef.current.dataType == DataTypeEnum.EMBEDDING_LIST) {
48+
if (currentAttributesRef.current.dataType == DataTypeEnum.EMBEDDING_LIST || currentAttributesRef.current.dataType == DataTypeEnum.TEXT_LIST) {
4949
sampleRecordsFinal.calculatedAttributesList = sampleRecordsFinal.calculatedAttributes.map((record: string) => JSON.parse(record));
5050
sampleRecordsFinal.calculatedAttributesListDisplay = extendArrayElementsByUniqueId(sampleRecordsFinal.calculatedAttributesList);
5151
}
@@ -76,12 +76,9 @@ export default function ExecutionContainer(props: ExecutionContainerProps) {
7676
if (sampleRecords && sampleRecords.calculatedAttributesDisplay) {
7777
return sampleRecords.calculatedAttributesDisplay.map((record: any, index) => {
7878
let calculatedValue;
79-
if (currentAttributesRef.current.dataType == DataTypeEnum.EMBEDDING_LIST) {
79+
if (currentAttributesRef.current.dataType == DataTypeEnum.EMBEDDING_LIST || currentAttributesRef.current.dataType == DataTypeEnum.TEXT_LIST) {
8080
calculatedValue = { id: record.id, value: JSON.parse(record.value) };
8181
}
82-
if (currentAttributesRef.current.dataType == DataTypeEnum.TEXT_LIST) {
83-
calculatedValue = { id: record.id, value: JSON.stringify(record) };
84-
}
8582
else {
8683
calculatedValue = record
8784
}
@@ -144,7 +141,7 @@ export default function ExecutionContainer(props: ExecutionContainerProps) {
144141
<div key={record.id} className="divide-y divide-gray-200 bg-white">
145142
<div className="flex-shrink-0 border-b border-gray-200 shadow-sm flex justify-between items-center">
146143
<div className="flex items-center text-xs leading-5 text-gray-500 font-normal mx-4 my-3 text-justify">
147-
{String(record?.calculatedValue?.value)}
144+
{Array.isArray(record?.calculatedValue?.value) ? JSON.stringify(record?.calculatedValue?.value) : String(record?.calculatedValue?.value)}
148145
</div>
149146
<div className="flex items-center justify-center mr-5 ml-auto">
150147
<KernButton

src/components/projects/projectId/attributes/attributeId/ViewRecordDetailsModal.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,19 @@ import style from '@/src/styles/components/projects/projectId/attribute-calculat
66
import { RecordDisplay } from "@/src/components/shared/record-display/RecordDisplay";
77
import { ViewRecordDetailsModalProps } from "@/src/types/components/projects/projectId/settings/attribute-calculation";
88
import { selectVisibleAttributesHeuristics } from "@/src/reduxStore/states/pages/settings";
9+
import { useMemo } from "react";
910

1011
export default function ViewRecordDetailsModal(props: ViewRecordDetailsModalProps) {
1112
const modalViewRecordDetails = useSelector(selectModal(ModalEnum.VIEW_RECORD_DETAILS));
1213
const attributes = useSelector(selectVisibleAttributesHeuristics);
1314

15+
const displayValue = useMemo(() => {
16+
if (!props.sampleRecords || !modalViewRecordDetails.open) return null;
17+
return Array.isArray(props.sampleRecords[modalViewRecordDetails.recordIdx].calculatedValue.value)
18+
? JSON.stringify(props.sampleRecords[modalViewRecordDetails.recordIdx].calculatedValue.value)
19+
: String(props.sampleRecords[modalViewRecordDetails.recordIdx].calculatedValue.value);
20+
}, [props.sampleRecords, modalViewRecordDetails.recordIdx, modalViewRecordDetails.open]);
21+
1422
return (<>
1523
{modalViewRecordDetails.open && modalViewRecordDetails.record && props.sampleRecords && <>
1624
<Modal modalName={ModalEnum.VIEW_RECORD_DETAILS} className="md:max-w-5xl">
@@ -23,7 +31,7 @@ export default function ViewRecordDetailsModal(props: ViewRecordDetailsModalProp
2331
<div className="text-sm leading-5 text-left text-gray-900 font-medium">Calculated value</div>
2432
<div className="text-sm leading-5 text-left text-gray-500 font-normal whitespace-pre-line">
2533
<div className="flex flex-col gap-y-2 divide-y">
26-
{props.sampleRecords[modalViewRecordDetails.recordIdx].calculatedValue.value}
34+
{displayValue}
2735
</div>
2836
</div>
2937
</div>

0 commit comments

Comments
 (0)