Fix population recursion error

alexwohlbruck · May 17, 2022 · 439f573 · 439f573
1 parent 512bc67
commit 439f573
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 25 deletions.
diff --git a/client/src/services/group.ts b/client/src/services/group.ts
@@ -11,15 +11,9 @@ export const getGroup = async (id: string) => {
 export const getMyGroups = async () => {
  const { data } = await axios.get<Group[]>('/groups/me')
 
- console.log(JSON.stringify(data))
- console.log(data)
-
  data.forEach(group => {
- console.log(group)
-
  // Destructure lamps
  group.lamps?.forEach(lamp => {
- console.log(lamp)
  Store.commit('ADD_LAMP', lamp)
  })
  delete group.lamps

diff --git a/client/src/store/groups.ts b/client/src/store/groups.ts
@@ -47,12 +47,17 @@ const mutations = {
 const getters = {
  group: (state: GroupsState, getters: any, _rootState: RootState, rootGetters: any) => (id: string, populateGroups = false) => {
  const g = state.byId[id]
+ console.log(populateGroups, g)
  if (populateGroups) {
  g.lamps = rootGetters.lampsByGroup(id)
  }
  return g
  },
- groups: (state: GroupsState, getters: any) => (ids: string[], populateGroups: boolean) => ids.map(id => getters.group(id, populateGroups)),
+
+ groups: (state: GroupsState, getters: any) => (ids: string[], populateGroups: boolean) => {
+ return ids.map(id => getters.group(id, populateGroups))
+ },
+
  myGroups: (state: GroupsState, getters: any, _rootState: RootState, _rootGetters: any) => {
  return getters
  .groups(state.all, true)

diff --git a/client/src/store/lamps.ts b/client/src/store/lamps.ts
@@ -23,11 +23,6 @@ const lampsGetters = {
  const lamp = {...state.byId[id]}
 
  // Denormalize data
- if (lamp.groupId) {
- lamp.group = getters.group(lamp.groupId)
- delete lamp.groupId
- }
-
  if (lamp.userId) {
  lamp.user = getters.user(lamp.userId)
  delete lamp.userId
@@ -36,6 +31,7 @@ const lampsGetters = {
  if (lamp?.user?._id) {
  lamp.user = getters.user(lamp.user._id)
  }
+ console.log(lamp)
 
  return lamp
  },
@@ -73,10 +69,10 @@ const mutations = {
  },
 
  ADD_LAMP_CONFIG(state: LampsState, config: any) {
- Vue.set(state.byId, config.lampId, {
- ...state.byId[config.lampId],
- config,
- })
+ // Vue.set(state.byId, config.lampId, {
+ //  ...state.byId[config.lampId],
+ //  config,
+ // })
  },
 
  REMOVE_LAMP(state: LampsState, lamp: Lamp | { _id: string }) {

diff --git a/client/src/views/Lamps.vue b/client/src/views/Lamps.vue
@@ -50,12 +50,6 @@ export default class Lamps extends Vue {
  await getMyGroups()
  }
 
- // When navigating reload data
- beforeRouteUpdate(_to: any, _from: any, next: any) {
- getMyGroups()
- next()
- }
-
  get myGroups() {
  return this.$store.getters.myGroups
  }

diff --git a/server/routes/lamps.ts b/server/routes/lamps.ts
@@ -48,15 +48,16 @@ router.post('/', isAuthenticated, async (req, res) => {
 })
 
 router.get('/:id/config', isAuthenticated, async (req, res) => {
- const config = await getLampConfig(req.params.id)
- // const config = {"deviceId":"4091519b56b8","readingLightColorTemperature":2001,"nightMode":false,"minimumLightLevel":0.8,"wifi":[{"ssid":"asu-visitor","password":""}],"brightness":0.5,"lampId":"626df507d6756882f166942c"}
+ // const config = await getLampConfig(req.params.id)
+ const config = {"deviceId":"4091519b56b8","readingLightColorTemperature":2001,"nightMode":false,"minimumLightLevel":0.8,"wifi":[{"ssid":"asu-visitor","password":""}],"brightness":0.5,"lampId":"626df507d6756882f166942c"}
  return res.status(200).json(config)
 })
 
 router.patch('/:id/config', isAuthenticated, async (req, res) => {
  // TODO: Wait for successful response using pEvent
  updateLampConfig(req.params.id, req.body)
- res.status(200).json({})
+ const config = await getLampConfig(req.params.id)
+ res.status(200).json(config)
 })
 
 // Move a lamp to another group