Overhaul condition API and UI

com.woltlab.wcf/objectTypeDefinition.xml

@@ -117,6 +117,7 @@
 			<name>com.woltlab.wcf.condition.box</name>
 			<interfacename>wcf\system\condition\IContentCondition</interfacename>
 		</definition>
+		<!-- deprecated since 6.3, only kept for the migration of legacy conditions to object filters -->
 		<definition>
 			<name>com.woltlab.wcf.condition.userGroupAssignment</name>
 			<interfacename>wcf\system\condition\IUserCondition</interfacename>
@@ -125,6 +126,7 @@
 			<name>com.woltlab.wcf.condition.trophy</name>
 			<interfacename>wcf\system\condition\IUserCondition</interfacename>
 		</definition>
+		<!-- deprecated since 6.3, only kept for the migration of legacy conditions to object filters -->
 		<definition>
 			<name>com.woltlab.wcf.condition.notice</name>
 			<interfacename>wcf\system\condition\IContentCondition</interfacename>
@@ -136,6 +138,7 @@
 		<definition>
 			<name>com.woltlab.wcf.adLocation</name>
 		</definition>
+		<!-- deprecated since 6.3, only kept for the migration of legacy conditions to object filters -->
 		<definition>
 			<name>com.woltlab.wcf.condition.ad</name>
 			<interfacename>wcf\system\condition\IContentCondition</interfacename>

com.woltlab.wcf/package.xml

@@ -69,6 +69,10 @@
 	Required order of the following steps for the update to 6.3:
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_likeObject.php</instruction>
 	<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.3_step1.php</instruction>
+	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_conditions.php</instruction>
+	The `objectType` PIP must run after `update_com.woltlab.wcf_6.3_conditions.php`,
+	because deleting the legacy condition object types cascades to `wcf1_condition`.
+	<instruction type="objectType" />
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_styleTemplateGroup.php</instruction>
 	<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.3_step2.php</instruction>
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_embeddedObjects.php</instruction>

com.woltlab.wcf/templates/shared_multiPageCondition.tpl

@@ -1,3 +1,4 @@
+{* @deprecated 6.3 Only used by the deprecated `MultiPageCondition`. *}
 <dl>
 	<dt></dt>
 	<dd>

com.woltlab.wcf/templates/shared_objectFilterFormField.tpl

@@ -0,0 +1,13 @@
+<div id="{$field->getPrefixedId()}" class="objectFilter__container"></div>
+
+<script data-relocate="true">
+	require(["WoltLabSuite/Core/Component/Object/Filter/Builder"], ({ setup }) => {
+		{jsphrase name='wcf.objectFilter.addFilter'}
+		{jsphrase name='wcf.objectFilter.joiner'}
+		setup(
+			document.getElementById('{unsafe:$field->getPrefixedId()|encodeJS}'),
+			'{unsafe:$field->getEndpoint()|encodeJS}',
+			{unsafe:$field->toJson()},
+		);
+	});
+</script>

com.woltlab.wcf/templates/shared_templateFormNode.tpl

@@ -0,0 +1,5 @@
+<div id="{$node->getPrefixedId()}Container"{if !$node->checkDependencies()} style="display: none;"{/if}>
+	{unsafe:$html}
+</div>
+
+{include file='shared_formFieldDependencies' field=$node}

phpstan-baseline.neon

@@ -42,11 +42,6 @@ parameters:
 			count: 2
 			path: wcfsetup/install/files/lib/acp/form/AbstractCustomOptionForm.class.php
 
-		-
-			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
-			identifier: empty.notAllowed
-			count: 2
-			path: wcfsetup/install/files/lib/acp/form/AdAddForm.class.php
 
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
@@ -102,12 +97,6 @@ parameters:
 			count: 1
 			path: wcfsetup/install/files/lib/acp/form/LanguageImportForm.class.php
 
-		-
-			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
-			identifier: empty.notAllowed
-			count: 3
-			path: wcfsetup/install/files/lib/acp/form/NoticeAddForm.class.php
-
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
 			identifier: empty.notAllowed
@@ -204,12 +193,6 @@ parameters:
 			count: 1
 			path: wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
 
