Skip to content

Commit 31915d5

Browse files
lrljoelrljoe
authored
Merge pull request rappasoft#1707 from rappasoft/develop
v3.2.5
2 parents 05a3d41 + b025249 commit 31915d5

File tree

15 files changed

+189
-122
lines changed

15 files changed

+189
-122
lines changed

‎.github/workflows/run-tests-pcov-pull.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: run-tests-pcov-pull
22

3-
on: [pull_request]
3+
on:
4+
pull_request:
5+
branches:
6+
- 'develop'
7+
- 'master'
48

59
jobs:
610
test:
@@ -41,6 +45,13 @@ jobs:
4145
env:
4246
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4347

48+
- name: Cache extensions
49+
uses: actions/cache@v3
50+
with:
51+
path: ${{ steps.extcache.outputs.dir }}
52+
key: ${{ steps.extcache.outputs.key }}
53+
restore-keys: ${{ steps.extcache.outputs.key }}
54+
4455
- name: Setup problem matchers for PHP
4556
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
4657

‎.github/workflows/run-tests-pcov.yml‎

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎.github/workflows/run-tests-pull.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: run-tests-pull
22

3-
on: [pull_request]
3+
on:
4+
pull_request:
5+
branches:
6+
- 'develop'
7+
- 'master'
48

59
jobs:
610
test:
@@ -10,8 +14,11 @@ jobs:
1014
matrix:
1115
os: [ubuntu-latest]
1216
php: [8.1, 8.2, 8.3]
13-
laravel: [10]
17+
laravel: [10.*,11.*]
1418
stability: [prefer-dist]
19+
exclude:
20+
- laravel: 11.*
21+
php: 8.1
1522

1623
name: STD-PULL - ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
1724
env:

‎.github/workflows/run-tests.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ jobs:
1010
matrix:
1111
os: [ubuntu-latest]
1212
php: [8.1, 8.2, 8.3]
13-
laravel: [10]
13+
laravel: [10.*,11.*]
1414
stability: [prefer-dist]
15+
exclude:
16+
- laravel: 11.*
17+
php: 8.1
1518

