remove old translations; remove obsolete admin/user route capabilities

Guite · Guite · commit 16d28710c1f7 · 2023-04-02T05:29:08.000+02:00
diff --git a/src/system/CategoriesBundle/composer.json b/src/system/CategoriesBundle/composer.json
@@ -38,12 +38,7 @@
             "class": "Zikula\\CategoriesBundle\\ZikulaCategoriesBundle",
             "displayname": "Categories",
             "url": "categories",
-            "icon": "fas fa-sitemap",
-            "capabilities": {
-                "admin": {
-                    "route": "zikulacategoriesbundle_category_listcategories"
-                }
-            }
+            "icon": "fas fa-sitemap"
         }
     }
 }
diff --git a/src/system/CoreBundle/Composer/MetaData.php b/src/system/CoreBundle/Composer/MetaData.php
@@ -46,8 +46,6 @@ class MetaData implements ArrayAccess
 
     private array $capabilities;
 
-    private array $securitySchema;
-
     public function __construct(array $json = [])
     {
         $this->name = $json['name'];
@@ -61,7 +59,6 @@ public function __construct(array $json = [])
         $this->url = $json['extra']['zikula']['url'] ?? '';
         $this->icon = $json['extra']['zikula']['icon'] ?? '';
         $this->capabilities = $json['extra']['zikula']['capabilities'] ?? [];
-        $this->securitySchema = $json['extra']['zikula']['securityschema'] ?? [];
     }
 
     public function getName(): string
@@ -164,11 +161,6 @@ public function getCapabilities(): array
         return $this->capabilities;
     }
 
