fix: drop collaboration resources integration to be compatible with n…

…c 28 Signed-off-by: Marcel Klehr <[email protected]>
nextcloud · Dec 10, 2023 · 29e1e93 · 29e1e93
1 parent 2416a8d
commit 29e1e93
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 248 deletions.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -8,11 +8,7 @@
 
 namespace OCA\Bookmarks\AppInfo;
 
-use Closure;
-use OC\EventDispatcher\SymfonyAdapter;
 use OCA\Bookmarks\Activity\ActivityPublisher;
-use OCA\Bookmarks\Collaboration\Resources\FolderResourceProvider;
-use OCA\Bookmarks\Collaboration\Resources\ResourceProvider;
 use OCA\Bookmarks\Dashboard\Frequent;
 use OCA\Bookmarks\Dashboard\Recent;
 use OCA\Bookmarks\Events\BeforeDeleteEvent;
@@ -32,7 +28,6 @@
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
 use OCP\Collaboration\Reference\RenderReferenceEvent;
-use OCP\Collaboration\Resources\IProviderManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Group\Events\UserAddedEvent;
 use OCP\Group\Events\UserRemovedEvent;
@@ -101,17 +96,7 @@ public function register(IRegistrationContext $context): void {
 	 * @throws \Throwable
 	 */
 	public function boot(IBootContext $context): void {
-		$context->injectFn(Closure::fromCallable([$this, 'registerCollaborationResources']));
 		$container = $context->getServerContainer();
 		CreateBookmark::register($container->get(IEventDispatcher::class));
 	}
-
-	protected function registerCollaborationResources(IProviderManager $resourceManager, SymfonyAdapter $symfonyAdapter): void {
-		$resourceManager->registerResourceProvider(ResourceProvider::class);
-		$resourceManager->registerResourceProvider(FolderResourceProvider::class);
-
-		$symfonyAdapter->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', static function () {
-			Util::addScript('bookmarks', 'bookmarks-collections');
-		});
-	}
 }
diff --git a/lib/Collaboration/Resources/FolderResourceProvider.php b/lib/Collaboration/Resources/FolderResourceProvider.php
diff --git a/lib/Collaboration/Resources/ResourceProvider.php b/lib/Collaboration/Resources/ResourceProvider.php
diff --git a/src/collections.js b/src/collections.js
diff --git a/templates/main.php b/templates/main.php
@@ -1,5 +1,4 @@
 <?php
 script('bookmarks', 'bookmarks-main');
-\OC::$server->getEventDispatcher()->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts');
 ?>
 <div id="vue-content"></div>
diff --git a/webpack.js b/webpack.js
@@ -8,5 +8,4 @@ webpackConfig.entry['service-worker'] = path.join(__dirname, 'src', 'service-wor
 webpackConfig.entry.flow = path.join(__dirname, 'src', 'flow.js')
 webpackConfig.entry.dashboard = path.join(__dirname, 'src', 'dashboard.js')
 webpackConfig.entry.talk = path.join(__dirname, 'src', 'talk.js')
-webpackConfig.entry.collections = path.join(__dirname, 'src', 'collections.js')
 webpackConfig.entry.references = path.join(__dirname, 'src', 'references.js')