1619
name: STD-PUSH - ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
1720
env:

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1160,4 +1160,4 @@ Ground Up Rebuild
11601160
[0.1.4]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.3...v0.1.4
11611161
[0.1.3]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.2...v0.1.3
11621162
[0.1.2]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.1...v0.1.2
1163-
[0.1.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.0...v0.1.1
1163+
[0.1.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v0.1.0...v0.1.1

‎CONTRIBUTORS.md‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,22 @@
55
# Localisation Contributors
66
| Language | Contributor(s) |
77
| --- | --- |
8-
| Brazilian (BR_PT) | [irineujunior](https://github.com/irineujunior)|
8+
| Arabic (AR) | None |
9+
| Catalan (CA) | None |
10+
| Brazilian (pt_BR) | [irineujunior](https://github.com/irineujunior)|
11+
| Chinese - Taiwan (TW) | None |
912
| Danish (DA) | [jeppeolesen](https://github.com/jeppeolesen) |
10-
| Dutch (NL) | [siebsie23](https://github.com/siebsie23) & [spekkie2002](https://github.com/spekkie2002)|
13+
| Dutch (NL) | [siebsie23](https://github.com/siebsie23), [spekkie2002](https://github.com/spekkie2002), [Jerimu](https://github.com/Jerimu) |
14+
| English (EN) | Core Team |
1115
| Finnish (FI) | [devmikromike](https://github.com/devmikromike) |
1216
| French (FR) | [dgillier](https://github.com/dgillier) |
17+
| German (DE) | None |
18+
| Indonesian (ID) | None |
19+
| Italian (IT) | Core Team |
1320
| Malay (MS) | [wanadri](https://github.com/wanadri) |
21+
| Portugese (PT) | None |
22+
| Russian (RU) | None |
1423
| Spanish (ES) | [CristhoferMF](https://github.com/CristhoferMF) |
24+
| Thai (TH) | None |
25+
| Turkish (TK) | None |
1526
| Ukrainian (UK) | [Oleksandr-Moik](https://github.com/Oleksandr-Moik) |

‎composer.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
"name": "Anthony Rappa",
1616
"email": "[email protected]",
1717
"role": "Developer"
18+
},
19+
{
20+
"name": "Joe McElwee",
21+
"email": "[email protected]",
22+
"role": "Developer"
1823
}
1924
],
2025
"require": {

‎docs/datatable/configurable-areas.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,20 @@ There are certain areas of the datatable as of `v2.3` where you can include your
77

88
## Available Methods
99

10+
### setConfigurableArea
11+
12+
You can use the `setConfigurableArea` method to set an area that you want to configure.
13+
14+
```php
15+
public function configure(): void
16+
{
17+
$this->setConfigurableArea('before-tools', 'path.to.my.view');
18+
}
19+
```
20+
1021
### setConfigurableAreas
1122

12-
You can use the `setConfigurableAreas` method to set the areas that you want to be configurable.
23+
You can use the `setConfigurableAreas` method to set multiple areas that you want to configure.
1324

1425
```php
1526
public function configure(): void

‎docs/datatable/events.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ These are the available events on the datatable component that you can fire from
88
### refreshDatatable
99

1010
```php
11-
$this->emit('refreshDatatable');
11+
$this->dispatch('refreshDatatable');
1212
```
1313

1414
Calls `$refresh` on the component. Good for updating from external sources or as an alternative to polling.
@@ -18,29 +18,29 @@ Calls `$refresh` on the component. Good for updating from external sources or as
1818
You can have the table sort a specific column:
1919

2020
```php
21-
$this->emit('setSort', 'name', 'asc');
21+
$this->dispatch('setSort', 'name', 'asc');
2222
```
2323

2424
### clearSorts
2525

2626
You can clear all the applied sorts:
2727

2828
```php
29-
$this->emit('clearSorts');
29+
$this->dispatch('clearSorts');
3030
```
3131

3232
### setFilter
3333

3434
You can have the table run a specific filter:
3535

3636
```php
37-
$this->emit('setFilter', 'status', '1');
37+
$this->dispatch('setFilter', 'status', '1');
3838
```
3939

4040
### clearFilters
4141

4242
You can have the table clear all filters:
4343

4444
```php
45-
$this->emit('clearFilters');
46-
```
45+
$this->dispatch('clearFilters');
46+
```

‎docs/questions-and-issues.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,35 @@ If you have found a reproducable bug please create an [issue](https://github.com
1010
If you would like other help you can join the [discord channel - details here](https://github.com/rappasoft/laravel-livewire-tables/discussions/1252/).
1111

1212
If you've found a bug regarding security please mail [email protected] instead of using the issue tracker.
13+
14+
We welcome contributions, and suggestions from the community, which will be reviewed by the Core Team
15+
16+
# Core Maintainers:
17+
- [Anthony Rappa](https://github.com/rappasoft)
18+
- [Joe McElwee](https://github.com/lrljoe)
19+
20+
We welcome localisation contributions, and are grateful for the contributions of the members of the community below. Please open a PR, reach out on GitHub, or Discord, should you wish to contribute to either an existing or new localisation, or if we have missed you from this list!
21+
22+
# Localisation Contributors
23+
24+
| Language | Contributor(s) |
25+
| --- | --- |
26+
| Arabic (AR) | None |
27+
| Catalan (CA) | None |
28+
| Brazilian (pt_BR) | [irineujunior](https://github.com/irineujunior)|
29+
| Chinese - Taiwan (TW) | None |
30+
| Danish (DA) | [jeppeolesen](https://github.com/jeppeolesen) |
31+
| Dutch (NL) | [siebsie23](https://github.com/siebsie23), [spekkie2002](https://github.com/spekkie2002), [Jerimu](https://github.com/Jerimu) |
32+
| English (EN) | Core Team |
33+
| Finnish (FI) | [devmikromike](https://github.com/devmikromike) |
34+
| French (FR) | [dgillier](https://github.com/dgillier) |
35+
| German (DE) | None |
36+
| Indonesian (ID) | None |
37+
| Italian (IT) | Core Team |
38+
| Malay (MS) | [wanadri](https://github.com/wanadri) |
39+
| Portugese (PT) | None |
40+
| Russian (RU) | None |
41+
| Spanish (ES) | [CristhoferMF](https://github.com/CristhoferMF) |
42+
| Thai (TH) | None |
43+
| Turkish (TK) | None |
44+
| Ukrainian (UK) | [Oleksandr-Moik](https://github.com/Oleksandr-Moik) |

0 commit comments

Comments
 (0)