Skip to content

Commit d2d8074

Browse files
lrljoelrljoe
committed
Optimize Header/Footer
1 parent 6d7b59b commit d2d8074

14 files changed

+7
-66
lines changed

‎src/Traits/Helpers/ColumnHelpers.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ protected function setupColumns(): void
2727
->setHasTableRowUrl($this->hasTableRowUrl())
2828
->setIsReorderColumn($this->getDefaultReorderColumn() == $column->getField());
2929

30+
if ($column->hasFooter()) {
31+
$this->columnsWithFooter = true;
32+
}
33+
if ($column->hasSecondaryHeader()) {
34+
$this->columnsWithSecondaryHeader = true;
35+
}
36+
3037
if ($column instanceof AggregateColumn) {
3138
if ($column->getAggregateMethod() == 'count' && $column->hasDataSource()) {
3239
$this->addExtraWithCount($column->getDataSource());

‎src/Traits/WithFooter.php‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,4 @@ trait WithFooter
1919

2020
protected bool $columnsWithFooter = false;
2121

22-
public function setupFooter(): void
23-
{
24-
foreach ($this->getColumns() as $column) {
25-
if ($column->hasFooter()) {
26-
$this->columnsWithFooter = true;
27-
}
28-
}
29-
}
30-
31-
public function renderingWithFooter(): void
32-
{
33-
$this->setupFooter();
34-
}
3522
}

‎src/Traits/WithSecondaryHeader.php‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,4 @@ trait WithSecondaryHeader
1616

1717
protected bool $columnsWithSecondaryHeader = false;
1818

19-
public function bootedWithSecondaryHeader(): void
20-
{
21-
$this->setupSecondaryHeader();
22-
}
23-
24-
public function setupSecondaryHeader(): void
25-
{
26-
foreach ($this->getColumns() as $column) {
27-
if ($column->hasSecondaryHeader()) {
28-
$this->columnsWithSecondaryHeader = true;
29-
}
30-
}
31-
}
3219
}

‎tests/DataTableComponentTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ public function test_minimum_one_column_expected(): void
7373
$table->bootedComponentUtilities();
7474
$table->bootedWithColumns();
7575
$table->bootedWithColumnSelect();
76-
$table->bootedWithSecondaryHeader();
7776
$table->booted();
7877
$table->renderingWithPagination($view, []);
7978
$table->render();

‎tests/TestCase.php‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,11 @@ protected function setupBasicTable()
102102
$this->basicTable->bootedComponentUtilities();
103103
$this->basicTable->bootedWithColumns();
104104
$this->basicTable->bootedWithColumnSelect();
105-
$this->basicTable->bootedWithSecondaryHeader();
106105
$this->basicTable->booted();
107106
$this->basicTable->renderingWithColumns($view, $view->getData());
108107
$this->basicTable->renderingWithColumnSelect($view, $view->getData());
109108
$this->basicTable->renderingWithCustomisations($view, $view->getData());
110109
$this->basicTable->renderingWithData($view, $view->getData());
111-
$this->basicTable->renderingWithFooter($view, $view->getData());
112110
$this->basicTable->renderingWithReordering($view, $view->getData());
113111
$this->basicTable->renderingWithPagination($view, $view->getData());
114112
$this->basicTable->render();
@@ -124,13 +122,11 @@ protected function setupEventsTable()
124122
$this->eventsTable->bootedManagesFilters();
125123
$this->eventsTable->bootedWithColumns();
126124
$this->eventsTable->bootedWithColumnSelect();
127-
$this->eventsTable->bootedWithSecondaryHeader();
128125
$this->eventsTable->booted();
129126
$this->eventsTable->renderingWithColumns($view, $view->getData());
130127
$this->eventsTable->renderingWithColumnSelect($view, $view->getData());
131128
$this->eventsTable->renderingWithCustomisations($view, $view->getData());
132129
$this->eventsTable->renderingWithData($view, $view->getData());
133-
$this->eventsTable->renderingWithFooter($view, $view->getData());
134130
$this->eventsTable->renderingWithReordering($view, $view->getData());
135131
$this->eventsTable->renderingWithPagination($view, $view->getData());
136132

