From 4ed998a9ab576243c6e56cb18dbd579924d3e9f9 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Thu, 3 Dec 2020 01:35:22 +0100
Subject: [PATCH] Fixes

---
 src/csui/NotificationUi.vue              |  1 +
 src/ext/lib/uwui/PlayerNotificationUI.js | 26 ++++++++++++++++--------
 src/ext/lib/uwui/UI.js                   | 18 +++++++++++++++-
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/csui/NotificationUi.vue b/src/csui/NotificationUi.vue
index 4f32f8c..394b3fc 100644
--- a/src/csui/NotificationUi.vue
+++ b/src/csui/NotificationUi.vue
@@ -41,6 +41,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import Icon from '../common/components/Icon';
 
 export default {
diff --git a/src/ext/lib/uwui/PlayerNotificationUI.js b/src/ext/lib/uwui/PlayerNotificationUI.js
index d2746c1..245592d 100644
--- a/src/ext/lib/uwui/PlayerNotificationUI.js
+++ b/src/ext/lib/uwui/PlayerNotificationUI.js
@@ -1,6 +1,11 @@
 import UI from './UI';
 import VuexWebExtensions from 'vuex-webextensions';
-import VideoNotification from '../../../csui/NotificationUi';
+import NotificationUi from '../../../csui/NotificationUi.vue';
+
+if (process.env.CHANNEL !== 'stable'){
+  console.info("Loading: PlayerNotificationUi");
+}
+
 
 class PlayerNotificationUi extends UI {
 
@@ -9,16 +14,16 @@ class PlayerNotificationUi extends UI {
   ) {
     super(
       'notification',
-      getStoreConfig(),
-      getUiConfig(playerElement),
-      getCommsConfig()
+      PlayerNotificationUi.getStoreConfig(),
+      PlayerNotificationUi.getUiConfig(playerElement),
+      PlayerNotificationUi.getCommsConfig()
     )
   }
 
 
   //#region constructor helpers
   // we will move some things out of the constructor in order to keep things clean
-  getStoreConfig() {
+  static getStoreConfig() {
     return {
       plugins: [
         VuexWebExtensions({
@@ -48,14 +53,14 @@ class PlayerNotificationUi extends UI {
     };
   }
 
-  getUiConfig(playerElement) {
+  static getUiConfig(playerElement) {
     return {
       parentElement: playerElement,
-      component: VideoNotification
+      component: NotificationUi
     }
   }
 
-  getCommsConfig() {
+  static getCommsConfig() {
     return {
       handlers: {
         'show-notification': [(message) => this.showNotification(message)],
@@ -94,4 +99,9 @@ class PlayerNotificationUi extends UI {
   }
 }
 
+if (process.env.CHANNEL !== 'stable'){
+  console.info("PlayerNotificationUi loaded");
+}
+
+
 export default PlayerNotificationUi;
diff --git a/src/ext/lib/uwui/UI.js b/src/ext/lib/uwui/UI.js
index 84536d6..3f0bb36 100644
--- a/src/ext/lib/uwui/UI.js
+++ b/src/ext/lib/uwui/UI.js
@@ -1,6 +1,11 @@
 import { createApp } from 'vue';
 import { createStore } from 'vuex';
 
+if (process.env.CHANNEL !== 'stable'){
+  console.info("Loading: UI");
+}
+
+
 class UI {
   constructor(
     interfaceId,
@@ -10,6 +15,10 @@ class UI {
   ) {
     this.interfaceId = interfaceId;
     this.commsConfig = commsConfig;
+    this.storeConfig = storeConfig,
+    this.uiConfig = uiConfig;
+
+    this.init();
   }
 
   async init() {
@@ -34,11 +43,13 @@ class UI {
 
   async initVue() {
     this.vuexStore = createStore(this.storeConfig);
+    this.initUi();
   }
 
   async initUi() {
     const random = Math.round(Math.random() * 69420);
-    const uwid = `uw-${this.interfaceId}-root-${random}`
+    // const uwid = `uw-${this.interfaceId}-root-${random}`
+    const uwid = 'not-so-random-id'
 
     const rootDiv = document.createElement('div');
     rootDiv.setAttribute('style', `position: ${uiConfig.style?.position ?? 'relative'}; width: ${uiConfig.style?.width ?? '100%'}; height: ${uiConfig.style?.height ?? '100%'}; ${uiConfig.additionalStyle}`);
@@ -73,4 +84,9 @@ class UI {
   }
 }
 
+if (process.env.CHANNEL !== 'stable'){
+  console.info("UI.js loaded");
+}
+
+
 export default UI;