Skip to content

feat(other): integrate advanced search into saved searches module set #1738

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

feat(other): integrate advanced search into saved searches module set #1738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9a2cef
feat(other): integrate advanced search into saved searches module set
IrAlfred Oct 11, 2025
169e1b4
feat(other): add unit tests to saved searches
IrAlfred Oct 14, 2025
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
36 changes: 36 additions & 0 deletions modules/advanced_search/js_modules/route_handlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,42 @@ function applyAdvancedSearchPageHandlers() {
$('.adv_reset').on("click", function() { adv_reset_page(); });
$('.combined_sort').on("change", function() { Hm_Message_List.sort($(this).val()); });

$(document).off('click', '.show_save_advanced_search');
$(document).on('click', '.show_save_advanced_search', function(e) {
e.preventDefault();
$('.save_advanced_search_form').show();
$('.show_save_advanced_search').hide();
$('.advanced_search_name').focus();
return false;
});

$(document).off('click', '.cancel_save_advanced_search');
$(document).on('click', '.cancel_save_advanced_search', function(e) {
e.preventDefault();
$('.save_advanced_search_form').hide();
$('.show_save_advanced_search').show();
$('.advanced_search_name').val('');
return false;
});

$(document).off('click', '.save_advanced_search_btn');
$(document).on('click', '.save_advanced_search_btn', function(e) {
e.preventDefault();
return save_advanced_search();
});

$(document).off('click', '.update_advanced_search_btn');
$(document).on('click', '.update_advanced_search_btn', function(e) {
e.preventDefault();
return update_advanced_search();
});

$(document).off('click', '.delete_advanced_search_btn');
$(document).on('click', '.delete_advanced_search_btn', function(e) {
e.preventDefault();
return delete_advanced_search();
});

apply_saved_search();
var data = Hm_Utils.get_from_local_storage('formatted_advanced_search_data');
if (data && data.length) {
Expand Down
3 changes: 3 additions & 0 deletions modules/advanced_search/setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
'advanced_search',
'ajax_adv_search'
),
'allowed_get' => array(
'search_name' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
),
'allowed_post' => array(
'adv_source' => FILTER_UNSAFE_RAW,
'adv_start' => FILTER_UNSAFE_RAW,
Expand Down
183 changes: 183 additions & 0 deletions modules/advanced_search/site.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,3 +609,186 @@ var adv_reset_page = function() {
Hm_Utils.save_to_local_storage('adv_search_params', '');
document.location.href = '?page=advanced_search';
};

var save_advanced_search = function() {
var search_name = $('.advanced_search_name').val().trim();
if (!search_name) {
alert('Please enter a search name');
return false;
}

var search_data = collect_advanced_search_data();
if (!search_data) {
alert('Please configure search parameters first');
return false;
}

$('.save_advanced_search_btn').prop('disabled', true);

Hm_Ajax.request(
[
{'name': 'hm_ajax_hook', 'value': 'ajax_save_advanced_search'},
{'name': 'search_name', 'value': search_name},
{'name': 'adv_search_data', 'value': JSON.stringify(search_data)}
],
function(res) {
$('.save_advanced_search_btn').prop('disabled', false);
if (res.advanced_search_result) {
$('.current_advanced_search_name').val(search_name);
$('.save_advanced_search_form').hide();
$('.show_save_advanced_search').hide();
update_advanced_search_controls(search_name);
Hm_Folders.reload_folders(true, '.search_folders');
}
},
[],
false,
function() {
$('.save_advanced_search_btn').prop('disabled', false);
}
);
return false;
};

var update_advanced_search = function() {
var search_name = $('.current_advanced_search_name').val();
if (!search_name) {
return false;
}

var search_data = collect_advanced_search_data();
if (!search_data) {
alert('Please configure search parameters first');
return false;
}

Hm_Ajax.request(
[
{'name': 'hm_ajax_hook', 'value': 'ajax_update_advanced_search'},
{'name': 'search_name', 'value': search_name},
{'name': 'adv_search_data', 'value': JSON.stringify(search_data)}
],
function(res) {
window.updating_advanced_search = false;
$('.update_advanced_search_btn').prop('disabled', false);
if (res.advanced_search_result) {
Hm_Folders.reload_folders(true, '.search_folders');
}
},
[],
false,
function() {
$('.update_advanced_search_btn').prop('disabled', false);
}
);
return false;
};

var delete_advanced_search = function() {
var search_name = $('.current_advanced_search_name').val();
if (!search_name) {
return false;
}

if (!confirm('Are you sure you want to delete this saved search?')) {
return false;
}

$('.delete_advanced_search_btn').prop('disabled', true);

Hm_Ajax.request(
[
{'name': 'hm_ajax_hook', 'value': 'ajax_delete_advanced_search'},
{'name': 'search_name', 'value': search_name}
],
function(res) {
$('.delete_advanced_search_btn').prop('disabled', false);
if (res.advanced_search_result) {
$('.current_advanced_search_name').val('');
update_advanced_search_controls('');
Hm_Folders.reload_folders(true, '.search_folders');
window.location.href = '?page=advanced_search';
}
},
[],
false,
function() {
$('.delete_advanced_search_btn').prop('disabled', false);
}
);
return false;
};

var load_advanced_search_from_data = function(search_data, execute_search) {
if (!search_data) {
return;
}

Hm_Utils.save_to_local_storage('adv_search_params', JSON.stringify(search_data));

var tryPopulateForm = function(attempts) {
attempts = attempts || 0;

if (!$('#adv_term').length || !$('.adv_source_list').length) {
if (attempts < 10) {
setTimeout(function() {
tryPopulateForm(attempts + 1);
}, 200);
return;
} else {
Hm_Notices.show('Form elements not ready', 'danger');
return;
}
}

Hm_Utils.save_to_local_storage('adv_search_params', JSON.stringify(search_data));

apply_saved_search();

if (execute_search) {
search_summary(search_data);
send_requests(build_adv_search_requests(
search_data.terms,
search_data.sources,
search_data.targets,
search_data.times,
search_data.other
));
}
};

tryPopulateForm();
};

var collect_advanced_search_data = function() {
var terms = get_adv_terms();
var targets = get_adv_targets();
var sources = get_adv_sources();
var times = get_adv_times();
var other = get_adv_other();

if (terms.length === 0 || targets.length === 0 || sources.length === 0) {
return false;
}

return {
'terms': terms,
'targets': targets,
'sources': sources,
'times': times,
'other': other
};
};

var update_advanced_search_controls = function(search_name) {
if (search_name) {
$('.current_search_name strong').text(search_name);
$('.current_advanced_search_name').val(search_name);
$('.advanced_search_update_controls, .advanced_search_delete_controls').show();
$('.advanced_search_save_controls').hide();
} else {
$('.current_advanced_search_name').val('');
$('.advanced_search_update_controls, .advanced_search_delete_controls').hide();
$('.advanced_search_save_controls').show();
}
};
Loading
Loading