technical debt

e154 · Oct 22, 2023 · d6169c1 · d6169c1
1 parent 1cc04d1
commit d6169c1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/static_source/admin/src/views/Automation/Actions/index.vue b/static_source/admin/src/views/Automation/Actions/index.vue
@@ -225,7 +225,7 @@ const tableRowClassName = (data) => {
 
 const callAction = async (action: ApiAction) => {
   if (!action?.id) return;
-  await api.v1.developerToolsServiceTaskCallAction({id: action.id})
+  await api.v1.developerToolsServiceCallAction({id: action.id})
       .catch(() => {
       })
       .finally(() => {

diff --git a/static_source/admin/src/views/Automation/Tasks/edit.vue b/static_source/admin/src/views/Automation/Tasks/edit.vue
@@ -127,7 +127,7 @@ const exportTask = async () => {
 
 const callAction = async (name: string) => {
   // todo: fix
-  await api.v1.developerToolsServiceTaskCallAction({ id: taskId.value || 0, name: name })
+  await api.v1.developerToolsServiceCallAction({ id: taskId.value || 0, name: name })
       .catch(() => {
       })
       .finally(() => {
@@ -181,8 +181,6 @@ useEmitt({
   }
 })
 
-
-
 fetch()
 
 </script>

diff --git a/static_source/admin/src/views/Automation/Triggers/edit.vue b/static_source/admin/src/views/Automation/Triggers/edit.vue
@@ -19,7 +19,7 @@ const {t} = useI18n()
 
 const writeRef = ref<ComponentRef<typeof Form>>()
 const loading = ref(true)
-const triggerId = computed(() => route.params.id as number);
+const triggerId = computed(() => +route.params.id);
 const currentRow = ref<Nullable<ApiTrigger>>(null)
 
 const fetch = async () => {
@@ -123,7 +123,7 @@ fetch()
 
     <div style="text-align: right">
 
-      <ElButton type="success" @click="callTrigger()" :disabled="!row?.isLoaded">
+      <ElButton type="success" @click="callTrigger()">
         {{ t('main.call') }}
       </ElButton>
 

diff --git a/system/supervisor/base_actor.go b/system/supervisor/base_actor.go
@@ -162,6 +162,11 @@ func NewBaseActor(entity *m.Entity,
 					log.Error(err.Error())
 				}
 			}
+			go func() {
+				if _ , err = scriptEngine.Engine().AssertFunction("init"); err != nil {
+					log.Error(err.Error())
+				}
+			}()
 			actor.ScriptEngines = append(actor.ScriptEngines, scriptEngine)
 		}
 	}

diff --git a/system/supervisor/supervisor.go b/system/supervisor/supervisor.go
@@ -165,7 +165,7 @@ func (e *supervisor) handlerSystemScripts(_ string, event interface{}) {
 func (e *supervisor) bindScripts() {
 	e.scriptService.PushFunctions("GetEntity", GetEntityBind(e))
 	e.scriptService.PushFunctions("EntitySetState", SetStateBind(e))
-	e.scriptService.PushFunctions("EntitySetStateName", SetStateBind(e))
+	e.scriptService.PushFunctions("EntitySetStateName", SetStateNameBind(e))
 	e.scriptService.PushFunctions("EntityGetState", GetStateBind(e))
 	e.scriptService.PushFunctions("EntitySetAttributes", SetAttributesBind(e))
 	e.scriptService.PushFunctions("EntityGetAttributes", GetAttributesBind(e))

diff --git a/system/supervisor/supervisor_bind.go b/system/supervisor/supervisor_bind.go
@@ -36,7 +36,8 @@ func SetStateBind(manager Supervisor) func(entityId string, params EntityStatePa
 func SetStateNameBind(manager Supervisor) func(entityId, stateName string) {
 	return func(entityId, stateName string) {
 		_ = manager.SetState(common.EntityId(entityId), EntityStateParams{
-			NewState: common.String(stateName),
+			NewState:    common.String(stateName),
+			StorageSave: true,
 		})
 	}
 }