Potential bug fix

Signed-off-by: Rob Tjalma <[email protected]>

Author: Rob Tjalma

src/compas/CompasSettingsElement.ts

@@ -9,12 +9,9 @@ export type CompasSettingsRecord = {
   sclDataServiceUrl: string;
   cimMappingServiceUrl: string;
 };
-export const defaults: CompasSettingsRecord = {
-  sclDataServiceUrl: '/compas-scl-data-service',
-  cimMappingServiceUrl: '/compas-cim-mapping',
-};
 
 export function CompasSettings() {
+  
   return {
     /** Current [[`CompasSettings`]] in `localStorage`, default to [[`defaults`]]. */
     get compasSettings(): CompasSettingsRecord {
@@ -24,14 +21,21 @@ export function CompasSettings() {
       };
     },
 
+    get defaultSettings(): CompasSettingsRecord {
+      return {
+        sclDataServiceUrl: '/compas-scl-data-service',
+        cimMappingServiceUrl: '/compas-cim-mapping'
+      }
+    },
+
     /** Update the `value` of `setting`, storing to `localStorage`. */
     setCompasSetting<T extends keyof CompasSettingsRecord>(setting: T, value: CompasSettingsRecord[T]): void {
       localStorage.setItem(setting, <string>(<unknown>value));
     },
 
     getCompasSetting<T extends keyof CompasSettingsRecord>(setting: T): CompasSettingsRecord[T] {
       return (
-        <CompasSettingsRecord[T] | null>localStorage.getItem(setting) ?? defaults[setting]
+        <CompasSettingsRecord[T] | null>localStorage.getItem(setting) ?? this.defaultSettings[setting]
       );
     }
   }

test/unit/compas/CompasSettingsElement.test.ts

@@ -1,7 +1,7 @@
 import {expect, fixture, html} from '@open-wc/testing';
 
 import "../../../src/compas/CompasSettingsElement.js";
-import {CompasSettings, CompasSettingsElement, defaults} from "../../../src/compas/CompasSettingsElement.js";
+import {CompasSettings, CompasSettingsElement} from "../../../src/compas/CompasSettingsElement.js";
 
 describe('compas-settings', () => {
   let element: CompasSettingsElement;
@@ -17,7 +17,7 @@ describe('compas-settings', () => {
   });
 
   it('initially has default settings', () => {
-    expect(element).to.have.deep.property('compasSettings', defaults);
+    expect(element).to.have.deep.property('compasSettings', CompasSettings().defaultSettings);
   });
 
   it('stores settings to localStorage', () => {
@@ -53,7 +53,7 @@ describe('compas-settings', () => {
     await element.getSclDataServiceUrlField().updateComplete;
 
     expect(element.save()).to.be.false;
-    expect(element).to.have.deep.property('compasSettings', defaults);
+    expect(element).to.have.deep.property('compasSettings', CompasSettings().defaultSettings);
   });
 
   it('save will not be done when invalid value (CIM Mapping Service)', async () => {
@@ -62,17 +62,17 @@ describe('compas-settings', () => {
     await element.getCimMappingServiceUrlField().updateComplete;
 
     expect(element.save()).to.be.false;
-    expect(element).to.have.deep.property('compasSettings', defaults);
+    expect(element).to.have.deep.property('compasSettings', CompasSettings().defaultSettings);
   });
 
   it('resets settings to default on reset button click', async () => {
     await element.updateComplete;
     CompasSettings().setCompasSetting('sclDataServiceUrl', 'http://localhost:9091/compas-scl-data-service');
     CompasSettings().setCompasSetting('cimMappingServiceUrl', 'http://localhost:9092/compas-cim-mapping');
 
-    expect(element).to.not.have.deep.property('compasSettings', defaults);
+    expect(element).to.not.have.deep.property('compasSettings', CompasSettings().defaultSettings);
     expect(element.reset()).to.be.true;
-    expect(element).to.have.deep.property('compasSettings', defaults);
+    expect(element).to.have.deep.property('compasSettings', CompasSettings().defaultSettings);
   });
 
   it('looks like the latest snapshot', async () => {