Beautiful review comments fixed

Signed-off-by: Flurb <[email protected]>

Author: Flurb

.gitignore

@@ -21,3 +21,4 @@
 /out-tsc/
 
 /public/cim/
+!/public/cim/README.md

src/compas/CompasImportFromApi.ts

@@ -2,23 +2,20 @@ import {customElement, html, LitElement, TemplateResult} from "lit-element";
 
 import '@material/mwc-button';
 
-import {newOpenDocEvent, newWizardEvent} from "../foundation.js";
+import {newOpenDocEvent, newPendingStateEvent, newWizardEvent} from "../foundation.js";
 
 import {createLogEvent, handleError, handleResponse, parseXml} from "../compas-services/foundation.js";
 import {dispatchEventOnOpenScd} from "./foundation.js";
 
 import '../WizardDivider.js';
 import './CompasSclTypeList.js';
 import './CompasScl.js';
-import { CompasSettings } from "./CompasSettings.js";
 import { CompasCimMappingService } from "../compas-services/CompasCimMappingService.js";
 
 @customElement('compas-import-from-api')
 export default class CompasImportFromApiElement extends LitElement {
   private async processCimFile(name: string) {
-    const url = CompasSettings().compasSettings.importFromApiUrl;
-
-    const doc = await fetch(url + '/' + name + '.xml')
+    const doc = await fetch('/public/cim/' + name + '.xml')
     .catch(handleError)
     .then(handleResponse)
     .then(parseXml);
@@ -40,19 +37,27 @@ export default class CompasImportFromApiElement extends LitElement {
     return html `
     <filtered-list>
     <mwc-list-item
-      @click=${() => this.processCimFile('cim-eq-hoorn-v3')}>
+      @click=${() => dispatchEventOnOpenScd(newPendingStateEvent(
+        this.processCimFile('cim-eq-hoorn-v3')
+      ))}>
       cim-eq-hoorn-v3
     </mwc-list-item>
     <mwc-list-item
-      @click=${() => this.processCimFile('cim-eq-makkum')}>
+      @click=${() => dispatchEventOnOpenScd(newPendingStateEvent(
+        this.processCimFile('cim-eq-makkum')
+      ))}>
       cim-eq-makkum
     </mwc-list-item>
     <mwc-list-item
-      @click=${() => this.processCimFile('cim-eq-winselingseweg-voorbeeld')}>
+      @click=${() => dispatchEventOnOpenScd(newPendingStateEvent(
+        this.processCimFile('cim-eq-winselingseweg-voorbeeld')
+      ))}>
       cim-eq-winselingseweg-voorbeeld
     </mwc-list-item>
     <mwc-list-item
-      @click=${() => this.processCimFile('EQ-entsoe-voorbeeld')}>
+      @click=${() => dispatchEventOnOpenScd(newPendingStateEvent(
+        this.processCimFile('EQ-entsoe-voorbeeld')
+      ))}>
       EQ-entsoe-voorbeeld
     </mwc-list-item>
   </filtered-list>

src/compas/CompasSettings.ts

@@ -13,7 +13,6 @@ export type CompasSettingsRecord = {
   sclValidatorServiceUrl: string;
   cimMappingServiceUrl: string;
   sclAutoAlignmentServiceUrl: string;
-  importFromApiUrl: string;
 };
 
 export function CompasSettings() {
@@ -24,8 +23,7 @@ export function CompasSettings() {
         sclDataServiceUrl: this.getCompasSetting('sclDataServiceUrl'),
         sclValidatorServiceUrl: this.getCompasSetting('sclValidatorServiceUrl'),
         cimMappingServiceUrl: this.getCompasSetting('cimMappingServiceUrl'),
-        sclAutoAlignmentServiceUrl: this.getCompasSetting('sclAutoAlignmentServiceUrl'),
-        importFromApiUrl: this.getCompasSetting('importFromApiUrl'),
+        sclAutoAlignmentServiceUrl: this.getCompasSetting('sclAutoAlignmentServiceUrl')
       };
     },
 
@@ -34,8 +32,7 @@ export function CompasSettings() {
         sclDataServiceUrl: '/compas-scl-data-service',
         sclValidatorServiceUrl: '/compas-scl-validator',
         cimMappingServiceUrl: '/compas-cim-mapping',
-        sclAutoAlignmentServiceUrl: '/compas-scl-auto-alignment',
-        importFromApiUrl: '/public/cim'
+        sclAutoAlignmentServiceUrl: '/compas-scl-auto-alignment'
       }
     },
 
@@ -75,16 +72,11 @@ export class CompasSettingsElement extends LitElement {
     return <TextFieldBase>this.shadowRoot!.querySelector('mwc-textfield[id="sclAutoAlignmentServiceUrl"]');
   }
 
-  getImportFromApiUrlField(): TextFieldBase {
-    return <TextFieldBase>this.shadowRoot!.querySelector('mwc-textfield[id="importFromApiUrl"]');
-  }
-
   valid(): boolean {
     return this.getSclDataServiceUrlField().checkValidity()
       && this.getSclValidatorServiceUrlField().checkValidity()
       && this.getCimMappingServiceUrlField().checkValidity()
-      && this.getSclAutoAlignmentServiceUrlField().checkValidity()
-      && this.getImportFromApiUrlField().checkValidity();
+      && this.getSclAutoAlignmentServiceUrlField().checkValidity();
   }
 
   save(): boolean {
@@ -97,7 +89,6 @@ export class CompasSettingsElement extends LitElement {
     CompasSettings().setCompasSetting('sclValidatorServiceUrl', this.getSclValidatorServiceUrlField().value);
     CompasSettings().setCompasSetting('cimMappingServiceUrl', this.getCimMappingServiceUrlField().value);
     CompasSettings().setCompasSetting('sclAutoAlignmentServiceUrl', this.getSclAutoAlignmentServiceUrlField().value);
-    CompasSettings().setCompasSetting('importFromApiUrl', this.getImportFromApiUrlField().value);
     return true;
   }
 
@@ -131,10 +122,6 @@ export class CompasSettingsElement extends LitElement {
                      label="${translate('compas.settings.sclAutoAlignmentServiceUrl')}"
                      value="${this.compasSettings.sclAutoAlignmentServiceUrl}" required>
       </mwc-textfield>
-      <mwc-textfield id="importFromApiUrl"
-                     label="${translate('compas.settings.importFromApiUrl')}"
-                     value="${this.compasSettings.importFromApiUrl}" required>
-      </mwc-textfield>
 
       <mwc-button @click=${() => {
                     if (this.reset()) {