Update device user list to use multiple location lists

Tangerine-Community · Nov 9, 2023 · 1eedf26 · 1eedf26
1 parent 37932d0
commit 1eedf26
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/editor/src/app/groups/responses/responses.component.ts b/editor/src/app/groups/responses/responses.component.ts
@@ -47,7 +47,8 @@ export class ResponsesComponent implements OnInit {
   }
 
   async getResponses() {
-    const locationList = await this.http.get('./assets/location-list.json').toPromise()
+    const data: any = await this.groupsService.getLocationLists(this.groupId);
+    const locationLists = data;
     let responses = []
     if (this.filterBy === '*') {
       responses = <Array<any>>await this.http.get(`/api/${this.groupId}/responses/${this.limit}/${this.skip}`).toPromise()
@@ -56,7 +57,7 @@ export class ResponsesComponent implements OnInit {
     }
     const flatResponses = []
     for (let response of responses) {
-      const flatResponse = await generateFlatResponse(response, locationList, false)
+      const flatResponse = await generateFlatResponse(response, locationLists, false)
       this.excludeColumns.forEach(column => delete flatResponse[column])
       flatResponses.push(flatResponse)
     }

diff --git a/editor/src/app/groups/responses/tangy-form-response-flatten.ts b/editor/src/app/groups/responses/tangy-form-response-flatten.ts
@@ -1,5 +1,5 @@
 
-export const generateFlatResponse = async function (formResponse, locationList, sanitized) {
+export const generateFlatResponse = async function (formResponse, locationLists, sanitized) {
   const process = {
     env: {
       T_REPORTING_MARK_SKIPPED_WITH: 'SKIPPED',
@@ -58,6 +58,7 @@ export const generateFlatResponse = async function (formResponse, locationList,
           for (let group of input.value) {
             locationKeys.push(group.value)
             try {
+              const locationList = locationLists.find(l => input.locationSrc.endsWith(l.path))
               const location = getLocationByKeys(locationKeys, locationList)
               set(input, location.level, location.label)
             } catch (e) {