Skip to content

Commit 5af0978

Browse files
author
Dennis Labordus
authored
Merge pull request #188 from com-pas/upstream-v0.23.0
Merge upstream changes from OpenSCD version V0.23.0
2 parents b3039bc + 4d9dbad commit 5af0978

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+4809
-1698
lines changed

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: Suggest an idea for this project
44
title: ''
55
labels: 'Kind: Enhancement'
66
assignees: ''
7-
87
---
98

109
**Is your feature request related to a problem? Please describe.**
@@ -21,3 +20,6 @@ Have a specific UI gesture in mind? If you want to discuss this first, please pr
2120

2221
**Additional information**
2322
For further reading including e.g parts of IEC 61850, Tissues or other sources that triggered your feature wish
23+
24+
**Test Files**
25+
If possible provide a file that can be used to test the feature and explain what is the outcome of the test with the test file

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [0.23.0](https://github.com/openscd/open-scd/compare/v0.22.0...v0.23.0) (2022-09-05)
6+
7+
8+
### Features
9+
10+
* **editors/cleanup:** Support DataTypeTemplates ([#701](https://github.com/openscd/open-scd/issues/701)) ([1db5169](https://github.com/openscd/open-scd/commits/1db5169b2139f4fa1b423f7f13b7609af3e0e058)), closes [#910](https://github.com/openscd/open-scd/issues/910)
11+
* **editors/subscriber-later-binding:** Add plugin with filterable FCDA list ([#945](https://github.com/openscd/open-scd/issues/945)) ([758da72](https://github.com/openscd/open-scd/commits/758da723193b069ca5772a9be25c4fc39659713b))
12+
* **wizard/dai:** Set/Update a value for a type 'Timestamp' of Data Attribute Instance ([#959](https://github.com/openscd/open-scd/issues/959)) ([4d52a9a](https://github.com/openscd/open-scd/commits/4d52a9a3e3aee64ee695606b046b85afdbddb2a8))
13+
514
## [0.22.0](https://github.com/openscd/open-scd/compare/v0.21.0...v0.22.0) (2022-08-22)
615

716

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
"purpose": "maskable"
4141
}
4242
],
43-
"version": "0.22.0"
43+
"version": "0.23.0"
4444
}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "open-scd",
3-
"version": "0.22.0",
3+
"version": "0.23.0",
44
"repository": "https://github.com/openscd/open-scd.git",
55
"description": "A bottom-up substation configuration designer for projects described using SCL `IEC 61850-6` Edition 2 or greater.",
66
"keywords": [

public/js/plugins.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ export const officialPlugins = [
2727
default: true,
2828
kind: 'editor',
2929
},
30+
{
31+
name: 'Subscriber Later Binding (GOOSE)',
32+
src: '/src/editors/GooseSubscriberLaterBinding.js',
33+
icon: 'link',
34+
default: false,
35+
kind: 'editor',
36+
},
3037
{
3138
name: 'Subscriber (SMV)',
3239
src: '/src/editors/SampledValuesSubscription.js',

src/editors/Cleanup.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { styles } from './templates/foundation.js';
66

77
import './cleanup/datasets-container.js';
88
import './cleanup/control-blocks-container.js';
9+
import './cleanup/datatypes-container.js';
910

1011
/** An editor [[`plugin`]] for cleaning SCL references and definitions. */
1112
export default class Cleanup extends LitElement {
@@ -18,6 +19,7 @@ export default class Cleanup extends LitElement {
1819
<div class="cleanup">
1920
<cleanup-datasets .doc=${this.doc}></cleanup-datasets>
2021
<cleanup-control-blocks .doc=${this.doc}></cleanup-control-blocks>
22+
<cleanup-data-types .doc=${this.doc}></cleanup-data-types>
2123
</div>
2224
`;
2325
}
@@ -29,7 +31,7 @@ export default class Cleanup extends LitElement {
2931
width: 100vw;
3032
}
3133
32-
@media (max-width: 800px) {
34+
@media (max-width: 799px) {
3335
.cleanup {
3436
flex-direction: column;
3537
}
@@ -41,14 +43,11 @@ export default class Cleanup extends LitElement {
4143
}
4244
}
4345
44-
cleanup-datasets, cleanup-control-blocks {
46+
cleanup-datasets, cleanup-control-blocks, cleanup-data-types {
4547
display: flex;
4648
flex: 1;
4749
flex-direction: column;
4850
justify-content: space-between;
49-
/* any more than 700px and distance between check box and item is too great */
50-
max-width: 700px;
51-
5251
}
5352
5453
.cleanup {
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { LitElement, property, html, TemplateResult, css } from 'lit-element';
2+
3+
import './subscription/later-binding/fcda-later-binding-list.js';
4+
5+
export default class GooseSubscribeLaterBindingPlugin extends LitElement {
6+
@property({ attribute: false })
7+
doc!: XMLDocument;
8+
9+
render(): TemplateResult {
10+
return html`<div>
11+
<div class="container">
12+
<fcda-later-binding-list .doc=${this.doc} controlTag="GSEControl">
13+
</fcda-later-binding-list>
14+
</div>
15+
</div>`;
16+
}
17+
18+
static styles = css`
19+
:host {
20+
width: 100vw;
21+
}
22+
23+
.container {
24+
padding: 8px 6px 16px;
25+
}
26+
`;
27+
}

src/editors/SMVSubscriberLaterBinding.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { css, html, LitElement, property, TemplateResult } from 'lit-element';
22

3-
import './subscription/smv-laterbinding/svc-laterbinding-list.js';
3+
import './subscription/later-binding/fcda-later-binding-list.js';
44
import './subscription/smv-laterbinding/ext-ref-laterbinding-list.js';
55

66
/** An editor [[`plugin`]] for Subscribe Later Binding (SMV). */
@@ -11,8 +11,12 @@ export default class SMVSubscribeLaterBindingPlugin extends LitElement {
1111
render(): TemplateResult {
1212
return html`<div>
1313
<div class="container">
14-
<svc-later-binding-list class="column" .doc=${this.doc}>
15-
</svc-later-binding-list>
14+
<fcda-later-binding-list
15+
class="column"
16+
.doc=${this.doc}
17+
controlTag="SampledValueControl"
18+
>
19+
</fcda-later-binding-list>
1620
<extref-later-binding-list class="column" .doc=${this.doc}>
1721
</extref-later-binding-list>
1822
</div>

0 commit comments

Comments
 (0)