Skip to content

feat(content-search): add date range filters for date/datetime fields #35745

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
dsilvam merged 3 commits into from
May 21, 2026
+102 −14
Merged

feat(content-search): add date range filters for date/datetime fields #35745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ade6433
feat(content-search): add date range filters for date/datetime fields
dsilvam May 19, 2026
4958984
fix(content-search): address code review feedback on date range filters
dsilvam May 20, 2026
1b634a1
fix(content-search): harden date range parsing against malformed values
dsilvam May 20, 2026
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
2 changes: 2 additions & 0 deletions dotCMS/src/main/webapp/WEB-INF/messages/Language.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,8 @@ Date-Short-String=Date Short String
Date-Long-String=Date Long String (mm/dd/yyyy hh:mm:ss)
Date=Date
date=Date
date-from=Date From
date-to=Date To
day-remaining-Purchase-now={0} day remaining. Purchase Now
day-s-=day(s)
day-s=day(s)
Expand Down
114 changes: 100 additions & 14 deletions dotCMS/src/main/webapp/html/portlet/ext/contentlet/view_contentlets_js_inc.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,55 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
}
}

/**
* Converts a MM/DD/YYYY string to Lucene date format YYYYMMDDHHmmss.
* endOfDay=true appends 235959, false appends 000000.
*/
function mmddyyyyToLuceneDate(mmddyyyy, endOfDay) {
if (!mmddyyyy) return null;
var parts = mmddyyyy.split('/');
if (parts.length !== 3 || parts[2].length !== 4) return null;
var mm = parts[0].length < 2 ? '0' + parts[0] : parts[0];
var dd = parts[1].length < 2 ? '0' + parts[1] : parts[1];
return parts[2] + mm + dd + (endOfDay ? '235959' : '000000');
}

/**
* Converts a YYYYMMDDHHmmss Lucene date string back to MM/DD/YYYY for display.
*/
function luceneDateToMmddyyyy(luceneDate) {
if (!luceneDate || !/^\d{14}$/.test(luceneDate)) return '';
return luceneDate.substring(4, 6) + '/' + luceneDate.substring(6, 8) + '/' + luceneDate.substring(0, 4);
}

/**
* Called when either the From or To picker of a date field changes.
* Assembles a [fromDate TO toDate] Lucene range in the hidden input and triggers search.
*/
function updateDateRangeField(fieldId) {
var fromWidget = dijit.byId(fieldId + '_from');
var toWidget = dijit.byId(fieldId + '_to');
var fromVal = fromWidget ? fromWidget.get('displayedValue') : '';
var toVal = toWidget ? toWidget.get('displayedValue') : '';
var fromDate = mmddyyyyToLuceneDate(fromVal, false);
var toDate = mmddyyyyToLuceneDate(toVal, true);
var hiddenInput = document.getElementById(fieldId);
if (hiddenInput) {
if (fromDate && toDate) {
hiddenInput.value = '[' + fromDate + ' TO ' + toDate + ']';
} else if (fromDate) {
// 30000101000000: far-future bound matching ContentletAjax convention
hiddenInput.value = '[' + fromDate + ' TO 30000101000000]';
} else if (toDate) {
// 18000101000000: far-past bound matching ContentletAjax convention
hiddenInput.value = '[18000101000000 TO ' + toDate + ']';
} else {
hiddenInput.value = '';
}
}
doSearch();
}

