Skip to content

Commit c3e9a64

Browse files
authored
Merge branch 'main' into jk/fix/variable-provider-error
2 parents 1b35f73 + b47df83 commit c3e9a64

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

src/notebooks/deepnote/converters/visualizationBlockConverter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export class VisualizationBlockConverter implements BlockConverter {
8484
};
8585

8686
const jsonContent = JSON.stringify(config, null, 2);
87-
const cell = new NotebookCellData(NotebookCellKind.Code, jsonContent, 'JSON');
87+
const cell = new NotebookCellData(NotebookCellKind.Code, jsonContent, 'json');
8888

8989
return cell;
9090
}

src/notebooks/deepnote/converters/visualizationBlockConverter.unit.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ suite('VisualizationBlockConverter', () => {
5959
const cell = converter.convertToCell(block);
6060

6161
assert.strictEqual(cell.kind, NotebookCellKind.Code);
62-
assert.strictEqual(cell.languageId, 'JSON');
62+
assert.strictEqual(cell.languageId, 'json');
6363
assert.include(cell.value, '\n');
6464
assert.match(cell.value, /{\n "variable"/);
6565

src/notebooks/deepnote/integrations/integrationManager.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,6 @@ export class IntegrationManager implements IIntegrationManager {
173173
}
174174
}
175175

176-
if (integrations.size === 0) {
177-
void window.showInformationMessage(l10n.t('No integrations found in this project.'));
178-
return;
179-
}
180-
181176
// Show the webview with optional selected integration
182177
await this.webviewProvider.show(projectId, integrations, selectedIntegrationId);
183178
}

src/webviews/webview-side/dataframe-renderer/DataframeRenderer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ export const DataframeRenderer = memo(function DataframeRenderer({
153153
{rows.map((value, index) => (
154154
<div
155155
key={index.toString()}
156-
className={`p-[4px] border-b border-r border-[var(--vscode-panel-border)] font-mono ${
156+
className={`p-[4px] min-h-[16px] border-b border-r border-[var(--vscode-panel-border)] font-mono ${
157157
index % 2 === 0
158158
? 'bg-[var(--vscode-editor-background)]'
159159
: 'bg-[var(--vscode-list-hoverBackground)]/50'
160160
}`}
161161
>
162-
{value === null || value === undefined ? 'None' : String(value)}
162+
{value == null ? 'None' : String(value)}
163163
</div>
164164
))}
165165
</div>

0 commit comments

Comments
 (0)