INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-10 15:20:48 -05:00
Code Issues Releases Wiki Activity

fix some issues with chat search feature

Browse Source
This commit is contained in:
RaidMax
2023-08-27 12:28:00 -05:00
parent 4025cbcd8f
commit a2e5e94b02
6 changed files with 9 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
WebfrontCore/Controllers/Client/Legacy/StatsController.cs
View File

@ -137,29 +137,9 @@ namespace IW4MAdmin.Plugins.Web.StatsWeb.Controllers
}
[HttpGet("Message/FindNext")]
public async Task<IActionResult> FindNextMessages([FromQuery] string query, [FromQuery] int count,
[FromQuery] int offset)
public async Task<IActionResult> FindNextMessages(ChatResourceRequest query)
{
ChatSearchQuery searchRequest;
try
{
searchRequest = query.ParseSearchInfo(count, offset);
}
catch (ArgumentException e)
{
_logger.LogWarning(e, "Could not parse chat message search query {query}", query);
throw;
}
catch (FormatException e)
{
_logger.LogWarning(e, "Could not parse chat message search query filter format {query}", query);
throw;
}
var result = await _chatResourceQueryHelper.QueryResource(searchRequest);
var result = await _chatResourceQueryHelper.QueryResource(query);
return PartialView("~/Views/Client/Message/_Item.cshtml", result.Results);
}

4
WebfrontCore/Views/Client/Message/Find.cshtml
View File

@ -26,14 +26,14 @@ else
</tbody>
</table>
<div id="loaderLoad" class="mt-10 m-auto text-center d-none d-lg-block">
<div id="loaderLoad" class="mt-10 m-auto text-center">
<i class="loader-load-more oi oi-chevron-bottom"></i>
</div>
@section scripts {
<script>
$(document).ready(function () {
initLoader('/Message/FindNext?query=@ViewBag.Query', '#message_table_body', @Model.RetrievedResultCount, @ViewBag.QueryLimit);
initLoader(`/Message/FindNext${window.location.search}`, '#message_table_body', @Model.RetrievedResultCount, 30);
});
</script>
}

4
WebfrontCore/Views/Shared/Partials/Search/_ChatSearch.cshtml
View File

@ -44,7 +44,7 @@
@foreach (var server in manager!.GetServers())
{
<option value="@server.Id" selected="@(server.Id == existingChatFilter?.ServerId)">
[@server.GameName.ToString()] @server.ServerName
[@server.GameName.ToString()] @server.ServerName.StripColors()
</option>
}
</select>
@ -62,6 +62,7 @@
value="@afterDate.ToString("s", CultureInfo.InvariantCulture)"/>
<input type="time" class="form-control w-half ml-10" name="sentAfterTime"
id="sentAfterTime@(Model)"
style="color-scheme: dark;"
value="@afterDate.ToString("HH:mm")"/>
</div>
@ -78,6 +79,7 @@
value="@beforeDate.ToString("s", CultureInfo.InvariantCulture)"/>
<input type="time" class="form-control w-half ml-10" name="sentBeforeTime"
id="sentBeforeTime@(Model)"
style="color-scheme: dark;"
value="@beforeDate.ToString("HH:mm")"/>
</div>
</div>

25
WebfrontCore/wwwroot/js/search.js
View File

@ -1,28 +1,4 @@
$(document).ready(function () {
$('.form-inline').submit(function (e) {
const id = $(e.currentTarget).find('input');
if ($(id).val().length < 3) {
e.preventDefault();
$(id)
.addClass('input-text-danger')
.delay(25)
.queue(function () {
$(this).addClass('input-border-transition').dequeue();
})
.delay(1000)
.queue(function () {
$(this).removeClass('input-text-danger').dequeue();
})
.delay(500)
.queue(function () {
$(this).removeClass('input-border-transition').dequeue();
});
} else if ($(id).val().startsWith("chat|")) {
e.preventDefault();
window.location = "/Message/Find?query=" + $(id).val();
}
});
$('.date-picker-input').each((index, selector) => {
new Datepicker(selector, {
buttonClass: 'btn',
@ -33,7 +9,6 @@
});
});
const clientSearchWrapper = $('*[id^="clientSearchWrapper"]');
const chatSearchWrapper = $('*[id^="chatSearchWrapper"]');
const searchTypeSelector = $('#searchTypeSelectorParent select');