Skip to content

Commit ef060c9

Browse files
stee-restee-re
committed
feat: migrate editor to use EditV2 (via eventing)
Release-As: 0.0.1
1 parent 6376ed2 commit ef060c9

19 files changed

+91
-91
lines changed

‎substation/base-substation-element-editor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { IconButton } from '@material/mwc-icon-button';
88
import type { ListItem } from '@material/mwc-list/mwc-list-item.js';
99
import type { Menu } from '@material/mwc-menu';
1010

11-
import { newEditEvent } from '@omicronenergy/oscd-api/utils.js';
11+
import { newEditEventV2 } from '@omicronenergy/oscd-api/utils.js';
1212
import { getChildren } from '@openenergytools/scl-lib';
1313

1414
import { newCreateWizardEvent, newEditWizardEvent } from '../foundation.js';
@@ -53,7 +53,7 @@ export default class BaseSubstationElementEditor extends LitElement {
5353

5454
removeElement(): void {
5555
this.dispatchEvent(
56-
newEditEvent({
56+
newEditEventV2({
5757
node: this.element,
5858
}),
5959
);

‎substation/bay-editor.spec.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ describe('Component for SCL element Bay ', () => {
2424
);
2525

2626
eventSpy = spy();
27-
window.addEventListener('oscd-edit', eventSpy);
27+
window.addEventListener('oscd-edit-v2', eventSpy);
2828
window.addEventListener('oscd-edit-wizard-request', eventSpy);
2929
window.addEventListener('oscd-create-wizard-request', eventSpy);
3030
});
3131

3232
afterEach(() => {
33-
window.removeEventListener('oscd-edit', eventSpy);
33+
window.removeEventListener('oscd-edit-v2', eventSpy);
3434
window.removeEventListener('oscd-edit-wizard-request', eventSpy);
3535
window.removeEventListener('oscd-create-wizard-request', eventSpy);
3636
eventSpy.resetHistory();
@@ -68,8 +68,8 @@ describe('Component for SCL element Bay ', () => {
6868

6969
const event = eventSpy.args[0][0];
7070

71-
expect(event.type).to.equal('oscd-edit');
72-
expect(event.detail).to.satisfy(isRemove);
73-
expect(event.detail.node).to.equal(bay);
71+
expect(event.type).to.equal('oscd-edit-v2');
72+
expect(event.detail.edit).to.satisfy(isRemove);
73+
expect(event.detail.edit.node).to.equal(bay);
7474
});
7575
});

‎substation/conducting-equipment-editor.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('Component for SCL element ConductingEquipment ', () => {
2828
);
2929

3030
eventSpy = spy();
31-
window.addEventListener('oscd-edit', eventSpy);
31+
window.addEventListener('oscd-edit-v2', eventSpy);
3232
window.addEventListener('oscd-edit-wizard-request', eventSpy);
3333
window.addEventListener('oscd-create-wizard-request', eventSpy);
3434
});
@@ -65,9 +65,9 @@ describe('Component for SCL element ConductingEquipment ', () => {
6565

6666
const event = eventSpy.args[0][0];
6767

68-
expect(event.type).to.equal('oscd-edit');
69-
expect(event.detail).to.satisfy(isRemove);
70-
expect(event.detail.node).to.equal(condEq);
68+
expect(event.type).to.equal('oscd-edit-v2');
69+
expect(event.detail.edit).to.satisfy(isRemove);
70+
expect(event.detail.edit.node).to.equal(condEq);
7171
});
7272
});
7373

@@ -84,7 +84,7 @@ describe('Component for SCL element ConductingEquipment ', () => {
8484
);
8585

8686
eventSpy = spy();
87-
window.addEventListener('oscd-edit', eventSpy);
87+
window.addEventListener('oscd-edit-v2', eventSpy);
8888
window.addEventListener('oscd-edit-wizard-request', eventSpy);
8989
});
9090

