Merge pull request #41501 from nextcloud/feat/dav/show-ooo-ui-by-default

feat(dav): Enable OOO UI and expose enabled via OCP

Author: ChristophWurst

apps/dav/lib/Settings/AvailabilitySettings.php

@@ -33,6 +33,7 @@
 use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
 use OCP\Settings\ISettings;
+use OCP\User\IAvailabilityCoordinator;
 use Psr\Log\LoggerInterface;
 
 class AvailabilitySettings implements ISettings {
@@ -44,6 +45,7 @@ public function __construct(IConfig $config,
 								IInitialState $initialState,
 								?string $userId,
 								private LoggerInterface $logger,
+								private IAvailabilityCoordinator $coordinator,
 								private AbsenceMapper $absenceMapper) {
 		$this->config = $config;
 		$this->initialState = $initialState;
@@ -60,11 +62,7 @@ public function getForm(): TemplateResponse {
 				'no'
 			)
 		);
-		$hideAbsenceSettings = $this->config->getAppValue(
-			Application::APP_ID,
-			'hide_absence_settings',
-			'yes',
-		) === 'yes';
+		$hideAbsenceSettings = !$this->coordinator->isEnabled();
 		$this->initialState->provideInitialState('hide_absence_settings', $hideAbsenceSettings);
 		if (!$hideAbsenceSettings) {
 			try {

lib/private/User/AvailabilityCoordinator.php

@@ -27,10 +27,12 @@
 namespace OC\User;
 
 use JsonException;
+use OCA\DAV\AppInfo\Application;
 use OCA\DAV\Db\AbsenceMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\ICache;
 use OCP\ICacheFactory;
+use OCP\IConfig;
 use OCP\IUser;
 use OCP\User\IAvailabilityCoordinator;
 use OCP\User\IOutOfOfficeData;
@@ -42,11 +44,20 @@ class AvailabilityCoordinator implements IAvailabilityCoordinator {
 	public function __construct(
 		ICacheFactory $cacheFactory,
 		private AbsenceMapper $absenceMapper,
+		private IConfig $config,
 		private LoggerInterface $logger,
 	) {
 		$this->cache = $cacheFactory->createLocal('OutOfOfficeData');
 	}
 
+	public function isEnabled(): bool {
+		return $this->config->getAppValue(
+			Application::APP_ID,
+			'hide_absence_settings',
+			'no',
+		) === 'no';
+	}
+
 	private function getCachedOutOfOfficeData(IUser $user): ?OutOfOfficeData {
 		$cachedString = $this->cache->get($user->getUID());
 		if ($cachedString === null) {

lib/public/User/IAvailabilityCoordinator.php

@@ -33,6 +33,15 @@
  * @since 28.0.0
  */
 interface IAvailabilityCoordinator {
+	/**
+	 * Check if the feature is enabled on this instance
+	 *
+	 * @return bool
+	 *
+	 * @since 28.0.0
+	 */
+	public function isEnabled(): bool;
+
 	/**
 	 * Get the user's out-of-office message, if any
 	 *

tests/lib/User/AvailabilityCoordinatorTest.php

@@ -32,14 +32,17 @@
 use OCA\DAV\Db\AbsenceMapper;
 use OCP\ICache;
 use OCP\ICacheFactory;
+use OCP\IConfig;
 use OCP\IUser;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Test\TestCase;
 
 class AvailabilityCoordinatorTest extends TestCase {
 	private AvailabilityCoordinator $availabilityCoordinator;
 	private ICacheFactory $cacheFactory;
 	private ICache $cache;
+	private IConfig|MockObject $config;
 	private AbsenceMapper $absenceMapper;
 	private LoggerInterface $logger;
 
@@ -49,6 +52,7 @@ protected function setUp(): void {
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
 		$this->cache = $this->createMock(ICache::class);
 		$this->absenceMapper = $this->createMock(AbsenceMapper::class);
+		$this->config = $this->createMock(IConfig::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
 
 		$this->cacheFactory->expects(self::once())
@@ -58,10 +62,22 @@ protected function setUp(): void {
 		$this->availabilityCoordinator = new AvailabilityCoordinator(
 			$this->cacheFactory,
 			$this->absenceMapper,
+			$this->config,
 			$this->logger,
 		);
 	}
 
+	public function testIsEnabled(): void {
+		$this->config->expects(self::once())
+			->method('getAppValue')
+			->with('dav', 'hide_absence_settings', 'no')
+			->willReturn('no');
+
+		$isEnabled = $this->availabilityCoordinator->isEnabled();
+
+		self::assertTrue($isEnabled);
+	}
+
 	public function testGetOutOfOfficeData(): void {
 		$absence = new Absence();
 		$absence->setId(420);