Merge pull request #15152 from nextcloud/enhancement/noid/contactsmenu-sharing-enum-settings
Respect sharing enumeration config in contacts menu
This commit is contained in:
commit
049d613dba
|
@ -26,6 +26,7 @@ namespace OC\Contacts\ContactsMenu;
|
||||||
|
|
||||||
use OCP\App\IAppManager;
|
use OCP\App\IAppManager;
|
||||||
use OCP\Contacts\ContactsMenu\IEntry;
|
use OCP\Contacts\ContactsMenu\IEntry;
|
||||||
|
use OCP\IConfig;
|
||||||
use OCP\IUser;
|
use OCP\IUser;
|
||||||
|
|
||||||
class Manager {
|
class Manager {
|
||||||
|
@ -39,15 +40,19 @@ class Manager {
|
||||||
/** @var IAppManager */
|
/** @var IAppManager */
|
||||||
private $appManager;
|
private $appManager;
|
||||||
|
|
||||||
|
/** @var IConfig */
|
||||||
|
private $config;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param ContactsStore $store
|
* @param ContactsStore $store
|
||||||
* @param ActionProviderStore $actionProviderStore
|
* @param ActionProviderStore $actionProviderStore
|
||||||
* @param IAppManager $appManager
|
* @param IAppManager $appManager
|
||||||
*/
|
*/
|
||||||
public function __construct(ContactsStore $store, ActionProviderStore $actionProviderStore, IAppManager $appManager) {
|
public function __construct(ContactsStore $store, ActionProviderStore $actionProviderStore, IAppManager $appManager, IConfig $config) {
|
||||||
$this->store = $store;
|
$this->store = $store;
|
||||||
$this->actionProviderStore = $actionProviderStore;
|
$this->actionProviderStore = $actionProviderStore;
|
||||||
$this->appManager = $appManager;
|
$this->appManager = $appManager;
|
||||||
|
$this->config = $config;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -56,11 +61,16 @@ class Manager {
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
public function getEntries(IUser $user, $filter) {
|
public function getEntries(IUser $user, $filter) {
|
||||||
$entries = $this->store->getContacts($user, $filter);
|
$maxAutocompleteResults = $this->config->getSystemValueInt('sharing.maxAutocompleteResults', 25);
|
||||||
|
$minSearchStringLength = $this->config->getSystemValueInt('sharing.minSearchStringLength', 0);
|
||||||
|
$topEntries = [];
|
||||||
|
if (strlen($filter) >= $minSearchStringLength) {
|
||||||
|
$entries = $this->store->getContacts($user, $filter);
|
||||||
|
|
||||||
$sortedEntries = $this->sortEntries($entries);
|
$sortedEntries = $this->sortEntries($entries);
|
||||||
$topEntries = array_slice($sortedEntries, 0, 25);
|
$topEntries = array_slice($sortedEntries, 0, $maxAutocompleteResults);
|
||||||
$this->processEntries($topEntries, $user);
|
$this->processEntries($topEntries, $user);
|
||||||
|
}
|
||||||
|
|
||||||
$contactsEnabled = $this->appManager->isEnabledForUser('contacts', $user);
|
$contactsEnabled = $this->appManager->isEnabledForUser('contacts', $user);
|
||||||
return [
|
return [
|
||||||
|
|
|
@ -30,6 +30,7 @@ use OC\Contacts\ContactsMenu\Manager;
|
||||||
use OCP\App\IAppManager;
|
use OCP\App\IAppManager;
|
||||||
use OCP\Contacts\ContactsMenu\IEntry;
|
use OCP\Contacts\ContactsMenu\IEntry;
|
||||||
use OCP\Contacts\ContactsMenu\IProvider;
|
use OCP\Contacts\ContactsMenu\IProvider;
|
||||||
|
use OCP\IConfig;
|
||||||
use OCP\IUser;
|
use OCP\IUser;
|
||||||
use PHPUnit_Framework_MockObject_MockObject;
|
use PHPUnit_Framework_MockObject_MockObject;
|
||||||
use Test\TestCase;
|
use Test\TestCase;
|
||||||
|
@ -42,6 +43,9 @@ class ManagerTest extends TestCase {
|
||||||
/** @var IAppManager|PHPUnit_Framework_MockObject_MockObject */
|
/** @var IAppManager|PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $appManager;
|
private $appManager;
|
||||||
|
|
||||||
|
/** @var IConfig|PHPUnit_Framework_MockObject_MockObject */
|
||||||
|
private $config;
|
||||||
|
|
||||||
/** @var ActionProviderStore|PHPUnit_Framework_MockObject_MockObject */
|
/** @var ActionProviderStore|PHPUnit_Framework_MockObject_MockObject */
|
||||||
private $actionProviderStore;
|
private $actionProviderStore;
|
||||||
|
|
||||||
|
@ -54,8 +58,9 @@ class ManagerTest extends TestCase {
|
||||||
$this->contactsStore = $this->createMock(ContactsStore::class);
|
$this->contactsStore = $this->createMock(ContactsStore::class);
|
||||||
$this->actionProviderStore = $this->createMock(ActionProviderStore::class);
|
$this->actionProviderStore = $this->createMock(ActionProviderStore::class);
|
||||||
$this->appManager = $this->createMock(IAppManager::class);
|
$this->appManager = $this->createMock(IAppManager::class);
|
||||||
|
$this->config = $this->createMock(IConfig::class);
|
||||||
|
|
||||||
$this->manager = new Manager($this->contactsStore, $this->actionProviderStore, $this->appManager);
|
$this->manager = new Manager($this->contactsStore, $this->actionProviderStore, $this->appManager, $this->config);
|
||||||
}
|
}
|
||||||
|
|
||||||
private function generateTestEntries() {
|
private function generateTestEntries() {
|
||||||
|
@ -75,6 +80,15 @@ class ManagerTest extends TestCase {
|
||||||
$user = $this->createMock(IUser::class);
|
$user = $this->createMock(IUser::class);
|
||||||
$entries = $this->generateTestEntries();
|
$entries = $this->generateTestEntries();
|
||||||
$provider = $this->createMock(IProvider::class);
|
$provider = $this->createMock(IProvider::class);
|
||||||
|
|
||||||
|
$this->config->expects($this->at(0))
|
||||||
|
->method('getSystemValueInt')
|
||||||
|
->with('sharing.maxAutocompleteResults', 25)
|
||||||
|
->willReturn(25);
|
||||||
|
$this->config->expects($this->at(1))
|
||||||
|
->method('getSystemValueInt')
|
||||||
|
->with('sharing.minSearchStringLength', 0)
|
||||||
|
->willReturn(0);
|
||||||
$this->contactsStore->expects($this->once())
|
$this->contactsStore->expects($this->once())
|
||||||
->method('getContacts')
|
->method('getContacts')
|
||||||
->with($user, $filter)
|
->with($user, $filter)
|
||||||
|
@ -99,6 +113,71 @@ class ManagerTest extends TestCase {
|
||||||
$this->assertEquals($expected, $data);
|
$this->assertEquals($expected, $data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testGetFilteredEntriesLimit() {
|
||||||
|
$filter = 'con';
|
||||||
|
$user = $this->createMock(IUser::class);
|
||||||
|
$entries = $this->generateTestEntries();
|
||||||
|
$provider = $this->createMock(IProvider::class);
|
||||||
|
|
||||||
|
$this->config->expects($this->at(0))
|
||||||
|
->method('getSystemValueInt')
|
||||||
|
->with('sharing.maxAutocompleteResults', 25)
|
||||||
|
->willReturn(3);
|
||||||
|
$this->config->expects($this->at(1))
|
||||||
|
->method('getSystemValueInt')
|
||||||
|
->with('sharing.minSearchStringLength', 0)
|
||||||
|
->willReturn(0);
|
||||||
|
$this->contactsStore->expects($this->once())
|
||||||
|
->method('getContacts')
|
||||||
|
->with($user, $filter)
|
||||||
|
->willReturn($entries);
|
||||||
|
$this->actionProviderStore->expects($this->once())
|
||||||
|
->method('getProviders')
|
||||||
|
->with($user)
|
||||||
|
->willReturn([$provider]);
|
||||||
|
$provider->expects($this->exactly(3))
|
||||||
|
->method('process');
|
||||||
|
$this->appManager->expects($this->once())
|
||||||
|
->method('isEnabledForUser')
|
||||||
|
->with($this->equalTo('contacts'), $user)
|
||||||
|
->willReturn(false);
|
||||||
|
$expected = [
|
||||||
|
'contacts' => array_slice($entries, 0, 3),
|
||||||
|
'contactsAppEnabled' => false,
|
||||||
|
];
|
||||||
|
|
||||||
|
$data = $this->manager->getEntries($user, $filter);
|
||||||
|
|
||||||
|
$this->assertEquals($expected, $data);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testGetFilteredEntriesMinSearchStringLength() {
|
||||||
|
$filter = 'con';
|
||||||
|
$user = $this->createMock(IUser::class);
|
||||||
|
$provider = $this->createMock(IProvider::class);
|
||||||
|
|
||||||
|
$this->config->expects($this->at(0))
|
||||||
|
->method('getSystemValueInt')
|
||||||
|
->with('sharing.maxAutocompleteResults', 25)
|
||||||
|
->willReturn(3);
|
||||||
|
$this->config->expects($this->at(1))
|
||||||
|
->method('getSystemValueInt')
|
||||||
|
->with('sharing.minSearchStringLength', 0)
|
||||||
|
->willReturn(4);
|
||||||
|
$this->appManager->expects($this->once())
|
||||||
|
->method('isEnabledForUser')
|
||||||
|
->with($this->equalTo('contacts'), $user)
|
||||||
|
->willReturn(false);
|
||||||
|
$expected = [
|
||||||
|
'contacts' => [],
|
||||||
|
'contactsAppEnabled' => false,
|
||||||
|
];
|
||||||
|
|
||||||
|
$data = $this->manager->getEntries($user, $filter);
|
||||||
|
|
||||||
|
$this->assertEquals($expected, $data);
|
||||||
|
}
|
||||||
|
|
||||||
public function testFindOne() {
|
public function testFindOne() {
|
||||||
$shareTypeFilter = 42;
|
$shareTypeFilter = 42;
|
||||||
$shareWithFilter = 'foobar';
|
$shareWithFilter = 'foobar';
|
||||||
|
|
Loading…
Reference in New Issue