Skip to content

[stable30] fix: register handler within init script #4985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luka-nextcloud merged 2 commits into from
Sep 3, 2025
Merged

[stable30] fix: register handler within init script #4985

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e378b3d
fix: register handler within init script
susnux Sep 2, 2025
8b4d4c4
fix: add missing lines
luka-nextcloud Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: register handler within init script 
Signed-off-by: Ferdinand Thiessen <[email protected]>

[skip ci]
  • Loading branch information
@susnux @backportbot
susnux authored and backportbot[bot] committed Sep 2, 2025
commit e378b3d684ec18ca7215c8760798bb45b7519074
4 changes: 3 additions & 1 deletion lib/Listener/LoadViewerListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace OCA\Richdocuments\Listener;

use OCA\Richdocuments\AppInfo\Application;
use OCA\Richdocuments\PermissionManager;
use OCA\Richdocuments\Service\InitialStateService;
use OCA\Viewer\Event\LoadViewer;
Expand Down Expand Up @@ -44,7 +45,8 @@ public function handle(Event $event): void {
}
if ($this->permissionManager->isEnabledForUser() && $this->userId !== null) {
$this->initialStateService->provideCapabilities();
Util::addScript('richdocuments', 'richdocuments-viewer', 'viewer');
Util::addInitScript(Application::APPNAME, Application::APPNAME . '-init-viewer');
Util::addScript(Application::APPNAME, Application::APPNAME . '-viewer', 'viewer');
$this->eventDispatcher->dispatchTyped(new RenderReferenceEvent());
}
}
Expand Down
6 changes: 4 additions & 2 deletions lib/Listener/ShareLinkListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
namespace OCA\Richdocuments\Listener;

use OCA\Files_Sharing\Event\ShareLinkAccessedEvent;
use OCA\Richdocuments\AppInfo\Application;
use OCA\Richdocuments\PermissionManager;
use OCA\Richdocuments\Service\InitialStateService;
use OCP\EventDispatcher\Event;
Expand Down Expand Up @@ -48,8 +49,9 @@ public function handle(Event $event): void {
$this->initialStateService->prepareParams(['userId' => $loggedInUser]);
$this->initialStateService->providePublicShare($updatable);

Util::addScript('richdocuments', 'richdocuments-viewer', 'viewer');
Util::addScript('richdocuments', 'richdocuments-public', 'viewer');
Util::addInitScript(Application::APPNAME, Application::APPNAME . '-init-viewer');
Util::addScript(Application::APPNAME, Application::APPNAME . '-viewer', 'viewer');
Util::addScript(Application::APPNAME, Application::APPNAME . '-public', 'viewer');
}
}
}
27 changes: 21 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions src/init-viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*!
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import './init-shared.js'

import { getCapabilities } from './services/capabilities.ts'
import { registerHandler } from '@nextcloud/viewer'

const supportedMimes = getCapabilities().mimetypes
const AsyncViewerComponent = () => import('./view/Viewer.vue')

const viewerHandler = {
id: 'richdocuments',
group: null,
mimes: supportedMimes,
component: AsyncViewerComponent,
theme: 'default',
canCompare: true,
}

registerHandler(viewerHandler)
17 changes: 0 additions & 17 deletions src/viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,6 @@
import './init-shared.js'
import '../css/filetypes.scss'

import { getCapabilities } from './services/capabilities.ts'
import { autoSetupBuiltInCodeServerIfNeeded } from './services/builtInCode.ts'

const supportedMimes = getCapabilities().mimetypes
const AsyncViewerComponent = () => import('./view/Viewer.vue')

if (OCA.Viewer) {
OCA.Viewer.registerHandler({
id: 'richdocuments',
group: null,
mimes: supportedMimes,
component: AsyncViewerComponent,
theme: 'default',
canCompare: true,
})
} else {
console.error('Unable to register viewer handler')
}

autoSetupBuiltInCodeServerIfNeeded()
1 change: 1 addition & 0 deletions webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const BabelLoaderExcludeNodeModulesExcept = require('babel-loader-exclude-node-m

webpackConfig.entry = {
viewer: path.join(__dirname, 'src', 'viewer.js'),
'init-viewer': path.join(__dirname, 'src', 'init-viewer.js'),
fileActions: path.join(__dirname, 'src', 'file-actions.js'),
document: path.join(__dirname, 'src', 'document.js'),
admin: path.join(__dirname, 'src', 'admin.js'),
Expand Down