@mixd-id/web-scaffold 0.1.230406390 → 0.1.230406392

package/package.json

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

package/src/components/List.vue

@@ -11,6 +11,8 @@
         <PresetBar :config="config"
                    class="flex-1"
                    :enumCache="enumCache"
+                   :controller="controller"
+                   :preset-key="presetKey"
                    @apply="load">
 
           <template #toolbar>
@@ -26,7 +28,7 @@
              @mousedown="(e) => $util.dragResize(e, resize1)"></div>
       </div>
 
-      <div class="flex-1 flex flex-col relative">
+      <div v-if="preset" class="flex-1 flex flex-col relative">
 
         <div class="flex-1 flex flex-col" :class="containerClass">
           <slot name="head"
@@ -287,6 +289,7 @@ export default{
     },
     presetKey: String,
     subscribeKey: String,
+    controller: String,
     src: undefined,
     title: String,
     view: {
@@ -365,13 +368,13 @@ export default{
     },
 
     load(){
-      if(this.src){
+      if(this.computedSrc){
         if(!this.preset.columns){
           this.preset.columns = JSON.parse(JSON.stringify(this.config.columns))
         }
 
         this.readyState = 2
-        return this.socket.send(this.src, {
+        return this.socket.send(this.computedSrc, {
           ...this.preset,
           id: undefined,
           itemsPerPage: this.data.itemsPerPage,
@@ -394,14 +397,14 @@ export default{
     },
 
     loadNext(){
-      if(this.src && this.readyState !== 4 &&
+      if(this.computedSrc && this.readyState !== 4 &&
           ((this.data ?? {}).hasNext !== false) &&
           !(this.preset.pivot ?? {}).enabled) {
 
         const afterItem = this.dataItems[this.dataItems.length - 1]
 
         this.readyState = 4
-        this.socket.send(this.src, {
+        this.socket.send(this.computedSrc, {
           ...this.preset,
           id: undefined,
           itemsPerPage: this.data.itemsPerPage,
@@ -422,7 +425,7 @@ export default{
     loadPreset(){
       if(!Object.keys(this.$route.query).map(_ => _.toLowerCase()).includes('reset')){
         if(this.presetKey){
-          return this.socket.send('user.preset', { key:this.presetKey })
+          return this.socket.send(this.presetSrc, { key:this.presetKey })
               .then(config => {
                 Object.assign(this.config, config)
 
@@ -434,8 +437,6 @@ export default{
       }
       else{
         return new Promise((resolve) => {
-          this.savePreset()
-
           const query = {}
           for(let key in this.$route.query){
             if(key.toLowerCase() !== 'reset')
@@ -504,7 +505,7 @@ export default{
       if(!this.extBar.open) return
 
       this.readyState = 3
-      return this.socket.send(this.src, {
+      return this.socket.send(this.computedSrc, {
         ...this.preset,
         filters: [
           ...(this.preset.filters ?? []),
@@ -521,7 +522,7 @@ export default{
     loadExtNext(){
       if(!this.preset.filters) return
 
-      return this.socket.send(this.src, {
+      return this.socket.send(this.computedSrc, {
         ...this.preset,
         filters: [
           ...(this.preset.filters ?? []),
@@ -544,7 +545,7 @@ export default{
 
     selectPreset(idx){
       if(this.config.presets[idx]){
-        this.config.presetIdx = idx
+        this.configParams.presetIdx = this.config.presets[idx].uid
         this.load()
         this.$refs.presetSelector.close()
         this.$refs.contextMenu.close()
@@ -553,7 +554,7 @@ export default{
 
     savePreset: invokeAfterIdle(function() {
       if(this.presetKey) {
-        this.socket.send('user.preset',
+        this.socket.send(this.presetSrc,
             {key: this.presetKey, config: this.config})
       }
     }),
@@ -609,7 +610,7 @@ export default{
     loadQueued(items){
       const key = items[0] && items[0].uid ? 'uid' : 'id'
 
-      this.socket.send(this.src, {
+      this.socket.send(this.computedSrc, {
         ...this.preset,
         [key]: items.map(item => item[key])
       })
@@ -945,7 +946,14 @@ export default{
     },
 
     preset(){
-      return ((this.config ?? {}).presets ?? [])[(this.config ?? {}).presetIdx ?? 0] ?? {}
+      return this.config.presets.find(_ => _.uid === this.configParams.presetIdx) ??
+          this.config.sharedPresets.find(_ => _.uid === this.configParams.presetIdx)
+    },
+
+    presetSrc(){
+      return this.controller ?
+          `${this.controller}.preset` :
+          'user.preset'
     },
 
     presetView(){
@@ -956,6 +964,12 @@ export default{
     configParams(){
       if(!this.config.params)
         this.config.params = {}
+
+      if(this.config.presets.length > 0 &&
+          (!this.config.params.presetIdx ||
+              !this.config.presets.find(_ => _.uid === this.config.params.presetIdx)))
+        this.config.params.presetIdx = this.config.presets[0].uid
+
       return this.config.params
     },
 
@@ -994,6 +1008,10 @@ export default{
 
     pivotEnabled(){
       return ((this.preset ?? {}).pivot ?? {}).enabled
+    },
+
+    computedSrc(){
+      return this.src ?? `${this.controller}.load`
     }
 
   },

package/src/components/VirtualTable.vue

@@ -578,7 +578,14 @@ export default{
 					break
 			}
 
-			return text ? text : (value === null ? '' : '-')
+			const res = text ? text : (value === null ? '' : '-')
+
+      return `${res}`
+          .replace(/&/g, "&")
+          .replace(/</g, "&lt;")
+          .replace(/>/g, "&gt;")
+          .replace(/"/g, "&quot;")
+          .replace(/'/g, "&#039;")
 		},
 
 		setState(state){

package/src/utils/preset-selector.js

@@ -1286,6 +1286,7 @@ const presetToSequelizeList = async(preset, {
   include,
   order:initialOrder
 }) => {
+  if(!model) return {}
 
   const updatedAtField = model.rawAttributes['updatedAt'] ?? model.rawAttributes['updated_at']
 

package/src/utils/preset-selector.mjs

@@ -68,6 +68,9 @@ const setupConfig = (config) => {
 
       if(!config.presets[idx].view)
         config.presets[idx].view = 'table'
+
+      if(!config.presets[idx].uid)
+        config.presets[idx].uid = getPresetUid(config.name)
     }
 
     if(!config.presetIdx && config.presets.length > 0){

package/src/utils/wss.js

@@ -74,18 +74,21 @@ class WSS extends EventEmitter2{
   _reqFn = []
   _retryCount = 0
 
-  async fromBinaryData(binaryData){
+  _connectionId = 0
+  _debugIds = {}
+
+  async fromBinaryData(binaryData, debugMode = false){
     const encryptedString = Buffer.from(binaryData).toString('utf-8');
-    const decryptedData = this._opt.key ?
+    const decryptedData = this._opt.key && !debugMode ?
       CryptoJS.AES.decrypt(encryptedString, this._opt.key).toString(CryptoJS.enc.Utf8) :
       encryptedString;
     const receivedObject = JSON.parse(decryptedData);
     return await revertDataUrlObj(receivedObject);
   }
 
-  async toBinaryData(obj){
+  async toBinaryData(obj, debugMode = false){
     const dataUrlObj = await convertDataUrlObj(obj)
-    const encryptedData = this._opt.key ?
+    const encryptedData = this._opt.key && !debugMode ?
       CryptoJS.AES.encrypt(JSON.stringify(dataUrlObj), this._opt.key).toString() :
       JSON.stringify(dataUrlObj);
     return new TextEncoder().encode(encryptedData);
@@ -106,12 +109,17 @@ class WSS extends EventEmitter2{
     this._client.connect().then()
 
     this._instance.on('connection', async (socket, req) => {
+      socket.id = `${++this._connectionId}`
+
+      if(`${req.url}`.indexOf('debug-ws') > 0){
+        this._debugIds[socket.id] = {}
+      }
 
       let subscriber
 
       const listener = (message) => {
         const { model, event, items } = JSON.parse(message)
-        this.toBinaryData({ data:{ model, event, items } })
+        this.toBinaryData({ data:{ model, event, items } }, !!this._debugIds[socket.id])
           .then(data => socket.send(data))
       }
 
@@ -157,7 +165,7 @@ class WSS extends EventEmitter2{
 
         let obj
         try{
-          obj = await this.fromBinaryData(binaryData);
+          obj = await this.fromBinaryData(binaryData, !!this._debugIds[socket.id]);
         }
         catch(e){
           return socket.close(1002, e.message);
@@ -170,7 +178,7 @@ class WSS extends EventEmitter2{
           this._retryCount = 0
         }
         else if(ping){
-          socket.send(await this.toBinaryData({ pong: 1 }))
+          socket.send(await this.toBinaryData({ pong: 1 }, !!this._debugIds[socket.id]))
         }
         else{
           let status = 200
@@ -209,7 +217,7 @@ class WSS extends EventEmitter2{
             _requestId,
             status,
             data
-          }))
+          }, !!this._debugIds[socket.id]))
         }
       });
 
@@ -231,7 +239,7 @@ class WSS extends EventEmitter2{
         }
 
         socket.isAuth = true
-        socket.send(await this.toBinaryData({ auth:true }))
+        socket.send(await this.toBinaryData({ auth:true }, !!this._debugIds[socket.id]))
 
         subscriber = this._client.duplicate()
         await subscriber.connect()
@@ -243,7 +251,7 @@ class WSS extends EventEmitter2{
       if(this._opt.ping !== false){
 
         const ping = async() => {
-          socket.send(await this.toBinaryData({ ping:1 }))
+          socket.send(await this.toBinaryData({ ping:1 }, !!this._debugIds[socket.id]))
           socket.pinging = true
 
           setTimeout(() => {

package/src/utils/wss.mjs

@@ -78,14 +78,14 @@ class WSS extends EventEmitter2{
 
   async fromBinaryData(binaryData){
     const encryptedString = new TextDecoder().decode(binaryData)
-    const decryptedData = this._opt.key ?
+    const decryptedData = this._opt.key && !this._opt.debug ?
       CryptoJS.AES.decrypt(encryptedString, this._opt.key).toString(CryptoJS.enc.Utf8) :
       encryptedString;
     return JSON.parse(decryptedData)
   }
 
   async toBinaryData(obj){
-    const encryptedData = this._opt.key ?
+    const encryptedData = this._opt.key && !this._opt.debug ?
       CryptoJS.AES.encrypt(JSON.stringify(obj), this._opt.key).toString() :
       JSON.stringify(obj);
     return new TextEncoder().encode(encryptedData)

package/src/widgets/Dashboard/SharingModal.vue

@@ -32,7 +32,7 @@
 	  <div class="flex-1 p-6 flex flex-col">
 
       <div v-if="items?.length > 0">
-        <div v-for="item in items" :class="dashboardStyle.button" @click="select(item)">
+        <div v-for="item in items" :class="appStyle.menuItem" @click="select(item)">
           <slot name="item" :item="item">
             <div>{{ item.name }}</div>
           </slot>
@@ -55,7 +55,7 @@ export default{
 
   emits: [ 'select' ],
 
-	inject: [ 'dashboardStyle', 'socket', 'toast' ],
+	inject: [ 'appStyle', 'socket', 'toast' ],
 
   name: 'SharingModal',