Filter angular errors in react

elastic · Sep 14, 2021 · 326d9ef · 326d9ef
1 parent 8ba3588
commit 326d9ef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/x-pack/plugins/monitoring/public/components/chart/get_chart_options.js b/x-pack/plugins/monitoring/public/components/chart/get_chart_options.js
@@ -14,8 +14,12 @@ export async function getChartOptions(axisOptions) {
   try {
     const $injector = Legacy.shims.getAngularInjector();
     timezone = $injector.get('config').get('dateFormat:tz');
-  } catch {
-    timezone = Legacy.shims.uiSettings?.get('dateFormat:tz');
+  } catch (error) {
+    if (error.message === 'Angular has been removed.') {
+      timezone = Legacy.shims.uiSettings?.get('dateFormat:tz');
+    } else {
+      throw error;
+    }
   }
   const opts = {
     legend: {

diff --git a/x-pack/plugins/monitoring/public/components/logs/logs.js b/x-pack/plugins/monitoring/public/components/logs/logs.js
@@ -20,9 +20,13 @@ const getFormattedDateTimeLocal = (timestamp) => {
     const injector = Legacy.shims.getAngularInjector();
     const timezone = injector.get('config').get('dateFormat:tz');
     return formatDateTimeLocal(timestamp, timezone);
-  } catch {
-    const timezone = Legacy.shims.uiSettings?.get('dateFormat:tz');
-    return formatDateTimeLocal(timestamp, timezone);
+  } catch (error) {
+    if (error.message === 'Angular has been removed.') {
+      const timezone = Legacy.shims.uiSettings?.get('dateFormat:tz');
+      return formatDateTimeLocal(timestamp, timezone);
+    } else {
+      throw error;
+    }
   }
 };