From 71df7cd9c279092acc4c4b838bb7efabfe420297 Mon Sep 17 00:00:00 2001
From: Bowen Tan <bowen.tan@smartx.com>
Date: Mon, 9 Jan 2023 15:53:03 +0800
Subject: [PATCH] fix(editor): allow removing data source trait

---
 .../ComponentForm/GeneralTraitFormList/GeneralTraitForm.tsx   | 2 +-
 packages/editor/src/components/DataSource/DataSourceGroup.tsx | 2 +-
 packages/editor/src/components/DataSource/DataSourceList.tsx  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/editor/src/components/ComponentForm/GeneralTraitFormList/GeneralTraitForm.tsx b/packages/editor/src/components/ComponentForm/GeneralTraitFormList/GeneralTraitForm.tsx
index 06b3bdac..d822822f 100644
--- a/packages/editor/src/components/ComponentForm/GeneralTraitFormList/GeneralTraitForm.tsx
+++ b/packages/editor/src/components/ComponentForm/GeneralTraitFormList/GeneralTraitForm.tsx
@@ -39,7 +39,7 @@ export const GeneralTraitForm: React.FC<Props> = props => {
     <VStack key={trait.type} className={formWrapperCSS}>
       <HStack width="full" justifyContent="space-between">
         <strong>{trait.type}</strong>
-        {!tImpl.metadata.isDataSource && onRemove ? (
+        {onRemove ? (
           <IconButton
             aria-label="remove trait"
             variant="ghost"
diff --git a/packages/editor/src/components/DataSource/DataSourceGroup.tsx b/packages/editor/src/components/DataSource/DataSourceGroup.tsx
index 1a18c65c..c7f953d5 100644
--- a/packages/editor/src/components/DataSource/DataSourceGroup.tsx
+++ b/packages/editor/src/components/DataSource/DataSourceGroup.tsx
@@ -82,7 +82,7 @@ export const DataSourceGroup: React.FC<Props> = props => {
       <AccordionButton justifyContent="space-between">
         <HStack>
           {type === 'component' ? <Tag colorScheme="blue">C</Tag> : undefined}
-          <Text fontWeight="bold">{title}</Text>
+          <Text fontWeight="bold">{title || 'Unknown'}</Text>
         </HStack>
         <AccordionIcon />
       </AccordionButton>
diff --git a/packages/editor/src/components/DataSource/DataSourceList.tsx b/packages/editor/src/components/DataSource/DataSourceList.tsx
index 9bdd7e4c..b78b9dc9 100644
--- a/packages/editor/src/components/DataSource/DataSourceList.tsx
+++ b/packages/editor/src/components/DataSource/DataSourceList.tsx
@@ -33,7 +33,7 @@ export const DataSourceList: React.FC<Props> = props => {
   const tDataSources = dataSources.filter(ds => ds.type === 'core/v1/dummy');
   const cDataSources = dataSources.filter(ds => ds.type !== 'core/v1/dummy');
   const cdsMap = groupBy(cDataSources, c => c.type);
-  const tdsMap = groupBy(tDataSources, c => c.traits[0]?.type);
+  const tdsMap = groupBy(tDataSources, c => c.traits[0]?.type || '');
   const cdsGroups = Object.keys(cdsMap).map(type => {
     return {
       title: type,
@@ -44,7 +44,7 @@ export const DataSourceList: React.FC<Props> = props => {
   const tdsGroups = Object.keys(tdsMap).map(type => {
     return {
       title: type,
-      dataSources: tdsMap[type],
+      dataSources: tdsMap[type] || [],
       type: 'trait',
     };
   });