fix json parse in dashboard

helyOSFramework · May 14, 2024 · bc66e98 · bc66e98
1 parent 8f5cc6c
commit bc66e98
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 84 deletions.
diff --git a/helyos_dashboard/package-lock.json b/helyos_dashboard/package-lock.json
diff --git a/helyos_dashboard/package.json b/helyos_dashboard/package.json
@@ -27,11 +27,10 @@
  "@ng-bootstrap/ng-bootstrap": "13.1.1",
  "@ngx-translate/core": "14.0.0",
  "@ngx-translate/http-loader": "7.0.0",
- "apollo-cache-inmemory": "1.6.6",
  "cheap-ruler": "3.0.2",
  "core-js": "3.20.2",
  "font-awesome": "4.7.0",
- "helyosjs-sdk": "^2.0.4",
+ "helyosjs-sdk": "^2.0.5",
  "js-yaml": "4.1.0",
  "lodash": "4.17.21",
  "rxjs": "7.8.1",

diff --git a/helyos_dashboard/src/app/layout/yards/yards.component.html b/helyos_dashboard/src/app/layout/yards/yards.component.html
@@ -26,7 +26,7 @@ <h1>Yards </h1>
  <th>Lat</th>
  <th>Lon</th>
  <th>Alt</th>
- <th>Map Info</th>
+ <th title="Optional: JSON data. If you have extensive map data, consider using map objects." >Map Info</th>
  <th>Source</th>
  </tr>
  </thead>
@@ -40,8 +40,8 @@ <h1>Yards </h1>
  <td>{{item.lat}}</td>
  <td>{{item.lon}}</td>
  <td>{{item.alt}}</td>
- <td title="Optional: JSON data. If you have extensive map data, consider using map objects.">{{item.mapData}}</td>
- <td>{{item.source}}</td>
+ <td title="Optional: JSON data. If you have extensive map data, consider using map objects.">
+  {{item.mapData.length > 200 ? item.mapData.substring(0, 200) + '...' : item.mapData}}</td>
  </tr>
  </tbody>
  </table>
@@ -116,8 +116,8 @@ <h4>{{selectedItem.name}}</h4>
 
 
  <div class="row" >
- <fieldset class="form-group col-xl-12">
- <label> Map data (arbritrary JSON data) </label>
+ <fieldset class="form-group col-xl-12" title="Optional: JSON data. If you have extensive map data, consider using map objects.">
+ <label> Map info (arbritrary JSON data) </label>
  <textarea class="form-control" [(ngModel)]="selectedItem.mapData" name="mapData"
  ></textarea>
  </fieldset>

diff --git a/helyos_dashboard/src/app/layout/yards/yards.component.ts b/helyos_dashboard/src/app/layout/yards/yards.component.ts
@@ -22,7 +22,16 @@ export class YardsComponent implements OnInit {
 
  list() {
  return this.helyosService.methods.yard.list({})
- .then( r => this.yards = r );
+ .then( r => {
+ this.yards = r.map(yard => {
+ try {
+ yard.mapData = JSON.stringify(yard.mapData, null, 2);
+ } catch (error) {
+ yard.mapData = '';
+ }
+ return yard;
+ });
+ });
  }
 
 
@@ -40,6 +49,11 @@ export class YardsComponent implements OnInit {
  this.helyosService.methods.yard.get(itemId)
  .then( (r:any)=> {
  this.selectedItem = r;
+ try {
+ this.selectedItem.mapData = JSON.stringify(this.selectedItem.mapData, null, 2);
+ } catch (error) {
+ this.selectedItem.mapData = '';
+ }
  });
  }
 
@@ -61,6 +75,13 @@ export class YardsComponent implements OnInit {
  delete patch.createdAt;
  delete patch.modifiedAt;
 
+ try {
+ patch.mapData = JSON.parse(patch.mapData);
+ } catch (error) {
+ alert('Map Info is no a valid JSON');
+ return;
+ }
+
  this.helyosService.methods.yard.patch(patch)
  .then( r=> {
  if (r.message){