function renderSearchField (field) {

var structureVelraw=dojo.byId("structureVelocityVarNames").value;
Expand Down Expand Up @@ -746,13 +795,37 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
return "";

}else if(type.indexOf("date") > -1){
dijit.registry.remove(selectedStruct+"."+ fieldContentlet + "Field");
if(dijit.byId(selectedStruct+"."+ fieldContentlet + "Field")){
dijit.byId(selectedStruct+"."+ fieldContentlet + "Field").destroy();
}
var fieldId = selectedStruct + "." + fieldContentlet + "Field";
// Destroy any existing widgets for this field
["", "_from", "_to"].forEach(function(suffix) {
dijit.registry.remove(fieldId + suffix);
if (dijit.byId(fieldId + suffix)) { dijit.byId(fieldId + suffix).destroy(); }
});
dojo.require("dijit.form.DateTextBox");
var result = "<input onchange='doSearch()' type=\"text\" displayedValue=\""+value+"\" constraints={datePattern:'MM/dd/yyyy'} dojoType=\"dijit.form.DateTextBox\" validate='return false;' invalidMessage=\"\" id=\"" + selectedStruct+"."+ fieldContentlet + "Field\" name=\"" + selectedStruct+"."+ fieldContentlet + "\" >";
return result;
// Parse back an existing [YYYYMMDDHHmmss TO YYYYMMDDHHmmss] range if present
var fromDisplayVal = '';
var toDisplayVal = '';
if (value && value.indexOf('[') === 0 && value.endsWith(']') && value.toLowerCase().indexOf(' to ') > 0) {
var inner = value.slice(1, -1);
var rangeParts = inner.split(/ to /i);
if (rangeParts.length === 2) {
fromDisplayVal = luceneDateToMmddyyyy(rangeParts[0].trim());
toDisplayVal = luceneDateToMmddyyyy(rangeParts[1].trim());
}
}
var result = "<input type=\"hidden\" id=\"" + fieldId + "\" name=\"" + selectedStruct + "." + fieldContentlet + "\" value=\"\" />"
+ "<span class=\"date-range-from\">"
+ "<input type=\"text\" id=\"" + fieldId + "_from\" dojoType=\"dijit.form.DateTextBox\""
+ " constraints=\"{datePattern:'MM/dd/yyyy'}\" invalidMessage=\"\" promptMessage=\"<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "date-from")) %>\""
+ " displayedValue=\"" + fromDisplayVal + "\""
+ " onChange=\"updateDateRangeField('" + fieldId + "')\" /></span>"
+ " &ndash; "
+ "<span class=\"date-range-to\">"
+ "<input type=\"text\" id=\"" + fieldId + "_to\" dojoType=\"dijit.form.DateTextBox\""
+ " constraints=\"{datePattern:'MM/dd/yyyy'}\" invalidMessage=\"\" promptMessage=\"<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "date-to")) %>\""
+ " displayedValue=\"" + toDisplayVal + "\""
+ " onChange=\"updateDateRangeField('" + fieldId + "')\" /></span>";
return result;
}else if(type=="relationship"){
var relationSearchField= selectedStruct+"."+ fieldContentlet;
var relationType = field["fieldRelationType"];
Expand Down Expand Up @@ -1227,19 +1300,18 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
return "";
}else{
if ((3 < field["fieldContentlet"].length) && (field["fieldContentlet"].substring(0, 4) == "date")) {
var type2 = field["fieldFieldType"];
// date and date_time fields now use From/To pickers — no tooltip needed
if (type2 === 'date' || type2 === 'date_time') {
return field["fieldName"] + ":";
}
var id = field["fieldStructureInode"] + '_' + field["fieldContentlet"];

dijit.registry.remove("tipMsg_" + id);
if (dijit.byId("tipMsg_" + id)) {
dijit.byId("tipMsg_" + id).destroy();
}
if(field["fieldFieldType"] == 'date')
var hintLabel = '<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "viewcontentlets.message.date.hint")) %>';
if(field["fieldFieldType"] == 'date_time')
var hintLabel = '<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "viewcontentlets.message.datetime.hint")) %>';
else if(field["fieldFieldType"] == 'time')
var hintLabel = '<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "viewcontentlets.message.time.hint")) %>';
return field["fieldName"] + " <a href=\"#\" id=\"hint_" + id + "\">?</a>:<div dojoType=\"dijit.Tooltip\" connectId=\"hint_" + id + "\" label=\"" + hintLabel + "\"></div>";
var hintLabel = '<%= UtilMethods.escapeSingleQuotes(LanguageUtil.get(pageContext, "viewcontentlets.message.time.hint")) %>';
return field["fieldName"] + " <a href=\"#\" id=\"hint_" + id + "\">?</a>:<div dojoType=\"dijit.Tooltip\" connectId=\"hint_" + id + "\" position=\"above\" label=\"" + hintLabel + "\"></div>";
} else {
var isOneOption = field["fieldValues"].split("\r\n").length === 1;
if (type === 'checkbox' && isOneOption || type === 'radio' && isOneOption) {
Expand Down Expand Up @@ -2414,6 +2486,20 @@ final String calendarEventInode = null!=calendarEventSt ? calendarEventSt.inode(
document.getElementById("Identifier").value = "";
document.getElementById("lastModDateFrom").value = "";
document.getElementById("lastModDateTo").value = "";
// Clear from/to date range pickers for all date fields in the current content type
if (currentStructureFields) {
currentStructureFields.forEach(function(f) {
if (f.fieldFieldType && f.fieldFieldType.indexOf('date') > -1) {
var fid = selectedStructureVarName + '.' + f.fieldVelocityVarName + 'Field';
var fromW = dijit.byId(fid + '_from');
if (fromW) { fromW.set('value', null); }
var toW = dijit.byId(fid + '_to');
if (toW) { toW.set('value', null); }
var hidden = document.getElementById(fid);
if (hidden) { hidden.value = ''; }
}
});
}

var showDeletedCB = dijit.byId("showDeletedCB");
if(showDeletedCB!=null){
Expand Down
Loading