Skip to content

fix: interactive html fixes #4943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2025
Merged

fix: interactive html fixes #4943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 56 additions & 73 deletions src/daft-dashboard/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,16 +266,6 @@ fn generate_interactive_html(
const closeButton = document.getElementById('close-button-' + dfId);
let selectedCell = null;

// Function to check if the server is available
async function isServerAvailable() {{
try {{
const response = await fetch(serverUrl + '/api/ping', {{ method: 'HEAD' }});
return response.ok;
}} catch (e) {{
return false;
}}
}}

function closeSidePane(paneId) {{
const pane = document.getElementById('side-pane-' + paneId);
if (pane) {{
Expand All @@ -297,72 +287,65 @@ fn generate_interactive_html(
sidePaneContent.innerHTML = '<div style="text-align:center; padding:20px;"><span style="font-style:italic">Loading full content...</span></div>';
}}

isServerAvailable().then((available) => {{
if (!available) {{
// Server is unavailable, do not attach any handlers
return;
}}
// Add event listener for close button
if (closeButton) {{
closeButton.addEventListener('click', function() {{
closeSidePane(dfId);
}});
}}

cells.forEach((cell) => {{
// Skip cells that do not have data-row and data-col attributes (e.g., ellipsis row)
const rowAttr = cell.getAttribute('data-row');
const colAttr = cell.getAttribute('data-col');
if (rowAttr === null || colAttr === null) return;

const row = parseInt(rowAttr);
const col = parseInt(colAttr);
cell.classList.add('clickable');

// Add event listener for close button
if (closeButton) {{
closeButton.addEventListener('click', function() {{
cell.onclick = function() {{
// Remove selection from previously selected cell
if (selectedCell && selectedCell !== cell) {{
selectedCell.classList.remove('selected');
}}

// Toggle selection for current cell
if (selectedCell === cell) {{
cell.classList.remove('selected');
selectedCell = null;
closeSidePane(dfId);
}});
}}
return;
}} else {{
cell.classList.add('selected');
selectedCell = cell;
}}

cells.forEach((cell) => {{
// Skip cells that do not have data-row and data-col attributes (e.g., ellipsis row)
const rowAttr = cell.getAttribute('data-row');
const colAttr = cell.getAttribute('data-col');
if (rowAttr === null || colAttr === null) return;

const row = parseInt(rowAttr);
const col = parseInt(colAttr);
cell.classList.add('clickable');

cell.onclick = function() {{
// Remove selection from previously selected cell
if (selectedCell && selectedCell !== cell) {{
selectedCell.classList.remove('selected');
}}

// Toggle selection for current cell
if (selectedCell === cell) {{
cell.classList.remove('selected');
selectedCell = null;
closeSidePane(dfId);
return;
}} else {{
cell.classList.add('selected');
selectedCell = cell;
}}

// Show the side pane immediately
showSidePane(row, col, '');

// Set a timeout to show loading content after 1 second
const loadingTimeout = setTimeout(() => {{
showLoadingContent();
}}, 100);

// Fetch the cell content
fetch(serverUrl + '/api/dataframes/' + dfId + '/cell?row=' + row + '&col=' + col)
.then(response => response.json())
.then(data => {{
clearTimeout(loadingTimeout);
showSidePane(row, col, data.value);
}})
.catch(err => {{
clearTimeout(loadingTimeout);
// Get the original cell content from the table
const cell = selectedCell;
if (cell) {{
const originalContent = cell.innerHTML;
showSidePane(row, col, originalContent);
}}
}});
}};
}});
// Show the side pane immediately
showSidePane(row, col, '');

// Set a timeout to show loading content after 1 second
const loadingTimeout = setTimeout(() => {{
showLoadingContent();
}}, 100);

// Fetch the cell content
fetch(serverUrl + '/api/dataframes/' + dfId + '/cell?row=' + row + '&col=' + col)
.then(response => response.json())
.then(data => {{
clearTimeout(loadingTimeout);
showSidePane(row, col, data.value);
}})
.catch(err => {{
clearTimeout(loadingTimeout);
// Get the original cell content from the table
const cell = selectedCell;
if (cell) {{
const originalContent = cell.innerHTML;
showSidePane(row, col, originalContent);
}}
}});
}};
}});
}})();
</script>
Expand Down
13 changes: 10 additions & 3 deletions src/daft-image/src/ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,15 @@ pub fn image_html_value(arr: &ImageArray, idx: usize, truncate: bool) -> String
.unwrap();
drop(writer);

let style = if truncate {
"width:auto;height:auto"
} else {
"width:100%;height:auto"
};

format!(
"<img style=\"width:auto;height:auto\" src=\"data:image/png;base64, {}\" alt=\"{}\" />",
"<img style=\"{}\" src=\"data:image/png;base64, {}\" alt=\"{}\" />",
style,
base64::engine::general_purpose::STANDARD.encode(&mut bytes),
str_val,
)
Expand Down Expand Up @@ -491,9 +498,9 @@ pub fn fixed_image_html_value(arr: &FixedShapeImageArray, idx: usize, truncate:
drop(writer);

let style = if truncate {
"max-height:128px;width:auto"
"width:auto;height:auto"
} else {
"max-width:90%;max-height:90vh;width:auto;height:auto"
"width:100%;height:auto"
};

format!(
Expand Down
Loading