Refactor About dialog to remove HTML template and use centralized server info #13933

banobepascal · 2025-12-30T00:05:06Z

Resolves: #
Target version: main

Summary

TODO

...

Checklist

I have run make prettier-write and formatted the code.
All commits have Change-Id
I have run tests with make check
I have issued make run and manually verified that everything looks okay
Documentation (manuals or wiki) has been updated or is not required

banobepascal · 2025-12-30T00:18:37Z

Todo

Add WOPI host id
Add date and vendor configuration
change params in feedback dialog to use serverinfo values than cloning

online/browser/src/map/handler/Map.Feedback.js

Line 111 in 97642ef

var params = [{ mobile : window.mode.isMobile() },

browser/src/global.d.ts

browser/src/core/Socket.js

browser/src/control/Control.AboutDialog.ts

browser/html/cool.html.m4

browser/src/control/Control.AboutDialog.ts

browser/html/cool.html.m4

browser/src/control/Control.AboutDialog.ts

pedropintosilva · 2026-01-06T09:00:18Z

A note: if this PR gets merged as it is we will have the feedback dialog broken on master branch, at least temporarily until a follow up PR comes.

browser/src/control/Control.AboutDialog.ts

eszkadev · 2026-01-06T10:33:59Z

A note: if this PR gets merged as it is we will have the feedback dialog broken on master branch, at least temporarily until a follow up PR comes.

good catch, it's used here https://github.com/CollaboraOnline/online/blob/main/browser/src/map/handler/Map.Feedback.js#L100

we can use new window.xxx values instead

eszkadev · 2026-01-06T11:52:41Z

please remember to rebase, there is a conflict with main to solve

This adds centralized storage for: - COOLWSD version and git hash (from 'coolserver') - LOKit (LibreOffice) version and git hash (from 'lokitversion') - OS info (from 'osinfo') This provides a single source of truth for server identification data, making it globally available for the About dialog and future UI components, without relying on DOM cloning or hidden HTML template. - Add data-wopi-host-id, data-vendor, and data-copyright-year attributes to #initial-variables Signed-off-by: Banobe Pascal <banobe.pascal@collabora.com> Change-Id: I7308db0b3fec7ea335d62108614fe4574af0d1c2

- Dynamically create the UI structure in JavaScript - Populate all content from window.app.serverInfo - Eliminate cloning from hidden HTML template - Separate structure creation from content population and show - Improve copy-to-clipboard to use serverInfo directly and include all fields (versions, hashes, served-by, server ID) - Use window.wopiHostId, window.copyrightYear, and window.vendor for accurate WOPI host, current year, and vendor name display - Preserve all other existing functionality Signed-off-by: Banobe Pascal <banobe.pascal@collabora.com> Change-Id: I1efadd2d106150dd8b1c973c82d3d2c12ae0762d

The About dialog is now fully created and filled in JavaScript using: - createAboutDialogContent() to build the structure - window.app.serverInfo to provide version and server details - populateAboutDialog() to insert all content and branding - This removes the need for duplicated HTML in the template file and makes the dialog easier to maintain. - A minimal empty <div id=\"about-dialog\" tabIndex=\"0\"></div> is kept in the HTML to preserve Notebookbar About tab detection Signed-off-by: Banobe Pascal <banobe.pascal@collabora.com> Change-Id: Id0bea4b6892b62fe4a9396c8d941f79ee5e39b97

…ection only - Restored dialog header and logos in the template - Restored lokit-version element since its used to create lokit-extra - Remove dynamic creation of the dialog header, product name, and logos from JavaScript, limiting JS to populating about-dialog-info Signed-off-by: Banobe Pascal <banobe.pascal@collabora.com> Change-Id: Ic64639177bb0292c9be407c5e05e3fc362765444

- Switch feedback dialog parameters to read lokitHash and wopiHostId from the window state, as these values are no longer available in the template after the About dialog template info is now dynamically created. Signed-off-by: Banobe Pascal <banobe.pascal@collabora.com> Change-Id: Ibf946cae20b5eb8d9b3179e9b94e2ac545b1617a

eszkadev · 2026-01-08T06:33:19Z

browser/html/cool.html.m4

      data-canvas-slideshow-enabled = "%CANVAS_SLIDESHOW_ENABLED%"
      data-wopi-setting-base-url = "%WOPI_SETTING_BASE_URL%"
+      data-wopi-host-id = "%WOPI_HOST_ID%"
+      data-vendor = VENDOR


We should put it inside " " as other strings I think.
Also the YEAR

eszkadev · 2026-01-08T08:21:03Z

browser/src/control/Control.AboutDialog.ts

 			info.lokitHash.substring(0, 10),
 		);

+		// Update lokit-extra position if exists


this comment is a bit useless, looking at code you see it shuffles nodes but you don't know what is the result - what would be more useful information :)

eszkadev

looks good now :)

github-project-automation bot added this to Collabora Online Dec 30, 2025

