From 6d45b5bf1166a44e7357be7fc2fdcec66fe4f08a Mon Sep 17 00:00:00 2001
From: Rafiafrzl <mrafiafrizal0@gmail.com>
Date: Mon, 20 Oct 2025 16:00:15 +0700
Subject: [PATCH] fix CardList

---
 src/components/Global/CardList.jsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/Global/CardList.jsx b/src/components/Global/CardList.jsx
index 624bca8..746e7c5 100644
--- a/src/components/Global/CardList.jsx
+++ b/src/components/Global/CardList.jsx
@@ -80,16 +80,18 @@ const CardList = ({
                         ]}
                     >
                         <div style={{ textAlign: 'left' }}>
-                            {column.map((itemCard) => (
-                                <>
-                                    {!itemCard.hidden && !itemCard.render && (
-                                        <p>
+                            {column.map((itemCard, index) => (
+                                <React.Fragment key={index}>
+                                    {!itemCard.hidden && itemCard.title !== 'No' && itemCard.title !== 'Aksi' && (
+                                        <p style={{ margin: '8px 0' }}>
                                             <Text strong>{itemCard.title}:</Text>{' '}
-                                            {item[itemCard.key]}
+                                            {itemCard.render
+                                                ? itemCard.render(item[itemCard.dataIndex], item, index)
+                                                : item[itemCard.dataIndex] || item[itemCard.key] || '-'
+                                            }
                                         </p>
                                     )}
-                                    {itemCard.render && itemCard.render}
-                                </>
+                                </React.Fragment>
                             ))}
                         </div>
                     </Card>