@@ -147,13 +143,11 @@ protected function setupBreedsTable()
147143
$this->breedsTable->bootedManagesFilters();
148144
$this->breedsTable->bootedWithColumns();
149145
$this->breedsTable->bootedWithColumnSelect();
150-
$this->breedsTable->bootedWithSecondaryHeader();
151146
$this->breedsTable->booted();
152147
$this->breedsTable->renderingWithColumns($view, $view->getData());
153148
$this->breedsTable->renderingWithColumnSelect($view, $view->getData());
154149
$this->breedsTable->renderingWithCustomisations($view, $view->getData());
155150
$this->breedsTable->renderingWithData($view, $view->getData());
156-
$this->breedsTable->renderingWithFooter($view, $view->getData());
157151
$this->breedsTable->renderingWithReordering($view, $view->getData());
158152
$this->breedsTable->renderingWithPagination($view, $view->getData());
159153
$this->breedsTable->render();
@@ -169,13 +163,11 @@ protected function setupPetOwnerTable()
169163
$this->petOwnerTable->bootedManagesFilters();
170164
$this->petOwnerTable->bootedWithColumns();
171165
$this->petOwnerTable->bootedWithColumnSelect();
172-
$this->petOwnerTable->bootedWithSecondaryHeader();
173166
$this->petOwnerTable->booted();
174167
$this->petOwnerTable->renderingWithColumns($view, $view->getData());
175168
$this->petOwnerTable->renderingWithColumnSelect($view, $view->getData());
176169
$this->petOwnerTable->renderingWithCustomisations($view, $view->getData());
177170
$this->petOwnerTable->renderingWithData($view, $view->getData());
178-
$this->petOwnerTable->renderingWithFooter($view, $view->getData());
179171
$this->petOwnerTable->renderingWithReordering($view, $view->getData());
180172
$this->petOwnerTable->renderingWithPagination($view, $view->getData());
181173
$this->petOwnerTable->render();
@@ -191,13 +183,11 @@ protected function setupSpeciesTable()
191183
$this->speciesTable->bootedManagesFilters();
192184
$this->speciesTable->bootedWithColumns();
193185
$this->speciesTable->bootedWithColumnSelect();
194-
$this->speciesTable->bootedWithSecondaryHeader();
195186
$this->speciesTable->booted();
196187
$this->speciesTable->renderingWithColumns($view, $view->getData());
197188
$this->speciesTable->renderingWithColumnSelect($view, $view->getData());
198189
$this->speciesTable->renderingWithCustomisations($view, $view->getData());
199190
$this->speciesTable->renderingWithData($view, $view->getData());
200-
$this->speciesTable->renderingWithFooter($view, $view->getData());
201191
$this->speciesTable->renderingWithReordering($view, $view->getData());
202192
$this->speciesTable->renderingWithPagination($view, $view->getData());
203193
$this->speciesTable->render();
@@ -214,13 +204,11 @@ protected function setupUnpaginatedTable()
214204
$this->unpaginatedTable->bootedManagesFilters();
215205
$this->unpaginatedTable->bootedWithColumns();
216206
$this->unpaginatedTable->bootedWithColumnSelect();
217-
$this->unpaginatedTable->bootedWithSecondaryHeader();
218207
$this->unpaginatedTable->booted();
219208
$this->unpaginatedTable->renderingWithColumns($view, $view->getData());
220209
$this->unpaginatedTable->renderingWithColumnSelect($view, $view->getData());
221210
$this->unpaginatedTable->renderingWithCustomisations($view, $view->getData());
222211
$this->unpaginatedTable->renderingWithData($view, $view->getData());
223-
$this->unpaginatedTable->renderingWithFooter($view, $view->getData());
224212
$this->unpaginatedTable->renderingWithReordering($view, $view->getData());
225213
$this->unpaginatedTable->renderingWithPagination($view, $view->getData());
226214
$this->unpaginatedTable->render();

‎tests/Unit/Traits/Configuration/SortingConfigurationTest.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,13 @@ public function configure(): void
112112
$tempDesc->bootedManagesFilters();
113113
$tempDesc->bootedWithColumns();
114114
$tempDesc->bootedWithColumnSelect();
115-
$tempDesc->bootedWithSecondaryHeader();
116115
$tempDesc->booted();
117116
$tempDesc->mountManagesFilters();
118117
$tempDesc->mountWithSorting();
119118
$tempDesc->renderingWithColumns($viewDesc, $viewDesc->getData());
120119
$tempDesc->renderingWithColumnSelect($viewDesc, $viewDesc->getData());
121120
$tempDesc->renderingWithCustomisations($viewDesc, $viewDesc->getData());
122121
$tempDesc->renderingWithData($viewDesc, $viewDesc->getData());
123-
$tempDesc->renderingWithFooter($viewDesc, $viewDesc->getData());
124122
$tempDesc->renderingWithReordering($viewDesc, $viewDesc->getData());
125123
$tempDesc->renderingWithPagination($viewDesc, $viewDesc->getData());
126124
$tempDesc->render();
@@ -142,15 +140,13 @@ public function configure(): void
142140
$tempAsc->bootedManagesFilters();
143141
$tempAsc->bootedWithColumns();
144142
$tempAsc->bootedWithColumnSelect();
145-
$tempAsc->bootedWithSecondaryHeader();
146143
$tempAsc->booted();
147144
$tempAsc->mountManagesFilters();
148145
$tempAsc->mountWithSorting();
149146
$tempAsc->renderingWithColumns($viewAsc, $viewAsc->getData());
150147
$tempAsc->renderingWithColumnSelect($viewAsc, $viewAsc->getData());
151148
$tempAsc->renderingWithCustomisations($viewAsc, $viewAsc->getData());
152149
$tempAsc->renderingWithData($viewAsc, $viewAsc->getData());
153-
$tempAsc->renderingWithFooter($viewAsc, $viewAsc->getData());
154150
$tempAsc->renderingWithReordering($viewAsc, $viewAsc->getData());
155151
$tempAsc->renderingWithPagination($viewAsc, $viewAsc->getData());
156152
$tempAsc->render();

‎tests/Unit/Traits/Helpers/ColumnHelpersTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ public function columns(): array
199199
$testTable->bootedManagesFilters();
200200
$testTable->bootedWithColumns();
201201
$testTable->bootedWithColumnSelect();
202-
$testTable->bootedWithSecondaryHeader();
203202
$testTable->booted();
204203

205204
}

‎tests/Unit/Traits/Helpers/ColumnSelectHelpersTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ public function configure(): void
125125
$testTable->bootedComponentUtilities();
126126
$testTable->bootedWithColumns();
127127
$testTable->bootedWithColumnSelect();
128-
$testTable->bootedWithSecondaryHeader();
129128
$testTable->booted();
130129

131130
$this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns);
@@ -164,7 +163,6 @@ public function configure(): void
164163
$testTable->bootedManagesFilters();
165164
$testTable->bootedWithColumns();
166165
$testTable->bootedWithColumnSelect();
167-
$testTable->bootedWithSecondaryHeader();
168166
$testTable->booted();
169167

170168
$this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns);
@@ -195,7 +193,6 @@ public function configure(): void
195193
$testTable->bootedComponentUtilities();
196194
$testTable->bootedWithColumns();
197195
$testTable->bootedWithColumnSelect();
198-
$testTable->bootedWithSecondaryHeader();
199196
$testTable->booted();
200197

201198
$this->assertSame(['id', 'sort', 'name', 'age', 'breed', 'other', 'link', 'rowimg'], $testTable->selectedColumns);

‎tests/Unit/Traits/Helpers/FilterHelpersTest.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ public function configure(): void
232232
$testTable->bootedComponentUtilities();
233233
$testTable->bootedWithColumns();
234234
$testTable->bootedWithColumnSelect();
235-
$testTable->bootedWithSecondaryHeader();
236235
$testTable->booted();
237236

238237
$testTable->setFilter('breed_id_filter', '2');

‎tests/Unit/Traits/Helpers/QueryStringHelpersTest.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public function getCurrentQueryStringBinding(): array
3131
$testTableQueryString->bootedManagesFilters();
3232
$testTableQueryString->bootedWithColumns();
3333
$testTableQueryString->bootedWithColumnSelect();
34-
$testTableQueryString->bootedWithSecondaryHeader();
3534
$testTableQueryString->booted();
3635

3736
$this->assertSame([], $testTableQueryString->getCurrentQueryStringBinding());
@@ -62,7 +61,6 @@ public function getCurrentQueryStringBinding(): array
6261
$testTableQueryString->bootedManagesFilters();
6362
$testTableQueryString->bootedWithColumns();
6463
$testTableQueryString->bootedWithColumnSelect();
65-
$testTableQueryString->bootedWithSecondaryHeader();
6664
$testTableQueryString->booted();
6765

6866
$this->assertSame(['table' => ['except' => null, 'history' => false, 'keep' => false, 'as' => 'table']], $testTableQueryString->getCurrentQueryStringBinding());
@@ -93,7 +91,6 @@ public function getCurrentQueryStringBinding(): array
9391
$testTableQueryString->bootedManagesFilters();
9492
$testTableQueryString->bootedWithColumns();
9593
$testTableQueryString->bootedWithColumnSelect();
96-
$testTableQueryString->bootedWithSecondaryHeader();
9794
$testTableQueryString->booted();
9895

9996
$this->assertFalse($testTableQueryString->hasQueryStringAlias());

0 commit comments

Comments
 (0)