fix: Connected AP wizard element order (openscd#1703)

fix: Settings addon translations

Author: clepski

packages/openscd/src/addons/Settings.ts

@@ -7,7 +7,7 @@ import {
   LitElement,
   css,
 } from 'lit-element';
-import { get, registerTranslateConfig, Strings, use } from 'lit-translate';
+import { get, translate, registerTranslateConfig, Strings, use } from 'lit-translate';
 
 import '@material/mwc-button';
 import '@material/mwc-dialog';
@@ -204,7 +204,7 @@ export class OscdSettings extends LitElement {
         @change="${(evt: Event) => this.uploadNsdocFile(evt)}}"
       />
       <mwc-button
-        label="${get('settings.selectFileButton')}"
+        label="${translate('settings.selectFileButton')}"
         id="selectFileButton"
         @click=${() => {
           const input = <HTMLInputElement | null>(
@@ -360,39 +360,39 @@ export class OscdSettings extends LitElement {
   render(): TemplateResult {
     return html`<mwc-dialog
         id="settings"
-        heading="${get('settings.title')}"
+        heading="${translate('settings.title')}"
         @closing=${this.onClosing}
       >
         <form>
           <mwc-select
             fixedMenuPosition
             id="language"
             icon="language"
-            label="${get('settings.language')}"
+            label="${translate('settings.language')}"
           >
             ${Object.keys(this.languageConfig.languages).map(
               lang =>
                 html`<mwc-list-item
                   graphic="icon"
                   value="${lang}"
                   ?selected=${lang === this.settings.language}
-                  >${get(`settings.languages.${lang}`)}</mwc-list-item
+                  >${translate(`settings.languages.${lang}`)}</mwc-list-item
                 >`
             )}
           </mwc-select>
-          <mwc-formfield label="${get('settings.dark')}">
+          <mwc-formfield label="${translate('settings.dark')}">
             <mwc-switch
               id="dark"
               ?checked=${this.settings.theme === 'dark'}
             ></mwc-switch>
           </mwc-formfield>
-          <mwc-formfield label="${get('settings.mode')}">
+          <mwc-formfield label="${translate('settings.mode')}">
             <mwc-switch
               id="mode"
               ?checked=${this.settings.mode === 'pro'}
             ></mwc-switch>
           </mwc-formfield>
-          <mwc-formfield label="${get('settings.showieds')}">
+          <mwc-formfield label="${translate('settings.showieds')}">
             <mwc-switch
               id="showieds"
               ?checked=${this.settings.showieds === 'on'}
@@ -402,7 +402,7 @@ export class OscdSettings extends LitElement {
         <wizard-divider></wizard-divider>
         ${this.nsdUploadButton
           ? html`<section id="shownsdbutton">
-              <h3>${get('settings.loadNsdTranslations')}</h3>
+              <h3>${translate('settings.loadNsdTranslations')}</h3>
               ${this.renderFileSelect()}
             </section>`
           : html``}
@@ -413,22 +413,22 @@ export class OscdSettings extends LitElement {
           ${this.renderNsdocItem('IEC 61850-8-1')}
         </mwc-list>
         <mwc-button slot="secondaryAction" dialogAction="close">
-          ${get('cancel')}
+          ${translate('cancel')}
         </mwc-button>
         <mwc-button
           style="--mdc-theme-primary: var(--mdc-theme-error)"
           slot="secondaryAction"
           dialogAction="reset"
         >
-          ${get('reset')}
+          ${translate('reset')}
         </mwc-button>
         <mwc-button
           icon="save"
           trailingIcon
           slot="primaryAction"
           dialogAction="save"
         >
-          ${get('save')}
+          ${translate('save')}
         </mwc-button>
       </mwc-dialog>
       <slot></slot>

packages/plugins/src/wizards/connectedap.ts

@@ -278,20 +278,20 @@ function createConnectedApAction(parent: Element): WizardActor {
         apName,
       });
       actions.push({ new: { parent, element: connectedAp } });
-      actions.push(
-        ...initSMVElements(doc, connectedAp, {
-          macGeneratorSmv,
-          appidGeneratorSmv,
-          unconnectedSampledValueControl,
-        })
-      );
       actions.push(
         ...initGSEElements(doc, connectedAp, {
           macGeneratorGse,
           appidGeneratorGse,
           unconnectedGseControl,
         })
       );
+      actions.push(
+        ...initSMVElements(doc, connectedAp, {
+          macGeneratorSmv,
+          appidGeneratorSmv,
+          unconnectedSampledValueControl,
+        })
+      );
 
       return { title: 'Added ConnectedAP', actions };
     });