github-project-automation bot moved this to To Review in Collabora Online Dec 30, 2025

banobepascal requested a review from eszkadev December 30, 2025 00:19

banobepascal force-pushed the private/banobepascal/about-dialog branch from af2619c to d26bde0 Compare December 30, 2025 00:31

eszkadev reviewed Dec 30, 2025

View reviewed changes

browser/src/global.d.ts Outdated Show resolved Hide resolved

eszkadev reviewed Dec 30, 2025

View reviewed changes

browser/src/core/Socket.js Outdated Show resolved Hide resolved

browser/src/core/Socket.js Outdated Show resolved Hide resolved

browser/src/core/Socket.js Outdated Show resolved Hide resolved

eszkadev reviewed Dec 30, 2025

View reviewed changes

browser/src/core/Socket.js Outdated Show resolved Hide resolved

eszkadev reviewed Dec 30, 2025

View reviewed changes

browser/src/core/Socket.js Outdated Show resolved Hide resolved

eszkadev reviewed Dec 30, 2025

View reviewed changes

browser/src/control/Control.AboutDialog.ts Outdated Show resolved Hide resolved

eszkadev reviewed Dec 30, 2025

View reviewed changes

browser/src/control/Control.AboutDialog.ts Outdated Show resolved Hide resolved

eszkadev added the draft label Dec 30, 2025

eszkadev reviewed Dec 30, 2025

View reviewed changes

browser/html/cool.html.m4 Show resolved Hide resolved

banobepascal force-pushed the private/banobepascal/about-dialog branch from d26bde0 to 8c74743 Compare January 2, 2026 01:14

banobepascal marked this pull request as ready for review January 2, 2026 01:14

banobepascal force-pushed the private/banobepascal/about-dialog branch from 8c74743 to 6b2fdf0 Compare January 2, 2026 01:41

eszkadev reviewed Jan 2, 2026

View reviewed changes

browser/src/control/Control.AboutDialog.ts Outdated Show resolved Hide resolved

eszkadev reviewed Jan 2, 2026

View reviewed changes

browser/src/control/Control.AboutDialog.ts Outdated Show resolved Hide resolved

eszkadev reviewed Jan 2, 2026

View reviewed changes

browser/src/control/Control.AboutDialog.ts Outdated Show resolved Hide resolved

eszkadev reviewed Jan 2, 2026

View reviewed changes

browser/src/control/Control.AboutDialog.ts Outdated Show resolved Hide resolved

eszkadev reviewed Jan 2, 2026

View reviewed changes

browser/src/control/Control.AboutDialog.ts Show resolved Hide resolved

banobepascal force-pushed the private/banobepascal/about-dialog branch from 6b2fdf0 to 13720c4 Compare January 2, 2026 16:01

banobepascal removed the draft label Jan 2, 2026

banobepascal force-pushed the private/banobepascal/about-dialog branch from 13720c4 to 7e357c6 Compare January 6, 2026 00:01

eszkadev reviewed Jan 6, 2026

View reviewed changes

browser/src/control/Control.AboutDialog.ts Outdated Show resolved Hide resolved

eszkadev reviewed Jan 6, 2026

View reviewed changes

browser/src/control/Control.AboutDialog.ts Outdated Show resolved Hide resolved

eszkadev reviewed Jan 6, 2026

View reviewed changes

browser/html/cool.html.m4 Show resolved Hide resolved

eszkadev reviewed Jan 6, 2026

View reviewed changes

browser/src/control/Control.AboutDialog.ts Outdated Show resolved Hide resolved

eszkadev reviewed Jan 6, 2026

View reviewed changes

browser/src/control/Control.AboutDialog.ts Outdated Show resolved Hide resolved

banobepascal added 5 commits January 7, 2026 17:36

banobepascal force-pushed the private/banobepascal/about-dialog branch from 7e357c6 to 319a395 Compare January 7, 2026 14:45

eszkadev reviewed Jan 8, 2026

View reviewed changes

eszkadev approved these changes Jan 8, 2026

View reviewed changes

github-project-automation bot moved this from To Review to To Test in Collabora Online Jan 8, 2026

eszkadev merged commit 8aaff9c into main Jan 8, 2026
15 checks passed

eszkadev deleted the private/banobepascal/about-dialog branch January 8, 2026 08:35

github-project-automation bot moved this from To Test to Done in Collabora Online Jan 8, 2026

Refactor About dialog to remove HTML template and use centralized server info #13933

Refactor About dialog to remove HTML template and use centralized server info #13933

Conversation

banobepascal commented Dec 30, 2025

Summary

TODO

Checklist

Uh oh!

banobepascal commented Dec 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pedropintosilva commented Jan 6, 2026

Uh oh!

Uh oh!

eszkadev commented Jan 6, 2026

Uh oh!

eszkadev commented Jan 6, 2026

Uh oh!

eszkadev Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

eszkadev Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

eszkadev left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

banobepascal commented Dec 30, 2025 •

edited

Loading