Merged functions for creating textfields into 1 function

Author: Flurb

src/editors/protocol104/foundation/foundation.ts

@@ -1,11 +1,16 @@
+import { html, TemplateResult } from "lit-element";
+import { ifDefined } from "lit-html/directives/if-defined.js";
+import { translate } from "lit-translate";
 import {
   Create,
   getInstanceAttribute,
   getNameAttribute,
   newWizardEvent
 } from "../../../foundation.js";
+import { typeMaxLength } from "../../../wizards/foundation/p-types.js";
 import { editAddressWizard } from "../wizards/address.js";
 import { TiInformation } from "./cdc.js";
+import { typeDescriptiveNameKeys, typePattern } from "./p-types.js";
 
 export const PRIVATE_TYPE_104 = "IEC_60870_5_104";
 
@@ -241,6 +246,22 @@ export function createCheckActions(
   return actions;
 }
 
+/**
+ * Create a wizard-textfield element for the wizards within the Network part of the 104 plugin.
+ * @param pType - The type of P a Text Field has to be created for.
+ * @returns - A Text Field created for a specific type for the Create wizard.
+ */
+export function createNetworkTextField(pType: string, maybeValue?: string): TemplateResult {
+  return html`<wizard-textfield
+    required
+    label="${pType}"
+    pattern="${ifDefined(typePattern[pType])}"
+    .maybeValue=${maybeValue ?? null}
+    maxLength="${ifDefined(typeMaxLength[pType])}"
+    helper="${translate(typeDescriptiveNameKeys[pType])}"
+  ></wizard-textfield>`
+}
+
 /**
  * Enumeration stating the active view of the 104 plugin.
  */

src/editors/protocol104/wizards/foundation.ts

@@ -1,11 +1,9 @@
-import { html, TemplateResult } from 'lit-element';
-import { get, translate } from 'lit-translate';
+import { html } from 'lit-element';
+import { get } from 'lit-translate';
 
 import '../../../wizard-textfield.js';
 import {
-  pTypesLogicLink104,
-  typeDescriptiveNameKeys,
-  typePattern,
+  pTypesLogicLink104
 } from '../foundation/p-types.js';
 import {
   cloneElement,
@@ -21,9 +19,7 @@ import {
   WizardInputElement,
   WizardMenuActor
 } from '../../../foundation.js';
-import { ifDefined } from 'lit-html/directives/if-defined';
-import { typeMaxLength } from '../../../wizards/foundation/p-types.js';
-import { createCreateTextField } from './foundation.js';
+import { createNetworkTextField } from '../foundation/foundation.js';
 
 export function editLogicLinkWizard(parent: Element, rGNumber: number, lLNumber: number): Wizard {
   return [
@@ -48,7 +44,9 @@ export function editLogicLinkWizard(parent: Element, rGNumber: number, lLNumber:
           .maybeValue=${lLNumber}
         ></wizard-textfield>
         ${pTypesLogicLink104.map(
-          pType => html`${createEditTextField(parent, pType, rGNumber, lLNumber)}`
+          pType => html`${createNetworkTextField(pType, parent.querySelector(
+            `Address > P[type$="RG${rGNumber}-LL${lLNumber}-${pType}"]`
+          )?.innerHTML)}`
         )}`
       ],
     },
@@ -77,7 +75,7 @@ export function createLogicLinkWizard(parent: Element, rGNumber: number, occupie
           value="${lLNumber}"
         ></wizard-textfield>
         ${pTypesLogicLink104.map(
-          pType => html`${createCreateTextField(pType)}`
+          pType => html`${createNetworkTextField(pType)}`
         )}`
       ],
     },
@@ -183,24 +181,3 @@ function addLogicLinkAction(parent: Element, rGNumber: number, lLNumber: number)
     return [complexAction];
   };
 }
