refactor(js): avoid use of window.XXX and move to import/export
- change worker: do not cache html pages (not necessary) - remove use of window.XXX and maximize import/export, this will provide more clarety, show circular dependencies + you will benefit IDE help
This commit is contained in:
@@ -2,16 +2,23 @@
|
||||
* Search view orchestration logic
|
||||
*/
|
||||
|
||||
async function performSearch(query, sortBy) {
|
||||
const app = window.app;
|
||||
import { search } from '../features/files/search.js';
|
||||
import { resolveHomeFolder } from './authSession.js';
|
||||
import { app } from './state.js';
|
||||
import { ui } from './ui.js';
|
||||
|
||||
/**
|
||||
* @param {string} query
|
||||
* @param {string} [sortBy]
|
||||
*/
|
||||
async function performSearch(query, sortBy) {
|
||||
console.log(`Performing search for: "${query}" (sort: ${sortBy || 'relevance'})`);
|
||||
|
||||
try {
|
||||
app.isSearchMode = true;
|
||||
window.ui.updateBreadcrumb(`Search: "${query}"`);
|
||||
ui.updateBreadcrumb(`Search: "${query}"`);
|
||||
|
||||
window.ui.showError(`<h3><i class="fas fa-spinner fa-spin search-spinner"></i> Searching for "${query}"...</h3>`);
|
||||
ui.showError(`<h3><i class="fas fa-spinner fa-spin search-spinner"></i> Searching for "${query}"...</h3>`);
|
||||
|
||||
const options = {
|
||||
recursive: true,
|
||||
@@ -22,7 +29,7 @@ async function performSearch(query, sortBy) {
|
||||
if (!app.isTrashView) {
|
||||
// Ensure we have a valid folder_id before searching
|
||||
if (!app.currentPath || app.currentPath === '') {
|
||||
await window.resolveHomeFolder();
|
||||
await resolveHomeFolder();
|
||||
}
|
||||
|
||||
// Only set folder_id if we have a valid value
|
||||
@@ -32,11 +39,11 @@ async function performSearch(query, sortBy) {
|
||||
// If still no valid folder_id, search will be global (without folder_id)
|
||||
}
|
||||
|
||||
const searchResults = await window.search.searchFiles(query, options);
|
||||
window.search.displaySearchResults(searchResults);
|
||||
const searchResults = await search.searchFiles(query, options);
|
||||
search.displaySearchResults(searchResults);
|
||||
} catch (error) {
|
||||
console.error('Search error:', error);
|
||||
window.ui.showNotification('Error', 'Error performing search');
|
||||
ui.showNotification('Error', 'Error performing search');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,4 +54,4 @@ document.addEventListener('search-resort', (e) => {
|
||||
}
|
||||
});
|
||||
|
||||
window.performSearch = performSearch;
|
||||
export { performSearch };
|
||||
|
||||
Reference in New Issue
Block a user