fix(admin): Hide empty section for users admin delegation

apps/settings/appinfo/info.xml

@@ -35,7 +35,6 @@
 		<admin>OCA\Settings\Settings\Admin\Sharing</admin>
 		<admin>OCA\Settings\Settings\Admin\Security</admin>
 		<admin>OCA\Settings\Settings\Admin\Delegation</admin>
-		<admin>OCA\Settings\Settings\Admin\Users</admin>
 		<admin-section>OCA\Settings\Sections\Admin\Additional</admin-section>
 		<admin-section>OCA\Settings\Sections\Admin\Delegation</admin-section>
 		<admin-section>OCA\Settings\Sections\Admin\Groupware</admin-section>
@@ -45,6 +44,8 @@
 		<admin-section>OCA\Settings\Sections\Admin\Security</admin-section>
 		<admin-section>OCA\Settings\Sections\Admin\Server</admin-section>
 		<admin-section>OCA\Settings\Sections\Admin\Sharing</admin-section>
+		<admin-delegation>OCA\Settings\Settings\Admin\Users</admin-delegation>
+		<admin-delegation-section>OCA\Settings\Sections\Admin\Users</admin-delegation-section>
 		<personal>OCA\Settings\Settings\Personal\Additional</personal>
 		<personal>OCA\Settings\Settings\Personal\PersonalInfo</personal>
 		<personal>OCA\Settings\Settings\Personal\ServerDevNotice</personal>

apps/settings/composer/composer/autoload_classmap.php

@@ -60,6 +60,7 @@
     'OCA\\Settings\\Sections\\Admin\\Security' => $baseDir . '/../lib/Sections/Admin/Security.php',
     'OCA\\Settings\\Sections\\Admin\\Server' => $baseDir . '/../lib/Sections/Admin/Server.php',
     'OCA\\Settings\\Sections\\Admin\\Sharing' => $baseDir . '/../lib/Sections/Admin/Sharing.php',
+    'OCA\\Settings\\Sections\\Admin\\Users' => $baseDir . '/../lib/Sections/Admin/Users.php',
     'OCA\\Settings\\Sections\\Personal\\Availability' => $baseDir . '/../lib/Sections/Personal/Availability.php',
     'OCA\\Settings\\Sections\\Personal\\Calendar' => $baseDir . '/../lib/Sections/Personal/Calendar.php',
     'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => $baseDir . '/../lib/Sections/Personal/PersonalInfo.php',

apps/settings/composer/composer/autoload_static.php

@@ -75,6 +75,7 @@ class ComposerStaticInitSettings
         'OCA\\Settings\\Sections\\Admin\\Security' => __DIR__ . '/..' . '/../lib/Sections/Admin/Security.php',
         'OCA\\Settings\\Sections\\Admin\\Server' => __DIR__ . '/..' . '/../lib/Sections/Admin/Server.php',
         'OCA\\Settings\\Sections\\Admin\\Sharing' => __DIR__ . '/..' . '/../lib/Sections/Admin/Sharing.php',
+        'OCA\\Settings\\Sections\\Admin\\Users' => __DIR__ . '/..' . '/../lib/Sections/Admin/Users.php',
         'OCA\\Settings\\Sections\\Personal\\Availability' => __DIR__ . '/..' . '/../lib/Sections/Personal/Availability.php',
         'OCA\\Settings\\Sections\\Personal\\Calendar' => __DIR__ . '/..' . '/../lib/Sections/Personal/Calendar.php',
         'OCA\\Settings\\Sections\\Personal\\PersonalInfo' => __DIR__ . '/..' . '/../lib/Sections/Personal/PersonalInfo.php',

apps/settings/lib/Sections/Admin/Users.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Settings\Sections\Admin;
+
+use OCP\IL10N;
+use OCP\Settings\IIconSection;
+
+class Users implements IIconSection {
+	public function __construct(
+		private IL10N $l,
+	) {
+	}
+
+	public function getID(): string {
+		return 'usersdelegation';
+	}
+
+	public function getName(): string {
+		return $this->l->t('Users');
+	}
+
+	public function getPriority(): int {
+		return 55;
+	}
+
+	public function getIcon(): string {
+		return '';
+	}
+}

apps/settings/lib/Settings/Admin/Delegation.php

