@aj-shadow/actorjs-app 0.0.0-aj-beta.227 → 0.0.0-aj-beta.237

package/project/client/components/middle/actor-editor/middle-actor-editor-view.jsx

@@ -1,29 +1,29 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
  
-import ActorEditorStore from '../../../stores/actor-editor-store';
+import { ActorEditorStore } from '../../../stores/actor-editor-store';
 import { ActionActorEditorFileGet, ActionActorEditorFileSet, ActionActorEditorFileEdit, ActionActorEditorFileClose, ActionActorEditorFileMove } from '../../../actions/action-actor-editor/action-actor-editor-file';
-import Tabs from 'z-abs-complayer-bootstrap-client/client/tabs';
-import Tab from 'z-abs-complayer-bootstrap-client/client/tab';
-import CodeMirrorEditor from 'z-abs-complayer-codemirror-client/client/code-mirror-editor';
-import {RouterContext} from 'z-abs-complayer-router-client/client/react-component/router-context';
-import LogType from 'z-abs-funclayer-engine-cs/clientServer/log/log-type';
-import ReactComponentStore from 'z-abs-corelayer-client/client/react-component/react-component-store';
-import React from 'react';
+import * as CompLayerBootstrapClient from 'z-abs-complayer-bootstrap-client/client/tabs';
+import * as CompLayerBootstrapClient1 from 'z-abs-complayer-bootstrap-client/client/tab';
+import * as CompLayerCodeMirrorClient from 'z-abs-complayer-codemirror-client/client/code-mirror-editor';
+import * as CompLayerRouterClient from 'z-abs-complayer-router-client/client/react-component/router-context';
+import * as FuncLayerEngineCs from 'z-abs-funclayer-engine-cs/client/log/log-type';
+import * as CoreLayerClient from 'z-abs-corelayer-client/client/react-component/react-component-store';
+import * as React from 'react';
 
 
-export default class MiddleActorEditorView extends ReactComponentStore {
+export class MiddleActorEditorView extends CoreLayerClient.ReactComponentStore {
   constructor(props) {
-    super(props, [ActorEditorStore]);
+    super(props, [ActorEditorStore.getInstance()]);
     this.close = false;
   }
   
   didMount() {
     if(this.props._uriPath && 0 < this.props._uriPath.length) {
-      this.dispatch(ActorEditorStore, new ActionActorEditorFileSet(`.${this.props._uriPath}`, this.props.location.search));
+      this.dispatch(ActorEditorStore.getInstance(), new ActionActorEditorFileSet(`.${this.props._uriPath}`, this.props.location.search));
     }
     else {
-      this.dispatch(ActorEditorStore, new ActionActorEditorFileSet());
+      this.dispatch(ActorEditorStore.getInstance(), new ActionActorEditorFileSet());
     }
   }
   
@@ -38,7 +38,7 @@ export default class MiddleActorEditorView extends ReactComponentStore {
   
   didUpdate(prevProps, prevState) {
     if(this.props._uriPath !== prevProps._uriPath) {
-      this.dispatch(ActorEditorStore, new ActionActorEditorFileSet(`.${this.props._uriPath}`, this.props.location.search));
+      this.dispatch(ActorEditorStore.getInstance(), new ActionActorEditorFileSet(`.${this.props._uriPath}`, this.props.location.search));
     }
   }
   
@@ -48,20 +48,20 @@ export default class MiddleActorEditorView extends ReactComponentStore {
     const query = !queryState ? undefined : {
       url: queryState.url,
       line: queryState.line,
-      typeCss: LogType.csses[Number.parseInt(this.state.ActorEditorStore.current.query.type)]
+      typeCss: FuncLayerEngineCs.LogType.csses[Number.parseInt(this.state.ActorEditorStore.current.query.type)]
     };
     this.state.ActorEditorStore.files.forEach((file, key) => {
       if(null !== file.content) {
         const currentType = 'file_inline' === this.state.ActorEditorStore.current.type ? 'file' : this.state.ActorEditorStore.current.type;
         result.push(
-          <Tab eventKey={key} key={key} id={key} 
+          <CompLayerBootstrapClient.Tab eventKey={key} key={key} id={key} 
             title={
               <div>
                 {file.title}
                 <button type="button" className={this.theme(this.state.ActorEditorStore.persistentData.darkMode, 'middle_code_editor_close')} aria-label="Close"
                   onClick={(e, a) => {
                     this.close = true;
-                    this.dispatch(ActorEditorStore, new ActionActorEditorFileClose(key));
+                    this.dispatch(ActorEditorStore.getInstance(), new ActionActorEditorFileClose(key));
                   }}
                 >
                   ×
@@ -69,23 +69,23 @@ export default class MiddleActorEditorView extends ReactComponentStore {
               </div>
             }
             onMove={(fromKey, toKey) => {
-              this.dispatch(ActorEditorStore, new ActionActorEditorFileMove(fromKey, toKey));
+              this.dispatch(ActorEditorStore.getInstance(), new ActionActorEditorFileMove(fromKey, toKey));
             }}
           >
-            <CodeMirrorEditor id={`actor_editor_view_${key}`} projectId={file.projectId} docKey={key} code={file.content} build={this.state.ActorEditorStore.build} options={this.getOptions(file.type, key)} currentType={currentType} currentFile={this.state.ActorEditorStore.current.file} currentQuery={query} darkMode={this.state.ActorEditorStore.persistentData.darkMode}
+            <CompLayerCodeMirrorClient.CodeMirrorEditor id={`actor_editor_view_${key}`} projectId={file.projectId} docKey={key} code={file.content} build={this.state.ActorEditorStore.build} options={this.getOptions(file.type, key)} currentType={currentType} currentFile={this.state.ActorEditorStore.current.file} currentQuery={query} darkMode={this.state.ActorEditorStore.persistentData.darkMode}
               onChanged={(projectId, docKey, code) => {
-                this.dispatch(ActorEditorStore, new ActionActorEditorFileEdit(projectId, docKey, code));
+                this.dispatch(ActorEditorStore.getInstance(), new ActionActorEditorFileEdit(projectId, docKey, code));
               }}
               onFocusChange={(focused, docKey) => {
                 if(focused) {
                   const file = this.state.ActorEditorStore.files.get(docKey);
                   if(file) {
-                    this.dispatch(ActorEditorStore, new ActionActorEditorFileGet(file.projectId, file.key, file.title, file.path, file.type));
+                    this.dispatch(ActorEditorStore.getInstance(), new ActionActorEditorFileGet(file.projectId, file.key, file.title, file.path, file.type));
                   }
                 }
               }}
             />
-          </Tab>
+          </CompLayerBootstrapClient.Tab>
         );
       }
     });
@@ -95,11 +95,11 @@ export default class MiddleActorEditorView extends ReactComponentStore {
   renderTabs(options) {
     if(0 !== this.state.ActorEditorStore.files.size) {
       return (
-        <Tabs id="actor_editor_tabs" draggable="true" activeKey={null !== this.state.ActorEditorStore.current.file ? this.state.ActorEditorStore.current.file.key : null} darkMode={this.state.ActorEditorStore.persistentData.darkMode}
+        <CompLayerBootstrapClient.Tabs id="actor_editor_tabs" draggable="true" activeKey={null !== this.state.ActorEditorStore.current.file ? this.state.ActorEditorStore.current.file.key : null} darkMode={this.state.ActorEditorStore.persistentData.darkMode}
           onSelect={(selectedKey) => {
             if(!this.close) {
               const file = this.state.ActorEditorStore.files.get(selectedKey);
-              this.dispatch(ActorEditorStore, new ActionActorEditorFileGet(file.projectId, file.key, file.title, file.path, file.type));
+              this.dispatch(ActorEditorStore.getInstance(), new ActionActorEditorFileGet(file.projectId, file.key, file.title, file.path, file.type));
             }
             else {
               this.close = false;
@@ -107,7 +107,7 @@ export default class MiddleActorEditorView extends ReactComponentStore {
           }}
         >
           {this.renderTab(options)}
-        </Tabs>
+        </CompLayerBootstrapClient.Tabs>
       );
     }
     else {
@@ -153,5 +153,5 @@ export default class MiddleActorEditorView extends ReactComponentStore {
 }
 
 
-MiddleActorEditorView.contextType = RouterContext;
+MiddleActorEditorView.contextType = CompLayerRouterClient.RouterContext;
 MiddleActorEditorView.REMOVE_KEY_LENGTH = 'actor_editor_tabs-tab-'.length;

package/project/client/components/middle/actor-editor/middle-actor-editor.jsx

@@ -1,16 +1,16 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
-import ActorEditorStore from '../../../stores/actor-editor-store';
-import MiddleActorEditorToolbar from './middle-actor-editor-toolbar';
-import MiddleActorEditorSidebar from './middle-actor-editor-sidebar';
-import MiddleActorEditorView from './middle-actor-editor-view';
-import Route from 'z-abs-complayer-router-client/client/react-component/route';
-import ReactComponentBase from 'z-abs-corelayer-client/client/react-component/react-component-base';
-import React from 'react';
+import { ActorEditorStore } from '../../../stores/actor-editor-store';
+import { MiddleActorEditorToolbar } from './middle-actor-editor-toolbar';
+import { MiddleActorEditorSidebar } from './middle-actor-editor-sidebar';
+import { MiddleActorEditorView } from './middle-actor-editor-view';
+import * as CompLayerRouterClient from 'z-abs-complayer-router-client/client/react-component/route';
+import * as CoreLayerClient from 'z-abs-corelayer-client/client/react-component/react-component-base';
+import * as React from 'react';
 
 
-export default class MiddleActorEditor extends ReactComponentBase {
+export class MiddleActorEditor extends CoreLayerClient.ReactComponentBase {
   constructor(props) {
     super(props);
     this.setTitle(() => {
@@ -29,9 +29,9 @@ export default class MiddleActorEditor extends ReactComponentBase {
   render() {
     return (
       <div className="middle middle_code_editor">
-        <Route switch="*" handler={MiddleActorEditorToolbar} />
-        <Route switch="*" handler={MiddleActorEditorSidebar} />
-        <Route switch="*" handler={MiddleActorEditorView} />
+        <CompLayerRouterClient.Route switch="*" handler={MiddleActorEditorToolbar} />
+        <CompLayerRouterClient.Route switch="*" handler={MiddleActorEditorSidebar} />
+        <CompLayerRouterClient.Route switch="*" handler={MiddleActorEditorView} />
       </div>
     );
   }

package/project/client/components/middle/addresses/helpers/stage-filter.js

@@ -1,8 +1,8 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 
-class StageFilter {
+export class StageFilter {
   static filter(stage, value, filter, sutMandatory= false) {
     if(!filter) {
       return true;
@@ -28,5 +28,3 @@ class StageFilter {
     return stage.systemUnderTest === value.sut;
   }
 }
-
-module.exports = StageFilter;

package/project/client/components/middle/addresses/middle-addresses-toolbar.jsx

@@ -1,18 +1,18 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
-import AddressesStore from '../../../stores/addresses-store';
-import LoginStore from '../../../stores/login-store';
+import { AddressesStore } from '../../../stores/addresses-store';
+import { LoginStore } from '../../../stores/login-store';
 import { ActionAddressesMarkup, ActionAddressesMarkupSave, ActionAddressesMarkupCancel, ActionAddressesLabUserFilter } from '../../../actions/action-addresses/action-addresses';
-import ButtonNew from 'z-abs-complayer-bootstrap-client/client/button-new';
-import {RouterContext} from 'z-abs-complayer-router-client/client/react-component/router-context';
-import ReactComponentStore from 'z-abs-corelayer-client/client/react-component/react-component-store';
-import React from 'react';
+import * as CompLayerBootstrapClient from 'z-abs-complayer-bootstrap-client/client/button-new';
+import * as CompLayerRouterClient from 'z-abs-complayer-router-client/client/react-component/router-context';
+import * as CoreLayerClient from 'z-abs-corelayer-client/client/react-component/react-component-store';
+import * as React from 'react';
 
 
-export default class MiddleAddressesToolbar extends ReactComponentStore {
+export class MiddleAddressesToolbar extends CoreLayerClient.ReactComponentStore {
   constructor(props) {
-    super(props, [AddressesStore, LoginStore]);
+    super(props, [AddressesStore.getInstance(), LoginStore.getInstance()]);
     this.boundKeyDown = this._keyDown.bind(this);
     this.markupDisabledOpen = false;
     this.markupDisabledSave = true;
@@ -35,11 +35,11 @@ export default class MiddleAddressesToolbar extends ReactComponentStore {
   }
   
   _markupOpen() {
-    this.dispatch(AddressesStore, new ActionAddressesMarkup());
+    this.dispatch(AddressesStore.getInstance(), new ActionAddressesMarkup());
   }
   
   _markupSave() {
-    this.dispatch(AddressesStore, new ActionAddressesMarkupSave());
+    this.dispatch(AddressesStore.getInstance(), new ActionAddressesMarkupSave());
   }
   
   _markupHelp() {
@@ -47,7 +47,7 @@ export default class MiddleAddressesToolbar extends ReactComponentStore {
   }
   
   _markupCancel() {
-    this.dispatch(AddressesStore, new ActionAddressesMarkupCancel());
+    this.dispatch(AddressesStore.getInstance(), new ActionAddressesMarkupCancel());
   }
   
   _keyDown(e) {
@@ -80,7 +80,7 @@ export default class MiddleAddressesToolbar extends ReactComponentStore {
   renderMarkupOpenButton() {
     this.markupDisabledOpen = this.state.AddressesStore.markup.definition;
     return (
-      <ButtonNew id="addresses_markup_open" icon="icon-markup-open" size="aj_btn_sm" colorMark="markup_color" placement="bottom" heading="Open" content="Markup" shortcut="Ctrl+O" disabled={this.markupDisabledOpen}
+      <CompLayerBootstrapClient.ButtonNew id="addresses_markup_open" icon="icon-markup-open" size="aj_btn_sm" colorMark="markup_color" placement="bottom" heading="Open" content="Markup" shortcut="Ctrl+O" disabled={this.markupDisabledOpen}
         onClick={(e) => {
           this._markupOpen();
         }}
@@ -91,7 +91,7 @@ export default class MiddleAddressesToolbar extends ReactComponentStore {
   renderMarkupSaveButton() {
     this.markupDisabledSave = this.state.AddressesStore.markup.content === this.state.AddressesStore.markup.contentOriginal;
     return (
-      <ButtonNew id="addresses_markup_save" icon="icon-markup-save" size="aj_btn_sm" colorMark="markup_color" placement="bottom" heading="Save" content="Markup" shortcut="Ctrl+S" disabled={this.markupDisabledSave}
+      <CompLayerBootstrapClient.ButtonNew id="addresses_markup_save" icon="icon-markup-save" size="aj_btn_sm" colorMark="markup_color" placement="bottom" heading="Save" content="Markup" shortcut="Ctrl+S" disabled={this.markupDisabledSave}
         onClick={(e) => {
           this._markupSave();
         }}
@@ -102,7 +102,7 @@ export default class MiddleAddressesToolbar extends ReactComponentStore {
   renderMarkupHelpButton() {
     this.markupDisabledHelp = this.state.AddressesStore.markup.definition;
     return (
-      <ButtonNew id="addresses_markup_help" icon="icon-markup-help" size="aj_btn_sm" colorMark="markup_color" placement="bottom" heading="Help" content="Markup" shortcut="Ctrl+?" disabled={this.markupDisabledHelp}
+      <CompLayerBootstrapClient.ButtonNew id="addresses_markup_help" icon="icon-markup-help" size="aj_btn_sm" colorMark="markup_color" placement="bottom" heading="Help" content="Markup" shortcut="Ctrl+?" disabled={this.markupDisabledHelp}
         onClick={(e) => {
           this._markupHelp();
         }}
@@ -113,7 +113,7 @@ export default class MiddleAddressesToolbar extends ReactComponentStore {
   renderMarkupCancelButton() {
     this.markupDisabledCancel = !this.state.AddressesStore.markup.definition;
     return (
-      <ButtonNew id="addresses_markup_cancel" icon="icon-markup-close" size="aj_btn_sm" colorMark="markup_color" placement="bottom" heading="Cancel" content="Markup" shortcut="Ctrl+Shift+C" disabled={this.markupDisabledCancel}
+      <CompLayerBootstrapClient.ButtonNew id="addresses_markup_cancel" icon="icon-markup-close" size="aj_btn_sm" colorMark="markup_color" placement="bottom" heading="Cancel" content="Markup" shortcut="Ctrl+Shift+C" disabled={this.markupDisabledCancel}
         onClick={(e) => {
           this._markupCancel();
         }}
@@ -135,9 +135,9 @@ export default class MiddleAddressesToolbar extends ReactComponentStore {
     const filter = this.state.AddressesStore.labUserFilter ? 'show all' : 'show staged sut';
     return (
       <>
-        <ButtonNew id="addresses_lab_user_filter" className="labuser_filter" icon="icon-filter" size="aj_btn_sm" colorMark="markup_color" placement="bottom" heading="Filter" content={filter} active={this.state.AddressesStore.labUserFilter}
+        <CompLayerBootstrapClient.ButtonNew id="addresses_lab_user_filter" className="labuser_filter" icon="icon-filter" size="aj_btn_sm" colorMark="markup_color" placement="bottom" heading="Filter" content={filter} active={this.state.AddressesStore.labUserFilter}
           onClick={(e) => {
-            this.dispatch(AddressesStore, new ActionAddressesLabUserFilter(!this.state.AddressesStore.labUserFilter));
+            this.dispatch(AddressesStore.getInstance(), new ActionAddressesLabUserFilter(!this.state.AddressesStore.labUserFilter));
           }}
         />
       </>
@@ -146,7 +146,7 @@ export default class MiddleAddressesToolbar extends ReactComponentStore {
   
   renderStageButton() {
     return (
-      <ButtonNew id="address_stage" colorMark="markup_color" icon="icon-stage" size="aj_btn_sm" placement="bottom" heading="Goto" content="Stage" aria-label="Stage"
+      <CompLayerBootstrapClient.ButtonNew id="address_stage" colorMark="markup_color" icon="icon-stage" size="aj_btn_sm" placement="bottom" heading="Goto" content="Stage" aria-label="Stage"
         onClick={(e) => {
           this.context.history(`/stage`, {global: true});
         }}
@@ -180,4 +180,4 @@ export default class MiddleAddressesToolbar extends ReactComponentStore {
 }
 
 
-MiddleAddressesToolbar.contextType = RouterContext;
+MiddleAddressesToolbar.contextType = CompLayerRouterClient.RouterContext;

package/project/client/components/middle/addresses/middle-addresses-view-client-address.jsx

@@ -1,22 +1,22 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
-import StageFilter from './helpers/stage-filter';
-import AddressesStore from '../../../stores/addresses-store';
+import { StageFilter } from './helpers/stage-filter';
+import { AddressesStore } from '../../../stores/addresses-store';
 import { ActionAddressesMarkupChange } from '../../../actions/action-addresses/action-addresses';
-import ComponentMarkedTextarea from 'z-abs-complayer-bootstrap-client/client/marked-textarea';
-import DataAddressesClientAddressGlobal from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-client-address-global';
-import DataAddressesClientAddressLocal from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-client-address-local';
-import ComponentTableDataTable from 'z-abs-complayer-markup-client/client/react-components/markup/component-table-data-table';
-import ReactComponentStore from 'z-abs-corelayer-client/client/react-component/react-component-store';
-import React from 'react';
+import * as CompLayerBootstrapClient from 'z-abs-complayer-bootstrap-client/client/marked-textarea';
+import * as CompLayerMarkupClient from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-client-address-global';
+import * as CompLayerMarkupClient1 from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-client-address-local';
+import * as CompLayerMarkupClient2 from 'z-abs-complayer-markup-client/client/react-components/markup/component-table-data-table';
+import * as CoreLayerClient from 'z-abs-corelayer-client/client/react-component/react-component-store';
+import * as React from 'react';
 
 
-export default class MiddleAddressesViewClientAddress extends ReactComponentStore {
+export class MiddleAddressesViewClientAddress extends CoreLayerClient.ReactComponentStore {
   constructor(props) {
-    super(props, [AddressesStore]);
-    this.dataAddressesClientAddressGlobal = new DataAddressesClientAddressGlobal();
-    this.dataAddressesClientAddressLocal = new DataAddressesClientAddressLocal();
+    super(props, [AddressesStore.getInstance()]);
+    this.dataAddressesClientAddressGlobal = new CompLayerMarkupClient.DataAddressesClientAddressGlobal();
+    this.dataAddressesClientAddressLocal = new CompLayerMarkupClient.DataAddressesClientAddressLocal();
   }
 
   shouldUpdate(nextProps, nextState) {
@@ -34,9 +34,9 @@ export default class MiddleAddressesViewClientAddress extends ReactComponentStor
     return (
       <div className="address_group">
         <label htmlFor="client_address_markup_textarea">Address - Markup</label>
-        <ComponentMarkedTextarea id="client_address_markup_textarea" className="form-control address_definition same_size_as_parent" rows="10" value={this.state.AddressesStore.markup.content} results={this.state.AddressesStore.markup.rows}
+        <CompLayerBootstrapClient.MarkedTextarea id="client_address_markup_textarea" className="form-control address_definition same_size_as_parent" rows="10" value={this.state.AddressesStore.markup.content} results={this.state.AddressesStore.markup.rows}
           onChange={(value) => {
-            this.dispatch(AddressesStore, new ActionAddressesMarkupChange(value));
+            this.dispatch(AddressesStore.getInstance(), new ActionAddressesMarkupChange(value));
           }}
           />
       </div>
@@ -54,10 +54,10 @@ export default class MiddleAddressesViewClientAddress extends ReactComponentStor
     else {
       return (
         <div className="address_tab_view">
-          <ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_local" classHeading="markup_table_local_table_heading" classRow="test_data_table" dataTable={this.dataAddressesClientAddressLocal} values={this.state.AddressesStore.addressesClientAddressLocals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
+          <CompLayerMarkupClient.ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_local" classHeading="markup_table_local_table_heading" classRow="test_data_table" dataTable={this.dataAddressesClientAddressLocal} values={this.state.AddressesStore.addressesClientAddressLocals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
             return StageFilter.filter(this.props.stage, value, filterData);
           }}/>
-          <ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_global" classHeading="markup_table_global_table_heading" classRow="test_data_table" dataTable={this.dataAddressesClientAddressGlobal} values={this.state.AddressesStore.addressesClientAddressGlobals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
+          <CompLayerMarkupClient.ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_global" classHeading="markup_table_global_table_heading" classRow="test_data_table" dataTable={this.dataAddressesClientAddressGlobal} values={this.state.AddressesStore.addressesClientAddressGlobals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
             return StageFilter.filter(this.props.stage, value, filterData);
           }}/>
         </div>

package/project/client/components/middle/addresses/middle-addresses-view-client-interface.jsx

@@ -1,22 +1,22 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
-import StageFilter from './helpers/stage-filter';
-import AddressesStore from '../../../stores/addresses-store';
+import { StageFilter } from './helpers/stage-filter';
+import { AddressesStore } from '../../../stores/addresses-store';
 import { ActionAddressesMarkupChange } from '../../../actions/action-addresses/action-addresses';
-import MarkedTextarea from 'z-abs-complayer-bootstrap-client/client/marked-textarea';
-import DataAddressesClientInterfaceGlobal from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-client-interface-global';
-import DataAddressesClientInterfaceLocal from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-client-interface-local';
-import ComponentTableDataTable from 'z-abs-complayer-markup-client/client/react-components/markup/component-table-data-table';
-import ReactComponentStore from 'z-abs-corelayer-client/client/react-component/react-component-store';
-import React from 'react';
+import * as  CompLayerBootstrapClient from 'z-abs-complayer-bootstrap-client/client/marked-textarea';
+import * as CompLayerMarkupClient from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-client-interface-global';
+import * as CompLayerMarkupClient1 from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-client-interface-local';
+import * as CompLayerMarkupClient2 from 'z-abs-complayer-markup-client/client/react-components/markup/component-table-data-table';
+import * as CoreLayerClient from 'z-abs-corelayer-client/client/react-component/react-component-store';
+import * as React from 'react';
 
 
-export default class MiddleAddressesViewClientInterface extends ReactComponentStore {
+export class MiddleAddressesViewClientInterface extends CoreLayerClient.ReactComponentStore {
   constructor(props) {
-    super(props, [AddressesStore]);
-    this.dataAddressesClientInterfaceGlobal = new DataAddressesClientInterfaceGlobal();
-    this.dataAddressesClientInterfaceLocal = new DataAddressesClientInterfaceLocal();
+    super(props, [AddressesStore.getInstance()]);
+    this.dataAddressesClientInterfaceGlobal = new CompLayerMarkupClient.DataAddressesClientInterfaceGlobal();
+    this.dataAddressesClientInterfaceLocal = new CompLayerMarkupClient.DataAddressesClientInterfaceLocal();
   }
 
   shouldUpdate(nextProps, nextState) {
@@ -34,9 +34,9 @@ export default class MiddleAddressesViewClientInterface extends ReactComponentSt
     return (
       <div className="address_group">
         <label htmlFor="client_interface_markup_textarea">Address - Markup</label>
-        <MarkedTextarea id="client_interface_markup_textarea" className="form-control address_definition same_size_as_parent" rows="10" value={this.state.AddressesStore.markup.content} results={this.state.AddressesStore.markup.rows}
+        <CompLayerBootstrapClient.MarkedTextarea id="client_interface_markup_textarea" className="form-control address_definition same_size_as_parent" rows="10" value={this.state.AddressesStore.markup.content} results={this.state.AddressesStore.markup.rows}
           onChange={(value) => {
-            this.dispatch(AddressesStore, new ActionAddressesMarkupChange(value));
+            this.dispatch(AddressesStore.getInstance(), new ActionAddressesMarkupChange(value));
           }}
           />
       </div>
@@ -55,10 +55,10 @@ export default class MiddleAddressesViewClientInterface extends ReactComponentSt
     else {
       return (
         <div className="address_tab_view">
-          <ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_local" classHeading="markup_table_local_table_heading" classRow="test_data_table" dataTable={this.dataAddressesClientInterfaceLocal} values={this.state.AddressesStore.addressesClientInterfaceLocals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
+          <CompLayerMarkupClient.ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_local" classHeading="markup_table_local_table_heading" classRow="test_data_table" dataTable={this.dataAddressesClientInterfaceLocal} values={this.state.AddressesStore.addressesClientInterfaceLocals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
             return StageFilter.sutFilter(this.props.stage, value, filterData);
           }}/>
-          <ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_global" classHeading="markup_table_global_table_heading" classRow="test_data_table" dataTable={this.dataAddressesClientInterfaceGlobal} values={this.state.AddressesStore.addressesClientInterfaceGlobals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
+          <CompLayerMarkupClient.ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_global" classHeading="markup_table_global_table_heading" classRow="test_data_table" dataTable={this.dataAddressesClientInterfaceGlobal} values={this.state.AddressesStore.addressesClientInterfaceGlobals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
             return StageFilter.sutFilter(this.props.stage, value, filterData);
           }}/>
         </div>

package/project/client/components/middle/addresses/middle-addresses-view-dns.jsx

@@ -1,22 +1,22 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
-import StageFilter from './helpers/stage-filter';
-import AddressesStore from '../../../stores/addresses-store';
+import { StageFilter } from './helpers/stage-filter';
+import { AddressesStore } from '../../../stores/addresses-store';
 import { ActionAddressesMarkupChange } from '../../../actions/action-addresses/action-addresses';
-import ComponentMarkedTextarea from 'z-abs-complayer-bootstrap-client/client/marked-textarea';
-import DataAddressesDnsGlobal from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-dns-global';
-import DataAddressesDnsLocal from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-dns-local';
-import ComponentTableDataTable from 'z-abs-complayer-markup-client/client/react-components/markup/component-table-data-table';
-import ReactComponentStore from 'z-abs-corelayer-client/client/react-component/react-component-store';
-import React from 'react';
+import * as  CompLayerBootstrapClient from 'z-abs-complayer-bootstrap-client/client/marked-textarea';
+import * as CompLayerMarkupClient from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-dns-global';
+import * as CompLayerMarkupClient1 from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-dns-local';
+import * as CompLayerMarkupClient2 from 'z-abs-complayer-markup-client/client/react-components/markup/component-table-data-table';
+import * as CoreLayerClient from 'z-abs-corelayer-client/client/react-component/react-component-store';
+import * as React from 'react';
 
 
-export default class MiddleAddressesViewDns extends ReactComponentStore {
+export class MiddleAddressesViewDns extends CoreLayerClient.ReactComponentStore {
   constructor(props) {
-    super(props, [AddressesStore]);
-    this.dataAddressesDnsGlobal = new DataAddressesDnsGlobal();
-    this.dataAddressesDnsLocal = new DataAddressesDnsLocal();
+    super(props, [AddressesStore.getInstance()]);
+    this.dataAddressesDnsGlobal = new CompLayerMarkupClient.DataAddressesDnsGlobal();
+    this.dataAddressesDnsLocal = new CompLayerMarkupClient.DataAddressesDnsLocal();
   }
   
   shouldUpdate(nextProps, nextState) {
@@ -34,9 +34,9 @@ export default class MiddleAddressesViewDns extends ReactComponentStore {
     return (
       <div className="address_group">
         <label htmlFor="address_dns_markup_textarea">Address - Markup</label>
-        <ComponentMarkedTextarea id="address_dns_markup_textarea" className="form-control address_definition same_size_as_parent" rows="10" value={this.state.AddressesStore.markup.content} results={this.state.AddressesStore.markup.rows}
+        <CompLayerBootstrapClient.MarkedTextarea id="address_dns_markup_textarea" className="form-control address_definition same_size_as_parent" rows="10" value={this.state.AddressesStore.markup.content} results={this.state.AddressesStore.markup.rows}
           onChange={(value) => {
-            this.dispatch(AddressesStore, new ActionAddressesMarkupChange(value));
+            this.dispatch(AddressesStore.getInstance(), new ActionAddressesMarkupChange(value));
           }}
           />
       </div>
@@ -54,10 +54,10 @@ export default class MiddleAddressesViewDns extends ReactComponentStore {
     else {
       return (
         <div className="address_tab_view">, 
-          <ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_local" classHeading="markup_table_local_table_heading" classRow="test_data_table" dataTable={this.dataAddressesDnsLocal} values={this.state.AddressesStore.addressesDnsLocals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
+          <CompLayerMarkupClient.ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_local" classHeading="markup_table_local_table_heading" classRow="test_data_table" dataTable={this.dataAddressesDnsLocal} values={this.state.AddressesStore.addressesDnsLocals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
             return StageFilter.filter(this.props.stage, value, filterData);
           }}/>
-          <ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_global" classHeading="markup_table_global_table_heading" classRow="test_data_table" dataTable={this.dataAddressesDnsGlobal} values={this.state.AddressesStore.addressesDnsGlobals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
+          <CompLayerMarkupClient.ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_global" classHeading="markup_table_global_table_heading" classRow="test_data_table" dataTable={this.dataAddressesDnsGlobal} values={this.state.AddressesStore.addressesDnsGlobals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
             return StageFilter.filter(this.props.stage, value, filterData);
           }}/>
         </div>

package/project/client/components/middle/addresses/middle-addresses-view-dst.jsx

@@ -1,22 +1,22 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
-import StageFilter from './helpers/stage-filter';
-import AddressesStore from '../../../stores/addresses-store';
+import { StageFilter } from './helpers/stage-filter';
+import { AddressesStore } from '../../../stores/addresses-store';
 import { ActionAddressesMarkupChange } from '../../../actions/action-addresses/action-addresses';
-import ComponentMarkedTextarea from 'z-abs-complayer-bootstrap-client/client/marked-textarea';
-import DataAddressesDstGlobal from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-dst-global';
-import DataAddressesDstLocal from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-dst-local';
-import ComponentTableDataTable from 'z-abs-complayer-markup-client/client/react-components/markup/component-table-data-table';
-import ReactComponentStore from 'z-abs-corelayer-client/client/react-component/react-component-store';
-import React from 'react';
+import * as CompLayerBootstrapClient from 'z-abs-complayer-bootstrap-client/client/marked-textarea';
+import * as CompLayerMarkupClient from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-dst-global';
+import * as CompLayerMarkupClient1 from 'z-abs-complayer-markup-client/client/data/addresses/data-addresses-dst-local';
+import * as CompLayerMarkupClient2 from 'z-abs-complayer-markup-client/client/react-components/markup/component-table-data-table';
+import * as CoreLayerClient from 'z-abs-corelayer-client/client/react-component/react-component-store';
+import * as React from 'react';
 
 
-export default class MiddleAddressesViewDst extends ReactComponentStore {
+export class MiddleAddressesViewDst extends CoreLayerClient.ReactComponentStore {
   constructor(props) {
-    super(props, [AddressesStore]);
-    this.dataAddressesDstGlobal = new DataAddressesDstGlobal();
-    this.dataAddressesDstLocal = new DataAddressesDstLocal();
+    super(props, [AddressesStore.getInstance()]);
+    this.dataAddressesDstGlobal = new CompLayerMarkupClient.DataAddressesDstGlobal();
+    this.dataAddressesDstLocal = new CompLayerMarkupClient.DataAddressesDstLocal();
   }
 
   shouldUpdate(nextProps, nextState) {
@@ -34,9 +34,9 @@ export default class MiddleAddressesViewDst extends ReactComponentStore {
     return (
       <div className="address_group">
         <label htmlFor="address_dst_markup_textarea">Address - Markup</label>
-        <ComponentMarkedTextarea id="address_dst_markup_textarea" className="form-control address_definition same_size_as_parent" rows="10" value={this.state.AddressesStore.markup.content} results={this.state.AddressesStore.markup.rows}
+        <CompLayerBootstrapClient.MarkedTextarea id="address_dst_markup_textarea" className="form-control address_definition same_size_as_parent" rows="10" value={this.state.AddressesStore.markup.content} results={this.state.AddressesStore.markup.rows}
           onChange={(value) => {
-            this.dispatch(AddressesStore, new ActionAddressesMarkupChange(value));
+            this.dispatch(AddressesStore.getInstance(), new ActionAddressesMarkupChange(value));
           }}
           />
       </div>
@@ -54,10 +54,10 @@ export default class MiddleAddressesViewDst extends ReactComponentStore {
     else {
       return (
         <div className="address_tab_view">
-          <ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_local" classHeading="markup_table_local_table_heading" classRow="test_data_table" dataTable={this.dataAddressesDstLocal} values={this.state.AddressesStore.addressesDstLocals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
+          <CompLayerMarkupClient.ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_local" classHeading="markup_table_local_table_heading" classRow="test_data_table" dataTable={this.dataAddressesDstLocal} values={this.state.AddressesStore.addressesDstLocals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
             return StageFilter.filter(stage, value, filterData);
           }}/>
-          <ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_global" classHeading="markup_table_global_table_heading" classRow="test_data_table" dataTable={this.dataAddressesDstGlobal} values={this.state.AddressesStore.addressesDstGlobals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
+          <CompLayerMarkupClient.ComponentTableDataTable showAlways classTable="markup_table_fit_content markup_table_global" classHeading="markup_table_global_table_heading" classRow="test_data_table" dataTable={this.dataAddressesDstGlobal} values={this.state.AddressesStore.addressesDstGlobals} stage={this.props.stage} filterData={this.state.AddressesStore.labUserFilter} filter={(value, stage, filterData) => {
             return StageFilter.filter(stage, value, filterData);
           }}/>
         </div>