-    public function getSecuritySchema(): array
-    {
-        return $this->securitySchema;
-    }
-
     private function confirmTranslator(): void
     {
         if (!isset($this->translator)) {
diff --git a/src/system/LegalBundle/Controller/ConfigController.php b/src/system/LegalBundle/Controller/ConfigController.php
@@ -13,37 +13,38 @@
 
 namespace Zikula\LegalBundle\Controller;
 
+use Nucleos\UserBundle\Model\GroupManager;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Zikula\GroupsBundle\Repository\GroupRepositoryInterface;
 use Zikula\LegalBundle\Form\Type\ConfigType;
 use Zikula\LegalBundle\Helper\ResetAgreementHelper;
 
 #[Route('/legal')]
 #[IsGranted('ROLE_ADMIN')]
 class ConfigController extends AbstractController
 {
-    public function __construct(private readonly TranslatorInterface $translator)
-    {
+    public function __construct(
+        private readonly GroupManager $groupManager,
+        private readonly TranslatorInterface $translator
+    ) {
     }
 
     #[Route('/config', name: 'zikulalegalbundle_config_config')]
     public function config(
         Request $request,
-        GroupRepositoryInterface $groupRepository,
         ResetAgreementHelper $resetAgreementHelper
     ): Response {
         // build choices for user group selector
         $groupChoices = [
             $this->translator->trans('All users') => 0,
         ];
-        $groups = $groupRepository->findAll();
+        $groups = $this->groupManager->findGroups();
         foreach ($groups as $group) {
-            $groupChoices[$group->getName()] = $group->getGid();
+            $groupChoices[$group->getName()] = $group->getId();
         }
 
         $form = $this->createForm(ConfigType::class, [], [
diff --git a/src/system/LegalBundle/Helper/ResetAgreementHelper.php b/src/system/LegalBundle/Helper/ResetAgreementHelper.php
@@ -13,9 +13,9 @@
 
 namespace Zikula\LegalBundle\Helper;
 
+use Nucleos\UserBundle\Model\GroupManager;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Zikula\GroupsBundle\Repository\GroupRepositoryInterface;
 use Zikula\LegalBundle\LegalConstant;
 use Zikula\UsersBundle\Repository\UserAttributeRepositoryInterface;
 
@@ -26,8 +26,8 @@ class ResetAgreementHelper
 {
     public function __construct(
         private readonly Security $security,
-        private readonly UserAttributeRepositoryInterface $attributeRepository,
-        private readonly GroupRepositoryInterface $groupRepository
+        private readonly GroupManager $groupManager,
+        private readonly UserAttributeRepositoryInterface $attributeRepository
     ) {
     }
 
@@ -56,8 +56,8 @@ public function reset(int $groupId): bool
 
         $members = [];
         if (0 !== $groupId) {
-            $group = $this->groupRepository->find($groupId);
-            if (empty($group)) {
+            $group = $this->groupManager->findGroupBy(['id' => $groupId]);
+            if (null === $group) {
                 return false;
             }
             $members = $group->getUsers()->toArray();
diff --git a/src/system/LegalBundle/Resources/views/Config/config.html.twig b/src/system/LegalBundle/Resources/views/Config/config.html.twig
@@ -1,21 +1,20 @@
-<h3>
-    <span class="fas fa-wrench"></span>
-    {% trans %}Settings{% endtrans %}
-    {{ pageSetVar('title', 'Legal settings'|trans) }}
-</h3>
+{% extends '@EasyAdmin/page/content.html.twig' %}
 
-<p class="alert alert-danger"><strong>{% trans %}Important Usage Note{% endtrans %}</strong>: {% trans with {'%dir%': '"/Resources/views/en"', '%dir2%': '"templates/bundles/ZikulaLegalBundle/"'} %}The provided legal statements are samples only. They need to be adapted to your specific needs and locales. You will find the content of the statements in files in the %dir% directory. These templates can be overridden by theme templates, or by global templates you would create in the %dir2% directory (in the appropriate sub-directory for the language you are writing for).{% endtrans %}</p>
+{% block content_title 'Legal settings'|trans %}
+{% block main %}
+    <p class="alert alert-danger"><strong>{% trans %}Important Usage Note{% endtrans %}</strong>: {% trans with {'%dir%': '"/Resources/views/en"', '%dir2%': '"templates/bundles/ZikulaLegalBundle/"'} %}The provided legal statements are samples only. They need to be adapted to your specific needs and locales. You will find the content of the statements in files in the %dir% directory. These templates can be overridden by theme templates, or by global templates you would create in the %dir2% directory (in the appropriate sub-directory for the language you are writing for).{% endtrans %}</p>
 
-{{ form_start(form) }}
-{{ form_errors(form) }}
-<fieldset>
-    <legend>{% trans %}Reset agreement{% endtrans %}</legend>
-    {{ form_row(form.resetagreement) }}
-</fieldset>
-<div class="form-group">
-    <div class="col-md-9 offset-md-3">
-        {{ form_widget(form.save) }}
-        {{ form_widget(form.cancel) }}
+    {{ form_start(form) }}
+    {{ form_errors(form) }}
+    <fieldset>
+        <legend>{% trans %}Reset agreement{% endtrans %}</legend>
+        {{ form_row(form.resetagreement) }}
+    </fieldset>
+    <div class="form-group">
+        <div class="col-md-9 offset-md-3">
+            {{ form_widget(form.save) }}
+            {{ form_widget(form.cancel) }}
+        </div>
     </div>
-</div>
-{{ form_end(form) }}
+    {{ form_end(form) }}
+{% endblock %}
diff --git a/src/system/LegalBundle/composer.json b/src/system/LegalBundle/composer.json
@@ -21,15 +21,7 @@
             "class": "Zikula\\LegalBundle\\ZikulaLegalModule",
             "displayname": "Legal",
             "url": "legal",
-            "icon": "fas fa-gavel",
-            "capabilities": {
-                "admin": {
-                    "route": "zikulalegalbundle_config_config"
-                },
-                "user": {
-                    "route": "zikulalegalbundle_user_legalnotice"
-                }
-            }
+            "icon": "fas fa-gavel"
         }
     }
 }
diff --git a/src/system/ProfileBundle/composer.json b/src/system/ProfileBundle/composer.json
@@ -23,15 +23,7 @@
             "class": "Zikula\\ProfileBundle\\ZikulaProfileModule",
             "displayname": "Profile",
             "url": "profile",
-            "icon": "fas fa-id-card",
-            "capabilities": {
-                "admin": {
-                    "route": "zikulaprofilebundle_property_listproperties"
-                },
-                "user": {
-                    "route": "zikulaprofilebundle_profile_display"
-                }
-            }
+            "icon": "fas fa-id-card"
         }
     }
 }
diff --git a/src/system/ThemeBundle/Controller/Dashboard/AbstractThemedDashboardController.php b/src/system/ThemeBundle/Controller/Dashboard/AbstractThemedDashboardController.php
@@ -25,7 +25,6 @@
 use Symfony\Component\Translation\TranslatableMessage;
 use Zikula\CoreBundle\Site\SiteDefinitionInterface;
 use Zikula\ThemeBundle\ExtensionMenu\ExtensionMenuCollector;
-use Zikula\ThemeBundle\Helper\AdminBundleHelper;
 use Zikula\ThemeBundle\Helper\AdminCategoryHelper;
 use Zikula\ThemeBundle\Helper\UserMenuExtensionHelper;
 
@@ -35,7 +34,6 @@ public function __construct(
         protected readonly KernelInterface $kernel,
         protected readonly AdminUrlGenerator $urlGenerator,
         protected readonly AdminCategoryHelper $adminCategoryHelper,
-        protected readonly AdminBundleHelper $adminBundleHelper,
         protected readonly ExtensionMenuCollector $extensionMenuCollector,
         protected readonly UserMenuExtensionHelper $userMenuExtensionHelper,
         protected readonly SiteDefinitionInterface $site,
diff --git a/src/system/ThemeBundle/Controller/Dashboard/AdminDashboardController.php b/src/system/ThemeBundle/Controller/Dashboard/AdminDashboardController.php
@@ -40,27 +40,18 @@ public function configureMenuItems(): iterable
         yield MenuItem::linkToDashboard(t('Dashboard'), 'fa fa-gauge-high');
         yield MenuItem::linktoUrl(t('Website frontend'), 'fas fa-home', '/');
 
+        $menuItemsByBundle = $this->extensionMenuCollector->getAllByContext(ExtensionMenuInterface::CONTEXT_ADMIN);
+
         foreach ($this->adminCategoryHelper->getCategories() as $category) {
             yield MenuItem::section($category->getName(), $category->getIcon());
             $bundleNames = $this->adminCategoryHelper->getBundleAssignments($category);
-            $adminBundles = $this->adminBundleHelper->getAdminCapableBundles();
-            foreach ($adminBundles as $bundle) {
+            foreach ($menuItemsByBundle as $bundleName => $extensionMenuItems) {
+                $bundle = $this->kernel->getBundle($bundleName);
                 if (!in_array($bundle->getName(), $bundleNames, true)) {
                     continue;
                 }
-
                 $bundleInfo = $bundle->getMetaData();
-                [$menuTextUrl, $menuText] = $this->adminBundleHelper->getAdminRouteInformation($bundleInfo);
-
-                $bundleName = (string) $bundle->getName();
-                $extensionMenuItems = $this->extensionMenuCollector->get($bundleName, ExtensionMenuInterface::CONTEXT_ADMIN);
-                $isSubMenu = isset($extensionMenuItems);
-
-                if ($isSubMenu) {
-                    yield MenuItem::subMenu($menuText, $bundleInfo->getIcon())->setSubItems(iterator_to_array($extensionMenuItems));
-                } else {
-                    yield MenuItem::linktoRoute($menuText, $bundleInfo->getIcon(), $menuTextUrl);
-                }
+                yield MenuItem::subMenu($bundleInfo->getDisplayName(), $bundleInfo->getIcon())->setSubItems(iterator_to_array($extensionMenuItems));
             }
         }
 
diff --git a/src/system/ThemeBundle/Controller/Dashboard/UserDashboardController.php b/src/system/ThemeBundle/Controller/Dashboard/UserDashboardController.php
@@ -41,12 +41,12 @@ public function configureMenuItems(): iterable
         $menuItemsByBundle = $this->extensionMenuCollector->getAllByContext(ExtensionMenuInterface::CONTEXT_USER);
         foreach ($menuItemsByBundle as $bundleName => $extensionMenuItems) {
             $bundle = $this->kernel->getBundle($bundleName);
-            $bundleInfo = $bundle->getMetaData();
 
             $menuItems = is_array($extensionMenuItems) ? $extensionMenuItems : iterator_to_array($extensionMenuItems);
             if (!count($menuItems)) {
                 continue;
             }
+            $bundleInfo = $bundle->getMetaData();
             yield MenuItem::subMenu($bundleInfo->getDisplayName(), $bundleInfo->getIcon())->setSubItems($menuItems);
             /*foreach ($menuItems as $item) {
                 yield $item;
diff --git a/src/system/ThemeBundle/Helper/AdminBundleHelper.php b/src/system/ThemeBundle/Helper/AdminBundleHelper.php
diff --git a/src/system/ThemeBundle/composer.json b/src/system/ThemeBundle/composer.json
@@ -50,12 +50,7 @@
             "class": "Zikula\\ThemeBundle\\ZikulaThemeBundle",
             "displayname": "Theme management",
             "url": "theme",
-            "icon": "fas fa-palette",
-            "capabilities": {
-                "admin": {
-                    "route": "zikulathemebundle_branding_overview"
-                }
-            }
+            "icon": "fas fa-palette"
         }
     }
 }
diff --git a/src/system/UsersBundle/composer.json b/src/system/UsersBundle/composer.json
@@ -42,15 +42,7 @@
             "class": "Zikula\\UsersBundle\\ZikulaUsersBundle",
             "displayname": "Users management",
             "url": "users",
-            "icon": "fas fa-users-cog",
-            "capabilities": {
-                "admin": {
-                    "route": "zikulausersbundle_useradministration_listusers"
-                },
-                "user": {
-                    "route": "zikulausersbundle_account_menu"
-                }
-            }
+            "icon": "fas fa-users-cog"
         }
     }
 }
diff --git a/translations/.gitkeep b/translations/.gitkeep
diff --git a/translations/mail.en.yaml b/translations/mail.en.yaml
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
diff --git a/translations/validators.en.yaml b/translations/validators.en.yaml

Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,7 @@`
`38`	`38`	`"class": "Zikula\\CategoriesBundle\\ZikulaCategoriesBundle",`
`39`	`39`	`"displayname": "Categories",`
`40`	`40`	`"url": "categories",`
`41`		`- "icon": "fas fa-sitemap",`
`42`		`- "capabilities": {`
`43`		`- "admin": {`
`44`		`- "route": "zikulacategoriesbundle_category_listcategories"`
`45`		`- }`
`46`		`- }`
	`41`	`+ "icon": "fas fa-sitemap"`
`47`	`42`	`}`
`48`	`43`	`}`
`49`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ class MetaData implements ArrayAccess`
`46`	`46`
`47`	`47`	`private array $capabilities;`
`48`	`48`
`49`		`- private array $securitySchema;`
`50`		`-`
`51`	`49`	`public function __construct(array $json = [])`
`52`	`50`	`{`
`53`	`51`	`$this->name = $json['name'];`
`@@ -61,7 +59,6 @@ public function __construct(array $json = [])`
`61`	`59`	`$this->url = $json['extra']['zikula']['url'] ?? '';`
`62`	`60`	`$this->icon = $json['extra']['zikula']['icon'] ?? '';`
`63`	`61`	`$this->capabilities = $json['extra']['zikula']['capabilities'] ?? [];`
`64`		`- $this->securitySchema = $json['extra']['zikula']['securityschema'] ?? [];`
`65`	`62`	`}`
`66`	`63`
`67`	`64`	`public function getName(): string`
`@@ -164,11 +161,6 @@ public function getCapabilities(): array`
`164`	`161`	`return $this->capabilities;`
`165`	`162`	`}`
`166`	`163`
`167`		`- public function getSecuritySchema(): array`
`168`		`- {`
`169`		`- return $this->securitySchema;`
`170`		`- }`
`171`		`-`
`172`	`164`	`private function confirmTranslator(): void`
`173`	`165`	`{`
`174`	`166`	`if (!isset($this->translator)) {`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,7 @@`
`21`	`21`	`"class": "Zikula\\LegalBundle\\ZikulaLegalModule",`
`22`	`22`	`"displayname": "Legal",`
`23`	`23`	`"url": "legal",`
`24`		`- "icon": "fas fa-gavel",`
`25`		`- "capabilities": {`
`26`		`- "admin": {`
`27`		`- "route": "zikulalegalbundle_config_config"`
`28`		`- },`
`29`		`- "user": {`
`30`		`- "route": "zikulalegalbundle_user_legalnotice"`
`31`		`- }`
`32`		`- }`
	`24`	`+ "icon": "fas fa-gavel"`
`33`	`25`	`}`
`34`	`26`	`}`
`35`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,7 @@`
`23`	`23`	`"class": "Zikula\\ProfileBundle\\ZikulaProfileModule",`
`24`	`24`	`"displayname": "Profile",`
`25`	`25`	`"url": "profile",`
`26`		`- "icon": "fas fa-id-card",`
`27`		`- "capabilities": {`
`28`		`- "admin": {`
`29`		`- "route": "zikulaprofilebundle_property_listproperties"`
`30`		`- },`
`31`		`- "user": {`
`32`		`- "route": "zikulaprofilebundle_profile_display"`
`33`		`- }`
`34`		`- }`
	`26`	`+ "icon": "fas fa-id-card"`
`35`	`27`	`}`
`36`	`28`	`}`
`37`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,7 @@`
`50`	`50`	`"class": "Zikula\\ThemeBundle\\ZikulaThemeBundle",`
`51`	`51`	`"displayname": "Theme management",`
`52`	`52`	`"url": "theme",`
`53`		`- "icon": "fas fa-palette",`
`54`		`- "capabilities": {`
`55`		`- "admin": {`
`56`		`- "route": "zikulathemebundle_branding_overview"`
`57`		`- }`
`58`		`- }`
	`53`	`+ "icon": "fas fa-palette"`
`59`	`54`	`}`
`60`	`55`	`}`
`61`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,7 @@`
`42`	`42`	`"class": "Zikula\\UsersBundle\\ZikulaUsersBundle",`
`43`	`43`	`"displayname": "Users management",`
`44`	`44`	`"url": "users",`
`45`		`- "icon": "fas fa-users-cog",`
`46`		`- "capabilities": {`
`47`		`- "admin": {`
`48`		`- "route": "zikulausersbundle_useradministration_listusers"`
`49`		`- },`
`50`		`- "user": {`
`51`		`- "route": "zikulausersbundle_account_menu"`
`52`		`- }`
`53`		`- }`
	`45`	`+ "icon": "fas fa-users-cog"`
`54`	`46`	`}`
`55`	`47`	`}`
`56`	`48`	`}`