Merge pull request #645 from jetstreamapp/bug/644

Ensure number in id column does not break table
jetstreamapp · Dec 1, 2023 · 0948cab · 0948cab
2 parents ddab6ba + 7a25f86
commit 0948cab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/apps/jetstream/src/app/components/query/QueryBuilder/QueryChildFields.tsx b/apps/jetstream/src/app/components/query/QueryBuilder/QueryChildFields.tsx
@@ -97,7 +97,7 @@ export const QueryChildFields: FunctionComponent<QueryChildFieldsProps> = ({
           (field): QueryFieldWithPolymorphic => ({
             field: `${basePath}${field}`,
             polymorphicObj: queryField.isPolymorphic ? queryField.sobject : undefined,
-            metadata: queryField.fields[field].metadata,
+            metadata: queryField.fields[field]?.metadata,
           })
         );
       });

diff --git a/apps/jetstream/src/app/components/query/utils/query-fields-utils.ts b/apps/jetstream/src/app/components/query/utils/query-fields-utils.ts
@@ -49,7 +49,7 @@ export function getSelectedFieldsFromQueryFields(fieldsMap: MapOf<QueryFields>):
           return {
             field: `${basePath}${field}`,
             polymorphicObj: queryField.isPolymorphic ? queryField.sobject : undefined,
-            metadata: queryField.fields[field].metadata,
+            metadata: queryField.fields[field]?.metadata,
           };
         });
       }),

diff --git a/libs/ui/src/lib/data-table/data-table-utils.tsx b/libs/ui/src/lib/data-table/data-table-utils.tsx
@@ -76,7 +76,7 @@ export function getRowId(data: any): string {
     return uniqueId('row-id');
   }
   let nodeId = data?.attributes?.url || data.Id || data.id || data.key;
-  if (!nodeId || nodeId.endsWith(SFDC_EMPTY_ID) || data.Id === SFDC_EMPTY_ID) {
+  if (!nodeId || (isString(nodeId) && nodeId.endsWith(SFDC_EMPTY_ID)) || data.Id === SFDC_EMPTY_ID) {
     nodeId = uniqueId('row-id');
   }
   return nodeId;