Bump popovermenu item options and tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

3 files changed, 23 insertions, 52 deletions

diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 49db6a03923..a2da2d74669 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -42,21 +42,15 @@ namespace OC\Settings\Controller;
 use OC\Accounts\AccountManager;
 use OC\AppFramework\Http;
 use OC\ForbiddenException;
-use OC\HintException;
-use OC\Settings\Mailer\NewUserMailHelper;
 use OC\Security\IdentityProof\Manager;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\BackgroundJob\IJobList;
-use OCP\Files\Config\IUserMountCache;
-use OCP\Encryption\IEncryptionModule;
-use OCP\Encryption\IManager;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IL10N;
-use OCP\ILogger;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IUser;
@@ -64,57 +58,37 @@ use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
 use OCP\Mail\IMailer;
-use OCP\IAvatarManager;
-use OCP\Security\ISecureRandom;
-use OCP\Util;
 use OC\Settings\BackgroundJobs\VerifyUserData;
 
 /**
  * @package OC\Settings\Controller
  */
 class UsersController extends Controller {
-	/** @var IL10N */
-	private $l10n;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var bool */
-	private $isAdmin;
 	/** @var IUserManager */
 	private $userManager;
 	/** @var IGroupManager */
 	private $groupManager;
+	/** @var IUserSession */
+	private $userSession;
 	/** @var IConfig */
 	private $config;
-	/** @var ILogger */
-	private $log;
+	/** @var bool */
+	private $isAdmin;
+	/** @var IL10N */
+	private $l10n;
 	/** @var IMailer */
 	private $mailer;
 	/** @var IFactory */
 	private $l10nFactory;
-	/** @var bool contains the state of the encryption app */
-	private $isEncryptionAppEnabled;
-	/** @var bool contains the state of the admin recovery setting */
-	private $isRestoreEnabled = false;
 	/** @var IAppManager */
 	private $appManager;
-	/** @var IAvatarManager */
-	private $avatarManager;
 	/** @var AccountManager */
 	private $accountManager;
-	/** @var ISecureRandom */
-	private $secureRandom;
-	/** @var NewUserMailHelper */
-	private $newUserMailHelper;
 	/** @var Manager */
 	private $keyManager;
 	/** @var IJobList */
 	private $jobList;
 
-	/** @var IUserMountCache */
-	private $userMountCache;
-
-	/** @var IManager */
-	private $encryptionManager;
 
 	public function __construct(string $appName,
 								IRequest $request,
@@ -124,19 +98,12 @@ class UsersController extends Controller {
 								IConfig $config,
 								bool $isAdmin,
 								IL10N $l10n,
-								ILogger $log,
 								IMailer $mailer,
 								IFactory $l10nFactory,
-								IURLGenerator $urlGenerator,
 								IAppManager $appManager,
-								IAvatarManager $avatarManager,
 								AccountManager $accountManager,
-								ISecureRandom $secureRandom,
-								NewUserMailHelper $newUserMailHelper,
 								Manager $keyManager,
-								IJobList $jobList,
-								IUserMountCache $userMountCache,
-								IManager $encryptionManager) {
+								IJobList $jobList) {
 		parent::__construct($appName, $request);
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
@@ -144,18 +111,12 @@ class UsersController extends Controller {
 		$this->config = $config;
 		$this->isAdmin = $isAdmin;
 		$this->l10n = $l10n;
-		$this->log = $log;
 		$this->mailer = $mailer;
 		$this->l10nFactory = $l10nFactory;
 		$this->appManager = $appManager;
-		$this->avatarManager = $avatarManager;
 		$this->accountManager = $accountManager;
-		$this->secureRandom = $secureRandom;
-		$this->newUserMailHelper = $newUserMailHelper;
 		$this->keyManager = $keyManager;
 		$this->jobList = $jobList;
-		$this->userMountCache = $userMountCache;
-		$this->encryptionManager = $encryptionManager;
 	}
 
 
diff --git a/settings/src/components/popoverMenu/popoverItem.vue b/settings/src/components/popoverMenu/popoverItem.vue
index 343c4638005..710aff80aa6 100644
--- a/settings/src/components/popoverMenu/popoverItem.vue
+++ b/settings/src/components/popoverMenu/popoverItem.vue
@@ -1,13 +1,23 @@
 <template>
 	<li>
+		<!-- If item.href is set, a link will be directly used -->
 		<a @click="item.action" v-if="item.href" :href="(item.href) ? item.href : '#' ">
 			<span :class="item.icon"></span>
-			<span>{{item.text}}</span>
+			<span v-if="item.text">{{item.text}}</span>
+			<p v-else-if="item.longtext">{{item.longtext}}</p>
 		</a>
-		<button @click="item.action" v-else>
+		<!-- If item.action is set instead, a button will be used -->
+		<button @click="item.action" v-else-if="item.action">
 			<span :class="item.icon"></span>
-			<span>{{item.text}}</span>
+			<span v-if="item.text">{{item.text}}</span>
+			<p v-else-if="item.longtext">{{item.longtext}}</p>
 		</button>
+		<!-- If item.longtext is set AND the item does not have an action -->
+		<span v-else>
+			<span :class="item.icon"></span>
+			<span v-if="item.text">{{item.text}}</span>
+			<p v-else-if="item.longtext">{{item.longtext}}</p>
+		</span>
 	</li>
 </template>
 
diff --git a/settings/src/components/userList/userRow.vue b/settings/src/components/userList/userRow.vue
index ab62877ed13..6686c4ab025 100644
--- a/settings/src/components/userList/userRow.vue
+++ b/settings/src/components/userList/userRow.vue
@@ -132,9 +132,9 @@ export default {
 				text: t('settings','Delete user'),
 				action: this.deleteUser
 			},{
-				'icon': this.user.enabled ? 'icon-close' : 'icon-add',
-				'text': this.user.enabled ? t('settings','Disable user') : t('settings','Enable user'),
-				'action': this.enableDisableUser
+				icon: this.user.enabled ? 'icon-close' : 'icon-add',
+				text: this.user.enabled ? t('settings','Disable user') : t('settings','Enable user'),
+				action: this.enableDisableUser
 			}]
 		},