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.

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 bug #1997 - Found the issue elsewhere also, so I fixed them too. #2004

Closed
wants to merge 2 commits into from

Conversation

mrl22
Copy link
Contributor

@mrl22 mrl22 commented Oct 21, 2024

This pull request is to fix bug #1997 .

I have found this issue in multiple places where there is incorrect brackets in conjunction with coalescing operator (??).

Example:

$input1 = false;
$input2 = true;
return ($input1 ?? true || $input2 ?? true); // Will always return value of $input1 unless null

Fixed:

return (($input1 ?? true) || $input2 ?? true); // Will only return true if either (or both) $input1 or $input2 are null or true.

lrljoe and others added 2 commits October 1, 2024 00:20
* Add explanation of setRefreshMethod (rappasoft#1857)

* Unlocking Entangled Items (rappasoft#1859)

* Unlock properties locked in error

---------

Co-authored-by: lrljoe <[email protected]>

* Add dispatch on updated filter components (rappasoft#1861)

* Add additional dispatch

* Add FilterApplied Event

* Add Filter Event Dispatch Tests

---------

Co-authored-by: lrljoe <[email protected]>

* v3.4.8

* Fix superfluous bulk actions tr < (rappasoft#1868)

* Default useComputedProperties to False (rappasoft#1869)

* Update ChangeLog

* Add Action Buttons (rappasoft#1864)

* Make ActionButtons An Optional Feature in Beta


---------

Co-authored-by: lrljoe <[email protected]>

* FixDateRangeFilter (rappasoft#1872)

* Adjust Methods - useComputedProperties (rappasoft#1873)

* Adjust Methods - useComputedProperties

* Adjust ActionTest

* Update ChangeLog

* AllowDeleteDateRangeFilter (rappasoft#1875)

* Fix ChangeLog

* Update Docs (rappasoft#1876)

* Update ChangeLog - Add Docs Update

* Add setIconLeft/setIconRight (rappasoft#1877)

* Add setIconLeft/setIconRight

* Fix styling

* Adjust Test

* Adjust ActionTest

---------

Co-authored-by: lrljoe <[email protected]>

* Adjust ChangeLog

* Adjust Action Button Icon Margin (rappasoft#1880)

* Adjust Action Button Icon Margin

* Adjust ChangeLog

* Change Order of "Getting Started" section (rappasoft#1883)

* Change Order of "Getting Started" section

* Change to "UsersTable"

* Add Button with No Icon (rappasoft#1887)

* Add a "Recommended" approach (rappasoft#1886)

* Add a "Recommended" approach

* Add blurb to Recommended

* v3.4.13

* Set actions position (rappasoft#1889)

* Add displayActionsInToolbar and actionsPosition

* Add docs and tests for setActionsInToolbar

* Fix styling

---------

Co-authored-by: lrljoe <[email protected]>

* Update ChangeLog

* Doc Type Fixes (rappasoft#1891)

* Update NumberFilter and TypeHints

* Update DateFilter/DateTimeFilter and ConfigurableAreasHelpers for typehints and array key exists

* Add Float Test for NumberFilter

* Add ColorColumn View Test

* Adjust ColumnSelectConfigurationTest

---------

Co-authored-by: lrljoe <[email protected]>

* BooleanColumn - Toggleable Callback (rappasoft#1892)

* Add Docs, Code for Toggleable Columns

* Add Confirmation Option

* Tweak Blade - Standardise

* Add Tests for Toggleable

---------

Co-authored-by: lrljoe <[email protected]>

* Update ChangeLog

* Enable/Disable Tools/Toolbar (rappasoft#1896)

* Customised Toolbar Approach


---------

Co-authored-by: lrljoe <[email protected]>

* Use Computed Properties By Default (rappasoft#1898)

* Fix has actions (rappasoft#1901)

* Fix Action Repetitive Calling

* Fix validActionsCount

---------

Co-authored-by: lrljoe <[email protected]>

* Add icon column (rappasoft#1902)

* Initial Commit - Awaiting Docs & Tests

* Tweak to IconColumn label behaviour

* Adding IconColumn documentation

* Add Additional Tests - Replace Test Database

* Add Visuals Test for IconColumn

* Add Icon Columns to Other Column Types

* Undo FrontendAssetsTest Changes

---------

Co-authored-by: lrljoe <[email protected]>

* Add Baseline - Convert phpstan.neon to tabs (rappasoft#1903)

* Update ChangeLog

* Save filter selection to session (BETA) (rappasoft#1910)

* Initial Commit

* Fix styling

* Initial Commit

* Fix styling

* Fix nullable return

* Add Initial Tests - Remove Non-Required Method

* Fix styling

* Swap methods

* Add default docs

* Remove errant note

* Adjust docs

* Adjust Docs for storeFiltersInSessionEnabled

---------

Co-authored-by: lrljoe <[email protected]>

* Add hide table option (rappasoft#1914)

* Initial Commit

* Fix styling

* Further adjustments

* Fix styling

* Improve Tests - Extend PetsTable

* Fix styling

---------

Co-authored-by: lrljoe <[email protected]>

* Add column select session methods (rappasoft#1913)

* Initial Commit

* Fix styling

* Minor Tweaks

* Fix styling

* Fix Tests

* Add Tests for StoredColumnSelect

* Fix styling

* Add Missing Tests

* Fix styling

---------

Co-authored-by: lrljoe <[email protected]>

* Use Core HasTheme Methods (rappasoft#1915)

* Centralise Theme Methods

* Fix styling

* Fix for broken tests

* Fix styling

* Remove persisted computed properties

---------

Co-authored-by: lrljoe <[email protected]>

* Use Core Attribute Bag (rappasoft#1916)

* Initial Commit

* Fix styling

* Add Missing Test

* Fix styling

* Adjustments

* Fix styling

* Adjust Test

* Fix styling

* Fix Sorting Visual Test

---------

Co-authored-by: lrljoe <[email protected]>

* Fix ChangeLog

* Add Polish translation by @meavric (rappasoft#1925)

* Add Polish translation by @meavric

* Update ChangeLog to reflect translation

* Add Vertical Scrolling Example (rappasoft#1926)

* Adjusting contributing

* Fix missing variable in workflow (rappasoft#1933)

* Fix missing variable name

* Remove phpunit failOnWarning

* Tests

* PCOV Use Laravel 11

* Fixes for ButtonGroupColumn, ImageColumn, LinkColumn - to not default as label if has a "from" property. (rappasoft#1932)

* Initial Commit - Allowing Labels with "From" to be included in queries

* Fix styling

* Fixes for ButtonGroupColumn, ImageColumn, LinkColumn - to not default as label if has a "from" property.

---------

Co-authored-by: lrljoe <[email protected]>

* Add button type to tailwind pagination blade template (rappasoft#1928)

* v3.4.19 ChangeLog

* Revert tableName to be public (rappasoft#1937)

* v3.4.20 ChangeLog

* Migration to Core attribute management (rappasoft#1943)

* Migration to Core attribute management

* Fix styling

* Fix missing type hint, update tests

* Fix styling

* Remove defaults from being output

* Fix styling

* Adjust defaults

* Adjust behaviour for Bulk Actions TH

* Add "styling" to Columns docs

* Docs Adjust, add missing test

* Fix styling

* Adjust workflows - use L11 for PHPStan, use PHPUnit for L10

* Add missing test for thSortIconAttributes

* Fix styling

* Add CustomAttributesTest

* Fix styling

* Add missing tests - correct attribute to respect defaults

* Fix styling

* Remove defined processes in workflows

* Add test for setShouldBeHidden and setShouldBeDisplayed

* Fix styling

---------

Co-authored-by: lrljoe <[email protected]>

* Update docs - add Action setLabelAttributes method (rappasoft#1952)

* Reset Page on "Per Page" changing (rappasoft#1953)

* Localisation - Avoid Conflicts With Other Packages (rappasoft#1955)

* Merging Localisation Tweaks

* Fix styling

* Tweak localisations

* Fix styling

* Tweaks to sorting pill direction label

* Fix styling

* Fixes for Sorting Pill Labels

---------

Co-authored-by: lrljoe <[email protected]>

* Add filterComponents into queryString (rappasoft#1957)

* Fix syntax for DateColumn outputFormat in docs (rappasoft#1960)

* Fix Filter Pills Icon - Tailwind (rappasoft#1961)

* Add original translation strings - for use in published views (rappasoft#1959)

* Fix for Search Field Attribute Defaults (rappasoft#1962)

* Fix for Search Field Attribute Defaults

* SearchFieldAttributes -> Defaults To False

* Change the type of LaravelLivewireTablesEvent::$user from Illuminate\Foundation\Auth\User to Illuminate\Contracts\Auth\Authenticatable (rappasoft#1963)

* Remove persist from getFilterGenericData (rappasoft#1966)

* Update ChangeLog

* Update Pint Workflow (rappasoft#1967)

* Update Pint Workflow

* Update ChangeLog

* Test Styling Workflow

* Fix styling

* Test Workflow

* Fix styling

---------

Co-authored-by: lrljoe <[email protected]>

* Update Discord Releases Workflow (rappasoft#1968)

* Update ChangeLog

* Fix Loading Placeholder Bug - Breaking Table (rappasoft#1969)

* FixLoadingPlaceholderBug

* Adjust tests for new Loading blade

* v3.4.22 ChangeLog

* Update ChangeLog

* Add comment on getTitle (rappasoft#1976)

* Add before-wrapper and after-wrapper configurable areas (rappasoft#1977)

* Add initial commit for setPaginationWrapperAttributes (rappasoft#1978)

* Add initial commit for setPaginationWrapperAttributes

* Fix styling

* Update ChangeLog

* Adjust Tests & Methods

* Fix styling

---------

Co-authored-by: lrljoe <[email protected]>

* Update ChangeLog

* Update ChangeLog

* Adjust ChangeLog Date

* Add ToolsAttributes and ToolbarAttributes (rappasoft#1982)

* Initial Commit

* Fix styling

* Add getCustomAttributesBagFromArray

* Fix styling

* Reorder Array

* Reorder Initial Array - Add Additional Test

* Fix styling

* Add More Tests

---------

Co-authored-by: lrljoe <[email protected]>

* Add docs for the ColumnSelect lifecycle hooks (rappasoft#1983)

* Add setToolsAttributes and setToolBarAttributes docs (rappasoft#1984)

* Update ChangeLog

---------

Co-authored-by: lrljoe <[email protected]>
Co-authored-by: Matthias Schmitt <[email protected]>
Co-authored-by: Paoulo Riveros <[email protected]>
@lrljoe
Copy link
Collaborator

lrljoe commented Oct 25, 2024

Thanks for the contribution, very helpful :)

However -please base your PR on the "development" branch, I've set the tests to run, but please rebase to get this merged in.

Copy link

codecov bot commented Oct 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.19%. Comparing base (0c8ec45) to head (1ed0c5d).
Report is 139 commits behind head on development.

Additional details and impacted files
@@                Coverage Diff                @@
##             development    #2004      +/-   ##
=================================================
+ Coverage          87.30%   88.19%   +0.88%     
- Complexity          1672     1855     +183     
=================================================
  Files                150      174      +24     
  Lines               3891     4285     +394     
=================================================
+ Hits                3397     3779     +382     
- Misses               494      506      +12     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mrl22
Copy link
Contributor Author

mrl22 commented Oct 25, 2024

Apologies, I am not very familiar with PR’s, I will read up.

@lrljoe lrljoe changed the base branch from master to development October 25, 2024 19:40
@lrljoe
Copy link
Collaborator

lrljoe commented Oct 25, 2024

Apologies, I am not very familiar with PR’s, I will read up.

So I rebased your branch, and you can see where it's a bit confusing due to other pending changes.

In your fork, create a new branch, and base it on the "development" branch.

Then apply your changes, and raise a new PR.

@mrl22
Copy link
Contributor Author

mrl22 commented Oct 25, 2024

Thank you, leave it with me :)

@lrljoe
Copy link
Collaborator

lrljoe commented Oct 25, 2024

Thank you, leave it with me :)

I've replicated your changes I think, please check out this PR to ensure I've mirrored them:
#2016

In your fork, instead of clicking "New Branch", go here:
https://github.com/mrl22/laravel-livewire-tables/branches

Click "New Branch", and then select the "rappasoft/laravel-livewire-tables" repo, then select "development" as the repository.

This will ensure that you are working with the "development" branch, which often has fixes/changes in it that aren't in "master" yet.

@lrljoe lrljoe mentioned this pull request Oct 25, 2024
9 tasks
@mrl22 mrl22 closed this Oct 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants