Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(zeroline): show SampledValueControl for IED and whole project #477

Merged
merged 3 commits into from
Jan 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/translations/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ export const de: Translations = {
iedsloading: 'IEDs werden geladen...',
commmap: 'Kommunikationszuordnung',
gsecontrol: 'GOOSEs anzeigen',
smvcontrol: 'Sampled Values anzeigen',
},
editing: {
created: '{{ name }} hinzugefügt',
Expand Down Expand Up @@ -162,7 +163,7 @@ export const de: Translations = {
searchHelper: 'IED auswählen',
searchHelperDesc: '({{description}})',
missing: 'Kein IED vorhanden',
toggleChildElements: "???"
JakobVogelsang marked this conversation as resolved.
Show resolved Hide resolved
toggleChildElements: '???',
},
powertransformer: {
wizard: {
Expand Down
9 changes: 5 additions & 4 deletions src/translations/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export const en = {
iedsloading: 'Loading IEDs...',
commmap: 'Communication mapping',
gsecontrol: 'Show all GOOSEs',
smvcontrol: 'Show all Sampled Values',
},
editing: {
created: 'Added {{ name }}',
Expand Down Expand Up @@ -156,10 +157,10 @@ export const en = {
},
},
iededitor: {
searchHelper: "Select IED",
searchHelperDesc: "({{description}})",
searchHelper: 'Select IED',
searchHelperDesc: '({{description}})',
missing: 'No IED',
toggleChildElements: "Toggle child elements"
toggleChildElements: 'Toggle child elements',
},
powertransformer: {
wizard: {
Expand All @@ -168,7 +169,7 @@ export const en = {
title: {
edit: 'Edit power transformer',
},
}
},
},
voltagelevel: {
name: 'Voltage level',
Expand Down
29 changes: 29 additions & 0 deletions src/wizards/sampledvaluecontrol.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { html } from 'lit-element';
import { get } from 'lit-translate';

import { identity, isPublic, Wizard } from '../foundation.js';

export function selectSampledValueControlWizard(element: Element): Wizard {
const smvControls = Array.from(
element.querySelectorAll('SampledValueControl')
).filter(isPublic);

return [
{
title: get('wizard.title.select', { tagName: 'SampledValueControl' }),
content: [
html`<filtered-list
>${smvControls.map(
smvControl =>
html`<mwc-list-item twoline value="${identity(smvControl)}"
><span>${smvControl.getAttribute('name')}</span
><span slot="secondary"
>${identity(smvControl)}</span
></mwc-list-item
>`
)}</filtered-list
>`,
],
},
];
}
16 changes: 15 additions & 1 deletion src/zeroline-pane.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ import './zeroline/substation-editor.js';
import './zeroline/ied-editor.js';
import { Settings } from './Setting.js';
import { communicationMappingWizard } from './wizards/commmap-wizards.js';
import { gooseIcon } from './icons.js';
import { gooseIcon, smvIcon } from './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';

function shouldShowIEDs(): boolean {
return localStorage.getItem('showieds') === 'on';
Expand All @@ -47,6 +48,7 @@ export class ZerolinePane extends LitElement {
@query('#commmap') commmap!: IconButton;
@query('#showieds') showieds!: IconButtonToggle;
@query('#gsecontrol') gsecontrol!: IconButton;
@query('#smvcontrol') smvcontrol!: IconButton;
@query('#createsubstation') createsubstation!: IconButton;

openCommunicationMapping(): void {
Expand All @@ -65,6 +67,11 @@ export class ZerolinePane extends LitElement {
if (wizard) this.dispatchEvent(newWizardEvent(wizard));
}

openSampledValueControlSelection(): void {
const wizard = selectSampledValueControlWizard(this.doc.documentElement);
if (wizard) this.dispatchEvent(newWizardEvent(wizard));
}

toggleShowIEDs(): void {
if (shouldShowIEDs()) setShowIEDs('off');
else setShowIEDs('on');
Expand Down Expand Up @@ -119,6 +126,13 @@ export class ZerolinePane extends LitElement {
>${gooseIcon}</mwc-icon-button
></abbr
>
<abbr title="${translate('zeroline.smvcontrol')}"
><mwc-icon-button
id="smvcontrol"
@click="${() => this.openSampledValueControlSelection()}"
>${smvIcon}</mwc-icon-button
></abbr
>
</nav>
</h1>
${this.renderIedContainer()}
Expand Down
14 changes: 13 additions & 1 deletion src/zeroline/ied-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ import { Fab } from '@material/mwc-fab';

import '../action-icon.js';
import { createClientLnWizard } from '../wizards/clientln.js';
import { gooseIcon } from '../icons.js';
import { gooseIcon, smvIcon } from '../icons.js';
import { newWizardEvent } from '../foundation.js';
import { selectGseControlWizard } from '../wizards/gsecontrol.js';
import { selectSampledValueControlWizard } from '../wizards/sampledvaluecontrol.js';

/** [[`SubstationEditor`]] subeditor for a child-less `IED` element. */
@customElement('ied-editor')
Expand Down Expand Up @@ -44,6 +45,11 @@ export class IedEditor extends LitElement {
if (wizard) this.dispatchEvent(newWizardEvent(wizard));
}

private openSmvControlSelection(): void {
const wizard = selectSampledValueControlWizard(this.element);
if (wizard) this.dispatchEvent(newWizardEvent(wizard));
}

render(): TemplateResult {
return html`<action-icon label="${this.name}" icon="developer_board"
><mwc-fab
Expand All @@ -59,6 +65,12 @@ export class IedEditor extends LitElement {
mini
@click="${() => this.openGseControlSelection()}"
><mwc-icon slot="icon">${gooseIcon}</mwc-icon></mwc-fab
><mwc-fab
slot="action"
class="selectsmv"
mini
@click="${() => this.openSmvControlSelection()}"
><mwc-icon slot="icon">${smvIcon}</mwc-icon></mwc-fab
></action-icon
> `;
}
Expand Down
14 changes: 14 additions & 0 deletions test/integration/zeroline-pane.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,20 @@ describe('zeroline-pane wizarding editing integration', () => {
);
});

it('opens selectSampledValueControlWizard for the complete SCL file', async () => {
zeroline.smvcontrol.click();
await parent.updateComplete;

expect(parent.wizardUI.dialog).to.exist;
const smvControlList = <FilteredList>(
parent.wizardUI.dialog?.querySelector('filtered-list')
);
await smvControlList.updateComplete;
expect(smvControlList.items.length).to.equal(
doc.querySelectorAll('SampledValueControl').length
);
});

it('add Substation element with createSubstationWizard', async () => {
expect(doc.querySelector('Substation[name="newSubstation"]')).to.not.exist;
zeroline.createsubstation.click();
Expand Down
Loading