We agreed today that this should go on the backburner because for now collecting metrics from Wikidata will be far easier.
We are also confident that we will want to pull in whatever additional work comes out of T396002 to cloud when it is merged upstream

Took a look at this today: the last sync we did with upstream was Feb 2022 (tag: wmde.6 / commit: 3be93201 (gitlab)

I checked the upstream repo out and diffed it against our fork. Since we are so far behind upstream my suggestion is to

• create an inventory of modifications that are currently in place (see the list below for a start)
• use git to merge upstream, as we did with for example cradle (see https://github.com/wbstack/cradle#syncing-this-fork)
• keep track of all our custom changes in the README, so we have an inventory of things we modified and can test after an update
• sync "regularly" to make updating smoother / avoid build up of changes

Using the docker image as a base sounds great at first but unless we find a way to write a test suite for our modifications, I suspect overlaying changes on it would just evolve to its own little maintenance nightmare (since in the future we would lose out on git showing us potential breaking changes when syncing upstream).

Overall our git history of changes aren't too many. Here are some notable changes I saw in the diff against wmde.6, with some notes for refactoring:

• in general a lot of initial modifications can be seen in this commit: https://github.com/wbstack/queryservice-ui/commit/15855c140d21073f9c3d0929bf3345d1893157ce
  • wikibase/config.js: extends configuration
  • wikibase/queryService/ui: App.js - disabled last updated time
• index.html: leftover of an old feedback banner, non-visible, can probably get dismissed now
• style.less: css adjustements (at top and bottom of the file - best to consolidate into the marked top section)
• wikibase/init.js: cleaner prefixes
  • https://phabricator.wikimedia.org/T347023
  • related PR: https://github.com/wbstack/queryservice-ui/pull/237
• wikibase/queryService/ui/queryHelper/QueryHelper.js: removal of workaround for https://phabricator.wikimedia.org/T133316
• wikibase/queryService/ui: ResultView.js - Hide graph builder
  • https://phabricator.wikimedia.org/T357115
  • https://github.com/wbstack/queryservice-ui/pull/294
• wikibase/queryService/api/UrlShortener.js - fixes for URL shortening
  • https://phabricator.wikimedia.org/T347022
  • https://github.com/wbstack/queryservice-ui/pull/292

https://github.com/wbstack/queryservice-ui/pull/298

We have kept the base64 encoded tinyurl modification but we haven't investigated further if this has totally resolved T383250

• wikibase/init.js: cleaner prefixes
  • https://phabricator.wikimedia.org/T347023
  • related PR: https://github.com/wbstack/queryservice-ui/pull/237
• wikibase/queryService/ui/queryHelper/QueryHelper.js: removal of workaround for https://phabricator.wikimedia.org/T133316

I couldn't see any wikibase/init.js changes that relate to T347023 or #237. There are changes in wikibase/queryService/ui/queryHelper/QueryHelper.js that are related, though. I believe we should keep the changes made in #237 (i.e. we should not clean query prefixes).

PR: https://github.com/wbstack/queryservice-ui/pull/312

How to sync:

1. Create a new branch
2. Add local upstream remote: git remote add upstream https://gitlab.wikimedia.org/repos/wmde/wikidata-query-gui
3. Rebase main brnach git rebase upstream/main (or you can merge but rebase seems to be better option git merge upstream/main)
4. Resolve conflicts

some important changes:

• wikibase/queryService/api/UrlShortener.js and wikibase/queryService/ui/App.js: are part of PR#292 to improve TinyURL
• style.less: combine both changes, using new codex
• wikibase/queryService/ui/queryHelper/QueryHelper.js: keep workaround for T133316 removed

Note: node will be updated to node:18 to be similar with upstream