refactor(editors/substation): move zeroline-pane back to editor

src/editors/IED.ts

@@ -4,8 +4,8 @@ import '@material/mwc-fab';
 import '@material/mwc-select';
 import '@material/mwc-list/mwc-list-item';
 
-import '../zeroline-pane.js';
 import './ied/ied-container.js'
+import './substation/zeroline-pane.js';
 
 import { translate } from 'lit-translate';
 import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';

src/editors/Substation.ts

@@ -3,7 +3,7 @@ import { get } from 'lit-translate';
 
 import '@material/mwc-fab';
 
-import '../zeroline-pane.js';
+import './substation/zeroline-pane.js';
 import { newWizardEvent } from '../foundation.js';
 import { wizards } from '../wizards/wizard-library.js';
 

src/editors/singlelinediagram/sld-drawing.ts

@@ -1,5 +1,5 @@
 import { getDescriptionAttribute, getNameAttribute, identity } from '../../foundation.js';
-import { getIcon } from '../../zeroline/foundation.js';
+import { getIcon } from '../substation/foundation.js';
 import {
   connectivityNodeIcon,
   editIcon,

src/zeroline/bay-editor.ts → src/editors/substation/bay-editor.ts

@@ -14,7 +14,7 @@ import { Menu } from '@material/mwc-menu';
 import { IconButton } from '@material/mwc-icon-button';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
 
-import '../action-pane.js';
+import '../../action-pane.js';
 import './ied-editor.js';
 import './conducting-equipment-editor.js';
 import './powertransformer-editor.js';
@@ -25,8 +25,8 @@ import {
   newWizardEvent,
   SCLTag,
   tags,
-} from '../foundation.js';
-import { emptyWizard, wizards } from '../wizards/wizard-library.js';
+} from '../../foundation.js';
+import { emptyWizard, wizards } from '../../wizards/wizard-library.js';
 import { cloneSubstationElement, startMove, styles } from './foundation.js';
 
 function childTags(element: Element | null | undefined): SCLTag[] {

src/zeroline/conducting-equipment-editor.ts → src/editors/substation/conducting-equipment-editor.ts

@@ -9,11 +9,11 @@ import {
 
 import '@material/mwc-fab';
 
-import '../action-icon.js';
+import '../../action-icon.js';
 import { startMove, getIcon } from './foundation.js';
-import { newActionEvent, newWizardEvent } from '../foundation.js';
+import { newActionEvent, newWizardEvent } from '../../foundation.js';
 import { BayEditor } from './bay-editor.js';
-import { wizards } from '../wizards/wizard-library.js';
+import { wizards } from '../../wizards/wizard-library.js';
 
 /** [[`SubstationEditor`]] subeditor for a `ConductingEquipment` element. */
 @customElement('conducting-equipment-editor')
@@ -68,7 +68,8 @@ export class ConductingEquipmentEditor extends LitElement {
       <mwc-fab
         slot="action"
         mini
-        @click="${() => startMove(this, ConductingEquipmentEditor, [BayEditor])}"
+        @click="${() =>
+          startMove(this, ConductingEquipmentEditor, [BayEditor])}"
         icon="forward"
       ></mwc-fab>
       <mwc-fab

src/zeroline/foundation.ts → src/editors/substation/foundation.ts

@@ -1,19 +1,19 @@
 import { css, TemplateResult } from 'lit-element';
 
 import './function-editor.js';
-import { newActionEvent, isPublic } from '../foundation.js';
+import { newActionEvent, isPublic } from '../../foundation.js';
 import {
   circuitBreakerIcon,
   disconnectorIcon,
   currentTransformerIcon,
   voltageTransformerIcon,
   earthSwitchIcon,
   generalConductingEquipmentIcon,
-} from '../icons/icons.js';
+} from '../../icons/icons.js';
 import { BayEditor } from './bay-editor.js';
 import { SubstationEditor } from './substation-editor.js';
 import { VoltageLevelEditor } from './voltage-level-editor.js';
-import { typeStr } from '../wizards/conductingequipment.js';
+import { typeStr } from '../../wizards/conductingequipment.js';
 
 function containsReference(element: Element, iedName: string): boolean {
   return Array.from(element.getElementsByTagName('LNode'))

src/zeroline/function-editor.ts → src/editors/substation/function-editor.ts

@@ -7,9 +7,9 @@ import {
   state,
 } from 'lit-element';
 
-import '../action-pane.js';
+import '../../action-pane.js';
 import './subfunction-editor.js';
-import { getChildElementsByTagName } from '../foundation.js';
+import { getChildElementsByTagName } from '../../foundation.js';
 
 /** Pane rendering `Function` element with its children */
 @customElement('function-editor')

src/zeroline/ied-editor.ts → src/editors/substation/ied-editor.ts

@@ -11,14 +11,14 @@ import '@material/mwc-fab';
 import '@material/mwc-icon';
 import { Fab } from '@material/mwc-fab';
 
-import '../action-icon.js';
-import { createClientLnWizard } from '../wizards/clientln.js';
-import { gooseIcon, smvIcon, reportIcon } from '../icons/icons.js';
-import { wizards } from '../wizards/wizard-library.js';
-import { newWizardEvent } from '../foundation.js';
-import { selectGseControlWizard } from '../wizards/gsecontrol.js';
-import { selectSampledValueControlWizard } from '../wizards/sampledvaluecontrol.js';
-import { selectReportControlWizard } from '../wizards/reportcontrol.js';
+import '../../action-icon.js';
+import { createClientLnWizard } from '../../wizards/clientln.js';
+import { gooseIcon, smvIcon, reportIcon } from '../../icons/icons.js';
+import { wizards } from '../../wizards/wizard-library.js';
+import { newWizardEvent } from '../../foundation.js';
+import { selectGseControlWizard } from '../../wizards/gsecontrol.js';
+import { selectSampledValueControlWizard } from '../../wizards/sampledvaluecontrol.js';
+import { selectReportControlWizard } from '../../wizards/reportcontrol.js';
 
 /** [[`SubstationEditor`]] subeditor for a child-less `IED` element. */
 @customElement('ied-editor')

src/zeroline/powertransformer-editor.ts → src/editors/substation/powertransformer-editor.ts

@@ -10,14 +10,14 @@ import {
 import '@material/mwc-fab';
 import '@material/mwc-icon';
 
-import '../action-icon.js';
-import { powerTransformerTwoWindingIcon } from '../icons/icons.js';
-import { wizards } from '../wizards/wizard-library.js';
-import { newActionEvent, newWizardEvent } from '../foundation.js';
-import { startMove } from "./foundation.js";
-import { SubstationEditor } from "./substation-editor.js";
-import { BayEditor } from "./bay-editor.js";
-import { VoltageLevelEditor } from "./voltage-level-editor.js";
+import '../../action-icon.js';
+import { powerTransformerTwoWindingIcon } from '../../icons/icons.js';
+import { wizards } from '../../wizards/wizard-library.js';
+import { newActionEvent, newWizardEvent } from '../../foundation.js';
+import { startMove } from './foundation.js';
+import { SubstationEditor } from './substation-editor.js';
+import { BayEditor } from './bay-editor.js';
+import { VoltageLevelEditor } from './voltage-level-editor.js';
 
 /** [[`SubstationEditor`]] subeditor for a child-less `PowerTransformer` element. */
 @customElement('powertransformer-editor')
@@ -56,7 +56,10 @@ export class PowerTransformerEditor extends LitElement {
   }
 
   render(): TemplateResult {
-    return html`<action-icon label="${this.name}" .icon="${powerTransformerTwoWindingIcon}">
+    return html`<action-icon
+      label="${this.name}"
+      .icon="${powerTransformerTwoWindingIcon}"
+    >
       <mwc-fab
         slot="action"
         class="edit"
@@ -74,7 +77,11 @@ export class PowerTransformerEditor extends LitElement {
         slot="action"
         mini
         @click="${() => {
-          startMove(this, PowerTransformerEditor, [SubstationEditor, VoltageLevelEditor, BayEditor])
+          startMove(this, PowerTransformerEditor, [
+            SubstationEditor,
+            VoltageLevelEditor,
+            BayEditor,
+          ]);
         }}"
         icon="forward"
       ></mwc-fab>

src/zeroline/subfunction-editor.ts → src/editors/substation/subfunction-editor.ts

@@ -7,9 +7,9 @@ import {
   state,
 } from 'lit-element';
 
-import '../action-pane.js';
+import '../../action-pane.js';
 import './subfunction-editor.js';
-import { getChildElementsByTagName } from '../foundation.js';
+import { getChildElementsByTagName } from '../../foundation.js';
 
 /** Pane rendering `SubFunction` element with its children */
 @customElement('subfunction-editor')

src/zeroline/substation-editor.ts → src/editors/substation/substation-editor.ts

@@ -14,7 +14,7 @@ import { Menu } from '@material/mwc-menu';
 import { IconButton } from '@material/mwc-icon-button';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
 
-import '../action-pane.js';
+import '../../action-pane.js';
 import './ied-editor.js';
 import './powertransformer-editor.js';
 import './voltage-level-editor.js';
@@ -24,8 +24,8 @@ import {
   newWizardEvent,
   SCLTag,
   tags,
-} from '../foundation.js';
-import { emptyWizard, wizards } from '../wizards/wizard-library.js';
+} from '../../foundation.js';
+import { emptyWizard, wizards } from '../../wizards/wizard-library.js';
 import {
   cloneSubstationElement,
   selectors,

src/zeroline/voltage-level-editor.ts → src/editors/substation/voltage-level-editor.ts

@@ -14,7 +14,7 @@ import { Menu } from '@material/mwc-menu';
 import { IconButton } from '@material/mwc-icon-button';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
 
-import '../action-pane.js';
+import '../../action-pane.js';
 import './bay-editor.js';
 import './ied-editor.js';
 import './powertransformer-editor.js';
@@ -30,10 +30,10 @@ import {
   newWizardEvent,
   SCLTag,
   tags,
-} from '../foundation.js';
+} from '../../foundation.js';
 
 import { SubstationEditor } from './substation-editor.js';
-import { emptyWizard, wizards } from '../wizards/wizard-library.js';
+import { emptyWizard, wizards } from '../../wizards/wizard-library.js';
 
 function childTags(element: Element | null | undefined): SCLTag[] {
   if (!element) return [];

src/zeroline-pane.ts → src/editors/substation/zeroline-pane.ts

@@ -14,17 +14,17 @@ import '@material/mwc-icon-button-toggle';
 import { IconButton } from '@material/mwc-icon-button';
 import { IconButtonToggle } from '@material/mwc-icon-button-toggle';
 
-import './zeroline/substation-editor.js';
-import './zeroline/ied-editor.js';
-import { communicationMappingWizard } from './wizards/commmap-wizards.js';
-import { gooseIcon, smvIcon, reportIcon } from './icons/icons.js';
-import { isPublic, newWizardEvent } from './foundation.js';
-import { selectGseControlWizard } from './wizards/gsecontrol.js';
-import { wizards } from './wizards/wizard-library.js';
-import { getAttachedIeds } from './zeroline/foundation.js';
-import { selectSampledValueControlWizard } from './wizards/sampledvaluecontrol.js';
-import { Settings } from './Setting.js';
-import { selectReportControlWizard } from './wizards/reportcontrol.js';
+import './substation-editor.js';
+import './ied-editor.js';
+import { communicationMappingWizard } from '../../wizards/commmap-wizards.js';
+import { gooseIcon, smvIcon, reportIcon } from '../../icons/icons.js';
+import { isPublic, newWizardEvent } from '../../foundation.js';
+import { selectGseControlWizard } from '../../wizards/gsecontrol.js';
+import { wizards } from '../../wizards/wizard-library.js';
+import { getAttachedIeds } from './foundation.js';
+import { selectSampledValueControlWizard } from '../../wizards/sampledvaluecontrol.js';
+import { Settings } from '../../Setting.js';
+import { selectReportControlWizard } from '../../wizards/reportcontrol.js';
 
 function shouldShowIEDs(): boolean {
   return localStorage.getItem('showieds') === 'on';

test/integration/zeroline/bay-editor-wizarding-editing.test.ts → test/integration/editors/substation/bay-editor-wizarding-editing.test.ts

@@ -1,12 +1,12 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
-import '../../mock-wizard-editor.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
-import '../../../src/zeroline/bay-editor.js';
-import { BayEditor } from '../../../src/zeroline/bay-editor.js';
+import '../../../../src/editors/substation/bay-editor.js';
+import { BayEditor } from '../../../../src/editors/substation/bay-editor.js';
 import { Select } from '@material/mwc-select';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
 
 describe('bay-editor wizarding editing integration', () => {
   describe('edit wizard', () => {

test/integration/zeroline/bay-editor-wizarding.test.ts → test/integration/editors/substation/bay-editor-wizarding.test.ts

@@ -1,11 +1,11 @@
 import { fixture, html, expect } from '@open-wc/testing';
 import fc from 'fast-check';
 
-import '../../mock-wizard.js';
-import { MockWizard } from '../../mock-wizard.js';
+import '../../../mock-wizard.js';
+import { MockWizard } from '../../../mock-wizard.js';
 
-import '../../../src/zeroline/bay-editor.js';
-import { regExp, regexString } from '../../foundation.js';
+import '../../../../src/editors/substation/bay-editor.js';
+import { regExp, regexString } from '../../../foundation.js';
 
 describe('bay-editor wizarding integration', () => {
   let doc: XMLDocument;

test/integration/zeroline/conducting-equipment-editor-wizarding-editing.test.ts → test/integration/editors/substation/conducting-equipment-editor-wizarding-editing.test.ts

@@ -1,11 +1,11 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
-import '../../mock-wizard-editor.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
-import '../../../src/zeroline/conducting-equipment-editor.js';
-import { ConductingEquipmentEditor } from '../../../src/zeroline/conducting-equipment-editor.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
+import '../../../../src/editors/substation/conducting-equipment-editor.js';
+import { ConductingEquipmentEditor } from '../../../../src/editors/substation/conducting-equipment-editor.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
 
 describe('conducting-equipment-editor wizarding editing integration', () => {
   describe('edit wizard', () => {

test/integration/zeroline/conducting-equipment-editor-wizarding.test.ts → test/integration/editors/substation/conducting-equipment-editor-wizarding.test.ts

@@ -1,11 +1,11 @@
 import { fixture, html, expect } from '@open-wc/testing';
 import fc from 'fast-check';
 
-import '../../mock-wizard.js';
-import { MockWizard } from '../../mock-wizard.js';
+import '../../../mock-wizard.js';
+import { MockWizard } from '../../../mock-wizard.js';
 
-import '../../../src/zeroline/conducting-equipment-editor.js';
-import { regexString, regExp } from '../../foundation.js';
+import '../../../../src/editors/substation/conducting-equipment-editor.js';
+import { regexString, regExp } from '../../../foundation.js';
 
 describe('conducting-equipment-editor wizarding integration', () => {
   let doc: XMLDocument;

test/integration/zeroline/ied-editor-wizarding-integration.test.ts → test/integration/editors/substation/ied-editor-wizarding-integration.test.ts

@@ -1,11 +1,11 @@
 import { expect, fixture, html } from '@open-wc/testing';
 
-import '../../mock-wizard-editor.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
-import '../../../src/zeroline/ied-editor.js';
-import { FilteredList } from '../../../src/filtered-list.js';
-import { IedEditor } from '../../../src/zeroline/ied-editor.js';
+import '../../../../src/editors/substation/ied-editor.js';
+import { FilteredList } from '../../../../src/filtered-list.js';
+import { IedEditor } from '../../../../src/editors/substation/ied-editor.js';
 
 describe('IED editor component wizarding editing integration', () => {
   let doc: XMLDocument;

test/integration/zeroline/substation-editor-wizarding-editing.test.ts → test/integration/editors/substation/substation-editor-wizarding-editing.test.ts

@@ -1,11 +1,11 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
-import '../../mock-wizard-editor.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
-import '../../../src/zeroline/substation-editor.js';
-import { SubstationEditor } from '../../../src/zeroline/substation-editor.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
+import '../../../../src/editors/substation/substation-editor.js';
+import { SubstationEditor } from '../../../../src/editors/substation/substation-editor.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
 
 describe('substation-editor wizarding editing integration', () => {
   describe('edit wizard', () => {

test/integration/zeroline/substation-editor-wizarding.test.ts → test/integration/editors/substation/substation-editor-wizarding.test.ts

@@ -1,11 +1,11 @@
 import { fixture, html, expect } from '@open-wc/testing';
 import fc from 'fast-check';
 
-import '../../mock-wizard.js';
-import { MockWizard } from '../../mock-wizard.js';
+import '../../../mock-wizard.js';
+import { MockWizard } from '../../../mock-wizard.js';
 
-import '../../../src/zeroline/substation-editor.js';
-import { regExp, regexString } from '../../foundation.js';
+import '../../../../src/editors/substation/substation-editor.js';
+import { regExp, regexString } from '../../../foundation.js';
 
 describe('substation-editor wizarding integration', () => {
   let doc: XMLDocument;

test/integration/zeroline/voltage-level-editor-wizarding-editing.test.ts → test/integration/editors/substation/voltage-level-editor-wizarding-editing.test.ts

@@ -1,11 +1,11 @@
 import { fixture, html, expect } from '@open-wc/testing';
 
-import '../../mock-wizard-editor.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
 
-import '../../../src/zeroline/voltage-level-editor.js';
-import { VoltageLevelEditor } from '../../../src/zeroline/voltage-level-editor.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
+import '../../../../src/editors/substation/voltage-level-editor.js';
+import { VoltageLevelEditor } from '../../../../src/editors/substation/voltage-level-editor.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
 
 describe('voltage-level-editor wizarding editing integration', () => {
   describe('edit wizard', () => {