Review comments processed.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

src/editors/protocol104/wizards/connectedap.ts

@@ -1,18 +1,22 @@
 import { html, TemplateResult } from 'lit-element';
 import { get, translate } from 'lit-translate';
+import { ifDefined } from 'lit-html/directives/if-defined';
 
 import '@material/mwc-checkbox';
 import '@material/mwc-switch';
 import '@material/mwc-formfield';
 import '@material/mwc-list/mwc-list-item';
 import '@material/mwc-list/mwc-check-list-item';
 import '@material/mwc-icon';
+
 import { Checkbox } from '@material/mwc-checkbox';
 import { List } from '@material/mwc-list';
 import { ListItemBase } from '@material/mwc-list/mwc-list-item-base';
+import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
 
 import '../../../wizard-textfield.js';
 import '../../../filtered-list.js';
+
 import {
   pTypes104,
   stationTypeOptions,
@@ -35,15 +39,11 @@ import {
   WizardInputElement,
   WizardMenuActor,
 } from '../../../foundation.js';
-import { createTypeRestrictionCheckbox } from '../../../wizards/connectedap.js';
-import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
-import { ifDefined } from 'lit-html/directives/if-defined';
-import { typeMaxLength } from '../../../wizards/foundation/p-types.js';
+import { getTypeAttribute } from '../foundation/foundation.js';
 import {
   createRedundancyGroupWizard,
   editRedundancyGroupWizard,
 } from './redundancygroup.js';
-import { getTypeAttribute } from '../foundation/foundation';
 
 interface AccessPointDescription {
   element: Element;
@@ -383,6 +383,21 @@ function createEditTextField(parent: Element, pType: string): TemplateResult {
     pattern="${ifDefined(typePattern[pType])}"
     .maybeValue=${parent.querySelector(`Address > P[type="${pType}"]`)
       ?.innerHTML ?? null}
-    maxLength="${ifDefined(typeMaxLength[pType])}"
   ></wizard-textfield>`;
 }
+
+function createTypeRestrictionCheckbox(element: Element): TemplateResult {
+  return html`<mwc-formfield
+    label="${translate('connectedap.wizard.addschemainsttype')}"
+    ><mwc-checkbox
+      id="typeRestriction"
+      ?checked=${hasTypeRestriction(element)}
+    ></mwc-checkbox>
+  </mwc-formfield>`;
+}
+
+function hasTypeRestriction(element: Element): boolean {
+  return Array.from(element.querySelectorAll('Address > P'))
+    .filter(p => isPublic(p))
+    .some(pType => pType.getAttribute('xsi:type'));
+}

src/translations/en.ts

@@ -403,11 +403,11 @@ export const en = {
           },
           redundancyGroupNumberLabel: 'Redundancy Group number',
           addedLRedundancyGroup:
-            'Added Redundancy Group {{ rGNumber }} from SubNetwork[name="{{ subNetworkName }}"] > ConnectedAP[apName="{{ apName }}"][iedName="{{ iedName }}"]',
+            'Added Redundancy Group {{ rGNumber }} from SubNetwork (name="{{ subNetworkName }}") and ConnectedAP (AccessPoint Name="{{ apName }}", IED Name="{{ iedName }}")',
           editedRedundancyGroup:
-            'Edited Redundancy Group {{ rGNumber }} from SubNetwork[name="{{ subNetworkName }}"] > ConnectedAP[apName="{{ apName }}"][iedName="{{ iedName }}"]',
+            'Edited Redundancy Group {{ rGNumber }} from SubNetwork (name="{{ subNetworkName }}") and ConnectedAP (AccessPoint Name="{{ apName }}", IED Name="{{ iedName }}")',
           removedRedundancyGroup:
-            'Removed Redundancy Group {{ rGNumber }} from SubNetwork[name="{{ subNetworkName }}"] > ConnectedAP[apName="{{ apName }}"][iedName="{{ iedName }}"]',
+            'Removed Redundancy Group {{ rGNumber }} from SubNetwork (name="{{ subNetworkName }}") and ConnectedAP (AccessPoint Name="{{ apName }}", IED Name="{{ iedName }}")',
           logicLinkGroupTitle: 'Logic Links',
           noLogicLinksAvailable: 'No Logic Links available',
           addLogicLink: 'Logic Link',
@@ -421,11 +421,11 @@ export const en = {
           },
           logicLinkNumberLabel: 'Logic Link number',
           addedLogicLink:
-            'Added Logic Link group from SubNetwork[name="{{ subNetworkName }}"] > ConnectedAP[apName="{{ apName }}"][iedName="{{ iedName }}"]',
+            'Added Logic Link group to SubNetwork (name="{{ subNetworkName }}") and ConnectedAP (AccessPoint Name="{{ apName }}", IED Name="{{ iedName }}")',
           editedLogicLink:
-            'Edited Logic Link group from SubNetwork[name="{{ subNetworkName }}"] > ConnectedAP[apName="{{ apName }}"][iedName="{{ iedName }}"]',
+            'Edited Logic Link group from SubNetwork (name="{{ subNetworkName }}") and ConnectedAP (AccessPoint Name="{{ apName }}", IED Name="{{ iedName }}")',
           removedLogicLink:
-            'Removed Logic Link group from SubNetwork[name="{{ subNetworkName }}"] > ConnectedAP[apName="{{ apName }}"][iedName="{{ iedName }}"]',
+            'Removed Logic Link group from SubNetwork (name="{{ subNetworkName }}") and ConnectedAP (AccessPoint Name="{{ apName }}", IED Name="{{ iedName }}")',
         },
       },
     },