-
Notifications
You must be signed in to change notification settings - Fork 241
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6103 from nextcloud/Fix/intialize-state-correctly
Fix: move state init to a service
- Loading branch information
Showing
4 changed files
with
147 additions
and
216 deletions.
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,125 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
| /** | ||
| * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
| namespace OCA\Calendar\Service; | ||
|
|
||
| use OC\App\CompareVersion; | ||
| use OCA\Calendar\Service\Appointments\AppointmentConfigService; | ||
| use OCP\App\IAppManager; | ||
| use OCP\AppFramework\Services\IInitialState; | ||
| use OCP\IConfig; | ||
| use function in_array; | ||
|
|
||
| class CalendarInitialStateService { | ||
|
|
||
| public function __construct( | ||
| private string $appName, | ||
| private IInitialState $initialStateService, | ||
| private IAppManager $appManager, | ||
| private IConfig $config, | ||
| private AppointmentConfigService $appointmentConfigService, | ||
| private CompareVersion $compareVersion, | ||
| private ?string $userId, | ||
| ) { | ||
| $this->appName = $appName; | ||
| $this->config = $config; | ||
| $this->initialStateService = $initialStateService; | ||
| $this->appointmentConfigService = $appointmentConfigService; | ||
| $this->appManager = $appManager; | ||
| $this->compareVersion = $compareVersion; | ||
| $this->userId = $userId; | ||
| } | ||
|
|
||
| public function run(): void { | ||
| $defaultEventLimit = $this->config->getAppValue($this->appName, 'eventLimit', 'yes'); | ||
| $defaultInitialView = $this->config->getAppValue($this->appName, 'currentView', 'dayGridMonth'); | ||
| $defaultShowWeekends = $this->config->getAppValue($this->appName, 'showWeekends', 'yes'); | ||
| $defaultWeekNumbers = $this->config->getAppValue($this->appName, 'showWeekNr', 'no'); | ||
| $defaultSkipPopover = $this->config->getAppValue($this->appName, 'skipPopover', 'no'); | ||
| $defaultTimezone = $this->config->getAppValue($this->appName, 'timezone', 'automatic'); | ||
| $defaultSlotDuration = $this->config->getAppValue($this->appName, 'slotDuration', '00:30:00'); | ||
| $defaultDefaultReminder = $this->config->getAppValue($this->appName, 'defaultReminder', 'none'); | ||
| $defaultShowTasks = $this->config->getAppValue($this->appName, 'showTasks', 'yes'); | ||
|
|
||
| $appVersion = $this->config->getAppValue($this->appName, 'installed_version', ''); | ||
| $eventLimit = $this->config->getUserValue($this->userId, $this->appName, 'eventLimit', $defaultEventLimit) === 'yes'; | ||
| $firstRun = $this->config->getUserValue($this->userId, $this->appName, 'firstRun', 'yes') === 'yes'; | ||
| $initialView = $this->getView($this->config->getUserValue($this->userId, $this->appName, 'currentView', $defaultInitialView)); | ||
| $showWeekends = $this->config->getUserValue($this->userId, $this->appName, 'showWeekends', $defaultShowWeekends) === 'yes'; | ||
| $showWeekNumbers = $this->config->getUserValue($this->userId, $this->appName, 'showWeekNr', $defaultWeekNumbers) === 'yes'; | ||
| $skipPopover = $this->config->getUserValue($this->userId, $this->appName, 'skipPopover', $defaultSkipPopover) === 'yes'; | ||
| $timezone = $this->config->getUserValue($this->userId, $this->appName, 'timezone', $defaultTimezone); | ||
| $attachmentsFolder = $this->config->getUserValue($this->userId, 'dav', 'attachmentsFolder', '/Calendar'); | ||
| $slotDuration = $this->config->getUserValue($this->userId, $this->appName, 'slotDuration', $defaultSlotDuration); | ||
| $defaultReminder = $this->config->getUserValue($this->userId, $this->appName, 'defaultReminder', $defaultDefaultReminder); | ||
| $showTasks = $this->config->getUserValue($this->userId, $this->appName, 'showTasks', $defaultShowTasks) === 'yes'; | ||
| $hideEventExport = $this->config->getAppValue($this->appName, 'hideEventExport', 'no') === 'yes'; | ||
| $disableAppointments = $this->config->getAppValue($this->appName, 'disableAppointments', 'no') === 'yes'; | ||
| $forceEventAlarmType = $this->config->getAppValue($this->appName, 'forceEventAlarmType', ''); | ||
| if (!in_array($forceEventAlarmType, ['DISPLAY', 'EMAIL'], true)) { | ||
| $forceEventAlarmType = false; | ||
| } | ||
| $canSubscribeLink = $this->config->getAppValue('dav', 'allow_calendar_link_subscriptions', 'yes') === 'yes'; | ||
| $showResources = $this->config->getAppValue($this->appName, 'showResources', 'yes') === 'yes'; | ||
| $publicCalendars = $this->config->getAppValue($this->appName, 'publicCalendars', ''); | ||
|
|
||
| $talkEnabled = $this->appManager->isEnabledForUser('spreed'); | ||
| $talkApiVersion = version_compare($this->appManager->getAppVersion('spreed'), '12.0.0', '>=') ? 'v4' : 'v1'; | ||
| $tasksEnabled = $this->appManager->isEnabledForUser('tasks'); | ||
|
|
||
| $circleVersion = $this->appManager->getAppVersion('circles'); | ||
| $isCirclesEnabled = $this->appManager->isEnabledForUser('circles') === true; | ||
| // if circles is not installed, we use 0.0.0 | ||
| $isCircleVersionCompatible = $this->compareVersion->isCompatible($circleVersion ? $circleVersion : '0.0.0', '22'); | ||
|
|
||
| $this->initialStateService->provideInitialState('app_version', $appVersion); | ||
| $this->initialStateService->provideInitialState('event_limit', $eventLimit); | ||
| $this->initialStateService->provideInitialState('first_run', $firstRun); | ||
| $this->initialStateService->provideInitialState('initial_view', $initialView); | ||
| $this->initialStateService->provideInitialState('show_weekends', $showWeekends); | ||
| $this->initialStateService->provideInitialState('show_week_numbers', $showWeekNumbers); | ||
| $this->initialStateService->provideInitialState('skip_popover', $skipPopover); | ||
| $this->initialStateService->provideInitialState('talk_enabled', $talkEnabled); | ||
| $this->initialStateService->provideInitialState('talk_api_version', $talkApiVersion); | ||
| $this->initialStateService->provideInitialState('timezone', $timezone); | ||
| $this->initialStateService->provideInitialState('attachments_folder', $attachmentsFolder); | ||
| $this->initialStateService->provideInitialState('slot_duration', $slotDuration); | ||
| $this->initialStateService->provideInitialState('default_reminder', $defaultReminder); | ||
| $this->initialStateService->provideInitialState('show_tasks', $showTasks); | ||
| $this->initialStateService->provideInitialState('tasks_enabled', $tasksEnabled); | ||
| $this->initialStateService->provideInitialState('hide_event_export', $hideEventExport); | ||
| $this->initialStateService->provideInitialState('force_event_alarm_type', $forceEventAlarmType); | ||
| $this->initialStateService->provideInitialState('appointmentConfigs', $this->appointmentConfigService->getAllAppointmentConfigurations($this->userId)); | ||
| $this->initialStateService->provideInitialState('disable_appointments', $disableAppointments); | ||
| $this->initialStateService->provideInitialState('can_subscribe_link', $canSubscribeLink); | ||
| $this->initialStateService->provideInitialState('show_resources', $showResources); | ||
| $this->initialStateService->provideInitialState('isCirclesEnabled', $isCirclesEnabled && $isCircleVersionCompatible); | ||
| $this->initialStateService->provideInitialState('publicCalendars', $publicCalendars); | ||
| } | ||
|
|
||
| /** | ||
| * Makes sure we don't use the old views anymore | ||
| * | ||
| * @param string $view | ||
| * @return string | ||
| */ | ||
| private function getView(string $view): string { | ||
| switch ($view) { | ||
| case 'agendaDay': | ||
| return 'timeGridDay'; | ||
|
|
||
| case 'agendaWeek': | ||
| return 'timeGridWeek'; | ||
|
|
||
| case 'month': | ||
| return 'dayGridMonth'; | ||
|
|
||
| default: | ||
| return $view; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.