IBX-6750/IBX-6754/IBX-6839: Implementation of smart/expert mode #1017
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,82 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @copyright Copyright (C) Ibexa AS. All rights reserved. | ||
| * @license For full copyright and license information view LICENSE file distributed with this source code. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Ibexa\Bundle\AdminUi\Controller\User; | ||
|
|
||
| use Ibexa\AdminUi\Form\Data\User\UserModeChangeData; | ||
| use Ibexa\AdminUi\Form\Type\User\UserModeChangeType; | ||
| use Ibexa\AdminUi\UserSetting\UserMode; | ||
| use Ibexa\Contracts\AdminUi\Controller\Controller; | ||
| use Ibexa\User\UserSetting\UserSettingService; | ||
| use Symfony\Component\HttpFoundation\RedirectResponse; | ||
| use Symfony\Component\HttpFoundation\Request; | ||
| use Symfony\Component\HttpFoundation\Response; | ||
|
|
||
| final class UserModeController extends Controller | ||
| { | ||
| private const RETURN_URL_PARAM = 'returnUrl'; | ||
|
|
||
| private UserSettingService $userSettingService; | ||
|
|
||
| public function __construct(UserSettingService $userSettingService) | ||
| { | ||
| $this->userSettingService = $userSettingService; | ||
| } | ||
|
|
||
| public function changeAction(Request $request, ?string $returnUrl): Response | ||
| { | ||
| $data = new UserModeChangeData(); | ||
| $data->setMode($this->userSettingService->getUserSetting(UserMode::IDENTIFIER)->value === UserMode::EXPERT); | ||
|
|
||
| $form = $this->createForm( | ||
| UserModeChangeType::class, | ||
| $data, | ||
| [ | ||
| 'action' => $this->generateUrl( | ||
| 'ibexa.user_mode.change', | ||
| [ | ||
| self::RETURN_URL_PARAM => $returnUrl, | ||
| ] | ||
| ), | ||
| 'method' => Request::METHOD_POST, | ||
| ] | ||
| ); | ||
|
|
||
| $form->handleRequest($request); | ||
| if ($form->isSubmitted() && $form->isValid()) { | ||
| $this->userSettingService->setUserSetting( | ||
| UserMode::IDENTIFIER, | ||
| $data->getMode() ? UserMode::EXPERT : UserMode::SMART | ||
| ); | ||
|
|
||
| return $this->createRedirectToReturnUrl($request); | ||
| } | ||
|
|
||
| return $this->render( | ||
| '@ibexadesign/ui/user_mode_form.html.twig', | ||
| [ | ||
| 'form' => $form->createView(), | ||
| ] | ||
| ); | ||
| } | ||
|
|
||
| private function createRedirectToReturnUrl(Request $request): RedirectResponse | ||
| { | ||
| $url = $request->query->get(self::RETURN_URL_PARAM); | ||
| if (is_string($url) && $this->isSafeUrl($url, $request->getBaseUrl())) { | ||
| return new RedirectResponse($url); | ||
| } | ||
|
|
||
| throw $this->createAccessDeniedException('Malformed return URL'); | ||
| } | ||
|
|
||
| private function isSafeUrl(string $referer, string $baseUrl): bool | ||
| { | ||
| return str_starts_with($referer, $baseUrl); | ||
| } | ||
| } | ||
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
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,12 @@ | ||
| (function (global, doc) { | ||
| const FORM_SELECTOR = 'form[name=user_mode_change]'; | ||
| const form = doc.querySelector(FORM_SELECTOR); | ||
|
|
||
| if (form) { | ||
| form.querySelectorAll('input[type=checkbox]').forEach((input) => { | ||
| input.addEventListener('change', () => { | ||
| form.submit(); | ||
| }); | ||
| }); | ||
| } | ||
| })(window, window.document); |
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
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
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
Oops, something went wrong.
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.
Why aren't we using
UserMode::EXPERTandUserMode::SMARTdirectly, instead of relying on a straight up boolean?For me myself, it would make sense to use the same value as user settings. It would be also a lot easier to work with in case a third setting is introduced.
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.
Ah, I commented on the same issue. Fully agree, user setting was prepared to accept more user modes in the future. We could maybe even make it extendable by developers, especially with suggestions like #1017 (comment) Data format should reflect values from the user setting.