[Backport] Web console: fix crash when parsing data in data loader that can not be parsed

web-console/src/utils/object-change.spec.ts

@@ -18,7 +18,15 @@
 
 import * as JSONBig from 'json-bigint-native';
 
-import { deepDelete, deepExtend, deepGet, deepSet, makePath, parsePath } from './object-change';
+import {
+  allowKeys,
+  deepDelete,
+  deepExtend,
+  deepGet,
+  deepSet,
+  makePath,
+  parsePath,
+} from './object-change';
 
 describe('object-change', () => {
   describe('parsePath', () => {
@@ -36,6 +44,17 @@ describe('object-change', () => {
     });
   });
 
+  describe('allowKeys', () => {
+    it('works with bad objects', () => {
+      expect(allowKeys(null, ['a', 'b', 'c'] as any)).toEqual(null);
+      expect(allowKeys(undefined as any, ['a', 'b', 'c'] as any)).toEqual(undefined);
+    });
+
+    it('works in a normal case', () => {
+      expect(allowKeys({ a: 1, z: 4 }, ['a', 'b', 'c'] as any)).toEqual({ a: 1 });
+    });
+  });
+
   describe('deepGet', () => {
     const thing = {
       hello: {

web-console/src/utils/object-change.ts

@@ -160,9 +160,10 @@ export function deepExtend<T extends Record<string, any>>(target: T, diff: Recor
 }
 
 export function allowKeys<T>(obj: T, keys: (keyof T)[]): T {
-  const newObj: T = {} as any;
+  if (!obj || typeof obj !== 'object') return obj;
+  const newObj = {} as T;
   for (const key of keys) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+    if (Object.hasOwn(obj, key)) {
       newObj[key] = obj[key];
     }
   }

web-console/src/utils/sampler.ts

@@ -133,7 +133,7 @@ export interface SampleEntry {
 export function getCacheRowsFromSampleResponse(sampleResponse: SampleResponse): CacheRows {
   return filterMap(sampleResponse.data, d => ({
     ...d.input,
-    ...allowKeys<any>(d.parsed, ALL_POSSIBLE_SYSTEM_FIELDS),
+    ...allowKeys<any>(d.parsed || {}, ALL_POSSIBLE_SYSTEM_FIELDS),
   })).slice(0, 20);
 }