Skip to content

Commit 8910987

Browse files
Dennis LabordusFlurb
Dennis Labordus
authored and
Flurb
committed
Fix tests and small improvements.
Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com>
1 parent 286deba commit 8910987

19 files changed

+157
-116
lines changed

‎__snapshots__/compas-scl-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
mwc-list-item=""
1010
tabindex="0"
1111
>
12-
Loading...
12+
[compas.loading]
1313
</mwc-list-item>
1414
</mwc-list>
1515

‎__snapshots__/compas-scltype-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
mwc-list-item=""
1010
tabindex="0"
1111
>
12-
Loading...
12+
[compas.loading]
1313
</mwc-list-item>
1414
</mwc-list>
1515

‎__snapshots__/compas-scltype-radiogroup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
mwc-list-item=""
1010
tabindex="0"
1111
>
12-
Loading...
12+
[compas.loading]
1313
</mwc-list-item>
1414
</mwc-list>
1515

‎__snapshots__/open-scd.md

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
folder_open
4949
</mwc-icon>
5050
<span>
51-
Open from CoMPAS
51+
Open CoMPAS
5252
</span>
5353
<mwc-linear-progress indeterminate="">
5454
</mwc-linear-progress>
@@ -101,7 +101,7 @@
101101
folder_open
102102
</mwc-icon>
103103
<span>
104-
Save to CoMPAS
104+
Save CoMPAS
105105
</span>
106106
<mwc-linear-progress indeterminate="">
107107
</mwc-linear-progress>
@@ -373,7 +373,7 @@
373373
icon="folder_open"
374374
>
375375
<div class="landing_label">
376-
Open from CoMPAS
376+
Open CoMPAS
377377
</div>
378378
</mwc-icon-button>
379379
<mwc-icon-button
@@ -558,6 +558,24 @@
558558
tab
559559
</mwc-icon>
560560
</mwc-list-item>
561+
<mwc-list-item
562+
activated=""
563+
aria-disabled="false"
564+
graphic="icon"
565+
hasmeta=""
566+
mwc-list-item=""
567+
selected=""
568+
tabindex="-1"
569+
value="/src/compas-editors/CompasVersions.js"
570+
>
571+
<mwc-icon slot="graphic">
572+
copy_all
573+
</mwc-icon>
574+
CoMPAS Versions
575+
<mwc-icon slot="meta">
576+
tab
577+
</mwc-icon>
578+
</mwc-list-item>
561579
<mwc-list-item
562580
activated=""
563581
aria-disabled="false"
@@ -589,7 +607,7 @@
589607
<mwc-icon slot="graphic">
590608
folder_open
591609
</mwc-icon>
592-
Open from CoMPAS
610+
Open CoMPAS
593611
<mwc-icon slot="meta">
594612
folder_open
595613
</mwc-icon>
@@ -643,7 +661,7 @@
643661
<mwc-icon slot="graphic">
644662
folder_open
645663
</mwc-icon>
646-
Save to CoMPAS
664+
Save CoMPAS
647665
<mwc-icon slot="meta">
648666
save
649667
</mwc-icon>

