check if circles app is enabled

lib/Controller/ViewController.php

@@ -27,6 +27,7 @@
 
 use OCA\Calendar\Service\Appointments\AppointmentConfigService;
 use OCA\Calendar\Service\CategoriesService;
+use OC\App\CompareVersion;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\FileDisplayResponse;
@@ -55,6 +56,9 @@ class ViewController extends Controller {
 	/** @var IAppManager */
 	private $appManager;
 
+    /** @var CompareVersion */
+    private $compareVersion;
+
 	/** @var string */
 	private $userId;
 
@@ -67,6 +71,7 @@ public function __construct(string $appName,
 		CategoriesService $categoriesService,
 		IInitialState $initialStateService,
 		IAppManager $appManager,
+		CompareVersion $compareVersion,
 		?string $userId,
 		IAppData $appData) {
 		parent::__construct($appName, $request);
@@ -75,6 +80,7 @@ public function __construct(string $appName,
 		$this->categoriesService = $categoriesService;
 		$this->initialStateService = $initialStateService;
 		$this->appManager = $appManager;
+		$this->compareVersion = $compareVersion;
 		$this->userId = $userId;
 		$this->appData = $appData;
 	}
@@ -123,6 +129,11 @@ public function index():TemplateResponse {
 		$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);
@@ -145,6 +156,7 @@ public function index():TemplateResponse {
 		$this->initialStateService->provideInitialState('can_subscribe_link', $canSubscribeLink);
 		$this->initialStateService->provideInitialState('categories', $this->categoriesService->getCategories($this->userId));
 		$this->initialStateService->provideInitialState('show_resources', $showResources);
+		$this->initialStateService->provideInitialState('isCirclesEnabled', $isCirclesEnabled && $isCircleVersionCompatible);
 
 		return new TemplateResponse($this->appName, 'main');
 	}

src/components/Editor/Invitees/InviteesListSearch.vue

@@ -75,6 +75,7 @@ import {
 	NcMultiselect as Multiselect,
 } from '@nextcloud/vue'
 import { principalPropertySearchByDisplaynameOrEmail } from '../../../services/caldavService.js'
+import isCirclesEnabled from '../../../services/isCirclesEnabled.js'
 import { circleSearchByName } from '../../../services/circleService.js'
 import HttpClient from '@nextcloud/axios'
 import debounce from 'debounce'
@@ -100,6 +101,7 @@ export default {
 			isLoading: false,
 			inputGiven: false,
 			matches: [],
+			isCirclesEnabled
 		}
 	},
 	computed: {
@@ -118,14 +120,18 @@ export default {
 			if (query.length > 0) {
 				const promises = [
 					this.findAttendeesFromContactsAPI(query),
-					this.findAttendeesFromDAV(query),
-					this.findAttendeesFromCircles(query),
+					this.findAttendeesFromDAV(query)
 				]
+				if (isCirclesEnabled) {
+					promises.push(this.findAttendeesFromCircles(query))
+				}
 
 				const [contactsResults, davResults, circleResults] = await Promise.all(promises)
 				matches.push(...contactsResults)
 				matches.push(...davResults)
-				matches.push(...circleResults)
+				if (isCirclesEnabled) {
+					matches.push(...circleResults)
+				}
 
 				// Source of the Regex: https://stackoverflow.com/a/46181
 				// eslint-disable-next-line
@@ -267,7 +273,7 @@ export default {
 				return {
 					commonName: circle.displayname,
 					calendarUserType: 'GROUP',
-					email: '',
+					email: '+' +  circle.id + '@',
 					isUser: false,
 					dropdownName: circle.displayname,
 					type: 'circle',

src/services/circleService.js

@@ -59,6 +59,8 @@ const circleSearchByName = async (query) => {
 		return []
 	}
 
+	console.log(circles)
+
 	return circles.filter((circle) => {
 		return true
 	}).map(circle => ({

src/services/isCirclesEnabled.js

@@ -0,0 +1,26 @@
+/**
+ * @copyright Copyright (c) 2021 John Molakvoæ <[email protected]>
+ *
+ * @author John Molakvoæ <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import { loadState } from '@nextcloud/initial-state'
+
+const isCirclesEnabled = loadState('calendar', 'isCirclesEnabled', false)
+export default isCirclesEnabled