working code needs cleanup

paulr34 · Sep 11, 2024 · a294972 · a294972
1 parent 90091a6
commit a294972
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src-electron/db/query-endpoint.js b/src-electron/db/query-endpoint.js
@@ -68,7 +68,6 @@ ORDER BY E1.ENDPOINT_IDENTIFIER
  * @returns {Promise<Array>} - A promise that resolves to an array of rows containing DEVICE_TYPE_REF.
  */
 async function getRootNode(db, packageIds) {
-  console.log(packageIds)
   const query = `
     SELECT DEVICE_TYPE_REF
     FROM ENDPOINT_COMPOSITION

diff --git a/src-electron/rest/endpoint.js b/src-electron/rest/endpoint.js
@@ -211,7 +211,7 @@ function httpGetRootNode(db) {
     )
     let packageIds = packages.map((item) => item.pkg.id)
     let rootNode = await queryEndpoint.getRootNode(db, packageIds)
-    response.status(StatusCodes.OK).json({ rootNode: rootNode })
+    response.status(StatusCodes.OK).json(rootNode)
   }
 }
 

diff --git a/src/App.vue b/src/App.vue
@@ -35,6 +35,7 @@ import { defineComponent } from 'vue'
 import { QSpinnerGears } from 'quasar'
 import ZclTour from './tutorials/ZclTour.vue'
 import CommonMixin from './util/common-mixin'
+import uiOptions from '../util/ui-options'
 
 const rendApi = require(`../src-shared/rend-api.js`)
 const restApi = require(`../src-shared/rest-api.js`)
@@ -136,7 +137,7 @@ export default defineComponent({
   components: {
     ZclTour
   },
-  mixins: [CommonMixin],
+  mixins: [CommonMixin, uiOptions],
   computed: {
     showExceptionIcon() {
       return this.$store.state.zap.showExceptionIcon

diff --git a/src/store/zap/actions.js b/src/store/zap/actions.js
@@ -328,12 +328,23 @@ export function loadComposition(context) {
   axiosRequests
     .$serverGet(restApi.uri.rootNode)
     .then((res) => {
-      const dataArray = { deviceTypeRef: res.data }
-      console.log(dataArray)
+      console.log(res.data)
+      const dataArray = {
+        deviceTypeRef: res.data,
+        deviceIdentifier: 1,
+        deviceVersion: 1,
+        name: 'rootNode'
+      }
       return addEndpointType(context, dataArray) // Call addEndpointType with the array containing deviceTypeRef
     })
     .then((endpointTypeData) => {
-      return addEndpoint(context, endpointTypeData) // Call addEndpoint with the data returned from addEndpointType
+      return addEndpoint(context, {
+        endpointId: 0,
+        networkId: 0,
+        profileId: null,
+        parentEndpointIdentifier: null,
+        endpointType: endpointTypeData.id
+      }) // Call addEndpoint with the data returned from addEndpointType
     })
     .catch((error) => {
       console.error('Error loading composition:', error)