Rebase to current dev

VERSION

@@ -1 +1 @@
-2.8.0
+2.8.3

changelist.md

@@ -1,4 +1,16 @@
 # GADS Changelist
+--------
+**Version**: 2.8.3
+**Released**: 13-05-2026
+
+# Fixes
+
+- Fix for error in JS logging
+- Fix error in drag and drop
+- Better error for when duplicate curval ID's are present
+
+# QoL Fixes
+
 --------
 **Version**: 2.8.2
 **Released**: 01-05-2026

lib/GADS.pm

@@ -116,7 +116,7 @@ tie %{schema->storage->dbh->{CachedKids}}, 'Tie::Cache', 100;
 # required for that)
 GADS::DB->setup(schema);
 
-our $VERSION = '0.1';
+our $VERSION = '2.8.3';
 
 # set serializer => 'JSON';
 set behind_proxy => config->{behind_proxy}; # XXX Why doesn't this work in config file

package.json

@@ -67,6 +67,7 @@
     "@types/typeahead.js": "^0.11.6",
     "autoprefixer": "^10.5.0",
     "babel-loader": "^10.1.1",
+    "buffer": "^6.0.3",
     "clean-webpack-plugin": "^4.0.0",
     "copy-webpack-plugin": "^14.0.0",
     "core-js": "^3.49.0",

src/frontend/components/data-table/lib/DataTablesPlugins.ts

@@ -1,4 +1,4 @@
-import DataTable from 'datatables.net-bs4';
+import DataTable from 'datatables.net';
 
 /**
  * Create a toggle button

src/frontend/components/data-table/lib/helper.test.ts

@@ -71,4 +71,4 @@ describe.skip('helper - Jest really doesn\'t like JQuery right now!', () => {
         clearTable($(target));
         expect(target.querySelectorAll('tbody tr').length).toBe(1);
     });
-});
+});

src/frontend/js/lib/logging.js

@@ -25,8 +25,8 @@ class Logging {
         if (this.allowLogging) {
             console.log(...message);
         } else {
-            const message = this.formatMessage('log', ...message);
-            uploadMessage(message);
+            const msg = this.formatMessage('log', ...message);
+            uploadMessage(msg);
         }
     }
 
@@ -38,8 +38,8 @@ class Logging {
         if (this.allowLogging) {
             console.info(...message);
         } else {
-            const message = this.formatMessage('info', ...message);
-            uploadMessage(message);
+            const msg = this.formatMessage('info', ...message);
+            uploadMessage(msg);
         }
     }
 
@@ -51,8 +51,8 @@ class Logging {
         if (this.allowLogging) {
             console.warn(...message);
         } else {
-            const message = this.formatMessage('warn', ...message);
-            uploadMessage(message);
+            const msg = this.formatMessage('warn', ...message);
+            uploadMessage(msg);
         }
     }
 
@@ -64,8 +64,8 @@ class Logging {
         if (this.allowLogging) {
             console.error(...message);
         } else {
-            const message = this.formatMessage('error', ...message);
-            uploadMessage(message);
+            const msg = this.formatMessage('error', ...message);
+            uploadMessage(msg);
         }
     }
 

src/frontend/js/lib/util/scriptErrorHandler/lib/MessageUploader.ts

@@ -9,22 +9,33 @@ export const uploadMessage = async (message: string) => {
         description: message,
         url: window.location.href
     };
-    const uploader = new Uploader('/api/script_error', 'POST');
-    const messageUploader = new MessageUploader(uploader);
+    const messageUploader = MessageUploader.instance;
     return await messageUploader.uploadMessage(body.description);
 };
 
 /**
  * Class to upload messages to the server. It takes an instance of Uploader to handle the actual upload process.
  */
-export class MessageUploader {
+class MessageUploader {
+    private static _instance: MessageUploader;
+
     /**
      * Create an instance of MessageUploader.
      * @param uploader The uploader to use when uploading messages
      */
     constructor(private uploader: Uploader) {
     }
 
+    /**
+     * Get the singleton instance of MessageUploader. If it doesn't exist, create a new instance with a new Uploader.
+     */
+    static get instance(): MessageUploader {
+        if (!this._instance) {
+            this._instance = new MessageUploader(new Uploader('/api/script_error', 'POST'));
+        }
+        return this._instance;
+    }
+
     /**
      * Upload a message to the server. It constructs the request body with the message description,
      * current URL, and CSRF token, then uses the uploader to send the data. If the upload fails, it logs an error to the console.

src/frontend/js/lib/util/typeahead/lib/TypeaheadBuilder.test.ts

@@ -1,3 +1,4 @@
+import { describe, it, expect } from '@jest/globals';
 import { TypeaheadBuilder } from './TypeaheadBuilder';
 
 describe('builder', () => {

views/layouts/main.tt

@@ -22,6 +22,6 @@
       %]
     </div>
     <script type="text/javascript" src="[% url.js %]/fengari-web.js"></script>
-    <script type="text/javascript" src="[% url.js %]/site.js?v=39"></script>
+    <script type="text/javascript" src="[% url.js %]/site.js?v=40"></script>
   </body>
 </html>