@@ -105,9 +105,9 @@ describe('Component for SCL element ConductingEquipment ', () => {
105105

106106
const event = eventSpy.args[0][0];
107107

108-
expect(event.type).to.equal('oscd-edit');
109-
expect(event.detail).to.satisfy(isRemove);
110-
expect(event.detail.node).to.equal(condEq);
108+
expect(event.type).to.equal('oscd-edit-v2');
109+
expect(event.detail.edit).to.satisfy(isRemove);
110+
expect(event.detail.edit.node).to.equal(condEq);
111111
});
112112
});
113113
});

‎substation/eq-function-editor.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('Component for SCL element EqSubFunction ', () => {
2424
);
2525

2626
eventSpy = spy();
27-
window.addEventListener('oscd-edit', eventSpy);
27+
window.addEventListener('oscd-edit-v2', eventSpy);
2828
window.addEventListener('oscd-edit-wizard-request', eventSpy);
2929
window.addEventListener('oscd-create-wizard-request', eventSpy);
3030
});
@@ -61,8 +61,8 @@ describe('Component for SCL element EqSubFunction ', () => {
6161

6262
const event = eventSpy.args[0][0];
6363

64-
expect(event.type).to.equal('oscd-edit');
65-
expect(event.detail).to.satisfy(isRemove);
66-
expect(event.detail.node).to.equal(eqFun);
64+
expect(event.type).to.equal('oscd-edit-v2');
65+
expect(event.detail.edit).to.satisfy(isRemove);
66+
expect(event.detail.edit.node).to.equal(eqFun);
6767
});
6868
});

‎substation/eq-sub-function-editor.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('Component for SCL element EqSubFunction ', () => {
2626
);
2727

2828
eventSpy = spy();
29-
window.addEventListener('oscd-edit', eventSpy);
29+
window.addEventListener('oscd-edit-v2', eventSpy);
3030
window.addEventListener('oscd-edit-wizard-request', eventSpy);
3131
window.addEventListener('oscd-create-wizard-request', eventSpy);
3232
});
@@ -63,8 +63,8 @@ describe('Component for SCL element EqSubFunction ', () => {
6363

6464
const event = eventSpy.args[0][0];
6565

66-
expect(event.type).to.equal('oscd-edit');
67-
expect(event.detail).to.satisfy(isRemove);
68-
expect(event.detail.node).to.equal(subFunc);
66+
expect(event.type).to.equal('oscd-edit-v2');
67+
expect(event.detail.edit).to.satisfy(isRemove);
68+
expect(event.detail.edit.node).to.equal(subFunc);
6969
});
7070
});

‎substation/function-editor.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('Component for SCL element Function', () => {
2424
);
2525

2626
eventSpy = spy();
27-
window.addEventListener('oscd-edit', eventSpy);
27+
window.addEventListener('oscd-edit-v2', eventSpy);
2828
window.addEventListener('oscd-edit-wizard-request', eventSpy);
2929
window.addEventListener('oscd-create-wizard-request', eventSpy);
3030
});
@@ -61,8 +61,8 @@ describe('Component for SCL element Function', () => {
6161

6262
const event = eventSpy.args[0][0];
6363

64-
expect(event.type).to.equal('oscd-edit');
65-
expect(event.detail).to.satisfy(isRemove);
66-
expect(event.detail.node).to.equal(func);
64+
expect(event.type).to.equal('oscd-edit-v2');
65+
expect(event.detail.edit).to.satisfy(isRemove);
66+
expect(event.detail.edit.node).to.equal(func);
6767
});
6868
});

‎substation/general-equipment-editor.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('Component for SCL element GeneralEquipment ', () => {
2828
);
2929

3030
eventSpy = spy();
31-
window.addEventListener('oscd-edit', eventSpy);
31+
window.addEventListener('oscd-edit-v2', eventSpy);
3232
window.addEventListener('oscd-edit-wizard-request', eventSpy);
3333
window.addEventListener('oscd-create-wizard-request', eventSpy);
3434
});
@@ -65,9 +65,9 @@ describe('Component for SCL element GeneralEquipment ', () => {
6565

6666
const event = eventSpy.args[0][0];
6767

68-
expect(event.type).to.equal('oscd-edit');
69-
expect(event.detail).to.satisfy(isRemove);
70-
expect(event.detail.node).to.equal(eqFun);
68+
expect(event.type).to.equal('oscd-edit-v2');
69+
expect(event.detail.edit).to.satisfy(isRemove);
70+
expect(event.detail.edit.node).to.equal(eqFun);
7171
});
7272
});
7373

