Skip to content
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

Fix table groups only extra column #9362

Merged
merged 13 commits into from
Nov 15, 2023
Merged

Fix table groups only extra column #9362

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f0fcbeb
exclude group column in summary
wychoong Oct 29, 2023
6feb766
hide select all checkbox if groupsOnly
wychoong Oct 29, 2023
e5b9bd3
chore: fix code style
wychoong Oct 29, 2023
9c640f2
Update row.blade.php
danharrin Oct 30, 2023
634e9f4
Update index.blade.php
danharrin Oct 30, 2023
714e8a4
Apply suggestions from code review
danharrin Oct 30, 2023
2127722
Update packages/tables/resources/views/components/summary/index.blade…
danharrin Oct 30, 2023
d5a0481
chore: fix code style
danharrin Oct 30, 2023
e776505
use wrapper for heading content
wychoong Oct 31, 2023
5399dbd
remove empty checkbox column
wychoong Oct 31, 2023
6133769
Update packages/tables/resources/views/index.blade.php
zepfietje Nov 1, 2023
6f0a6bf
Update row.blade.php
wychoong Nov 1, 2023
7771697
Merge branch 'fix-table-groups-only-extra-column' of https://github.c…
wychoong Nov 1, 2023
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
4 changes: 4 additions & 0 deletions packages/tables/resources/views/components/summary/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
'actionsPosition' => null,
'columns',
'extraHeadingColumn' => false,
'groupColumn' => null,
'groupsOnly' => false,
'placeholderColumns' => true,
'pluralModelLabel',
Expand All @@ -16,6 +17,9 @@
use Filament\Tables\Enums\ActionsPosition;
use Filament\Tables\Enums\RecordCheckboxPosition;

if ($groupsOnly && $groupColumn) {
$columns = collect($columns)->reject(fn ($column) => $column->getName() == $groupColumn)->toArray();
danharrin marked this conversation as resolved.
Show resolved Hide resolved
}
danharrin marked this conversation as resolved.
Show resolved Hide resolved
$hasPageSummary = (! $groupsOnly) && $records instanceof \Illuminate\Contracts\Pagination\Paginator && $records->hasPages();
@endphp

Expand Down
7 changes: 6 additions & 1 deletion packages/tables/resources/views/components/summary/row.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
'actionsPosition' => null,
'columns',
'extraHeadingColumn' => false,
'groupColumn' => null,
'groupsOnly' => false,
'heading',
'placeholderColumns' => true,
Expand All @@ -16,6 +17,10 @@
use Filament\Support\Enums\Alignment;
use Filament\Tables\Enums\ActionsPosition;
use Filament\Tables\Enums\RecordCheckboxPosition;

if ($groupsOnly && $groupColumn) {
$columns = collect($columns)->reject(fn ($column) => $column->getName() == $groupColumn)->toArray();
danharrin marked this conversation as resolved.
Show resolved Hide resolved
}
@endphp

<x-filament-tables::row
Expand All @@ -34,7 +39,7 @@

@if ($extraHeadingColumn || $groupsOnly)
<x-filament-tables::cell
class="text-sm font-medium text-gray-950 dark:text-white"
class="px-3 text-sm font-medium text-gray-950 dark:text-white"
zepfietje marked this conversation as resolved.
Show resolved Hide resolved
>
{{ $heading }}
</x-filament-tables::cell>
Expand Down
31 changes: 18 additions & 13 deletions packages/tables/resources/views/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,23 +700,25 @@ class="mx-1 my-2 shrink-0"

@if ($isSelectionEnabled && $recordCheckboxPosition === RecordCheckboxPosition::BeforeCells)
<x-filament-tables::selection.cell tag="th">
<x-filament-tables::selection.checkbox
:label="__('filament-tables::table.fields.bulk_select_page.label')"
x-bind:checked="
const recordsOnPage = getRecordsOnPage()
@if (! $isGroupsOnly)
<x-filament-tables::selection.checkbox
:label="__('filament-tables::table.fields.bulk_select_page.label')"
x-bind:checked="
const recordsOnPage = getRecordsOnPage()

if (recordsOnPage.length && areRecordsSelected(recordsOnPage)) {
$el.checked = true
if (recordsOnPage.length && areRecordsSelected(recordsOnPage)) {
$el.checked = true

return 'checked'
}
return 'checked'
}

$el.checked = false
$el.checked = false

return null
"
x-on:click="toggleSelectRecordsOnPage"
/>
return null
"
x-on:click="toggleSelectRecordsOnPage"
/>
@endif
</x-filament-tables::selection.cell>
@endif

Expand Down Expand Up @@ -864,6 +866,7 @@ class="mx-1 my-2 shrink-0"
:actions="count($actions)"
:actions-position="$actionsPosition"
:columns="$columns"
:group-column="$group?->getColumn()"
:groups-only="$isGroupsOnly"
:heading="$isGroupsOnly ? $previousRecordGroupTitle : __('filament-tables::table.summary.subheadings.group', ['group' => $previousRecordGroupTitle, 'label' => $pluralModelLabel])"
:query="$group->scopeQuery($this->getAllTableSummaryQuery(), $previousRecord)"
Expand Down Expand Up @@ -1069,6 +1072,7 @@ class="fi-ta-record-checkbox"
:actions="count($actions)"
:actions-position="$actionsPosition"
:columns="$columns"
:group-column="$group?->getColumn()"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we actually need the ? here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should? line 857, 858 is using the ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, in most other places we don't. 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't think it matters much tbh

:groups-only="$isGroupsOnly"
:heading="$isGroupsOnly ? $previousRecordGroupTitle : __('filament-tables::table.summary.subheadings.group', ['group' => $previousRecordGroupTitle, 'label' => $pluralModelLabel])"
:query="$group->scopeQuery($this->getAllTableSummaryQuery(), $previousRecord)"
Expand All @@ -1083,6 +1087,7 @@ class="fi-ta-record-checkbox"
:actions="count($actions)"
:actions-position="$actionsPosition"
:columns="$columns"
:group-column="$group?->getColumn()"
:groups-only="$isGroupsOnly"
:plural-model-label="$pluralModelLabel"
:record-checkbox-position="$recordCheckboxPosition"
Expand Down