fix: Merge cleanup

Author: tkislan

src/kernels/deepnote/deepnoteController.ts

@@ -8,7 +8,7 @@ import { addPocketToCellMetadata, createBlockFromPocket } from './pocket';
 import { TextBlockConverter } from './converters/textBlockConverter';
 import { MarkdownBlockConverter } from './converters/markdownBlockConverter';
 import { ChartBigNumberBlockConverter } from './converters/chartBigNumberBlockConverter';
-import { CHART_BIG_NUMBER_MIME_TYPE, OUTPUT_BLOCK_METADATA_KEY } from './deepnoteConstants';
+import { CHART_BIG_NUMBER_MIME_TYPE } from '../../platform/deepnote/deepnoteConstants';
 
 /**
  * Utility class for converting between Deepnote block structures and VS Code notebook cells.
@@ -219,14 +219,6 @@ export class DeepnoteDataConverter {
 
                 if (Object.keys(restMetadata).length > 0) {
                     (deepnoteOutput as DeepnoteOutput & { metadata?: Record<string, unknown> }).metadata = restMetadata;
-
-                    if (
-                        deepnoteOutput.metadata != null &&
-                        typeof deepnoteOutput.metadata === 'object' &&
-                        OUTPUT_BLOCK_METADATA_KEY in deepnoteOutput.metadata
-                    ) {
-                        delete deepnoteOutput.metadata[OUTPUT_BLOCK_METADATA_KEY];
-                    }
                 }
             }
 

src/notebooks/deepnote/deepnoteDataConverter.ts

@@ -1,3 +1 @@
-export const OUTPUT_BLOCK_METADATA_KEY = 'blockMetadata';
-
 export const CHART_BIG_NUMBER_MIME_TYPE = 'application/vnd.deepnote.chart.big-number+json';

src/notebooks/deepnote/deepnoteConstants.ts renamed to src/platform/deepnote/deepnoteConstants.ts

@@ -8,8 +8,7 @@ import type { ActivationFunction, OutputItem, RendererContext } from 'vscode-not
 import { ChartBigNumberOutputRenderer } from './ChartBigNumberOutputRenderer';
 import {
     DeepnoteBigNumberMetadataSchema,
-    DeepnoteChartBigNumberOutputSchema,
-    getDeepnoteBlockMetadataSchema
+    DeepnoteChartBigNumberOutputSchema
 } from '../../../notebooks/deepnote/deepnoteSchemas';
 
 export const activate: ActivationFunction = (_context: RendererContext<unknown>) => {
@@ -18,9 +17,7 @@ export const activate: ActivationFunction = (_context: RendererContext<unknown>)
             try {
                 // Remove single quotes from start and end of string if present
                 const data = JSON.parse(outputItem.text().replace(/^'|'$/g, ''));
-                const { blockMetadata } = getDeepnoteBlockMetadataSchema(DeepnoteBigNumberMetadataSchema).parse(
-                    outputItem.metadata
-                );
+                const blockMetadata = DeepnoteBigNumberMetadataSchema.parse(outputItem.metadata);
 
                 const chartBigNumberOutput = DeepnoteChartBigNumberOutputSchema.parse(data);
 

src/webviews/extension-side/dataframe/rendererComms.ts

@@ -35,6 +35,7 @@ export const activate: ActivationFunction = (context: RendererContext<unknown>)
                 console.log(`[DataframeRenderer] Extracted cellId: ${cellId}, cellIndex: ${cellIndex}`);
 
                 const root = document.createElement('div');
+
                 element.appendChild(root);
 
                 ReactDOM.render(