‎src/compas-editors/CompasVersions.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,19 @@ export default class CompasVersionsPlugin extends LitElement {
3232

3333
render(): TemplateResult {
3434
if (!this.scls) {
35-
return html`<h1>
36-
<span style="color: var(--base1)">${translate('compas.versions.noVersions')}</span>
37-
</h1>`;
35+
return html `
36+
<h1>
37+
<span style="color: var(--base1)">${translate("compas.loading")}</span>
38+
</h1>`
3839
}
3940

4041
if (this.scls?.length <= 0) {
41-
return html `<mwc-list>
42-
<mwc-list-item>
43-
<span style="color: var(--base1)">${translate('compas.versions.noScls')}</span>
44-
</mwc-list-item>
45-
</mwc-list>`
42+
return html `
43+
<mwc-list>
44+
<mwc-list-item>
45+
<span style="color: var(--base1)">${translate('compas.versions.noScls')}</span>
46+
</mwc-list-item>
47+
</mwc-list>`
4648
}
4749
return html`
4850
<div id="containerCompasVersions">

‎src/compas-editors/foundation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {css} from "lit-element";
22

3-
/** Common `CSS` styles used by DataTypeTemplate subeditors */
3+
/** Common `CSS` styles used by Compas Editors subeditors */
44
export const styles = css`
55
:host(.moving) section {
66
opacity: 0.3;

‎src/compas/CompasChangeSet.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ export class CompasChangeSetRadiogroup extends LitElement {
3838
return html`
3939
<mwc-list activatable>
4040
${Object.values(ChangeSet)
41-
.map((key) => html `<mwc-radio-list-item value="${key}" left>${changeSetDetails.get(key)!.description}</mwc-radio-list-item>`)}
41+
.map((key) =>
42+
html `<mwc-radio-list-item value="${key}" left>${changeSetDetails.get(key)!.description}</mwc-radio-list-item>`
43+
)}
4244
</mwc-list>
4345
`
4446
}

‎src/compas/CompasSaveTo.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ export class CompasSaveTo extends LitElement {
2626

2727
getSclTypeRadioGroup() : CompasScltypeRadiogroup {
2828
return (<CompasScltypeRadiogroup>this.shadowRoot!
29-
.querySelector("compas-scltype-radiogroup"))
29+
.querySelector('compas-scltype-radiogroup'))
3030
}
3131

3232
getChangeSetRadiogroup(): CompasChangeSetRadiogroup {
3333
return (<CompasChangeSetRadiogroup>this.shadowRoot!
34-
.querySelector("compas-changeset-radiogroup"))
34+
.querySelector('compas-changeset-radiogroup'))
3535
}
3636

3737
valid(): boolean {
@@ -43,10 +43,6 @@ export class CompasSaveTo extends LitElement {
4343
}
4444

4545
render(): TemplateResult {
46-
return this.renderWizardPage();
47-
}
48-
49-
renderWizardPage(): TemplateResult {
5046
if (!this.docId) {
5147
return html`
5248
<mwc-textfield dialogInitialFocus id="name" label="${translate('scl.name')}"
@@ -70,19 +66,17 @@ function getSclDocument(type: string, id: string): void {
7066
}
7167

7268
function addSclToCompas(wizard: Element, compasSaveTo: CompasSaveTo, doc: XMLDocument) {
73-
const openScd = <OpenSCD>document.querySelector('open-scd');
7469
const name = stripExtensionFromName(compasSaveTo.getNameField().value);
7570
const docType = compasSaveTo.getSclTypeRadioGroup().getSelectedValue() ?? '';
7671

77-
openScd.docName = name + "." + docType.toLowerCase()
7872
CompasSclDataService().addSclDocument(docType, {sclName: name, doc: doc})
7973
.then(xmlResponse => {
8074
const id = Array.from(xmlResponse.querySelectorAll('Id') ?? [])[0];
81-
openScd.docId = id.textContent ?? '';
8275

8376
// Retrieve the document to fetch server-side updates.
8477
getSclDocument(docType, id.textContent ?? '');
8578

79+
const openScd = <OpenSCD>document.querySelector('open-scd');
8680
openScd.dispatchEvent(
8781
newLogEvent({
8882
kind: 'info',
@@ -92,6 +86,7 @@ function addSclToCompas(wizard: Element, compasSaveTo: CompasSaveTo, doc: XMLDoc
9286
openScd.dispatchEvent(newWizardEvent());
9387
})
9488
.catch(() => {
89+
const openScd = <OpenSCD>document.querySelector('open-scd');
9590
openScd.dispatchEvent(
9691
newLogEvent({
9792
kind: 'error',
@@ -100,7 +95,6 @@ function addSclToCompas(wizard: Element, compasSaveTo: CompasSaveTo, doc: XMLDoc
10095
}
10196

10297
function updateSclInCompas(wizard: Element, compasSaveTo: CompasSaveTo, docId: string, docName: string, doc: XMLDocument) {
103-
const openScd = <OpenSCD>document.querySelector('open-scd');
10498
const changeSet = compasSaveTo.getChangeSetRadiogroup().getSelectedValue();
10599
const docType = getTypeFromDocName(docName);
106100

@@ -109,6 +103,7 @@ function updateSclInCompas(wizard: Element, compasSaveTo: CompasSaveTo, docId: s
109103
// Retrieve the document to fetch server-side updates.
110104
getSclDocument(docType, docId);
111105

106+
const openScd = <OpenSCD>document.querySelector('open-scd');
112107
openScd.dispatchEvent(
113108
newLogEvent({
114109
kind: 'info',
@@ -118,6 +113,7 @@ function updateSclInCompas(wizard: Element, compasSaveTo: CompasSaveTo, docId: s
118113
openScd.dispatchEvent(newWizardEvent());
119114
})
120115
.catch(() => {
116+
const openScd = <OpenSCD>document.querySelector('open-scd');
121117
openScd.dispatchEvent(
122118
newLogEvent({
123119
kind: 'error',

‎src/compas/CompasScl.ts

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {customElement, html, LitElement, property, TemplateResult} from "lit-element";
2-
import {get} from "lit-translate";
2+
import {get, translate} from "lit-translate";
33

44
import {newPendingStateEvent, newWizardEvent, Wizard} from "../foundation.js";
55
import {SingleSelectedEvent} from "@material/mwc-list/mwc-list-foundation";
@@ -34,33 +34,35 @@ export class CompasScl extends LitElement {
3434

3535
render(): TemplateResult {
3636
if (!this.scls) {
37-
return html `<mwc-list><mwc-list-item>Loading...</mwc-list-item></mwc-list>`
37+
return html `
38+
<mwc-list>
39+
<mwc-list-item>${translate("compas.loading")}</mwc-list-item>
40+
</mwc-list>`
3841
}
3942
if (this.scls?.length <= 0) {
40-
return html `<mwc-list>
41-
<mwc-list-item>
42-
${get("compas.open.noScls")}
43-
</mwc-list-item>
44-
</mwc-list>`
43+
return html `
44+
<mwc-list>
45+
<mwc-list-item>${translate("compas.open.noScls")}</mwc-list-item>
46+
</mwc-list>`
4547
}
4648
return html`
47-
<mwc-list>
48-
${this.scls.map( item => {
49-
const id = item.getElementsByTagName("Id").item(0)!.textContent ?? '';
50-
let name = item.getElementsByTagName("Name").item(0)!.textContent ?? '';
51-
if (name === '') {
52-
name = id;
53-
}
54-
const version = item.getElementsByTagName("Version").item(0);
55-
return html`<mwc-list-item tabindex="0"
56-
@click=${(evt: SingleSelectedEvent) => {
57-
this.openScl(id);
58-
evt.target!.dispatchEvent(newWizardEvent());
59-
}}>
60-
${name} (${version})
61-
</mwc-list-item>`
62-
})}
63-
</mwc-list>`
49+
<mwc-list>
50+
${this.scls.map( item => {
51+
const id = item.getElementsByTagName("Id").item(0)!.textContent ?? '';
52+
let name = item.getElementsByTagName("Name").item(0)!.textContent ?? '';
53+
if (name === '') {
54+
name = id;
55+
}
56+
const version = item.getElementsByTagName("Version").item(0);
57+
return html`<mwc-list-item tabindex="0"
58+
@click=${(evt: SingleSelectedEvent) => {
59+
this.openScl(id);
60+
evt.target!.dispatchEvent(newWizardEvent());
61+
}}>
62+
${name} (${version})
63+
</mwc-list-item>`
64+
})}
65+
</mwc-list>`
6466
}
6567
}
6668

‎src/compas/CompasScltypeList.ts

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {customElement, html, LitElement, property, TemplateResult} from "lit-element";
2-
import {get} from "lit-translate";
2+
import {get, translate} from "lit-translate";
33
import {SingleSelectedEvent} from "@material/mwc-list/mwc-list-foundation";
44
import {newWizardEvent, Wizard, WizardActor} from '../foundation.js';
55
import {CompasSclDataService} from "./CompasSclDataService.js";
@@ -21,32 +21,36 @@ export class CompasScltypeList extends LitElement {
2121

2222
render(): TemplateResult {
2323
if (!this.sclTypes) {
24-
return html `<mwc-list><mwc-list-item>Loading...</mwc-list-item></mwc-list>`
24+
return html `
25+
<mwc-list>
26+
<mwc-list-item>${translate("compas.loading")}</mwc-list-item>
27+
</mwc-list>`
2528
}
2629

2730
if (this.sclTypes.length <= 0) {
28-
return html `<mwc-list>
29-
<mwc-list-item>
30-
${get("compas.open.noSclTypes")}
31-
</mwc-list-item>
32-
</mwc-list>`
31+
return html `
32+
<mwc-list>
33+
<mwc-list-item>
34+
${translate("compas.open.noSclTypes")}
35+
</mwc-list-item>
36+
</mwc-list>`
3337
}
3438
return html`
35-
<mwc-list>
36-
${this.sclTypes.map( type => {
37-
const code = type.getElementsByTagName("Code").item(0);
38-
const description = type.getElementsByTagName("Description").item(0);
39-
return html`<mwc-list-item
40-
@click=${(evt: SingleSelectedEvent) => {
41-
evt.target!.dispatchEvent(newWizardEvent());
42-
this.listScls(code!.textContent ?? '');
43-
}}
44-
tabindex="0"
45-
>
46-
<span>${description} (${code})</span>
47-
</mwc-list-item>`;
48-
})}
49-
</mwc-list>`
39+
<mwc-list>
40+
${this.sclTypes.map( type => {
41+
const code = type.getElementsByTagName("Code").item(0);
42+
const description = type.getElementsByTagName("Description").item(0);
43+
return html`<mwc-list-item
44+
@click=${(evt: SingleSelectedEvent) => {
45+
evt.target!.dispatchEvent(newWizardEvent());
46+
this.listScls(code!.textContent ?? '');
47+
}}
48+
tabindex="0"
49+
>
50+
<span>${description} (${code})</span>
51+
</mwc-list-item>`;
52+
})}
53+
</mwc-list>`
5054
}
5155
}
5256

0 commit comments

Comments
 (0)