diff --git a/webclient-vue/src/components/script/ScriptTable.vue b/webclient-vue/src/components/script/ScriptTable.vue
new file mode 100644
index 0000000..7603fac
--- /dev/null
+++ b/webclient-vue/src/components/script/ScriptTable.vue
@@ -0,0 +1,156 @@
+
+
+
+
+ {{ row.alias }}
+
+
+
+
+
+ Scope
+ {{ row.scope }}
+
+
+ —
+
+
+
+ {{ areaNameFor(row) }}
+ —
+
+
+
+ {{ row.state }}
+
+
+
+
+ Disable
+
+
+ Enable
+
+
+
+
+
+
+
+
diff --git a/webclient-vue/src/features/areas/pages/AreaDetailPage.vue b/webclient-vue/src/features/areas/pages/AreaDetailPage.vue
index 2699b9d..ea28edf 100644
--- a/webclient-vue/src/features/areas/pages/AreaDetailPage.vue
+++ b/webclient-vue/src/features/areas/pages/AreaDetailPage.vue
@@ -78,11 +78,15 @@
title="No scripts"
message="No scripts assigned to this area."
/>
-
-
- View script
-
-
+
@@ -158,7 +162,6 @@
GnModal,
GnInput,
GnAlert,
- GnTable,
GnSelect,
GnConfirmDialog,
} from "gnexus-ui-kit/vue";
@@ -168,6 +171,7 @@
import AreaBadgeLink from "../../../components/area/AreaBadgeLink.vue";
import AreaAssignSection from "../../../components/area/AreaAssignSection.vue";
import DeviceTable from "../../../components/device/DeviceTable.vue";
+import ScriptTable from "../../../components/script/ScriptTable.vue";
const route = useRoute();
const router = useRouter();
@@ -223,12 +227,6 @@
const showRemoveDialog = ref(false);
const removeDialogMessage = ref("");
-const scriptColumns = [
- { key: "alias", label: "Alias" },
- { key: "name", label: "Name" },
- { key: "state", label: "State" },
-];
-
function openRename() {
if (!area.value) return;
renameForm.areaId = area.value.id;
diff --git a/webclient-vue/src/features/scripts/pages/ScriptsRegularPage.vue b/webclient-vue/src/features/scripts/pages/ScriptsRegularPage.vue
index fda4439..000d507 100644
--- a/webclient-vue/src/features/scripts/pages/ScriptsRegularPage.vue
+++ b/webclient-vue/src/features/scripts/pages/ScriptsRegularPage.vue
@@ -22,111 +22,33 @@
/>
-
-
-
- {{ row.alias }}
-
-
-
-
-
- Scope
- {{ row.scope }}
-
-
- —
-
-
-
- {{ areaNameFor(row) }}
- —
-
-
-
- {{ row.state }}
-
-
-
-
- Disable
-
-
- Enable
-
-
-
+ />
diff --git a/webclient-vue/src/test/mocks/handlers.js b/webclient-vue/src/test/mocks/handlers.js
index 241ec8f..e5c5eaf 100644
--- a/webclient-vue/src/test/mocks/handlers.js
+++ b/webclient-vue/src/test/mocks/handlers.js
@@ -209,9 +209,10 @@
status: true,
data: {
scripts: [
- { alias: "kitchen_light", name: "Kitchen Light", state: "enabled" },
+ { alias: "kitchen_light", name: "Kitchen Light", state: "enabled", type: "action", area_id: 1, scope: "KitchenScope" },
+ { alias: "auto_off", name: "Auto Off", state: "enabled", type: "regular", area_id: 1, scope: "KitchenScope", filename: "auto_off.php" },
],
- total: 1,
+ total: 2,
},
});
}