From 1ea7b92fa80e281df3ca0e6374dc27ed4f7c8713 Mon Sep 17 00:00:00 2001
From: Alexander Brandon Coles <a.coles@openproject.com>
Date: Mon, 14 Jul 2025 21:26:34 +0100
Subject: [PATCH] Fix dragula import, remove conflicting global

---
 .../controllers/dynamic/reporting/page.controller.ts      | 8 ++++----
 frontend/src/typings/shims.d.ts                           | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/frontend/src/stimulus/controllers/dynamic/reporting/page.controller.ts b/frontend/src/stimulus/controllers/dynamic/reporting/page.controller.ts
index 49bff501e70..ed11652bfed 100644
--- a/frontend/src/stimulus/controllers/dynamic/reporting/page.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/reporting/page.controller.ts
@@ -29,6 +29,7 @@
  */
 
 import { Controller } from '@hotwired/stimulus';
+import dragula from 'dragula';
 import jQuery from 'jquery';
 import 'tablesorter';
 
@@ -565,10 +566,9 @@ export default class PageController extends Controller {
   }
 
   private recreateSortables() {
-    const containers = jQuery('.group-by--selected-elements').toArray();
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-explicit-any
-    (dragula as any)(containers, {
-      mirrorContainer: document.getElementById('group-by--area'),
+    const containers = Array.from(document.querySelectorAll('.group-by--selected-elements'));
+    dragula(containers, {
+      mirrorContainer: document.getElementById('group-by--area')!,
     });
   }
 
diff --git a/frontend/src/typings/shims.d.ts b/frontend/src/typings/shims.d.ts
index 71b55b4ebf7..1f86c67d86a 100644
--- a/frontend/src/typings/shims.d.ts
+++ b/frontend/src/typings/shims.d.ts
@@ -11,14 +11,12 @@
 /// <reference path="../../node_modules/@types/moment-timezone/index.d.ts" />
 /// <reference path="../../node_modules/@types/urijs/index.d.ts" />
 /// <reference path="../../node_modules/@types/webpack-env/index.d.ts" />
-/// <reference path="../../node_modules/@types/dragula/index.d.ts" />
 /// <reference path="../../node_modules/@types/resize-observer-browser/index.d.ts" />
 
 import { Injector } from '@angular/core';
 
 import { OpenProject } from 'core-app/core/setup/globals/openproject';
 import * as TLodash from 'lodash';
-import { Dragula } from 'dragula';
 import { Screenfull } from 'screenfull';
 import { ErrorReporterBase } from 'core-app/core/errors/error-reporter-base';
 import { I18n } from 'i18n-js';
@@ -57,7 +55,6 @@ declare module '@hotwired/turbo' {
 declare global {
   const _:typeof TLodash;
   const I18n:I18n;
-  const dragula:Dragula;
 }
 
 declare global {