@@ -45,32 +45,19 @@ private function getDelegatedSettings(array $settings, array $innerSection): arr
 
 	private function initSettingState(): void {
 		// Available settings page initialization
-		$sections = $this->settingManager->getAdminSections();
+		$delegatedSettings = $this->settingManager->getAdminDelegatedSettings();
 		$settings = [];
-		foreach ($sections as $sectionPriority) {
-			foreach ($sectionPriority as $section) {
-				$sectionSettings = $this->settingManager->getAdminSettings($section->getId());
-				$sectionSettings = array_reduce($sectionSettings, [$this, 'getDelegatedSettings'], []);
-				$settings = array_merge(
-					$settings,
-					array_map(function (IDelegatedSettings $setting) use ($section) {
-						$sectionName = $section->getName() . ($setting->getName() !== null ? ' - ' . $setting->getName() : '');
-						return [
-							'class' => get_class($setting),
-							'sectionName' => $sectionName,
-							'id' => mb_strtolower(str_replace(' ', '-', $sectionName)),
-							'priority' => $section->getPriority(),
-						];
-					}, $sectionSettings)
-				);
+		foreach ($delegatedSettings as ['section' => $section, 'settings' => $sectionSettings]) {
+			foreach ($sectionSettings as $setting) {
+				$sectionName = $section->getName() . ($setting->getName() !== null ? ' - ' . $setting->getName() : '');
+				$settings[] = [
+					'class' => get_class($setting),
+					'sectionName' => $sectionName,
+					'id' => mb_strtolower(str_replace(' ', '-', $sectionName)),
+					'priority' => $section->getPriority(),
+				];
 			}
 		}
-		usort($settings, function (array $a, array $b) {
-			if ($a['priority'] == $b['priority']) {
-				return 0;
-			}
-			return ($a['priority'] < $b['priority']) ? -1 : 1;
-		});
 		$this->initialStateService->provideInitialState('available-settings', $settings);
 	}
 

apps/settings/lib/Settings/Admin/Users.php

@@ -10,49 +10,27 @@
 namespace OCA\Settings\Settings\Admin;
 
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IL10N;
 use OCP\Settings\IDelegatedSettings;
 
 /**
  * Empty settings class, used only for admin delegation.
  */
 class Users implements IDelegatedSettings {
-
-	public function __construct(
-		protected string $appName,
-		private IL10N $l10n,
-	) {
-	}
-
-	/**
-	 * Empty template response
-	 */
 	public function getForm(): TemplateResponse {
-
-		return new /** @template-extends TemplateResponse<\OCP\AppFramework\Http::STATUS_OK, array{}> */ class($this->appName, '') extends TemplateResponse {
-			public function render(): string {
-				return '';
-			}
-		};
+		throw new \Exception('Admin delegation settings should never be rendered');
 	}
 
 	public function getSection(): ?string {
-		return 'admindelegation';
+		return 'usersdelegation';
 	}
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the admin section. The forms are arranged in ascending order of the
-	 *             priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
 	public function getPriority(): int {
 		return 0;
 	}
 
-	public function getName(): string {
-		return $this->l10n->t('Users');
+	public function getName(): ?string {
+		/* Use section name alone */
+		return null;
 	}
 
 	public function getAuthorizedAppConfig(): array {

apps/webhook_listeners/appinfo/info.xml

@@ -32,6 +32,7 @@
 	</commands>
 
 	<settings>
-		<admin>OCA\WebhookListeners\Settings\Admin</admin>
+		<admin-delegation>OCA\WebhookListeners\Settings\Admin</admin-delegation>
+		<admin-delegation-section>OCA\WebhookListeners\Settings\AdminSection</admin-delegation-section>
 	</settings>
 </info>

apps/webhook_listeners/composer/composer/autoload_classmap.php

@@ -20,4 +20,5 @@
     'OCA\\WebhookListeners\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php',
     'OCA\\WebhookListeners\\Service\\PHPMongoQuery' => $baseDir . '/../lib/Service/PHPMongoQuery.php',
     'OCA\\WebhookListeners\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
+    'OCA\\WebhookListeners\\Settings\\AdminSection' => $baseDir . '/../lib/Settings/AdminSection.php',
 );

apps/webhook_listeners/composer/composer/autoload_static.php

@@ -35,6 +35,7 @@ class ComposerStaticInitWebhookListeners
         'OCA\\WebhookListeners\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
         'OCA\\WebhookListeners\\Service\\PHPMongoQuery' => __DIR__ . '/..' . '/../lib/Service/PHPMongoQuery.php',
         'OCA\\WebhookListeners\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
+        'OCA\\WebhookListeners\\Settings\\AdminSection' => __DIR__ . '/..' . '/../lib/Settings/AdminSection.php',
     );
 
     public static function getInitializer(ClassLoader $loader)

apps/webhook_listeners/lib/Settings/Admin.php

@@ -9,51 +9,32 @@
 
 namespace OCA\WebhookListeners\Settings;
 
-use OCP\AppFramework\Http;
+use OCA\WebhookListeners\AppInfo\Application;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IL10N;
 use OCP\Settings\IDelegatedSettings;
 
 /**
  * Empty settings class, used only for admin delegation for now as there is no UI
  */
 class Admin implements IDelegatedSettings {
-
-	public function __construct(
-		protected string $appName,
-		private IL10N $l10n,
-	) {
-	}
-
 	/**
 	 * Empty template response
 	 */
 	public function getForm(): TemplateResponse {
-
-		return new /** @template-extends TemplateResponse<Http::STATUS_OK, array{}> */ class($this->appName, '') extends TemplateResponse {
-			public function render(): string {
-				return '';
-			}
-		};
+		throw new \Exception('Admin delegation settings should never be rendered');
 	}
 
-	public function getSection(): ?string {
-		return 'admindelegation';
+	public function getSection(): string {
+		return Application::APP_ID . '-admin';
 	}
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 *             the admin section. The forms are arranged in ascending order of the
-	 *             priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
 	public function getPriority(): int {
 		return 0;
 	}
 
-	public function getName(): string {
-		return $this->l10n->t('Webhooks');
+	public function getName(): ?string {
+		/* Use section name alone */
+		return null;
 	}
 
 	public function getAuthorizedAppConfig(): array {

apps/webhook_listeners/lib/Settings/AdminSection.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\WebhookListeners\Settings;
+
+use OCA\WebhookListeners\AppInfo\Application;
+use OCP\IL10N;
+use OCP\Settings\IIconSection;
+
+class AdminSection implements IIconSection {
+	public function __construct(
+		private IL10N $l,
+	) {
+	}
+
+	public function getID(): string {
+		return Application::APP_ID . '-admin';
+	}
+
+	public function getName(): string {
+		return $this->l->t('Webhooks');
+	}
+
+	public function getPriority(): int {
+		return 56;
+	}
+
+	public function getIcon(): string {
+		return '';
+	}
+}

lib/private/App/AppManager.php

@@ -502,7 +502,7 @@ public function loadApp(string $app): void {
 		}
 
 		if (!empty($info['settings'])) {
-			$settingsManager = \OC::$server->get(ISettingsManager::class);
+			$settingsManager = \OCP\Server::get(ISettingsManager::class);
 			if (!empty($info['settings']['admin'])) {
 				foreach ($info['settings']['admin'] as $setting) {
 					$settingsManager->registerSetting('admin', $setting);
@@ -523,6 +523,16 @@ public function loadApp(string $app): void {
 					$settingsManager->registerSection('personal', $section);
 				}
 			}
+			if (!empty($info['settings']['admin-delegation'])) {
+				foreach ($info['settings']['admin-delegation'] as $setting) {
+					$settingsManager->registerSetting(ISettingsManager::SETTINGS_DELEGATION, $setting);
+				}
+			}
+			if (!empty($info['settings']['admin-delegation-section'])) {
+				foreach ($info['settings']['admin-delegation-section'] as $section) {
+					$settingsManager->registerSection(ISettingsManager::SETTINGS_DELEGATION, $section);
+				}
+			}
 		}
 
 		if (!empty($info['collaboration']['plugins'])) {

lib/private/App/InfoParser.php

@@ -184,6 +184,12 @@ public function parse(string $file): ?array {
 		if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) {
 			$array['settings']['personal-section'] = [$array['settings']['personal-section']];
 		}
+		if (isset($array['settings']['admin-delegation']) && !is_array($array['settings']['admin-delegation'])) {
+			$array['settings']['admin-delegation'] = [$array['settings']['admin-delegation']];
+		}
+		if (isset($array['settings']['admin-delegation-section']) && !is_array($array['settings']['admin-delegation-section'])) {
+			$array['settings']['admin-delegation-section'] = [$array['settings']['admin-delegation-section']];
+		}
 		if (isset($array['navigations']['navigation']) && $this->isNavigationItem($array['navigations']['navigation'])) {
 			$array['navigations']['navigation'] = [$array['navigations']['navigation']];
 		}