merge cleanup

Author: teallarson

airbyte-webapp/src/components/connection/CatalogTree/next/CatalogTreeTableRow.tsx

@@ -35,14 +35,10 @@ export const CatalogTreeTableRow: React.FC<StreamHeaderProps> = ({
   hasError,
   disabled,
 }) => {
-  const {
-    // primaryKey, cursorField,
-    syncMode,
-    destinationSyncMode,
-  } = stream.config ?? {};
+  const { primaryKey, cursorField, syncMode, destinationSyncMode } = stream.config ?? {};
   const isStreamEnabled = stream.config?.selected;
 
-  // const { defaultCursorField } = stream.stream ?? {};
+  const { defaultCursorField } = stream.stream ?? {};
   const syncSchema = useMemo(
     () => ({
       syncMode,
@@ -53,7 +49,7 @@ export const CatalogTreeTableRow: React.FC<StreamHeaderProps> = ({
 
   const [isSelected, selectForBulkEdit] = useBulkEditSelect(stream.id);
 
-  // const paths = useMemo(() => primitiveFields.map((field) => field.path), [primitiveFields]);
+  const paths = useMemo(() => primitiveFields.map((field) => field.path), [primitiveFields]);
   const fieldCount = fields?.length ?? 0;
   const onRowClick = fieldCount > 0 ? () => onExpand() : undefined;
 
@@ -115,7 +111,7 @@ export const CatalogTreeTableRow: React.FC<StreamHeaderProps> = ({
             path={cursorType === "sourceDefined" ? defaultCursorField : cursorField}
             onPathChange={onCursorChange}
           />
-        )} */}
+        )}
       </HeaderCell>
       <HeaderCell ellipsis>
         {pkType && (
@@ -126,7 +122,7 @@ export const CatalogTreeTableRow: React.FC<StreamHeaderProps> = ({
             isMulti
             onPathChange={onPrimaryKeyChange}
           />
-        )} */}
+        )}
       </HeaderCell>
       <Cell>
         <FontAwesomeIcon icon={faArrowRight} />