Merge branch '6.2' into 6.3

Author: dtdesign

com.woltlab.wcf/templates/articleList.tpl

@@ -39,7 +39,7 @@
 {if $__wcf->user->userID}
 	<script data-relocate="true">
 		require(['WoltLabSuite/Core/Ui/Article/MarkAllAsRead'], ({ setup }) => {
-			setup();
+			setup(document.getElementById('{unsafe:$listView->getID()|encodeJS}_items'));
 		});
 	</script>
 {/if}

com.woltlab.wcf/templates/categoryArticleList.tpl

@@ -46,7 +46,7 @@
 {if $__wcf->user->userID}
 	<script data-relocate="true">
 		require(['WoltLabSuite/Core/Ui/Article/MarkAllAsRead'], ({ setup }) => {
-			setup();
+			setup(document.getElementById('{unsafe:$listView->getID()|encodeJS}_items'));
 		});
 	</script>
 {/if}

ts/WoltLabSuite/Core/Component/Interaction/Bulk/Rpc.ts

@@ -1,5 +1,5 @@
 /**
- * Handles bulk interactions that call a RPC endpoint.
+ * Handles bulk interactions that call an RPC endpoint.
  *
  * @author Marcel Werk
  * @copyright 2001-2025 WoltLab GmbH

ts/WoltLabSuite/Core/Component/Interaction/Rpc.ts

@@ -1,5 +1,5 @@
 /**
- * Handles interactions that call a RPC endpoint.
+ * Handles interactions that call an RPC endpoint.
  *
  * @author Marcel Werk
  * @copyright 2001-2025 WoltLab GmbH

ts/WoltLabSuite/Core/Ui/Article/MarkAllAsRead.ts

@@ -9,22 +9,27 @@
 
 import { showDefaultSuccessSnackbar } from "WoltLabSuite/Core/Component/Snackbar";
 import { markAllArticlesAsRead } from "WoltLabSuite/Core/Api/Articles/MarkAllArticlesAsRead";
+import { promiseMutex } from "WoltLabSuite/Core/Helper/PromiseMutex";
 
-async function markAllAsRead(): Promise<void> {
+async function markAllAsRead(listView?: HTMLElement): Promise<void> {
   await markAllArticlesAsRead();
 
-  document.querySelectorAll(".contentItemList .contentItemBadgeNew").forEach((el: HTMLElement) => el.remove());
-  document.querySelectorAll(".boxMenu .active .badge").forEach((el: HTMLElement) => el.remove());
+  if (listView !== undefined) {
+    listView.dispatchEvent(new CustomEvent("interaction:invalidate-all"));
+  }
+
+  document.querySelectorAll(".boxMenu .active .badgeUpdate").forEach((el: HTMLElement) => el.remove());
 
   showDefaultSuccessSnackbar();
 }
 
-export function setup(): void {
+export function setup(listView?: HTMLElement): void {
   document.querySelectorAll(".markAllAsReadButton").forEach((el: HTMLElement) => {
-    el.addEventListener("click", (event) => {
-      event.preventDefault();
-
-      void markAllAsRead();
-    });
+    el.addEventListener(
+      "click",
+      promiseMutex(async () => {
+        await markAllAsRead(listView);
+      }),
+    );
   });
 }

wcfsetup/install/files/js/WoltLabSuite/Core/Component/Interaction/Bulk/Rpc.js

@@ -4,6 +4,7 @@
 
 use wcf\data\application\Application;
 use wcf\page\AbstractPage;
+use wcf\system\application\ApplicationHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\Environment;
 use wcf\system\exception\SystemException;
@@ -300,9 +301,13 @@ protected function validateMysql()
             foreach ($keys as $column => $reference) {
                 $innerConditionBuilder = new PreparedStatementConditionBuilder(false);
                 $innerConditionBuilder->add('REFERENCED_TABLE_SCHEMA = ?', [WCF::getDB()->getDatabaseName()]);
-                $innerConditionBuilder->add('REFERENCED_TABLE_NAME = ?', [$reference['referenceTable']]);
+                $innerConditionBuilder->add('REFERENCED_TABLE_NAME = ?', [
+                        ApplicationHandler::insertRealDatabaseTableNames($reference['referenceTable'])
+                ]);
                 $innerConditionBuilder->add('REFERENCED_COLUMN_NAME = ?', [$reference['referenceColumn']]);
-                $innerConditionBuilder->add('TABLE_NAME = ?', [$table]);
+                $innerConditionBuilder->add('TABLE_NAME = ?', [
+                        ApplicationHandler::insertRealDatabaseTableNames($table)
+                ]);
                 $innerConditionBuilder->add('COLUMN_NAME = ?', [$column]);
 
                 $conditionBuilder->add('(' . $innerConditionBuilder . ')', $innerConditionBuilder->getParameters());