Skip to content

Enable Jobs filters in the UI and improve some filter elements (CFM-252) #362

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions app/src/Lib/Traits/SearchFilterTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -299,15 +299,15 @@ public function getSearchableAttributes(string $controller, ViewBuilder $viewBui

// Include meta fields that are defined in the configuration
// FORCE USAGE
$filterMetadatFielsList = $this->filterMetadataFields();
$filterMetadatFieldsList = $this->filterMetadataFields();
foreach ($filterKeys as $key) {
if (isset($filterMetadatFielsList['meta'][$key])) {
$filterMetadatFielsList[$key] = $filterMetadatFielsList['meta'][$key];
if (isset($filterMetadatFieldsList['meta'][$key])) {
$filterMetadatFieldsList[$key] = $filterMetadatFieldsList['meta'][$key];
}

}

foreach ($filterMetadatFielsList as $column => $type) {
foreach ($filterMetadatFieldsList as $column => $type) {
// If the column is an array, then we are accessing the Metadata fields. Skip
if(\is_array($type)) {
continue;
Expand Down
42 changes: 42 additions & 0 deletions app/src/Model/Table/JobsTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class JobsTable extends Table {
use \App\Lib\Traits\QueryModificationTrait;
use \App\Lib\Traits\TableMetaTrait;
use \App\Lib\Traits\ValidationTrait;
use \App\Lib\Traits\SearchFilterTrait;

/**
* Perform Cake Model initialization.
Expand Down Expand Up @@ -96,6 +97,47 @@ public function initialize(array $config): void {
'class' => 'JobStatusEnum'
]
]);

// Hide the following fields from filters by default;
// their 'active' state is set to false.
$this->setFilterConfig([
'requeued_from_job_id' => [
'type' => 'field',
'model' => 'Jobs',
'active' => false,
'order' => 1
],
'retry_interval' => [
'type' => 'field',
'model' => 'Jobs',
'active' => false,
'order' => 99
],
'requeue_interval' => [
'type' => 'field',
'model' => 'Jobs',
'active' => false,
'order' => 99
],
'max_retry' => [
'type' => 'field',
'model' => 'Jobs',
'active' => false,
'order' => 99
],
'retry_count' => [
'type' => 'field',
'model' => 'Jobs',
'active' => false,
'order' => 99
],
'percent_complete' => [
'type' => 'field',
'model' => 'Jobs',
'active' => false,
'order' => 99
],
]);

$this->setViewContains([
'RequeuedFromJobs'
Expand Down
12 changes: 7 additions & 5 deletions app/templates/element/filter/filter.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,15 @@
</div>

<!-- Date/ Time search textboxes Group -->
<div class="top-filters-fields-subgroups">
<?= $this->element('filter/datetimeGroup', compact('field_datetime_columns'))
?>
</div>
<?php if(!empty($field_datetime_columns)): ?>
<div class="top-filters-fields-subgroups">
<?= $this->element('filter/datetimeGroup', compact('field_datetime_columns')) ?>
</div>
<?php endif; ?>

<!-- Footer / Submit Buttons -->
<?= $this->element('filter/footerButtons', compact('field_booleans_columns'))
<?= $this->element('filter/footerButtons',
compact('field_booleans_columns','field_datetime_columns'))
?>
</div>
</fieldset>
Expand Down
4 changes: 2 additions & 2 deletions app/templates/element/filter/footerButtons.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@

$classes = '';
if ($vv_active_search_filters_count % 2 === 1
&&
empty($field_booleans_columns)
&& empty($field_booleans_columns)
&& empty($field_datetime_columns)
) {
$classes .= ' class="tss-rebalance"';
}
Expand Down