-
-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Support re-enabling actions if they have been disabled. #6210
Open
dragosprotung
wants to merge
2
commits into
EasyCorp:4.x
Choose a base branch
from
dragosprotung:feature/enable-action
base: 4.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
<?php | ||
|
||
namespace EasyCorp\Bundle\EasyAdminBundle\Tests\Config; | ||
|
||
use EasyCorp\Bundle\EasyAdminBundle\Config\Action; | ||
use EasyCorp\Bundle\EasyAdminBundle\Config\Actions; | ||
use PHPUnit\Framework\TestCase; | ||
|
||
class ActionsTest extends TestCase | ||
{ | ||
public function testEnableDeleteAction(): void | ||
{ | ||
$actions = Actions::new(); | ||
$actions->disable(Action::DELETE); | ||
|
||
$this->assertSame(['delete', 'batchDelete'], $actions->getAsDto(null)->getDisabledActions()); | ||
|
||
$actions->enable(Action::DELETE); | ||
$this->assertSame([], $actions->getAsDto(null)->getDisabledActions()); | ||
} | ||
|
||
public function testEnableBatchDeleteAction(): void | ||
{ | ||
$actions = Actions::new(); | ||
$actions->disable(Action::BATCH_DELETE); | ||
|
||
$this->assertSame(['batchDelete'], $actions->getAsDto(null)->getDisabledActions()); | ||
|
||
$actions->enable(Action::BATCH_DELETE); | ||
$this->assertSame([], $actions->getAsDto(null)->getDisabledActions()); | ||
} | ||
|
||
public function testEnableBatchDeleteActionWillEnableDeleteAsWell(): void | ||
{ | ||
$actions = Actions::new(); | ||
$actions->disable(Action::DELETE, Action::BATCH_DELETE); | ||
|
||
$this->assertSame(['delete', 'batchDelete'], $actions->getAsDto(null)->getDisabledActions()); | ||
|
||
$actions->enable(Action::BATCH_DELETE); | ||
$this->assertSame([], $actions->getAsDto(null)->getDisabledActions()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
<?php | ||
|
||
namespace EasyCorp\Bundle\EasyAdminBundle\Tests\Dto; | ||
|
||
use EasyCorp\Bundle\EasyAdminBundle\Dto\ActionConfigDto; | ||
use PHPUnit\Framework\TestCase; | ||
|
||
final class ActionConfigDtoTest extends TestCase | ||
{ | ||
public static function provideLabels(): \Generator | ||
{ | ||
yield 'nothing to enable' => [[], ['foo', 'bar', 'baz', 'qux']]; | ||
yield 'enable action not disabled' => [['not-disabled'], ['foo', 'bar', 'baz', 'qux']]; | ||
yield 'enable 1 action' => [['bar'], ['foo', 'baz', 'qux']]; | ||
yield 'enable multiple action' => [['foo', 'baz'], ['bar', 'qux']]; | ||
yield 'enable all' => [['foo', 'bar', 'baz', 'qux'], []]; | ||
} | ||
|
||
/** | ||
* @dataProvider provideLabels | ||
*/ | ||
public function testEnableActions(array $actionsToEnable, array $expectedDisabledActions): void | ||
{ | ||
$actionConfigDto = new ActionConfigDto(); | ||
$actionConfigDto->disableActions(['foo', 'bar', 'baz', 'qux']); | ||
|
||
$this->assertSame(['foo', 'bar', 'baz', 'qux'], $actionConfigDto->getDisabledActions()); | ||
|
||
$actionConfigDto->enableActions($actionsToEnable); | ||
$this->assertSame($expectedDisabledActions, $actionConfigDto->getDisabledActions()); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we also re enable
Action::BATCH_DELETE
in caseAction::DELETE
is enabled?(to be consistent with the
disable
method)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I update the code to reflect this.
I also re-enable
Action::DELETE
ifAction::BATCH_DELETE
is re-enabled.