JavaScript Logging (18 violations fixed): - Replace console.log with centralized logger in marketplace.js - Replace console.log with centralized logger in vendor-themes.js - Replace console.log with centralized logger in settings.js - Replace console.log with centralized logger in imports.js API Layer Transaction Control (documented): - Add comments to db.commit() calls in companies.py - Document that commits at API level are intentional for transaction boundary control - Service layer handles business logic, API layer controls transactions Remaining Violations (221): - API-002: Database commits in endpoints (intentional for transaction control) - API-001: Raw dict responses (legacy code, will refactor incrementally) - Service layer patterns (legacy code, will refactor incrementally) Architecture Decision: Following standard pattern where: - Service Layer: Contains business logic - API Layer: Controls transaction boundaries (commit/rollback) This is a common and acceptable pattern in FastAPI applications.
430 lines
13 KiB
JavaScript
430 lines
13 KiB
JavaScript
// static/admin/js/marketplace.js
|
|
/**
|
|
* Admin marketplace import page logic
|
|
*/
|
|
|
|
// ✅ Use centralized logger
|
|
const adminMarketplaceLog = window.LogConfig.loggers.marketplace;
|
|
|
|
adminMarketplaceLog.info('Loading...');
|
|
|
|
function adminMarketplace() {
|
|
adminMarketplaceLog.info('adminMarketplace() called');
|
|
|
|
return {
|
|
// ✅ Inherit base layout state
|
|
...data(),
|
|
|
|
// ✅ Set page identifier
|
|
currentPage: 'marketplace',
|
|
|
|
// Loading states
|
|
loading: false,
|
|
importing: false,
|
|
error: '',
|
|
successMessage: '',
|
|
|
|
// Vendors list
|
|
vendors: [],
|
|
selectedVendor: null,
|
|
|
|
// Import form
|
|
importForm: {
|
|
vendor_id: '',
|
|
csv_url: '',
|
|
marketplace: 'Letzshop',
|
|
language: 'fr',
|
|
batch_size: 1000
|
|
},
|
|
|
|
// Filters
|
|
filters: {
|
|
vendor_id: '',
|
|
status: '',
|
|
marketplace: ''
|
|
},
|
|
|
|
// Import jobs
|
|
jobs: [],
|
|
totalJobs: 0,
|
|
page: 1,
|
|
limit: 10,
|
|
|
|
// Modal state
|
|
showJobModal: false,
|
|
selectedJob: null,
|
|
|
|
// Auto-refresh for active jobs
|
|
autoRefreshInterval: null,
|
|
|
|
async init() {
|
|
// Guard against multiple initialization
|
|
if (window._adminMarketplaceInitialized) {
|
|
return;
|
|
}
|
|
window._adminMarketplaceInitialized = true;
|
|
|
|
// IMPORTANT: Call parent init first
|
|
const parentInit = data().init;
|
|
if (parentInit) {
|
|
await parentInit.call(this);
|
|
}
|
|
|
|
await this.loadVendors();
|
|
await this.loadJobs();
|
|
|
|
// Auto-refresh active jobs every 10 seconds
|
|
this.startAutoRefresh();
|
|
},
|
|
|
|
/**
|
|
* Load all vendors for dropdown
|
|
*/
|
|
async loadVendors() {
|
|
try {
|
|
const response = await apiClient.get('/admin/vendors?limit=1000');
|
|
this.vendors = response.vendors || [];
|
|
adminMarketplaceLog.info('Loaded vendors:', this.vendors.length);
|
|
} catch (error) {
|
|
adminMarketplaceLog.error('Failed to load vendors:', error);
|
|
this.error = 'Failed to load vendors: ' + (error.message || 'Unknown error');
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Handle vendor selection change
|
|
*/
|
|
onVendorChange() {
|
|
const vendorId = parseInt(this.importForm.vendor_id);
|
|
this.selectedVendor = this.vendors.find(v => v.id === vendorId) || null;
|
|
adminMarketplaceLog.info('Selected vendor:', this.selectedVendor);
|
|
|
|
// Auto-populate CSV URL if marketplace is Letzshop
|
|
this.autoPopulateCSV();
|
|
},
|
|
|
|
/**
|
|
* Handle language selection change
|
|
*/
|
|
onLanguageChange() {
|
|
// Auto-populate CSV URL if marketplace is Letzshop
|
|
this.autoPopulateCSV();
|
|
},
|
|
|
|
/**
|
|
* Auto-populate CSV URL based on selected vendor and language
|
|
*/
|
|
autoPopulateCSV() {
|
|
// Only auto-populate for Letzshop marketplace
|
|
if (this.importForm.marketplace !== 'Letzshop') return;
|
|
if (!this.selectedVendor) return;
|
|
|
|
const urlMap = {
|
|
'fr': this.selectedVendor.letzshop_csv_url_fr,
|
|
'en': this.selectedVendor.letzshop_csv_url_en,
|
|
'de': this.selectedVendor.letzshop_csv_url_de
|
|
};
|
|
|
|
const url = urlMap[this.importForm.language];
|
|
if (url) {
|
|
this.importForm.csv_url = url;
|
|
adminMarketplaceLog.info('Auto-populated CSV URL:', this.importForm.language, url);
|
|
} else {
|
|
adminMarketplaceLog.info('No CSV URL configured for language:', this.importForm.language);
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Load import jobs (only jobs triggered by current admin user)
|
|
*/
|
|
async loadJobs() {
|
|
this.loading = true;
|
|
this.error = '';
|
|
|
|
try {
|
|
// Build query params
|
|
const params = new URLSearchParams({
|
|
page: this.page,
|
|
limit: this.limit,
|
|
created_by_me: 'true' // ✅ Only show jobs I triggered
|
|
});
|
|
|
|
// Add filters (keep for consistency, though less needed here)
|
|
if (this.filters.vendor_id) {
|
|
params.append('vendor_id', this.filters.vendor_id);
|
|
}
|
|
if (this.filters.status) {
|
|
params.append('status', this.filters.status);
|
|
}
|
|
if (this.filters.marketplace) {
|
|
params.append('marketplace', this.filters.marketplace);
|
|
}
|
|
|
|
const response = await apiClient.get(
|
|
`/admin/marketplace-import-jobs?${params.toString()}`
|
|
);
|
|
|
|
this.jobs = response.items || [];
|
|
this.totalJobs = response.total || 0;
|
|
|
|
adminMarketplaceLog.info('Loaded my jobs:', this.jobs.length);
|
|
} catch (error) {
|
|
adminMarketplaceLog.error('Failed to load jobs:', error);
|
|
this.error = error.message || 'Failed to load import jobs';
|
|
} finally {
|
|
this.loading = false;
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Start new import for selected vendor
|
|
*/
|
|
async startImport() {
|
|
if (!this.importForm.csv_url || !this.importForm.vendor_id) {
|
|
this.error = 'Please select a vendor and enter a CSV URL';
|
|
return;
|
|
}
|
|
|
|
this.importing = true;
|
|
this.error = '';
|
|
this.successMessage = '';
|
|
|
|
try {
|
|
const payload = {
|
|
vendor_id: parseInt(this.importForm.vendor_id),
|
|
source_url: this.importForm.csv_url,
|
|
marketplace: this.importForm.marketplace,
|
|
batch_size: this.importForm.batch_size
|
|
};
|
|
|
|
adminMarketplaceLog.info('Starting import:', payload);
|
|
|
|
const response = await apiClient.post('/admin/marketplace-import-jobs', payload);
|
|
|
|
adminMarketplaceLog.info('Import started:', response);
|
|
|
|
const vendorName = this.selectedVendor?.name || 'vendor';
|
|
this.successMessage = `Import job #${response.job_id || response.id} started successfully for ${vendorName}!`;
|
|
|
|
// Clear form
|
|
this.importForm.vendor_id = '';
|
|
this.importForm.csv_url = '';
|
|
this.importForm.language = 'fr';
|
|
this.importForm.batch_size = 1000;
|
|
this.selectedVendor = null;
|
|
|
|
// Reload jobs to show the new import
|
|
await this.loadJobs();
|
|
|
|
// Clear success message after 5 seconds
|
|
setTimeout(() => {
|
|
this.successMessage = '';
|
|
}, 5000);
|
|
} catch (error) {
|
|
adminMarketplaceLog.error('Failed to start import:', error);
|
|
this.error = error.message || 'Failed to start import';
|
|
} finally {
|
|
this.importing = false;
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Quick fill form with saved CSV URL from vendor settings
|
|
*/
|
|
quickFill(language) {
|
|
if (!this.selectedVendor) return;
|
|
|
|
const urlMap = {
|
|
'fr': this.selectedVendor.letzshop_csv_url_fr,
|
|
'en': this.selectedVendor.letzshop_csv_url_en,
|
|
'de': this.selectedVendor.letzshop_csv_url_de
|
|
};
|
|
|
|
const url = urlMap[language];
|
|
if (url) {
|
|
this.importForm.csv_url = url;
|
|
this.importForm.language = language;
|
|
adminMarketplaceLog.info('Quick filled:', language, url);
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Clear all filters and reload
|
|
*/
|
|
clearFilters() {
|
|
this.filters.vendor_id = '';
|
|
this.filters.status = '';
|
|
this.filters.marketplace = '';
|
|
this.page = 1;
|
|
this.loadJobs();
|
|
},
|
|
|
|
/**
|
|
* Refresh jobs list
|
|
*/
|
|
async refreshJobs() {
|
|
await this.loadJobs();
|
|
},
|
|
|
|
/**
|
|
* Refresh single job status
|
|
*/
|
|
async refreshJobStatus(jobId) {
|
|
try {
|
|
const response = await apiClient.get(`/admin/marketplace-import-jobs/${jobId}`);
|
|
|
|
// Update job in list
|
|
const index = this.jobs.findIndex(j => j.id === jobId);
|
|
if (index !== -1) {
|
|
this.jobs[index] = response;
|
|
}
|
|
|
|
// Update selected job if modal is open
|
|
if (this.selectedJob && this.selectedJob.id === jobId) {
|
|
this.selectedJob = response;
|
|
}
|
|
|
|
adminMarketplaceLog.info('Refreshed job:', jobId);
|
|
} catch (error) {
|
|
adminMarketplaceLog.error('Failed to refresh job:', error);
|
|
}
|
|
},
|
|
|
|
/**
|
|
* View job details in modal
|
|
*/
|
|
async viewJobDetails(jobId) {
|
|
try {
|
|
const response = await apiClient.get(`/admin/marketplace-import-jobs/${jobId}`);
|
|
this.selectedJob = response;
|
|
this.showJobModal = true;
|
|
adminMarketplaceLog.info('Viewing job details:', jobId);
|
|
} catch (error) {
|
|
adminMarketplaceLog.error('Failed to load job details:', error);
|
|
this.error = error.message || 'Failed to load job details';
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Close job details modal
|
|
*/
|
|
closeJobModal() {
|
|
this.showJobModal = false;
|
|
this.selectedJob = null;
|
|
},
|
|
|
|
/**
|
|
* Get vendor name by ID
|
|
*/
|
|
getVendorName(vendorId) {
|
|
const vendor = this.vendors.find(v => v.id === vendorId);
|
|
return vendor ? `${vendor.name} (${vendor.vendor_code})` : `Vendor #${vendorId}`;
|
|
},
|
|
|
|
/**
|
|
* Pagination: Previous page
|
|
*/
|
|
async previousPage() {
|
|
if (this.page > 1) {
|
|
this.page--;
|
|
await this.loadJobs();
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Pagination: Next page
|
|
*/
|
|
async nextPage() {
|
|
if (this.page * this.limit < this.totalJobs) {
|
|
this.page++;
|
|
await this.loadJobs();
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Format date for display
|
|
*/
|
|
formatDate(dateString) {
|
|
if (!dateString) return 'N/A';
|
|
|
|
try {
|
|
const date = new Date(dateString);
|
|
return date.toLocaleString('en-US', {
|
|
year: 'numeric',
|
|
month: 'short',
|
|
day: 'numeric',
|
|
hour: '2-digit',
|
|
minute: '2-digit'
|
|
});
|
|
} catch (error) {
|
|
return dateString;
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Calculate duration between start and end
|
|
*/
|
|
calculateDuration(job) {
|
|
if (!job.started_at) {
|
|
return 'Not started';
|
|
}
|
|
|
|
const start = new Date(job.started_at);
|
|
const end = job.completed_at ? new Date(job.completed_at) : new Date();
|
|
const durationMs = end - start;
|
|
|
|
// Convert to human-readable format
|
|
const seconds = Math.floor(durationMs / 1000);
|
|
const minutes = Math.floor(seconds / 60);
|
|
const hours = Math.floor(minutes / 60);
|
|
|
|
if (hours > 0) {
|
|
return `${hours}h ${minutes % 60}m`;
|
|
} else if (minutes > 0) {
|
|
return `${minutes}m ${seconds % 60}s`;
|
|
} else {
|
|
return `${seconds}s`;
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Start auto-refresh for active jobs
|
|
*/
|
|
startAutoRefresh() {
|
|
// Clear any existing interval
|
|
if (this.autoRefreshInterval) {
|
|
clearInterval(this.autoRefreshInterval);
|
|
}
|
|
|
|
// Refresh every 10 seconds if there are active jobs
|
|
this.autoRefreshInterval = setInterval(async () => {
|
|
const hasActiveJobs = this.jobs.some(job =>
|
|
job.status === 'pending' || job.status === 'processing'
|
|
);
|
|
|
|
if (hasActiveJobs) {
|
|
adminMarketplaceLog.info('Auto-refreshing active jobs...');
|
|
await this.loadJobs();
|
|
}
|
|
}, 10000); // 10 seconds
|
|
},
|
|
|
|
/**
|
|
* Stop auto-refresh (cleanup)
|
|
*/
|
|
stopAutoRefresh() {
|
|
if (this.autoRefreshInterval) {
|
|
clearInterval(this.autoRefreshInterval);
|
|
this.autoRefreshInterval = null;
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
// Cleanup on page unload
|
|
window.addEventListener('beforeunload', () => {
|
|
if (window._adminMarketplaceInstance && window._adminMarketplaceInstance.stopAutoRefresh) {
|
|
window._adminMarketplaceInstance.stopAutoRefresh();
|
|
}
|
|
});
|