-		-
-			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
-			identifier: empty.notAllowed
-			count: 1
-			path: wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php
-
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
 			identifier: empty.notAllowed

ts/WoltLabSuite/Core/Component/Object/Filter/Builder.ts

@@ -0,0 +1,235 @@
+/**
+ * Manages the list of configured object filters of an `ObjectFilterFormField`.
+ * New filters are configured through a dialog, the resulting list is written
+ * into a hidden input field when the form is submitted.
+ *
+ * @author Alexander Ebert
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+
+import { promiseMutex } from "WoltLabSuite/Core/Helper/PromiseMutex";
+import { confirmationFactory } from "../../Confirmation";
+import { dialogFactory } from "../../Dialog";
+import { getPhrase } from "WoltLabSuite/Core/Language";
+
+/**
+ * The filter returned by the dialog after it has been submitted.
+ */
+type Response = {
+  identifier: string;
+  summary: string;
+  value: string;
+};
+
+/**
+ * A filter that has already been configured.
+ */
+type Filter = {
+  identifier: string;
+  summary: string;
+  value: string;
+};
+
+type SerializedData = Filter[];
+
+class ObjectFilterBuilder {
+  readonly #conditions: Map<HTMLElement, Response> = new Map();
+  readonly #container: HTMLElement;
+  readonly #endpoint: string;
+
+  constructor(container: HTMLElement, endpoint: string, values: SerializedData) {
+    this.#container = container;
+    this.#endpoint = endpoint;
+
+    const button = document.createElement("button");
+    button.type = "button";
+    button.classList.add("button");
+
+    const icon = document.createElement("fa-icon");
+    icon.setIcon("plus");
+    button.appendChild(icon);
+
+    const span = document.createElement("span");
+    span.textContent = getPhrase("wcf.objectFilter.addFilter");
+    button.appendChild(span);
+
+    button.addEventListener(
+      "click",
+      promiseMutex(() => this.#addFilter()),
+    );
+
+    this.#container.insertAdjacentElement("afterend", button);
+
+    const form = this.#container.closest("form");
+    let shadow: HTMLInputElement | undefined = undefined;
+    form?.addEventListener("submit", () => {
+      if (shadow === undefined) {
+        shadow = document.createElement("input");
+        shadow.type = "hidden";
+        shadow.name = this.#container.id;
+
+        this.#container.insertAdjacentElement("afterend", shadow);
+      }
+
+      shadow.value = this.#serializeConditions();
+    });
+
+    this.#fromSerializedData(values);
+  }
+
+  /**
+   * Restores the filters that were configured before.
+   */
+  #fromSerializedData(values: SerializedData): void {
+    for (const filter of values) {
+      this.#createCondition(filter);
+    }
+  }
+
+  /**
+   * Returns the URL of the dialog, passing the identifiers of the configured
+   * filters except for the given one that is being edited. Filters that are
+   * not repeatable are no longer offered once they have been configured.
+   */
+  #getEndpoint(editedItem?: HTMLElement): URL {
+    const url = new URL(this.#endpoint, window.location.href);
+    this.#conditions.forEach((condition, item) => {
+      if (item !== editedItem) {
+        url.searchParams.append("used[]", condition.identifier);
+      }
+    });
+
+    return url;
+  }
+
+  /**
+   * Opens the dialog to configure a new filter and adds it to the list.
+   */
+  async #addFilter(): Promise<void> {
+    const url = this.#getEndpoint();
+
+    const response = await dialogFactory().usingFormBuilder().fromEndpoint<Response>(url.toString());
+    if (response.ok) {
+      this.#createCondition(response.result);
+    }
+  }
+
+  /**
+   * Opens the dialog prefilled with the given filter and replaces it with the result.
+   */
+  async #editFilter(item: HTMLElement, summary: HTMLElement): Promise<void> {
+    const data = this.#conditions.get(item)!;
+
+    const url = this.#getEndpoint(item);
+    url.searchParams.set("filter", data.identifier);
+    url.searchParams.set("value", data.value);
+
+    const response = await dialogFactory().usingFormBuilder().fromEndpoint<Response>(url.toString());
+    if (response.ok) {
+      summary.innerHTML = response.result.summary;
+      this.#conditions.set(item, response.result);
+    }
+  }
+
+  /**
+   * Adds the given filter to the list, showing its summary, a button to edit it
+   * and a button to remove it after a confirmation.
+   */
+  #createCondition(data: Response): void {
+    const item = document.createElement("div");
+    item.classList.add("objectFilter__item");
+
+    const summary = document.createElement("span");
+    summary.innerHTML = data.summary;
+
+    const buttons = document.createElement("div");
+    buttons.classList.add("objectFilter__item__buttons");
+
+    const editButton = document.createElement("button");
+    editButton.type = "button";
+    editButton.classList.add("button", "small", "jsTooltip");
+    editButton.title = getPhrase("wcf.global.button.edit");
+    editButton.innerHTML = '<fa-icon name="pencil"></fa-icon>';
+    editButton.addEventListener(
+      "click",
+      promiseMutex(() => this.#editFilter(item, summary)),
+    );
+
+    const deleteButton = document.createElement("button");
+    deleteButton.type = "button";
+    deleteButton.classList.add("button", "small", "jsTooltip");
+    deleteButton.title = getPhrase("wcf.global.button.delete");
+    deleteButton.innerHTML = '<fa-icon name="times"></fa-icon>';
+    deleteButton.addEventListener(
+      "click",
+      promiseMutex(async () => {
+        // Read the title when clicked, the summary changes when the filter is edited.
+        if (await confirmationFactory().delete(summary.textContent)) {
+          this.#deleteCondition(item);
+        }
+      }),
+    );
+
+    buttons.append(editButton, deleteButton);
+    item.append(summary, buttons);
+
+    if (this.#conditions.size > 0) {
+      this.#container.append(this.#createJoiner());
+    }
+    this.#container.append(item);
+
+    this.#conditions.set(item, data);
+  }
+
+  /**
+   * Creates the element that is shown between two filters, all filters must be satisfied.
+   */
+  #createJoiner(): HTMLElement {
+    const joiner = document.createElement("div");
+    joiner.classList.add("objectFilter__joiner");
+    joiner.textContent = getPhrase("wcf.objectFilter.joiner");
+
+    return joiner;
+  }
+
+  /**
+   * Removes the given filter from the list together with the joiner that
+   * separates it from the previous filter, or from the next filter if it is
+   * the first one.
+   */
+  #deleteCondition(element: HTMLElement): void {
+    const joiner = element.previousElementSibling ?? element.nextElementSibling;
+    if (joiner?.classList.contains("objectFilter__joiner")) {
+      joiner.remove();
+    }
+
+    element.remove();
+    this.#conditions.delete(element);
+  }
+
+  /**
+   * Serializes the configured filters as a JSON-encoded list of
+   * `[filterIdentifier, serializedValue]` pairs.
+   */
+  #serializeConditions(): string {
+    const values: [string, string][] = [];
+    this.#conditions.forEach((condition) => {
+      values.push([condition.identifier, condition.value]);
+    });
+
+    return JSON.stringify(values);
+  }
+}
+
+/**
+ * Initializes the filter builder for the given container.
+ *
+ * @param container element that holds the list of configured filters, its id is used as the name of the submitted value
+ * @param endpoint URL of the dialog to configure a new filter
+ * @param values filters that were configured before
+ */
+export function setup(container: HTMLElement, endpoint: string, values: SerializedData): void {
+  new ObjectFilterBuilder(container, endpoint, values);
+}

wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php

@@ -120,4 +120,16 @@
                 ->onDelete('SET NULL')
                 ->onUpdate('NO ACTION'),
         ]),
+    PartialDatabaseTable::create('wcf1_user_group_assignment')
+        ->columns([
+            JsonDatabaseTableColumn::create('conditions'),
+        ]),
+    PartialDatabaseTable::create('wcf1_notice')
+        ->columns([
+            JsonDatabaseTableColumn::create('conditions'),
+        ]),
+    PartialDatabaseTable::create('wcf1_ad')
+        ->columns([
+            JsonDatabaseTableColumn::create('conditions'),
+        ]),
 ];