-
-/**
- * Create a wizard-textfield element for the Edit wizard.
- * @param parent - The parent element of the P to create. 
- * @param pType - The type of P a Text Field has to be created for.
- * @param rGNumber - The Redundancy Group number of the Text Field used in the type.
- * @param lLNumber - The Logic Link Group number of the Text Field used in the type.
- * @returns - A Text Field created for a specific type for the Edit wizard.
- */
-function createEditTextField(parent: Element, pType: string, rGNumber: number, lLNumber: number): TemplateResult {
-  return html`<wizard-textfield
-    required
-    label="${pType}"
-    pattern="${ifDefined(typePattern[pType])}"
-    .maybeValue=${parent.querySelector(
-      `Address > P[type$="RG${rGNumber}-LL${lLNumber}-${pType}"]`
-    )?.innerHTML ?? null}
-    maxLength="${ifDefined(typeMaxLength[pType])}"
-    helper="${translate(typeDescriptiveNameKeys[pType])}"
-  ></wizard-textfield>`
-}

src/editors/protocol104/wizards/logiclink.ts

@@ -1,9 +1,9 @@
-import { html, TemplateResult } from 'lit-element';
-import { get, translate } from 'lit-translate';
+import { html } from 'lit-element';
+import { get } from 'lit-translate';
 
 import '../../../wizard-textfield.js';
 import {
-  pTypesRedundancyGroup104, typeDescriptiveNameKeys, typePattern,
+  pTypesRedundancyGroup104
 } from '../foundation/p-types.js';
 import {
   cloneElement,
@@ -20,11 +20,9 @@ import {
   WizardInputElement,
   WizardMenuActor
 } from '../../../foundation.js';
-import { ifDefined } from 'lit-html/directives/if-defined';
-import { typeMaxLength } from '../../../wizards/foundation/p-types.js';
 import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
 import { createLogicLinkWizard, editLogicLinkWizard } from './logiclink.js';
-import { createCreateTextField } from './foundation.js';
+import { createNetworkTextField } from '../foundation/foundation.js';
 
 export function editRedundancyGroupWizard(parent: Element, rGNumber: number): Wizard {
   const usedLLNumbers = getLogicLinkNumbers(parent, rGNumber);
@@ -55,7 +53,9 @@ export function editRedundancyGroupWizard(parent: Element, rGNumber: number): Wi
           .maybeValue=${rGNumber}
         ></wizard-textfield>
         ${pTypesRedundancyGroup104.map(
-          pType => html`${createEditTextField(parent, pType, rGNumber)}`
+          pType => html`${createNetworkTextField(pType, parent.querySelector(
+            `Address > P[type$="RG${rGNumber}-${pType}"]`
+          )?.innerHTML)}`
         )}
         <h3>${get('protocol104.network.redundancyGroup.wizard.logicLinkGroupTitle')}</h3>
         <mwc-list
@@ -101,7 +101,7 @@ export function createRedundancyGroupWizard(parent: Element, occupiedRGNumbers:
           value="${rGNumber}"
         ></wizard-textfield>
         ${pTypesRedundancyGroup104.map(
-          pType => html`${createCreateTextField(pType)}`
+          pType => html`${createNetworkTextField(pType)}`
         )}`
       ],
     },
@@ -233,23 +233,3 @@ function getLogicLinkNumbers(parent: Element, rGNumber: number): number[] {
 
   return usedNumbers.sort();
 }
-
-/**
- * Create a wizard-textfield element for the Edit wizard.
- * @param parent - The parent element of the P to create. 
- * @param pType - The type of P a Text Field has to be created for.
- * @param rGNumber - The Redundancy Group number of the Text Field used in the type.
- * @returns - A Text Field created for a specific type for the Edit wizard.
- */
-function createEditTextField(parent: Element, pType: string, rGNumber: number): TemplateResult {
-  return html`<wizard-textfield
-    required
-    label="${pType}"
-    pattern="${ifDefined(typePattern[pType])}"
-    .maybeValue=${parent.querySelector(
-      `Address > P[type$="RG${rGNumber}-${pType}"]`
-    )?.innerHTML ?? null}
-    maxLength="${ifDefined(typeMaxLength[pType])}"
-    helper="${translate(typeDescriptiveNameKeys[pType])}"
-  ></wizard-textfield>`
-}