chore: changes according to code review

raaymax · Feb 16, 2024 · 53861ff · 53861ff
1 parent 833682c
commit 53861ff
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 21 deletions.
diff --git a/.github/workflows/ci-ui.yml b/.github/workflows/ci-ui.yml
diff --git a/alfred/ci.py b/alfred/ci.py
@@ -7,6 +7,7 @@
 def ci():
     alfred.invoke_command("ci.mypy")
     alfred.invoke_command("ci.pytest")
+    alfred.invoke_command("npm.lint")
     alfred.invoke_command("npm.build")
 
 
@@ -18,4 +19,4 @@ def ci_mypy():
 @alfred.command("ci.pytest", help="run pytest on ./tests")
 def ci_test():
     os.chdir("tests")
-    alfred.run("pytest")
+    alfred.run("pytest")
diff --git a/alfred/npm.py b/alfred/npm.py
@@ -1,6 +1,11 @@
 import alfred
 import os
 
+@alfred.command("npm.lint", help="lint check ui code")
+def npm_lint():
+    os.chdir("ui")
+    alfred.run("npm run lint:ci")
+
 @alfred.command("npm.build", help="build ui code")
 def npm_build():
     os.chdir("ui")
@@ -9,4 +14,4 @@ def npm_build():
 @alfred.command("npm.build_custom_components", help="build custom components")
 def ui_build_custom():
     os.chdir("ui")
-    alfred.run("npm run custom.build")
+    alfred.run("npm run custom.build")
diff --git a/ui/src/builder/BuilderTreeBranch.vue b/ui/src/builder/BuilderTreeBranch.vue
@@ -1,6 +1,7 @@
 <template>
 	<div class="BuilderTreeBranch">
 		<div
+			ref="rootEl"
 			class="main"
 			:class="{
 				selected: isSelected,
@@ -12,7 +13,6 @@
 			tabindex="0"
 			draggable="true"
 			@click="selfSelectComponent"
-			ref="rootEl"
 			@keydown.enter="selfSelectComponent"
 			@dragover="handleDragOver"
 			@dragstart="handleDragStart"

diff --git a/ui/src/core_components/base/BaseSelect.vue b/ui/src/core_components/base/BaseSelect.vue
@@ -1,10 +1,10 @@
 <template>
 	<div
+		:id="baseId"
 		ref="rootEl"
 		class="BaseSelect"
 		tabindex="0"
 		:data-mode="mode"
-		:id="baseId"
 		:data-list-position="listPosition"
 		role="listbox"
 		:aria-activedescendant="