Merge pull request #1934 from nextcloud/move-latly-used-tags-to-the-top
Move lately used tags to the top
This commit is contained in:
commit
8fdfb41b93
|
@ -192,7 +192,7 @@ class SystemTagsObjectMappingCollection implements ICollection {
|
||||||
*
|
*
|
||||||
* @param ISystemTag $tag
|
* @param ISystemTag $tag
|
||||||
*
|
*
|
||||||
* @return SystemTagNode
|
* @return SystemTagMappingNode
|
||||||
*/
|
*/
|
||||||
private function makeNode(ISystemTag $tag) {
|
private function makeNode(ISystemTag $tag) {
|
||||||
return new SystemTagMappingNode(
|
return new SystemTagMappingNode(
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com>
|
||||||
|
*
|
||||||
|
* @author Joas Schilling <coding@schilljs.com>
|
||||||
|
*
|
||||||
|
* @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/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
return [
|
||||||
|
'routes' => [
|
||||||
|
['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'],
|
||||||
|
]
|
||||||
|
];
|
|
@ -153,6 +153,12 @@
|
||||||
},
|
},
|
||||||
escapeMarkup: function(m) {
|
escapeMarkup: function(m) {
|
||||||
return m;
|
return m;
|
||||||
|
},
|
||||||
|
sortResults: function(results) {
|
||||||
|
results.sort(function(a, b) {
|
||||||
|
return OC.Util.naturalSortCompare(a.get('name'), b.get('name'));
|
||||||
|
});
|
||||||
|
return results;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
* @type Array.<string>
|
* @type Array.<string>
|
||||||
*/
|
*/
|
||||||
_systemTagIds: [],
|
_systemTagIds: [],
|
||||||
|
_lastUsedTags: [],
|
||||||
|
|
||||||
_clientSideSort: true,
|
_clientSideSort: true,
|
||||||
_allowSelection: false,
|
_allowSelection: false,
|
||||||
|
@ -58,6 +59,7 @@
|
||||||
|
|
||||||
var $controls = this.$el.find('#controls').empty();
|
var $controls = this.$el.find('#controls').empty();
|
||||||
|
|
||||||
|
_.defer(_.bind(this._getLastUsedTags, this));
|
||||||
this._initFilterField($controls);
|
this._initFilterField($controls);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -67,7 +69,19 @@
|
||||||
OCA.Files.FileList.prototype.destroy.apply(this, arguments);
|
OCA.Files.FileList.prototype.destroy.apply(this, arguments);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
_getLastUsedTags: function() {
|
||||||
|
var self = this;
|
||||||
|
$.ajax({
|
||||||
|
type: 'GET',
|
||||||
|
url: OC.generateUrl('/apps/systemtags/lastused'),
|
||||||
|
success: function (response) {
|
||||||
|
self._lastUsedTags = response;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
_initFilterField: function($container) {
|
_initFilterField: function($container) {
|
||||||
|
var self = this;
|
||||||
this.$filterField = $('<input type="hidden" name="tags"/>');
|
this.$filterField = $('<input type="hidden" name="tags"/>');
|
||||||
$container.append(this.$filterField);
|
$container.append(this.$filterField);
|
||||||
this.$filterField.select2({
|
this.$filterField.select2({
|
||||||
|
@ -112,6 +126,27 @@
|
||||||
return OC.SystemTags.getDescriptiveTag(tag)[0].outerHTML;
|
return OC.SystemTags.getDescriptiveTag(tag)[0].outerHTML;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
sortResults: function(results) {
|
||||||
|
results.sort(function(a, b) {
|
||||||
|
var aLastUsed = self._lastUsedTags.indexOf(a.id);
|
||||||
|
var bLastUsed = self._lastUsedTags.indexOf(b.id);
|
||||||
|
|
||||||
|
if (aLastUsed !== bLastUsed) {
|
||||||
|
if (bLastUsed === -1) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (aLastUsed === -1) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return aLastUsed < bLastUsed ? -1 : 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Both not found
|
||||||
|
return OC.Util.naturalSortCompare(a.name, b.name);
|
||||||
|
});
|
||||||
|
return results;
|
||||||
|
},
|
||||||
|
|
||||||
escapeMarkup: function(m) {
|
escapeMarkup: function(m) {
|
||||||
// prevent double markup escape
|
// prevent double markup escape
|
||||||
return m;
|
return m;
|
||||||
|
|
|
@ -28,6 +28,7 @@ use OCP\App\IAppManager;
|
||||||
use OCP\Files\Config\IMountProviderCollection;
|
use OCP\Files\Config\IMountProviderCollection;
|
||||||
use OCP\Files\IRootFolder;
|
use OCP\Files\IRootFolder;
|
||||||
use OCP\Files\Node;
|
use OCP\Files\Node;
|
||||||
|
use OCP\IConfig;
|
||||||
use OCP\IGroup;
|
use OCP\IGroup;
|
||||||
use OCP\IGroupManager;
|
use OCP\IGroupManager;
|
||||||
use OCP\IUser;
|
use OCP\IUser;
|
||||||
|
@ -46,6 +47,8 @@ class Listener {
|
||||||
protected $activityManager;
|
protected $activityManager;
|
||||||
/** @var IUserSession */
|
/** @var IUserSession */
|
||||||
protected $session;
|
protected $session;
|
||||||
|
/** @var IConfig */
|
||||||
|
protected $config;
|
||||||
/** @var \OCP\SystemTag\ISystemTagManager */
|
/** @var \OCP\SystemTag\ISystemTagManager */
|
||||||
protected $tagManager;
|
protected $tagManager;
|
||||||
/** @var \OCP\App\IAppManager */
|
/** @var \OCP\App\IAppManager */
|
||||||
|
@ -61,6 +64,7 @@ class Listener {
|
||||||
* @param IGroupManager $groupManager
|
* @param IGroupManager $groupManager
|
||||||
* @param IManager $activityManager
|
* @param IManager $activityManager
|
||||||
* @param IUserSession $session
|
* @param IUserSession $session
|
||||||
|
* @param IConfig $config
|
||||||
* @param ISystemTagManager $tagManager
|
* @param ISystemTagManager $tagManager
|
||||||
* @param IAppManager $appManager
|
* @param IAppManager $appManager
|
||||||
* @param IMountProviderCollection $mountCollection
|
* @param IMountProviderCollection $mountCollection
|
||||||
|
@ -69,6 +73,7 @@ class Listener {
|
||||||
public function __construct(IGroupManager $groupManager,
|
public function __construct(IGroupManager $groupManager,
|
||||||
IManager $activityManager,
|
IManager $activityManager,
|
||||||
IUserSession $session,
|
IUserSession $session,
|
||||||
|
IConfig $config,
|
||||||
ISystemTagManager $tagManager,
|
ISystemTagManager $tagManager,
|
||||||
IAppManager $appManager,
|
IAppManager $appManager,
|
||||||
IMountProviderCollection $mountCollection,
|
IMountProviderCollection $mountCollection,
|
||||||
|
@ -76,6 +81,7 @@ class Listener {
|
||||||
$this->groupManager = $groupManager;
|
$this->groupManager = $groupManager;
|
||||||
$this->activityManager = $activityManager;
|
$this->activityManager = $activityManager;
|
||||||
$this->session = $session;
|
$this->session = $session;
|
||||||
|
$this->config = $config;
|
||||||
$this->tagManager = $tagManager;
|
$this->tagManager = $tagManager;
|
||||||
$this->appManager = $appManager;
|
$this->appManager = $appManager;
|
||||||
$this->mountCollection = $mountCollection;
|
$this->mountCollection = $mountCollection;
|
||||||
|
@ -126,6 +132,11 @@ class Listener {
|
||||||
$this->activityManager->publish($activity);
|
$this->activityManager->publish($activity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if ($actor !== '' && ($event->getEvent() === ManagerEvent::EVENT_CREATE || $event->getEvent() === ManagerEvent::EVENT_UPDATE)) {
|
||||||
|
$this->updateLastUsedTags($actor, $event->getTag());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -213,6 +224,27 @@ class Listener {
|
||||||
$this->activityManager->publish($activity);
|
$this->activityManager->publish($activity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($actor !== '' && $event->getEvent() === MapperEvent::EVENT_ASSIGN) {
|
||||||
|
foreach ($tags as $tag) {
|
||||||
|
$this->updateLastUsedTags($actor, $tag);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $actor
|
||||||
|
* @param ISystemTag $tag
|
||||||
|
*/
|
||||||
|
protected function updateLastUsedTags($actor, ISystemTag $tag) {
|
||||||
|
$lastUsedTags = $this->config->getUserValue($actor, 'systemtags', 'last_used', '[]');
|
||||||
|
$lastUsedTags = json_decode($lastUsedTags, true);
|
||||||
|
|
||||||
|
array_unshift($lastUsedTags, $tag->getId());
|
||||||
|
array_unique($lastUsedTags);
|
||||||
|
$lastUsedTags = array_slice($lastUsedTags, 0, 10);
|
||||||
|
|
||||||
|
$this->config->setUserValue($actor, 'systemtags', 'last_used', json_encode($lastUsedTags));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -0,0 +1,59 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
|
||||||
|
*
|
||||||
|
* @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/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OCA\SystemTags\Controller;
|
||||||
|
|
||||||
|
|
||||||
|
use OCP\AppFramework\Controller;
|
||||||
|
use OCP\AppFramework\Http\DataResponse;
|
||||||
|
use OCP\IConfig;
|
||||||
|
use OCP\IRequest;
|
||||||
|
use OCP\IUserSession;
|
||||||
|
|
||||||
|
class LastUsedController extends Controller {
|
||||||
|
|
||||||
|
/** @var IConfig */
|
||||||
|
protected $config;
|
||||||
|
|
||||||
|
/** @var IUserSession */
|
||||||
|
protected $userSession;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $appName
|
||||||
|
* @param IRequest $request
|
||||||
|
* @param IConfig $config
|
||||||
|
* @param IUserSession $userSession
|
||||||
|
*/
|
||||||
|
public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) {
|
||||||
|
parent::__construct($appName, $request);
|
||||||
|
$this->config = $config;
|
||||||
|
$this->userSession = $userSession;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @NoAdminRequired
|
||||||
|
*/
|
||||||
|
public function getLastUsedTagIds() {
|
||||||
|
$lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]');
|
||||||
|
$tagIds = json_decode($lastUsed, true);
|
||||||
|
return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds));
|
||||||
|
}
|
||||||
|
}
|
|
@ -57,6 +57,8 @@
|
||||||
|
|
||||||
_newTag: null,
|
_newTag: null,
|
||||||
|
|
||||||
|
_lastUsedTags: [],
|
||||||
|
|
||||||
className: 'systemTagsInputFieldContainer',
|
className: 'systemTagsInputFieldContainer',
|
||||||
|
|
||||||
template: function(data) {
|
template: function(data) {
|
||||||
|
@ -97,6 +99,8 @@
|
||||||
_.defer(self._refreshSelection);
|
_.defer(self._refreshSelection);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
_.defer(_.bind(this._getLastUsedTags, this));
|
||||||
|
|
||||||
_.bindAll(
|
_.bindAll(
|
||||||
this,
|
this,
|
||||||
'_refreshSelection',
|
'_refreshSelection',
|
||||||
|
@ -108,6 +112,17 @@
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
_getLastUsedTags: function() {
|
||||||
|
var self = this;
|
||||||
|
$.ajax({
|
||||||
|
type: 'GET',
|
||||||
|
url: OC.generateUrl('/apps/systemtags/lastused'),
|
||||||
|
success: function (response) {
|
||||||
|
self._lastUsedTags = response;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Refreshes the selection, triggering a call to
|
* Refreshes the selection, triggering a call to
|
||||||
* select2's initSelection
|
* select2's initSelection
|
||||||
|
@ -211,6 +226,7 @@
|
||||||
}, {
|
}, {
|
||||||
success: function(model) {
|
success: function(model) {
|
||||||
self._addToSelect2Selection(model.toJSON());
|
self._addToSelect2Selection(model.toJSON());
|
||||||
|
self._lastUsedTags.unshift(model.id);
|
||||||
self.trigger('select', model);
|
self.trigger('select', model);
|
||||||
},
|
},
|
||||||
error: function(model, xhr) {
|
error: function(model, xhr) {
|
||||||
|
@ -238,6 +254,7 @@
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
tag = this.collection.get(e.object.id);
|
tag = this.collection.get(e.object.id);
|
||||||
|
this._lastUsedTags.unshift(tag.id);
|
||||||
}
|
}
|
||||||
this._newTag = null;
|
this._newTag = null;
|
||||||
this.trigger('select', tag);
|
this.trigger('select', tag);
|
||||||
|
@ -400,6 +417,20 @@
|
||||||
var aSelected = selectedItems.indexOf(a.id) >= 0;
|
var aSelected = selectedItems.indexOf(a.id) >= 0;
|
||||||
var bSelected = selectedItems.indexOf(b.id) >= 0;
|
var bSelected = selectedItems.indexOf(b.id) >= 0;
|
||||||
if (aSelected === bSelected) {
|
if (aSelected === bSelected) {
|
||||||
|
var aLastUsed = self._lastUsedTags.indexOf(a.id);
|
||||||
|
var bLastUsed = self._lastUsedTags.indexOf(b.id);
|
||||||
|
|
||||||
|
if (aLastUsed !== bLastUsed) {
|
||||||
|
if (bLastUsed === -1) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if (aLastUsed === -1) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return aLastUsed < bLastUsed ? -1 : 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Both not found
|
||||||
return OC.Util.naturalSortCompare(a.name, b.name);
|
return OC.Util.naturalSortCompare(a.name, b.name);
|
||||||
}
|
}
|
||||||
if (aSelected && !bSelected) {
|
if (aSelected && !bSelected) {
|
||||||
|
|
Loading…
Reference in New Issue