technical debt

e154 · Jan 12, 2024 · ef4adc5 · ef4adc5
1 parent 763617c
commit ef4adc5
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 14 deletions.
diff --git a/api/dto/entity.go b/api/dto/entity.go
@@ -21,8 +21,7 @@ package dto
 import (
 	"fmt"
 
-	stub "github.com/e154/smart-home/api/stub"
-
+	"github.com/e154/smart-home/api/stub"
 	"github.com/e154/smart-home/common"
 	m "github.com/e154/smart-home/models"
 )
@@ -241,7 +240,7 @@ func ToEntity(entity *m.Entity) (obj *stub.ApiEntity) {
 	}
 	// image
 	if entity.Image != nil {
-		obj.Image = imageDto.ToImage(entity.Image)
+		obj.Image = imageDto.ToImageShort(entity.Image)
 	}
 	// parent
 	if entity.ParentId != nil {
@@ -263,7 +262,7 @@ func ToEntity(entity *m.Entity) (obj *stub.ApiEntity) {
 		}
 		// script
 		if a.Script != nil {
-			action.Script = scriptDto.GetStubScript(a.Script)
+			action.Script = scriptDto.GetStubScriptShort(a.Script)
 		}
 		obj.Actions = append(obj.Actions, action)
 	}
@@ -284,7 +283,7 @@ func ToEntity(entity *m.Entity) (obj *stub.ApiEntity) {
 	}
 	// scripts
 	for _, s := range entity.Scripts {
-		script := scriptDto.GetStubScript(s)
+		script := scriptDto.GetStubScriptShort(s)
 		obj.Scripts = append(obj.Scripts, *script)
 		obj.ScriptIds = append(obj.ScriptIds, s.Id)
 	}

diff --git a/api/dto/image.go b/api/dto/image.go
@@ -48,6 +48,16 @@ func (i Image) ToImage(image *m.Image) (result *stub.ApiImage) {
 	return
 }
 
+// ToImageShort ...
+func (i Image) ToImageShort(image *m.Image) (result *stub.ApiImage) {
+	result = &stub.ApiImage{
+		Id:   image.Id,
+		Name: image.Name,
+		Url:  image.Url,
+	}
+	return
+}
+
 // FromNewImageRequest ...
 func (i Image) FromNewImageRequest(req *stub.ApiNewImageRequest) (image *m.Image) {
 	image = &m.Image{

diff --git a/api/dto/script.go b/api/dto/script.go
@@ -72,6 +72,12 @@ func (s Script) GetStubScript(script *m.Script) (result *stub.ApiScript) {
 	return
 }
 
+// GetStubScriptShort ...
+func (s Script) GetStubScriptShort(script *m.Script) (result *stub.ApiScript) {
+	result = GetStubScriptShort(script)
+	return
+}
+
 // ToSearchResult ...
 func (s Script) ToSearchResult(list []*m.Script) *stub.ApiSearchScriptListResult {
 
@@ -139,6 +145,18 @@ func GetStubScript(script *m.Script) (result *stub.ApiScript) {
 	return
 }
 
+// GetStubScriptShort ...
+func GetStubScriptShort(script *m.Script) (result *stub.ApiScript) {
+	if script == nil {
+		return
+	}
+	result = &stub.ApiScript{
+		Id:   script.Id,
+		Name: script.Name,
+	}
+	return
+}
+
 func ImportScript(from *stub.ApiScript) (*int64, *m.Script) {
 	if from == nil {
 		return nil, nil

diff --git a/static_source/admin/src/components/Echart/src/Echart.vue b/static_source/admin/src/components/Echart/src/Echart.vue
@@ -92,11 +92,11 @@ const contentResizeHandler = async (e: TransitionEvent) => {
 onMounted(() => {
   initChart()
 
-  window.addEventListener('resize', resizeHandler)
+  window.addEventListener('resize', resizeHandler, {passive: true})
 
   contentEl.value = document.getElementsByClassName(`${variables.namespace}-layout-content`)[0]
   unref(contentEl) &&
-    (unref(contentEl) as Element).addEventListener('transitionend', contentResizeHandler)
+    (unref(contentEl) as Element).addEventListener('transitionend', contentResizeHandler, {passive: true})
 
   echartRef.on('datazoom', function (evt) {
     // const option = echartRef.getOption();

diff --git a/static_source/admin/src/layout/components/AppView.vue b/static_source/admin/src/layout/components/AppView.vue
@@ -32,7 +32,7 @@ const onKeydown = ( event ) => {
 }
 
 onMounted(() => {
-  document.addEventListener("keydown", onKeydown)
+  document.addEventListener("keydown", onKeydown, {passive: true})
 })
 
 onUnmounted(() => {

diff --git a/static_source/admin/src/views/Dashboard/card_items/state/index.vue b/static_source/admin/src/views/Dashboard/card_items/state/index.vue
@@ -34,7 +34,7 @@ onMounted(() => {
   // store dom element moveable
   props.item.setTarget(el.value)
 
-  currentImage.value = props.item?.payload.state.default_image || props.item?.payload.state.defaultImage || null;
+  currentImage.value = props.item?.payload.state.defaultImage || props.item?.payload.state.default_image || null;
   if (props.item?.payload?.state?.defaultIcon) {
     currentImage.value = null
     currentIcon.value = props.item?.payload?.state?.defaultIcon;
@@ -88,7 +88,7 @@ const update = debounce(() => {
   }
 
   if (counter == 0) {
-    currentImage.value = props.item?.payload.state.default_image || props.item?.payload.state.defaultImage || null;
+    currentImage.value = props.item?.payload.state.defaultImage || props.item?.payload.state.default_image || null;
     if (props.item?.payload?.state?.defaultIcon) {
       currentImage.value = null
       currentIcon.value = props.item?.payload?.state?.defaultIcon;

diff --git a/static_source/admin/src/views/Dashboard/card_items/video/VideoMse.vue b/static_source/admin/src/views/Dashboard/card_items/video/VideoMse.vue
@@ -30,7 +30,7 @@ onMounted(async () => {
       videoEl.value.currentTime = videoEl.value.buffered.end(videoEl.value.buffered.length - 1) - 0.1
       videoEl.value.play()
     }
-  })
+  }, {passive: true})
 
   startPlay()
 })

diff --git a/static_source/admin/src/views/Dashboard/core.ts b/static_source/admin/src/views/Dashboard/core.ts
@@ -320,11 +320,13 @@ export class CardItem {
         iconSize: action.iconSize,
       });
     }
-    const payload = btoa(unescape(encodeURIComponent(serializedObject({
+    const payload = {};
+    payload[this._type] = this.payload[this._type];
+    const cardItemPayload = btoa(unescape(encodeURIComponent(serializedObject({
       width: this.width,
       height: this.height,
       transform: this.transform,
-      payload: this.payload,
+      payload: payload,
       style: style,
       showOn: this.showOn,
       hideOn: this.hideOn,
@@ -338,7 +340,7 @@ export class CardItem {
       weight: this.weight,
       enabled: this.enabled,
       entityId: this._entityId || null,
-      payload: payload,
+      payload: cardItemPayload,
       hidden: this.hidden,
       frozen: this.frozen
 

diff --git a/system/access_list/data.json b/system/access_list/data.json
@@ -754,5 +754,14 @@
       "description": "",
       "method": "delete"
     }
+  },
+  "stream": {
+    "watch": {
+      "actions": [
+        "/stream/*"
+      ],
+      "description": "",
+      "method": "get"
+    }
   }
 }