Refactor ConditionFormField to remove lastConditionIndex and adjust index handling

Author: Cyperghost

com.woltlab.wcf/templates/shared_conditionFormContainer.tpl

@@ -31,6 +31,6 @@
 		'WoltLabSuite/Core/Form/Builder/Container/ConditionFormField',
 	], (DefaultContainerDependency, { ConditionFormField }) => {
 		new DefaultContainerDependency('{unsafe:$container->getPrefixedId()|encodeJS}Container');
-		new ConditionFormField('{unsafe:$container->getPrefixedId()|encodeJS}', '{link controller="ConditionAdd" isACP=false provider=$container->getConditionProviderClass()}{/link}', {$container->getLastConditionIndex() + 1});
+		new ConditionFormField('{unsafe:$container->getPrefixedId()|encodeJS}', '{link controller="ConditionAdd" isACP=false provider=$container->getConditionProviderClass()}{/link}');
 	});
 </script>

ts/WoltLabSuite/Core/Form/Builder/Container/ConditionFormField.ts

@@ -21,11 +21,10 @@ export class ConditionFormField {
   readonly #containerId: string;
   readonly #container: HTMLElement;
   readonly #button: HTMLButtonElement;
-  #index: number;
+  #index: number = 0;
 
-  constructor(containerId: string, endpoint: string, index: number) {
+  constructor(containerId: string, endpoint: string) {
     this.#containerId = containerId;
-    this.#index = index;
     this.#container = document.getElementById(`${containerId}Conditions`) as HTMLElement;
 
     this.#button = document.getElementById(`${containerId}AddCondition`) as HTMLButtonElement;
@@ -62,7 +61,7 @@ export class ConditionFormField {
   async #showConditionAddDialog(endpoint: string) {
     const url = new URL(unescapeHTML(endpoint));
     url.searchParams.set("containerId", this.#containerId);
-    url.searchParams.set("index", this.#index.toString());
+    url.searchParams.set("index", (this.#index + 1).toString());
 
     const { ok, result } = await dialogFactory().usingFormBuilder().fromEndpoint<ConditionAddResponse>(url.toString());
 

wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Container/ConditionFormField.js

@@ -28,7 +28,6 @@ final class ConditionFormContainer extends FormContainer
      * @inheritDoc
      */
     protected $templateName = 'shared_conditionFormContainer';
-    private int $lastConditionIndex = 0;
 
     /**
      * @var ConditionProvider
@@ -63,8 +62,6 @@ public function readValues(): static
 
             foreach ($conditions as $index => $identifier) {
                 $this->appendCondition($identifier, $index);
-
-                $this->lastConditionIndex = \max($this->lastConditionIndex, $index);
             }
         }
 
@@ -82,8 +79,6 @@ public function updatedObject(array $data, IStorableObject $object, $loadValues
                 $containers[] = $this->appendCondition($condition['identifier'], $index);
                 $fieldId = $this->getConditionProvider()->getFieldId($this->getPrefixedId(), $condition['identifier'], $index);
                 $data[$fieldId] = $condition['value'];
-
-                $this->lastConditionIndex = \max($this->lastConditionIndex, $index);
             }
 
             foreach ($containers as $container) {
@@ -174,9 +169,4 @@ public function getConditionProviderClass(): string
 
         return $this->conditionProvider::class;
     }
-
-    public function getLastConditionIndex(): int
-    {
-        return $this->lastConditionIndex;
-    }
 }