diff --git a/apps/files/lib/Collaboration/Resources/ResourceProvider.php b/apps/files/lib/Collaboration/Resources/ResourceProvider.php index 6d9b1b59784577365fcda0c58ac53d0be6dabc1c..62dcbe19c1d967d0805e791bac344ed0312c2958 100644 --- a/apps/files/lib/Collaboration/Resources/ResourceProvider.php +++ b/apps/files/lib/Collaboration/Resources/ResourceProvider.php @@ -25,6 +25,7 @@ namespace OCA\Files\Collaboration\Resources; use OCP\Collaboration\Resources\IProvider; use OCP\Collaboration\Resources\IResource; use OCP\Files\IRootFolder; +use OCP\Files\Node; use OCP\IUser; class ResourceProvider implements IProvider { @@ -80,4 +81,15 @@ class ResourceProvider implements IProvider { return false; } + + /** + * Get the icon class of a resource + * + * @param IResource $resource + * @return string + * @since 15.0.0 + */ + public function getIconClass(IResource $resource): string { + return 'icon-folder'; + } } diff --git a/apps/files_sharing/src/components/CollectionListItem.vue b/apps/files_sharing/src/components/CollectionListItem.vue index aebab670ac29e3596f4d8a84157baec9114f47df..f22d5238d6cbc2b33fc1993c3cf8693f94e7800c 100644 --- a/apps/files_sharing/src/components/CollectionListItem.vue +++ b/apps/files_sharing/src/components/CollectionListItem.vue @@ -92,7 +92,7 @@ ] }, getIcon() { - return (resource) => [window.OCP.Collaboration.getIcon(resource.type)] + return (resource) => [window.OCP.Collaboration.getIcon(resource.type), resource.iconClass] }, getLink() { return (resource) => window.OCP.Collaboration.getLink(resource.type, resource.id) diff --git a/core/Controller/CollaborationResourcesController.php b/core/Controller/CollaborationResourcesController.php index a5a40145fb750d4e5fe33fae870bd381a33fbc06..565e0ba4739eb6a99955a76f3d1a33cba5af280a 100644 --- a/core/Controller/CollaborationResourcesController.php +++ b/core/Controller/CollaborationResourcesController.php @@ -197,15 +197,16 @@ class CollaborationResourcesController extends OCSController { ]; } - protected function prepareResources(IResource $resource): array { + protected function prepareResources(IResource $resource): ?array { if (!$resource->canAccess($this->userSession->getUser())) { - return []; + return null; } return [ 'type' => $resource->getType(), 'id' => $resource->getId(), 'name' => $resource->getName(), + 'iconClass' => $resource->getIconClass() ]; } } diff --git a/lib/private/Collaboration/Resources/Manager.php b/lib/private/Collaboration/Resources/Manager.php index 82a14f47d9e1213ea325cd6949d8028bb4bd7669..cc09089c711c51dfc0a339f0b4dfbed5a7cdd0d4 100644 --- a/lib/private/Collaboration/Resources/Manager.php +++ b/lib/private/Collaboration/Resources/Manager.php @@ -119,6 +119,22 @@ class Manager implements IManager { return ''; } + /** + * + * @param IResource $resource + * @return string + */ + public function getIconClass(IResource $resource): string { + foreach ($this->getProviders() as $provider) { + try { + return $provider->getIconClass($resource); + } catch (ResourceException $e) { + } + } + + return ''; + } + /** * Can a user/guest access the collection * diff --git a/lib/private/Collaboration/Resources/Resource.php b/lib/private/Collaboration/Resources/Resource.php index 3013f1f5c481c31c042aa9c8fc9d7d792cd0b77a..2f491663a887eb7ee91b272820912ca50d03a7c7 100644 --- a/lib/private/Collaboration/Resources/Resource.php +++ b/lib/private/Collaboration/Resources/Resource.php @@ -47,6 +47,9 @@ class Resource implements IResource { /** @var string|null */ protected $name; + /** @var string|null */ + protected $iconClass; + public function __construct( IManager $manager, IDBConnection $connection, @@ -87,6 +90,18 @@ class Resource implements IResource { return $this->name; } + /** + * @return string + * @since 15.0.0 + */ + public function getIconClass(): string { + if ($this->iconClass === null) { + $this->iconClass = $this->manager->getIconClass($this); + } + + return $this->iconClass; + } + /** * Can a user/guest access the resource * diff --git a/lib/public/Collaboration/Resources/IProvider.php b/lib/public/Collaboration/Resources/IProvider.php index bf338113005eda80bf0aa889e47b2cda5a14776c..c5f6f7ed5601fe154dc2d55408706f842490896d 100644 --- a/lib/public/Collaboration/Resources/IProvider.php +++ b/lib/public/Collaboration/Resources/IProvider.php @@ -35,6 +35,15 @@ interface IProvider { */ public function getName(IResource $resource): string; + /** + * Get the icon class of a resource + * + * @param IResource $resource + * @return string + * @since 15.0.0 + */ + public function getIconClass(IResource $resource): string; + /** * Can a user/guest access the collection * diff --git a/lib/public/Collaboration/Resources/IResource.php b/lib/public/Collaboration/Resources/IResource.php index 242ad9432d09ea464628a0b00107e7b3e28cd6ab..9a4b2b30d1065af3cc072c3c3ca784f84ade274a 100644 --- a/lib/public/Collaboration/Resources/IResource.php +++ b/lib/public/Collaboration/Resources/IResource.php @@ -47,6 +47,12 @@ interface IResource { */ public function getName(): string; + /** + * @return string + * @since 15.0.0 + */ + public function getIconClass(): string; + /** * Can a user/guest access the resource *