@@ -84,7 +84,7 @@ describe('Component for SCL element GeneralEquipment ', () => {
8484
);
8585

8686
eventSpy = spy();
87-
window.addEventListener('oscd-edit', eventSpy);
87+
window.addEventListener('oscd-edit-v2', eventSpy);
8888
window.addEventListener('oscd-edit-wizard-request', eventSpy);
8989
window.addEventListener('oscd-create-wizard-request', eventSpy);
9090
});
@@ -106,9 +106,9 @@ describe('Component for SCL element GeneralEquipment ', () => {
106106

107107
const event = eventSpy.args[0][0];
108108

109-
expect(event.type).to.equal('oscd-edit');
110-
expect(event.detail).to.satisfy(isRemove);
111-
expect(event.detail.node).to.equal(eqFun);
109+
expect(event.type).to.equal('oscd-edit-v2');
110+
expect(event.detail.edit).to.satisfy(isRemove);
111+
expect(event.detail.edit.node).to.equal(eqFun);
112112
});
113113
});
114114
});

‎substation/l-node-editor.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('Component for SCL element LNode', () => {
2424
);
2525

2626
eventSpy = spy();
27-
window.addEventListener('oscd-edit', eventSpy);
27+
window.addEventListener('oscd-edit-v2', eventSpy);
2828
window.addEventListener('oscd-edit-wizard-request', eventSpy);
2929
});
3030

@@ -45,8 +45,8 @@ describe('Component for SCL element LNode', () => {
4545

4646
const event = eventSpy.args[0][0];
4747

48-
expect(event.type).to.equal('oscd-edit');
49-
expect(event.detail).to.satisfy(isRemove);
50-
expect(event.detail.node).to.equal(lNode);
48+
expect(event.type).to.equal('oscd-edit-v2');
49+
expect(event.detail.edit).to.satisfy(isRemove);
50+
expect(event.detail.edit.node).to.equal(lNode);
5151
});
5252
});

‎substation/line-editor.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('Component for SCL element Line', () => {
2424
);
2525

2626
eventSpy = spy();
27-
window.addEventListener('oscd-edit', eventSpy);
27+
window.addEventListener('oscd-edit-v2', eventSpy);
2828
window.addEventListener('oscd-edit-wizard-request', eventSpy);
2929
window.addEventListener('oscd-create-wizard-request', eventSpy);
3030
});
@@ -61,8 +61,8 @@ describe('Component for SCL element Line', () => {
6161

6262
const event = eventSpy.args[0][0];
6363

64-
expect(event.type).to.equal('oscd-edit');
65-
expect(event.detail).to.satisfy(isRemove);
66-
expect(event.detail.node).to.equal(subFunc);
64+
expect(event.type).to.equal('oscd-edit-v2');
65+
expect(event.detail.edit).to.satisfy(isRemove);
66+
expect(event.detail.edit.node).to.equal(subFunc);
6767
});
6868
});

‎substation/power-transformer-editor.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ describe('Component for SCL element PowerTransformer', () => {
2626
);
2727

2828
eventSpy = spy();
29-
window.addEventListener('oscd-edit', eventSpy);
29+
window.addEventListener('oscd-edit-v2', eventSpy);
3030
window.addEventListener('oscd-edit-wizard-request', eventSpy);
3131
window.addEventListener('oscd-create-wizard-request', eventSpy);
3232
});
@@ -63,8 +63,8 @@ describe('Component for SCL element PowerTransformer', () => {
6363

6464
const event = eventSpy.args[0][0];
6565

66-
expect(event.type).to.equal('oscd-edit');
67-
expect(event.detail).to.satisfy(isRemove);
68-
expect(event.detail.node).to.equal(pTrans);
66+
expect(event.type).to.equal('oscd-edit-v2');
67+
expect(event.detail.edit).to.satisfy(isRemove);
68+
expect(event.detail.edit.node).to.equal(pTrans);
6969
});
7070
});

0 commit comments

Comments
 (0)