Merge pull request #6522 from WoltLab/6.2-use-filter-when-reloading-rows

Apply filters when reloading a grid view row

Author: BurntimeX

ts/WoltLabSuite/Core/Api/GridViews/GetRow.ts

@@ -17,11 +17,17 @@ type Response = {
 export async function getRow(
   gridViewClass: string,
   objectId: string | number,
+  filters?: Map<string, string>,
   gridViewParameters?: Map<string, string>,
 ): Promise<Response> {
   const url = new URL(`${window.WSC_RPC_API_URL}core/grid-views/row`);
   url.searchParams.set("gridView", gridViewClass);
   url.searchParams.set("objectID", objectId.toString());
+  if (filters) {
+    filters.forEach((value, key) => {
+      url.searchParams.set(`filters[${key}]`, value);
+    });
+  }
   if (gridViewParameters) {
     gridViewParameters.forEach((value, key) => {
       if (Array.isArray(value)) {

ts/WoltLabSuite/Core/Api/ListViews/GetItem.ts

@@ -17,11 +17,17 @@ type Response = {
 export async function getItem(
   listViewClass: string,
   objectId: string | number,
+  filters?: Map<string, string>,
   listViewParameters?: Map<string, string>,
 ): Promise<Response> {
   const url = new URL(`${window.WSC_RPC_API_URL}core/list-views/item`);
   url.searchParams.set("listView", listViewClass);
   url.searchParams.set("objectID", objectId.toString());
+  if (filters) {
+    filters.forEach((value, key) => {
+      url.searchParams.set(`filters[${key}]`, value);
+    });
+  }
   if (listViewParameters) {
     listViewParameters.forEach((value, key) => {
       if (Array.isArray(value)) {

ts/WoltLabSuite/Core/Component/GridView.ts

@@ -67,11 +67,17 @@ export class GridView {
   }
 
   async #refreshRow(row: HTMLElement): Promise<void> {
-    const { template } = await getRow(this.#gridClassName, row.dataset.objectId!, this.#gridViewParameters);
+    const { template } = await getRow(
+      this.#gridClassName,
+      row.dataset.objectId!,
+      this.#state.getActiveFilters(),
+      this.#gridViewParameters,
+    );
 
     row.replaceWith(DomUtil.createFragmentFromHtml(template));
     this.#state.refreshSelection();
     DomChangeListener.trigger();
+    this.#checkEmptyTable();
   }
 
   #initInteractions(): void {

ts/WoltLabSuite/Core/Component/ListView.ts

@@ -71,10 +71,16 @@ export class ListView {
   }
 
   async #refreshItem(item: HTMLElement): Promise<void> {
-    const { template } = await getItem(this.#viewClassName, item.dataset.objectId!, this.#listViewParameters);
+    const { template } = await getItem(
+      this.#viewClassName,
+      item.dataset.objectId!,
+      this.#state.getActiveFilters(),
+      this.#listViewParameters,
+    );
     item.replaceWith(createFragmentFromHtml(template));
     this.#state.refreshSelection();
     triggerDomChange();
+    this.#checkEmptyList();
   }
 
   #initInteractions(): void {

wcfsetup/install/files/js/WoltLabSuite/Core/Api/GridViews/GetRow.js

@@ -40,6 +40,10 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
             throw new PermissionDeniedException();
         }
 
+        if ($parameters->filters !== []) {
+            $view->setActiveFilters($parameters->filters);
+        }
+
         $view->setObjectIDFilter($parameters->objectID);
 
         return new JsonResponse([
@@ -55,6 +59,8 @@ public function __construct(
         /** @var non-empty-string */
         public readonly string $gridView,
         public readonly string|int $objectID,
+        /** @var string[] */
+        public readonly array $filters,
         /** @var array<string, string|string[]> */
         public readonly array $gridViewParameters,
     ) {}

wcfsetup/install/files/js/WoltLabSuite/Core/Api/ListViews/GetItem.js

@@ -40,6 +40,10 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
             throw new PermissionDeniedException();
         }
 
+        if ($parameters->filters !== []) {
+            $view->setActiveFilters($parameters->filters);
+        }
+
         $view->setObjectIDFilter($parameters->objectID);
 
         return new JsonResponse([
@@ -55,6 +59,8 @@ public function __construct(
         /** @var non-empty-string */
         public readonly string $listView,
         public readonly string|int $objectID,
+        /** @var string[] */
+        public readonly array $filters,
         /** @var array<string, string|string[]> */
         public readonly array $listViewParameters,
     ) {}