Skip to content
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.

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

[FEATURE] Migration to the changed 3d viewer implementation of Kitodo.Presentation #295

Merged
merged 2 commits into from
Aug 15, 2024

Conversation

markusweigelt
Copy link
Contributor

@markusweigelt markusweigelt commented Jul 31, 2024

@markusweigelt
Copy link
Contributor Author

@beatrycze-volk For what reason is this Grunt test being conducted, and how should I fix the failing test? The changes in the global stylesheet are necessary.

@beatrycze-volk
Copy link
Contributor

beatrycze-volk commented Jul 31, 2024

@beatrycze-volk For what reason is this Grunt test being conducted, and how should I fix the failing test? The changes in the global stylesheet are necessary.

I would suspect that your version of node and the version of node used here are differing. Not log time ago @sebastian-meyer has updated it (#291). Maybe take a look into it and check if you are running the same version for the build.

Edit: I didn't answer the first part of your question. The test is conducted to ensure that after some changes in css or js files are made, the compiled files are also updated.

@markusweigelt
Copy link
Contributor Author

markusweigelt commented Jul 31, 2024

I provided the file compile with node 20.16.0 but nothing changed. What I see in the workflow job implementation is just a change detection and if there are changes test fails.

@beatrycze-volk
Copy link
Contributor

I provided the file compile with node 20.16.0 but nothing changed. What I see in the workflow job implementation is just a change detection and if there are changes test fails.

@sebastian-meyer do you have some idea why it happens?

@markusweigelt
Copy link
Contributor Author

markusweigelt commented Jul 31, 2024

I managed to get it working now, cause reverted the changes in allScripts.js to the master version. It's likely that some formatting issues were introduced when opening the file unintentionally in the IDE. Since no modifications were made to the JavaScript, the change was not necessary.

@markusweigelt markusweigelt added the ✔️ feature A new feature or enhancement. label Aug 2, 2024
@beatrycze-volk beatrycze-volk added this to the DFG-Viewer 6.1.1 milestone Aug 2, 2024
@beatrycze-volk
Copy link
Contributor

@markusweigelt Please resolve merge conflicts :)

@beatrycze-volk
Copy link
Contributor

Your last commit contains changes in CSS file, it needs also be rebuilt.

@markusweigelt
Copy link
Contributor Author

Thx. Currently, there are still more errors on my end. Once I have fixed them, I will force push.

@markusweigelt
Copy link
Contributor Author

@beatrycze-volk with the changes provided yesterday, the merge should work.

@beatrycze-volk
Copy link
Contributor

@beatrycze-volk with the changes provided yesterday, the merge should work.

Then I will test it today.

@beatrycze-volk
Copy link
Contributor

Your changes look ok, but I have problem with testing. I suspect it is problem with my configuration. Could you tell me where should I insert this config and with which value?
dfg-viewer

Stack Trace:
Tue, 13 Aug 2024 15:26:47 +0000 [CRITICAL] request="81d044a960148" component="TYPO3.CMS.Core.Error.DebugExceptionHandler": Core: Exception handler (WEB: FE): TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException, code #1509977699, file /var/www/html/public/typo3/sysext/core/Classes/Configuration/ExtensionConfiguration.php, line 109: Path 3dviewer does not exist in extension configuration- ExtensionConfigurationPathDoesNotExistException: Path 3dviewer does not exist in extension configuration, in file /var/www/html/public/typo3/sysext/core/Classes/Configuration/ExtensionConfiguration.php:109 - {"mode":"WEB","application_mode":"FE","exception_class":"TYPO3\\CMS\\Core\\Configuration\\Exception\\ExtensionConfigurationPathDoesNotExistException","exception_code":1509977699,"file":"/var/www/html/public/typo3/sysext/core/Classes/Configuration/ExtensionConfiguration.php","line":109,"message":"Path 3dviewer does not exist in extension configuration","request_url":"https://dfgviewer-dist.ddev.site/?middleware=dlf/embedded3dviewer&model=https://3d-repository.hs-mainz.de/sites/default/files/2022-07/MZ_1250_Dom_200507_ZIP/gltf/MZ_1250_Dom_200507.glb","exception":"TYPO3\\CMS\\Core\\Configuration\\Exception\\ExtensionConfigurationPathDoesNotExistException: Path 3dviewer does not exist in extension configuration in /var/www/html/public/typo3/sysext/core/Classes/Configuration/ExtensionConfiguration.php:109\nStack trace:\n#0 /var/www/extensions/kitodo-presentation/Classes/Middleware/Embedded3dViewer.php(165): TYPO3\\CMS\\Core\\Configuration\\ExtensionConfiguration->get('dlf', '3dviewer')\n#1 /var/www/extensions/kitodo-presentation/Classes/Middleware/Embedded3dViewer.php(77): Kitodo\\Dlf\\Middleware\\Embedded3dViewer->getViewerByExtensionConfiguration('glb')\n#2 /var/www/html/public/typo3/sysext/core/Classes/Http/MiddlewareDispatcher.php(172): Kitodo\\Dlf\\Middleware\\Embedded3dViewer->process(Object(TYPO3\\CMS\\Core\\Http\\ServerRequest), Object(class@anonymous))\n#3 /var/www/extensions/dfg-viewer/Classes/Middleware/SruMiddleware.php(58): class@anonymous->handle(Object(TYPO3\\CMS\\Core\\Http\\ServerRequest))\n#4 /var/www/html/public/typo3/sysext/core/Classes/Http/MiddlewareDispatcher.php(172):

@markusweigelt
Copy link
Contributor Author

markusweigelt commented Aug 14, 2024

Thx a classic bug! 😄 For testing, it is sufficient to simply save the dlf extension configuration. Otherwise, I have provided a bugfix PR for Kitodo-Presentation kitodo/kitodo-presentation#1297. If you switch the Kitodo.Presentation extension to the branch of the PR, it should work for you.

@beatrycze-volk
Copy link
Contributor

It works with your fix :)

I have only one more question. The download link doesn't appear. Is this still a placeholder for future functionality or maybe the problem is with the data provider?
dfg3d

@markusweigelt
Copy link
Contributor Author

markusweigelt commented Aug 14, 2024

Do you have the tx_dlf_modeldownloadtool plugin in your kitodo.typoscript, i.e. are you using the kitodo.typoscript from the PR? If you run Kitodo.Presentation with the state of master or the missing-extension-config branch it should work. Maybe you can flush all caches.

It tested the implementation on my local environment with your mets and it seams to work https://ddev-dfgviewer.ddev.site/viewer?tx_dlf[id]=https://3d-repository.hs-mainz.de/sites/default/files/xml_structure/59.xml.

@markusweigelt
Copy link
Contributor Author

markusweigelt commented Aug 14, 2024

The browser does not download the model of 3d-repository.hs-mainz.de but instead redirects to the modell in the Mainz repository.
This is due to the issue just reported. slub/dlf-3d-viewers#76

@beatrycze-volk beatrycze-volk merged commit 592da36 into slub:master Aug 15, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
✔️ feature A new feature or enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants