* Add Iceberg table details view
* Enhance Iceberg catalog browsing UI
* Fix Iceberg UI security and logic issues
- Fix selectSchema() and partitionFieldsFromFullMetadata() to always search for matching IDs instead of checking != 0
- Fix snapshotsFromFullMetadata() to defensive-copy before sorting to prevent mutating caller's slice
- Fix XSS vulnerabilities in s3tables.js: replace innerHTML with textContent/createElement for user-controlled data
- Fix deleteIcebergTable() to redirect to namespace tables list on details page instead of reloading
- Fix data-bs-target in iceberg_namespaces.templ: remove templ.SafeURL for CSS selector
- Add catalogName to delete modal data attributes for proper redirect
- Remove unused hidden inputs from create table form (icebergTableBucketArn, icebergTableNamespace)
* Regenerate templ files for Iceberg UI updates
* Support complex Iceberg type objects in schema
Change Type field from string to json.RawMessage in both IcebergSchemaFieldInfo
and internal icebergSchemaField to properly handle Iceberg spec's complex type
objects (e.g. {"type": "struct", "fields": [...]}). Currently test data
only shows primitive string types, but this change makes the implementation
defensively robust for future complex types by preserving the exact JSON
representation. Add typeToString() helper and update schema extraction
functions to marshal string types as JSON. Update template to convert
json.RawMessage to string for display.
* Regenerate templ files for Type field changes
* templ
* Fix additional Iceberg UI issues from code review
- Fix lazy-load flag that was set before async operation completed, preventing retries
on error; now sets loaded flag only after successful load and throws error to caller
for proper error handling and UI updates
- Add zero-time guards for CreatedAt and ModifiedAt fields in table details to avoid
displaying Go zero-time values; render dash when time is zero
- Add URL path escaping for all catalog/namespace/table names in URLs to prevent
malformed URLs when names contain special characters like /, ?, or #
- Remove redundant innerHTML clear in loadIcebergNamespaceTables that cleared twice
before appending the table list
- Fix selectSnapshotForMetrics to remove != 0 guard for consistency with selectSchema
fix; now always searches for CurrentSnapshotID without zero-value gate
- Enhance typeToString() helper to display '(complex)' for non-primitive JSON types
* Regenerate templ files for Phase 3 updates
* Fix template generation to use correct file paths
Run templ generate from repo root instead of weed/admin directory to ensure
generated _templ.go files have correct absolute paths in error messages
(e.g., 'weed/admin/view/app/iceberg_table_details.templ' instead of
'app/iceberg_table_details.templ'). This ensures both 'make admin-generate'
at repo root and 'make generate' in weed/admin directory produce identical
output with consistent file path references.
* Regenerate template files with correct path references
* Validate S3 Tables names in UI
- Add client-side validation for table bucket and namespace names to surface
errors for invalid characters (dots/underscores) before submission
- Use HTML validity messages with reportValidity for immediate feedback
- Update namespace helper text to reflect actual constraints (single-level,
lowercase letters, numbers, and underscores)
* Regenerate templ files for namespace helper text
* Fix Iceberg catalog REST link and actions
* Disallow S3 object access on table buckets
* Validate Iceberg layout for table bucket objects
* Fix REST API link to /v1/config
* merge iceberg page with table bucket page
* Allowed Trino/Iceberg stats files in metadata validation
* fixes
- Backend/data handling:
- Normalized Iceberg type display and fallback handling in weed/admin/dash/s3tables_management.go.
- Fixed snapshot fallback pointer semantics in weed/admin/dash/s3tables_management.go.
- Added CSRF token generation/propagation/validation for namespace create/delete in:
- weed/admin/dash/csrf.go
- weed/admin/dash/auth_middleware.go
- weed/admin/dash/middleware.go
- weed/admin/dash/s3tables_management.go
- weed/admin/view/layout/layout.templ
- weed/admin/static/js/s3tables.js
- UI/template fixes:
- Zero-time guards for CreatedAt fields in:
- weed/admin/view/app/iceberg_namespaces.templ
- weed/admin/view/app/iceberg_tables.templ
- Fixed invalid templ-in-script interpolation and host/port rendering in:
- weed/admin/view/app/iceberg_catalog.templ
- weed/admin/view/app/s3tables_buckets.templ
- Added data-catalog-name consistency on Iceberg delete action in weed/admin/view/app/iceberg_tables.templ.
- Updated retry wording in weed/admin/static/js/s3tables.js.
- Regenerated all affected _templ.go files.
- S3 API/comment follow-ups:
- Reused cached table-bucket validator in weed/s3api/bucket_paths.go.
- Added validation-failure debug logging in weed/s3api/s3api_object_handlers_tagging.go.
- Added multipart path-validation design comment in weed/s3api/s3api_object_handlers_multipart.go.
- Build tooling:
- Fixed templ generate working directory issues in weed/admin/Makefile (watch + pattern rule).
* populate data
* test/s3tables: harden populate service checks
* admin: skip table buckets in object-store bucket list
* admin sidebar: move object store to top-level links
* admin iceberg catalog: guard zero times and escape links
* admin forms: add csrf/error handling and client-side name validation
* admin s3tables: fix namespace delete modal redeclaration
* admin: replace native confirm dialogs with modal helpers
* admin modal-alerts: remove noisy confirm usage console log
* reduce logs
* test/s3tables: use partitioned tables in trino and spark populate
* admin file browser: normalize filer ServerAddress for HTTP parsing
331 lines
13 KiB
JavaScript
331 lines
13 KiB
JavaScript
/**
|
|
* Modal Alerts - Bootstrap Modal replacement for native alert() and confirm()
|
|
* Fixes Chrome auto-dismiss issue with native dialogs
|
|
*
|
|
* Usage:
|
|
* showAlert('Message', 'success');
|
|
* showConfirm('Delete this?', function() { });
|
|
*/
|
|
|
|
(function () {
|
|
'use strict';
|
|
|
|
// Create and inject modal HTML into page if not already present
|
|
function ensureModalsExist() {
|
|
if (document.getElementById('globalAlertModal')) {
|
|
return; // Already exists
|
|
}
|
|
|
|
const modalsHTML = `
|
|
<!-- Global Alert Modal -->
|
|
<div class="modal fade" id="globalAlertModal" tabindex="-1" aria-labelledby="globalAlertModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<div class="modal-header" id="globalAlertModalHeader">
|
|
<h5 class="modal-title" id="globalAlertModalLabel">
|
|
<i class="fas fa-info-circle me-2" id="globalAlertModalIcon"></i>
|
|
<span id="globalAlertModalTitle">Notice</span>
|
|
</h5>
|
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
|
</div>
|
|
<div class="modal-body" id="globalAlertModalBody">
|
|
<!-- Message will be inserted here -->
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">OK</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Global Confirm Modal -->
|
|
<div class="modal fade" id="globalConfirmModal" tabindex="-1" aria-labelledby="globalConfirmModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<div class="modal-header bg-warning">
|
|
<h5 class="modal-title" id="globalConfirmModalLabel">
|
|
<i class="fas fa-question-circle me-2"></i><span id="globalConfirmModalTitleText">Confirm Action</span>
|
|
</h5>
|
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
|
</div>
|
|
<div class="modal-body" id="globalConfirmModalBody">
|
|
<!-- Message will be inserted here -->
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="globalConfirmCancelBtn">Cancel</button>
|
|
<button type="button" class="btn btn-primary" id="globalConfirmOkBtn">OK</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Global Delete Confirm Modal -->
|
|
<div class="modal fade" id="globalDeleteModal" tabindex="-1" aria-labelledby="globalDeleteModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<div class="modal-header bg-danger text-white">
|
|
<h5 class="modal-title" id="globalDeleteModalLabel">
|
|
<i class="fas fa-exclamation-triangle me-2"></i>Confirm Delete
|
|
</h5>
|
|
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
|
|
</div>
|
|
<div class="modal-body">
|
|
<p class="mb-2" id="globalDeleteModalMessage">Are you sure you want to delete this item?</p>
|
|
<p class="mb-0"><strong id="globalDeleteModalItemName"></strong></p>
|
|
<p class="text-muted small mt-2 mb-0">This action cannot be undone.</p>
|
|
</div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
|
|
<button type="button" class="btn btn-danger" id="globalDeleteConfirmBtn">
|
|
<i class="fas fa-trash me-1"></i>Delete
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
`;
|
|
|
|
// Inject modals at end of body
|
|
document.body.insertAdjacentHTML('beforeend', modalsHTML);
|
|
}
|
|
|
|
/**
|
|
* Show an alert message using Bootstrap modal
|
|
* @param {string} message - The message to display
|
|
* @param {string|object} typeOrOptions - Type ('success', 'error', 'warning', 'info') or options object
|
|
* @param {string} title - Optional custom title
|
|
*/
|
|
window.showAlert = function (message, typeOrOptions, title) {
|
|
ensureModalsExist();
|
|
|
|
let type = 'info';
|
|
let isHtml = false;
|
|
|
|
if (typeof typeOrOptions === 'object' && typeOrOptions !== null) {
|
|
type = typeOrOptions.type || 'info';
|
|
isHtml = typeOrOptions.isHtml || false;
|
|
title = typeOrOptions.title || title;
|
|
} else if (typeof typeOrOptions === 'string') {
|
|
type = typeOrOptions;
|
|
}
|
|
|
|
const modal = document.getElementById('globalAlertModal');
|
|
const header = document.getElementById('globalAlertModalHeader');
|
|
const titleEl = document.getElementById('globalAlertModalTitle');
|
|
const bodyEl = document.getElementById('globalAlertModalBody');
|
|
const iconEl = document.getElementById('globalAlertModalIcon');
|
|
|
|
// Configuration for different types
|
|
const types = {
|
|
'success': {
|
|
title: 'Success',
|
|
icon: 'fa-check-circle',
|
|
headerClass: 'bg-success text-white',
|
|
btnClose: 'btn-close-white'
|
|
},
|
|
'error': {
|
|
title: 'Error',
|
|
icon: 'fa-exclamation-triangle',
|
|
headerClass: 'bg-danger text-white',
|
|
btnClose: 'btn-close-white'
|
|
},
|
|
'warning': {
|
|
title: 'Warning',
|
|
icon: 'fa-exclamation-circle',
|
|
headerClass: 'bg-warning text-dark',
|
|
btnClose: ''
|
|
},
|
|
'info': {
|
|
title: 'Notice',
|
|
icon: 'fa-info-circle',
|
|
headerClass: 'bg-info text-white',
|
|
btnClose: 'btn-close-white'
|
|
}
|
|
};
|
|
|
|
const config = types[type] || types['info'];
|
|
|
|
// Update header styling
|
|
header.className = 'modal-header ' + config.headerClass;
|
|
const closeBtn = header.querySelector('.btn-close');
|
|
closeBtn.className = 'btn-close ' + config.btnClose;
|
|
|
|
// Update icon
|
|
iconEl.className = 'fas ' + config.icon + ' me-2';
|
|
|
|
// Update title
|
|
titleEl.textContent = title || config.title;
|
|
|
|
// Update body - support HTML or text
|
|
if (isHtml || message.includes('<p>') || message.includes('<ul>')) {
|
|
bodyEl.innerHTML = message;
|
|
} else {
|
|
bodyEl.innerHTML = '<p class="mb-0">' + escapeHtml(message) + '</p>';
|
|
}
|
|
|
|
// Show modal
|
|
const bsModal = new bootstrap.Modal(modal);
|
|
bsModal.show();
|
|
};
|
|
|
|
/**
|
|
* Show a confirmation dialog using Bootstrap modal
|
|
* @param {string} message - The confirmation message
|
|
* @param {function} onConfirm - Callback function if user confirms
|
|
* @param {function|object} onCancelOrOptions - Optional callback or options object
|
|
* @param {string} title - Optional custom title
|
|
*/
|
|
window.showConfirm = function (message, onConfirm, onCancelOrOptions, title) {
|
|
ensureModalsExist();
|
|
|
|
let onCancel = null;
|
|
let isHtml = false;
|
|
|
|
if (typeof onCancelOrOptions === 'object' && onCancelOrOptions !== null) {
|
|
onCancel = onCancelOrOptions.onCancel;
|
|
isHtml = onCancelOrOptions.isHtml || false;
|
|
title = onCancelOrOptions.title || null;
|
|
} else {
|
|
onCancel = onCancelOrOptions;
|
|
}
|
|
|
|
const modalEl = document.getElementById('globalConfirmModal');
|
|
const bodyEl = document.getElementById('globalConfirmModalBody');
|
|
const titleEl = document.getElementById('globalConfirmModalTitleText');
|
|
const okBtn = document.getElementById('globalConfirmOkBtn');
|
|
const cancelBtn = document.getElementById('globalConfirmCancelBtn');
|
|
|
|
// Set title
|
|
if (title) {
|
|
titleEl.textContent = title;
|
|
} else {
|
|
titleEl.textContent = 'Confirm Action';
|
|
}
|
|
|
|
// Set message
|
|
if (isHtml || message.includes('<p>') || message.includes('<ul>')) {
|
|
bodyEl.innerHTML = message;
|
|
} else {
|
|
bodyEl.innerHTML = '<p class="mb-0">' + escapeHtml(message) + '</p>';
|
|
}
|
|
|
|
// Remove old event listeners by cloning buttons
|
|
const newOkBtn = okBtn.cloneNode(true);
|
|
const newCancelBtn = cancelBtn.cloneNode(true);
|
|
okBtn.parentNode.replaceChild(newOkBtn, okBtn);
|
|
cancelBtn.parentNode.replaceChild(newCancelBtn, cancelBtn);
|
|
|
|
const modal = new bootstrap.Modal(modalEl);
|
|
|
|
// Add event listeners
|
|
newOkBtn.addEventListener('click', function () {
|
|
modal.hide();
|
|
if (typeof onConfirm === 'function') {
|
|
onConfirm();
|
|
}
|
|
});
|
|
|
|
newCancelBtn.addEventListener('click', function () {
|
|
modal.hide();
|
|
if (typeof onCancel === 'function') {
|
|
onCancel();
|
|
}
|
|
});
|
|
|
|
modal.show();
|
|
};
|
|
|
|
/**
|
|
* Show a delete confirmation dialog
|
|
* @param {string} itemName - Name of the item to delete
|
|
* @param {function} onConfirm - Callback function if user confirms deletion
|
|
* @param {string} message - Optional custom message (default: "Are you sure you want to delete this item?")
|
|
*/
|
|
window.showDeleteConfirm = function (itemName, onConfirm, message) {
|
|
ensureModalsExist();
|
|
|
|
const modalEl = document.getElementById('globalDeleteModal');
|
|
const messageEl = document.getElementById('globalDeleteModalMessage');
|
|
const itemNameEl = document.getElementById('globalDeleteModalItemName');
|
|
const confirmBtn = document.getElementById('globalDeleteConfirmBtn');
|
|
|
|
// Set custom message if provided
|
|
if (message) {
|
|
messageEl.textContent = message;
|
|
} else {
|
|
messageEl.textContent = 'Are you sure you want to delete this item?';
|
|
}
|
|
|
|
// Set item name
|
|
itemNameEl.textContent = itemName;
|
|
|
|
// Remove old event listener by cloning button
|
|
const newConfirmBtn = confirmBtn.cloneNode(true);
|
|
confirmBtn.parentNode.replaceChild(newConfirmBtn, confirmBtn);
|
|
|
|
const modal = new bootstrap.Modal(modalEl);
|
|
|
|
// Add new event listener
|
|
newConfirmBtn.addEventListener('click', function () {
|
|
modal.hide();
|
|
if (typeof onConfirm === 'function') {
|
|
onConfirm();
|
|
}
|
|
});
|
|
|
|
modal.show();
|
|
};
|
|
|
|
/**
|
|
* Escape HTML to prevent XSS
|
|
*/
|
|
function escapeHtml(text) {
|
|
const map = {
|
|
'&': '&',
|
|
'<': '<',
|
|
'>': '>',
|
|
'"': '"',
|
|
"'": '''
|
|
};
|
|
return text.replace(/[&<>"']/g, function (m) { return map[m]; });
|
|
}
|
|
|
|
// Auto-initialize on DOMContentLoaded
|
|
if (document.readyState === 'loading') {
|
|
document.addEventListener('DOMContentLoaded', ensureModalsExist);
|
|
} else {
|
|
ensureModalsExist();
|
|
}
|
|
|
|
/**
|
|
* AUTOMATIC OVERRIDE of native alert()
|
|
* This makes ALL existing alert() calls automatically use Bootstrap modals
|
|
*/
|
|
window.alert = function (message) {
|
|
// Auto-detect message type from content
|
|
let type = 'info';
|
|
const msg = String(message || '');
|
|
const msgLower = msg.toLowerCase();
|
|
|
|
// Refined type inference to avoid false positives
|
|
if (msgLower.includes('success') || msgLower.includes('successfully') || msgLower.includes('created') || msgLower.includes('updated') || msgLower.includes('saved')) {
|
|
// Avoid "not successful"
|
|
if (!msgLower.includes('not success')) {
|
|
type = 'success';
|
|
}
|
|
}
|
|
|
|
if (type === 'info') {
|
|
if (msgLower.includes('error') || msgLower.includes('failed') || msgLower.includes('invalid') || msgLower.includes('exception')) {
|
|
type = 'error';
|
|
} else if (msgLower.includes('warning') || msgLower.includes('required') || msgLower.includes('attention')) {
|
|
type = 'warning';
|
|
}
|
|
}
|
|
|
|
showAlert(msg, type);
|
|
};
|
|
|
|
console.log('Modal Alerts library loaded - native alert() overridden');
|
|
})();
|