@mixd-id/web-scaffold 0.1.230406365 → 0.1.230406366

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.230406365",
+  "version": "0.1.230406366",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/components/Button.vue

@@ -169,21 +169,14 @@ export default{
 
 .button-primary {
   @apply bg-primary-500 text-white rounded-lg;
+  @apply hover:bg-primary-600 focus:border-primary-300;
   box-shadow: 0 2px 1px rgba(0, 0, 0, .05);
   border: solid 1px rgb(var(--primary-500));
 }
 
-.button-primary:focus {
-  border-color: rgb(var(--primary-600));
-}
-
-.button-primary:hover {
-  @apply bg-primary-600;
-}
-
 .button-primary-disabled,
 .button-primary-disabled:hover {
-  @apply bg-primary-300 top-0 left-0 cursor-not-allowed text-opacity-50;
+  @apply bg-primary-300 border-primary-300 top-0 left-0 cursor-not-allowed text-opacity-50;
   @apply top-0 left-0;
 }
 

package/src/utils/wss.js

@@ -245,6 +245,13 @@ class WSS extends EventEmitter2{
 
               if(this._retryCount > 10){
                 socket.close(1002, 'ping timeout')
+                if(subscriber){
+                  subscriber.disconnect()
+                  console.log('CLOSE SOCKET', token.substring(0, 10) + '...')
+                }
+                else{
+                  console.log('CLOSE SOCKET#2', token.substring(0, 10) + '...')
+                }
               }
             }
             else{

package/src/widgets/BotEditor/BotEditorActions.vue

@@ -112,6 +112,7 @@ export default{
       this.socket.send(`${this.controller}.open-action`, { uid })
           .then(_ => {
             this.action = _.item
+            this.config.selectedUid = this.action.uid
             this.initialAction = JSON.stringify(this.action)
           })
     },

package/src/widgets/BotEditor/BotEditorSettings.vue

@@ -0,0 +1,21 @@
+<template>
+	<div :class="$style.comp">
+
+	</div>
+</template>
+
+<script>
+
+export default{
+
+}
+
+</script>
+
+<style module>
+
+.comp{
+  @apply p-6;
+}
+
+</style>

package/src/widgets/BotEditor.vue

@@ -59,8 +59,7 @@
 
         <UserActionConsole class="flex-1"
                            ref="console"
-                           @test-message="testMessage"
-                           @test-reset="testReset" />
+                           :controller="controller" />
 
       </div>
 
@@ -85,6 +84,7 @@ import {capitalize} from "../utils/helpers.mjs";
 import BotEditorActions from "./BotEditor/BotEditorActions.vue";
 import VirtualGrid from "../components/VirtualGrid.vue";
 import UserActionConsole from "./UserActionBuilder/UserActionConsole.vue";
+import BotEditorSettings from "./BotEditor/BotEditorSettings.vue";
 
 
 export default{
@@ -93,6 +93,7 @@ export default{
     UserActionConsole,
     VirtualGrid,
     BotEditorActions,
+    BotEditorSettings,
   },
 
   inject: [ 'alert', 'confirm', 'socket', 'toast' ],
@@ -140,12 +141,17 @@ export default{
   data(){
     return {
       actions: null,
+      user: null,
       page: '',
     }
   },
 
   methods: {
 
+    getUser(){
+      return this.user
+    },
+
     load(){
 
     },
@@ -157,6 +163,13 @@ export default{
           })
     },
 
+    open(id){
+      this.socket.send(`${this.controller}.open`, { id })
+          .then(res => {
+            this.user = res.user
+          })
+    },
+
     resize1(w) {
       if (this.sidebar.width + w >= 200 && this.sidebar.width + w <= 600) {
         this.sidebar.width += w
@@ -169,14 +182,6 @@ export default{
       }
     },
 
-    testMessage(){
-
-    },
-
-    testReset(){
-
-    },
-
   },
 
   props: {
@@ -186,6 +191,14 @@ export default{
 
     controller: String,
 
+    id: String,
+
+  },
+
+  provide(){
+    return {
+      getUser: this.getUser
+    }
   },
 
   watch: {
@@ -197,6 +210,13 @@ export default{
       }
     },
 
+    id: {
+      immediate: true,
+      handler(to){
+        this.open(to)
+      }
+    },
+
     page: {
       immediate: true,
       handler(to){
@@ -222,7 +242,7 @@ export default{
 }
 
 .resize2 {
-  @apply h-[3px] cursor-n-resize absolute top-0 right-0 left-0 bg-red-500;
+  @apply h-[3px] cursor-n-resize absolute top-0 right-0 left-0 z-50;
 }
 
 </style>

package/src/widgets/UserActionBuilder/UserActionConsole.vue

@@ -1,6 +1,14 @@
 <template>
   <div class="flex flex-col relative">
 
+    <div class="p-3 flex flex-row items-start gap-3">
+      <div class="flex-1">
+        <h5>Simulation</h5>
+      </div>
+      <button type="button" class="text-primary" @click="reset">Reset</button>
+      <button type="button" class="text-primary" @click="clear">Clear</button>
+    </div>
+
     <div class="flex-1 overflow-y-auto flex flex-col-reverse px-3 gap-2">
       <div v-for="_message in reversedMessages"
            class="p-1 bg-text-50 self-start"
@@ -9,14 +17,9 @@
       </div>
     </div>
 
-    <div class="absolute top-0 right-0 p-3">
-      <button type="button" class="text-primary" @click="clear">Clear</button>
-    </div>
-
-    <div class="p-2 flex flex-row gap-2">
+    <div class="p-3 flex flex-row gap-2">
       <Textbox v-model="message.body" class="flex-1" />
       <Button class="px-4" @click="send">Send</Button>
-      <Button class="px-3" variant="secondary" @click="reset">Reset</Button>
     </div>
   </div>
 </template>
@@ -25,7 +28,7 @@
 
 export default{
 
-  emits: [ 'test-message', 'test-reset' ],
+  inject: [ 'getUser', 'socket' ],
 
   computed: {
 
@@ -38,7 +41,8 @@ export default{
   data(){
     return {
       message: {},
-      messages: []
+      messages: [],
+      context: null,
     }
   },
 
@@ -53,15 +57,31 @@ export default{
     },
 
     reset(){
-      this.$emit('test-reset')
+      this.context = {}
     },
 
     send(){
-      this.$emit('test-message', this.message)
+      this.socket.send(`${this.controller}.test-message`, {
+        userId: this.getUser().id,
+        message: this.message,
+        context: this.context
+      })
+          .then(res => {
+            this.context = res.context ?? this.context
+            if(res.message)
+              this.messages.push(res.message)
+          })
+
       this.messages.push(this.message)
       this.message = {}
     },
 
+  },
+
+  props: {
+
+    controller: String
+
   }
 
 }