Revert "Merge release2.4 to master (#458)"

This reverts commit 1c6097e.
nextcloud · Aug 21, 2023 · 86e8064 · 86e8064
1 parent 1c6097e
commit 86e8064
Show file tree

Hide file tree

Showing 21 changed files with 85 additions and 723 deletions.
diff --git a/lib/Controller/OpenProjectAPIController.php b/lib/Controller/OpenProjectAPIController.php
@@ -154,18 +154,17 @@ public function getNotifications(): DataResponse {
 	 *
 	 * @return DataResponse
 	 */
-	public function getSearchedWorkPackages(?string $searchQuery = null, ?int $fileId = null, bool $isSmartPicker = false): DataResponse {
+	public function getSearchedWorkPackages(?string $searchQuery = null, ?int $fileId = null): DataResponse {
 		if ($this->accessToken === '') {
 			return new DataResponse('', Http::STATUS_UNAUTHORIZED);
 		} elseif (!OpenProjectAPIService::validateURL($this->openprojectUrl)) {
 			return new DataResponse('', Http::STATUS_BAD_REQUEST);
 		}
-		// when the search is done through smart picker we don't want to check if the work package is linkable
+
 		$result = $this->openprojectAPIService->searchWorkPackage(
 			$this->userId,
 			$searchQuery,
-			$fileId,
-			!$isSmartPicker
+			$fileId
 		);
 
 		if (!isset($result['error'])) {

diff --git a/lib/Listener/OpenProjectReferenceListener.php b/lib/Listener/OpenProjectReferenceListener.php
@@ -23,48 +23,21 @@
 namespace OCA\OpenProject\Listener;
 
 use OCA\OpenProject\AppInfo\Application;
-use OCA\OpenProject\Service\OpenProjectAPIService;
-use OCP\AppFramework\Services\IInitialState;
 use OCP\Collaboration\Reference\RenderReferenceEvent;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
-use OCP\IConfig;
 use OCP\Util;
 
 /**
  * @template-implements IEventListener<Event>
  */
 class OpenProjectReferenceListener implements IEventListener {
-
-	/**
-	 * @var IInitialState
-	 */
-	private $initialStateService;
-
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-
-	public function __construct(
-		IInitialState $initialStateService,
-		IConfig $config
-	) {
-		$this->initialStateService = $initialStateService;
-		$this->config = $config;
-	}
 	public function handle(Event $event): void {
 		// @phpstan-ignore-next-line - make phpstan not complain in nextcloud version other than 26
 		if (!$event instanceof RenderReferenceEvent) {
 			return;
 		}
 
 		Util::addScript(Application::APP_ID, Application::APP_ID . '-reference');
-		$this->initialStateService->provideInitialState('admin-config-status', OpenProjectAPIService::isAdminConfigOk($this->config));
-
-		$this->initialStateService->provideInitialState(
-			'openproject-url',
-			$this->config->getAppValue(Application::APP_ID, 'openproject_instance_url')
-		);
 	}
 }
diff --git a/lib/Reference/WorkPackageReferenceProvider.php b/lib/Reference/WorkPackageReferenceProvider.php
@@ -25,6 +25,7 @@
 
 use OCA\OpenProject\Service\OpenProjectAPIService;
 use OCP\Collaboration\Reference\ADiscoverableReferenceProvider;
+use OCP\Collaboration\Reference\ISearchableReferenceProvider;
 use OCP\Collaboration\Reference\Reference;
 use OC\Collaboration\Reference\ReferenceManager;
 use OCA\OpenProject\AppInfo\Application;
@@ -33,7 +34,7 @@
 use OCP\IL10N;
 use OCP\IURLGenerator;
 
-class WorkPackageReferenceProvider extends ADiscoverableReferenceProvider {
+class WorkPackageReferenceProvider extends ADiscoverableReferenceProvider implements ISearchableReferenceProvider {
 	private const RICH_OBJECT_TYPE = Application::APP_ID . '_work_package';
 
 	// as we know we are on NC >= 26, we can use Php 8 syntax for class attributes
@@ -75,30 +76,29 @@ public function getIconUrl(): string {
 		);
 	}
 
+	/**
+	 * @inheritDoc
+	 */
+	public function getSupportedSearchProviderIds(): array {
+		return ['openproject-search'];
+	}
+
 	/**
 	 * Parse a link to find a work package ID
 	 *
 	 * @param string $referenceText
 	 *
 	 * @return int|null
 	 */
-	public function getWorkPackageIdFromUrl(string $referenceText): ?int {
-		$patterns = array(
-			'\/wp\/([0-9]+)/',
-			'\/projects\/[^\/\?]+\/(?:work_packages|bcf)(?:\/details)?\/([0-9]+)/',
-			'\/(?:work_packages|notifications)\/details\/([0-9]+)/',
-			'\/work_packages\/([0-9]+)/',
-			'\/projects\/[^\/\?]+\/(?:boards|calendars|team_planners)\/[^\/\?]+\/details\/([0-9]+)/');
+	private function getWorkPackageIdFromUrl(string $referenceText): ?int {
 		// example links
 		// https://community.openproject.org/projects/nextcloud-integration/work_packages/40070
-		$openProjectUrl = rtrim($this->config->getAppValue(Application::APP_ID, 'openproject_instance_url'),'/');
-		foreach ($patterns as $pattern) {
-			$patternString ='/^' . preg_quote($openProjectUrl, '/') . $pattern;
-			preg_match($patternString, $referenceText, $patternMatches);
-			if (count($patternMatches) > 1) {
-				return (int) $patternMatches[1];
-			}
+		$openProjectUrl = $this->config->getAppValue(Application::APP_ID, 'openproject_instance_url');
+		preg_match('/^' . preg_quote($openProjectUrl, '/') . '\/projects\/[^\/\?]+\/work_packages\/([0-9]+)/', $referenceText, $matches);
+		if (count($matches) > 1) {
+			return (int) $matches[1];
 		}
+
 		return null;
 	}
 
@@ -124,7 +124,7 @@ public function matchReference(string $referenceText): bool {
 	 * @inheritDoc
 	 */
 	public function resolveReference(string $referenceText): ?IReference {
-		if ($this->matchReference($referenceText) && OpenProjectAPIService::isAdminConfigOk($this->config)) {
+		if ($this->matchReference($referenceText)) {
 			$wpId = $this->getWorkPackageIdFromUrl($referenceText);
 			if ($wpId !== null) {
 				$wpInfo = $this->openProjectAPIService->getWorkPackageInfo($this->userId, $wpId);

diff --git a/lib/Search/OpenProjectSearchProvider.php b/lib/Search/OpenProjectSearchProvider.php
@@ -110,14 +110,24 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 		$offset = $offset ? intval($offset) : 0;
 		$openprojectUrl = OpenProjectAPIService::sanitizeUrl($this->config->getAppValue(Application::APP_ID, 'openproject_instance_url'));
 		$accessToken = $this->config->getUserValue($user->getUID(), Application::APP_ID, 'token');
-		$searchEnabled = $this->config->getUserValue(
-				$user->getUID(),
-				Application::APP_ID, 'search_enabled',
-				$this->config->getAppValue(Application::APP_ID, 'default_enable_unified_search', '0')) === '1';
-		if ($accessToken === '' || !$searchEnabled) {
+
+		if ($accessToken === '') {
 			return SearchResult::paginated($this->getName(), [], 0);
 		}
 
+		$routeFrom = $query->getRoute();
+		$requestedFromSmartPicker = $routeFrom === '' || $routeFrom === 'smart-picker';
+
+		if (!$requestedFromSmartPicker) {
+			$searchEnabled = $this->config->getUserValue(
+					$user->getUID(),
+					Application::APP_ID, 'search_enabled',
+					$this->config->getAppValue(Application::APP_ID, 'default_enable_unified_search', '0')) === '1';
+			if (!$searchEnabled) {
+				return SearchResult::paginated($this->getName(), [], 0);
+			}
+		}
+
 		$searchResults = $this->service->searchWorkPackage($user->getUID(), $term, null, false);
 		$searchResults = array_slice($searchResults, $offset, $limit);
 

diff --git a/lib/Service/OpenProjectAPIService.php b/lib/Service/OpenProjectAPIService.php
@@ -1129,12 +1129,8 @@ public function generateAppPasswordTokenForUser(): string {
 	 */
 	public function deleteAppPassword(): void {
 		if ($this->hasAppPassword()) {
-			$tokens = $this->tokenProvider->getTokenByUser(Application::OPEN_PROJECT_ENTITIES_NAME);
-			foreach ($tokens as $token) {
-				if ($token->getName() === Application::OPEN_PROJECT_ENTITIES_NAME) {
-					$this->tokenProvider->invalidateTokenById(Application::OPEN_PROJECT_ENTITIES_NAME, $token->getId());
-				}
-			}
+			$tokenId = $this->tokenProvider->getTokenByUser(Application::OPEN_PROJECT_ENTITIES_NAME)[0]->getId();
+			$this->tokenProvider->invalidateTokenById(Application::OPEN_PROJECT_ENTITIES_NAME, $tokenId);
 		}
 	}
 
@@ -1144,13 +1140,7 @@ public function deleteAppPassword(): void {
 	 * @return bool
 	 */
 	public function hasAppPassword(): bool {
-		$tokens = $this->tokenProvider->getTokenByUser(Application::OPEN_PROJECT_ENTITIES_NAME);
-		foreach ($tokens as $token) {
-			if ($token->getName() === Application::OPEN_PROJECT_ENTITIES_NAME) {
-				return true;
-			}
-		}
-		return false;
+		return sizeof($this->tokenProvider->getTokenByUser(Application::OPEN_PROJECT_ENTITIES_NAME)) === 1;
 	}
 
 	/**
@@ -1161,14 +1151,11 @@ public function hasAppPassword(): bool {
 	 */
 	public function getWorkPackageInfo(string $userId, int $wpId): array {
 		$result[] = null;
-		$accessToken = $this->config->getUserValue($userId, Application::APP_ID, 'token');
-		if ($accessToken) {
-			$searchResult = $this->searchWorkPackage($userId, null, null, false, $wpId);
-			$result['title'] = $this->getSubline($searchResult[0]);
-			$result['description'] = $this->getMainText($searchResult[0]);
-			$result['imageUrl'] = $this->getOpenProjectUserAvatarUrl($searchResult[0]);
-			$result['entry'] = $searchResult[0];
-		}
+		$searchResult = $this->searchWorkPackage($userId, null, null, false, $wpId);
+		$result['title'] = $this->getSubline($searchResult[0]);
+		$result['description'] = $this->getMainText($searchResult[0]);
+		$result['imageUrl'] = $this->getOpenProjectUserAvatarUrl($searchResult[0]);
+		$result['entry'] = $searchResult[0];
 		return $result;
 	}
 

diff --git a/phpstan.neon b/phpstan.neon
@@ -9,4 +9,3 @@ parameters:
     reportUnmatchedIgnoredErrors: false
     excludePaths:
     	-  './lib/Reference/WorkPackageReferenceProvider.php'
-    	- './tests/lib/Reference/WorkPackageReferenceProviderTest.php'
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
@@ -4,9 +4,7 @@
 		<div class="openproject-server-host">
 			<FormHeading index="1"
 				:title="t('integration_openproject', 'OpenProject server')"
-				:is-complete="isServerHostFormComplete"
-				:is-dark-theme="isDarkTheme" />
-
+				:is-complete="isServerHostFormComplete" />
 			<FieldValue v-if="isServerHostFormInView"
 				is-required
 				class="pb-1"
@@ -58,8 +56,7 @@
 			<FormHeading index="2"
 				:title="t('integration_openproject', 'OpenProject OAuth settings')"
 				:is-complete="isOPOAuthFormComplete"
-				:is-disabled="isOPOAuthFormInDisableMode"
-				:is-dark-theme="isDarkTheme" />
+				:is-disabled="isOPOAuthFormInDisableMode" />
 			<div v-if="isServerHostFormComplete">
 				<FieldValue v-if="isOPOAuthFormInView"
 					is-required
@@ -112,8 +109,7 @@
 			<FormHeading index="3"
 				:title="t('integration_openproject', 'Nextcloud OAuth client')"
 				:is-complete="isNcOAuthFormComplete"
-				:is-disabled="isNcOAuthFormInDisableMode"
-				:is-dark-theme="isDarkTheme" />
+				:is-disabled="isNcOAuthFormInDisableMode" />
 			<div v-if="state.nc_oauth_client">
 				<TextInput v-if="isNcOAuthFormInEdit"
 					id="nextcloud-oauth-client-id"
@@ -163,15 +159,6 @@
 					</NcButton>
 				</div>
 			</div>
-			<div v-if="!state.nc_oauth_client && isOPOAuthFormComplete && isOPOAuthFormInView && showDefaultManagedProjectFolders">
-				<NcButton data-test-id="reset-nc-oauth-btn"
-					@click="resetNcOauthValues">
-					<template #icon>
-						<AutoRenewIcon :size="20" />
-					</template>
-					{{ t('integration_openproject', 'Create Nextcloud OAuth values') }}
-				</NcButton>
-			</div>
 		</div>
 		<div class="project-folder-setup">
 			<FormHeading index="4"
@@ -252,7 +239,7 @@
 				</div>
 				<div v-else class="project-folder-status">
 					<div class="project-folder-status-value">
-						<b>Automatically managed folders:</b> {{ opUserAppPassword ? t('integration_openproject', 'Active') : t('integration_openproject', 'Inactive') }}
+						<b>Automatic managed folders:</b> {{ opUserAppPassword ? t('integration_openproject', 'Active') : t('integration_openproject', 'Inactive') }}
 					</div>
 					<ProjectFolderError
 						v-if="state.app_password_set && !isProjectFolderSetupCorrect"
@@ -275,8 +262,7 @@
 			<FormHeading index="5"
 				:title="t('integration_openproject', 'Project folders application connection')"
 				:is-complete="isOPUserAppPasswordFormComplete"
-				:is-disabled="isOPUserAppPasswordInDisableMode"
-				:is-dark-theme="isDarkTheme" />
+				:is-disabled="isOPUserAppPasswordInDisableMode" />
 			<div v-if="state.app_password_set">
 				<TextInput v-if="isOPUserAppPasswordFormInEdit"
 					id="openproject-system-password"
@@ -422,7 +408,6 @@ export default {
 			textLabelProjectFolderSetupButton: null,
 			// pointer for which form the request is coming
 			isFormStep: null,
-			isDarkTheme: null,
 		}
 	},
 	computed: {
@@ -543,13 +528,14 @@ export default {
 		isResetButtonDisabled() {
 			return !(this.state.openproject_client_id || this.state.openproject_client_secret || this.state.openproject_instance_url)
 		},
+		isDarkTheme() {
+			return !!document.querySelector("body[data-themes*='dark']")
+
+		},
 	},
 	created() {
 		this.init()
 	},
-	mounted() {
-		this.isDarkTheme = window.getComputedStyle(this.$el).getPropertyValue('--background-invert-if-dark') === 'invert(100%)'
-	},
 	methods: {
 		init() {
 			if (this.state) {
@@ -585,15 +571,6 @@ export default {
 					this.formMode.ncOauth = F_MODES.VIEW
 					this.isFormCompleted.ncOauth = true
 				}
-				if (!this.state.nc_oauth_client
-					&& this.state.openproject_instance_url
-					&& this.state.openproject_client_id
-					&& this.state.openproject_client_secret
-				    && this.textLabelProjectFolderSetupButton === 'Keep current setup') {
-					this.showDefaultManagedProjectFolders = true
-					this.formMode.projectFolderSetUp = F_MODES.VIEW
-					this.isFormCompleted.projectFolderSetUp = true
-				}
 				if (this.formMode.ncOauth === F_MODES.VIEW) {
 					this.showDefaultManagedProjectFolders = true
 				}

diff --git a/src/components/admin/FormHeading.vue b/src/components/admin/FormHeading.vue
@@ -10,12 +10,7 @@
 		<div v-else-if="isComplete" class="complete">
 			<CheckBoldIcon fill-color="#FFFFFF" :size="12" />
 		</div>
-		<div v-else
-			class="index"
-			:class="{
-				'index-dark-mode': isDarkTheme,
-				'index-light-mode': !isDarkTheme
-			}">
+		<div v-else class="index">
 			{{ index }}
 		</div>
 		<div class="title"
@@ -129,6 +124,7 @@ export default {
 		text-align: center;
 		border-radius: 50%;
 		background: var(--color-loading-dark);
+		color: white;
 	}
 	.title {
 		font-weight: 700;
@@ -138,12 +134,10 @@ export default {
 	}
 }
 
-.index-dark-mode {
-	color: #000000;
-}
-
-.index-light-mode {
-	color: #FFFFFF;
+body[data-themes*='dark'] {
+	.index {
+		color: #000000;
+	}
 }
 
 .form-heading.disabled {