chore: tidy up merge

Signed-off-by: Stef3st <[email protected]>
com-pas · Nov 6, 2023 · 76e002d · 76e002d
1 parent 83b3072
commit 76e002d
Show file tree

Hide file tree

Showing 82 changed files with 2,365 additions and 2,413 deletions.
diff --git a/.github/workflows/add-pr-to-board.yml b/.github/workflows/add-pr-to-board.yml
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
diff --git a/.github/workflows/save-pr-data-to-file.yml b/.github/workflows/save-pr-data-to-file.yml
diff --git a/packages/compas-open-scd/package.json b/packages/compas-open-scd/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "open-scd",
-  "version": "0.33.0",
+  "name": "compas-open-scd",
+  "version": "0.33.6",
   "repository": "https://github.com/openscd/open-scd.git",
   "description": "A bottom-up substation configuration designer for projects described using SCL `IEC 61850-6` Edition 2 or greater.",
   "keywords": [

diff --git a/packages/compas-open-scd/src/Hosting.ts b/packages/compas-open-scd/src/Hosting.ts
@@ -16,14 +16,9 @@ import { ActionDetail, List } from '@material/mwc-list';
 import { ListItem } from '@material/mwc-list/mwc-list-item';
 
 import { Mixin, newPendingStateEvent } from './foundation.js';
-<<<<<<< HEAD:packages/open-scd/src/Hosting.ts
-import { HistoringElement } from './Historing.js';
-import { Plugin, PluggingElement, pluginIcons } from './Plugging.js';
-=======
 import { UserInfoEvent } from './compas/foundation.js';
 import { LoggingElement } from './Logging.js';
 import { PluggingElement, Plugin, pluginIcons } from './Plugging.js';
->>>>>>> main:packages/compas-open-scd/src/Hosting.ts
 import { SettingElement } from './Setting.js';
 
 interface MenuItem {
@@ -45,12 +40,12 @@ interface MenuPlugin {
   run: () => Promise<void>;
 }
 
-/** Mixin that hosts the UI for Plugins, Settings and Historing */
+/** Mixin that hosts the UI for Plugins, Settings and Logging */
 export type HostingElement = Mixin<typeof Hosting>;
 
 export function Hosting<
   TBase extends new (...args: any[]) => PluggingElement &
-    HistoringElement &
+    LoggingElement &
     SettingElement
 >(Base: TBase) {
   class HostingElement extends Base {
@@ -185,19 +180,12 @@ export function Hosting<
         },
         ...validators,
         {
-          icon: 'list',
+          icon: 'history',
           name: 'menu.viewLog',
           actionItem: true,
           action: (): void => this.logUI.show(),
           kind: 'static',
         },
-        {
-          icon: 'history',
-          name: 'menu.viewHistory',
-          actionItem: true,
-          action: (): void => this.historyUI.show(),
-          kind: 'static',
-        },
         {
           icon: 'rule',
           name: 'menu.viewDiag',