Fix reported errors by Faro (#4408)

# What this PR does Fixes the following reported errors by Faro - Cannot read properties of undefined (reading 'error_code') - found in Page Error Handling wrapper - Cannot read properties of undefined (reading 'slack_team_identity') - Found in DefaultPageLayout helpers - Cannot read properties of undefined (reading 'reduce') - undefined passed labels in labels helpers - Cannot read properties of undefined (reading 'controlled_fields') - webhooks - Cannot read properties of undefined (reading 'data') The following needs to be further investigated to see if the response misses whole body - Cannot read properties of undefined (reading 'config') - happening in Faro. I assume it's when an exception is thrown and the ex doesn't have the `config` field ## Which issue(s) this PR closes Closes #4403
grafana · May 28, 2024 · 8559112 · 8559112
1 parent 2b60013
commit 8559112
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 50 deletions.
diff --git a/src/components/PageErrorHandlingWrapper/PageErrorHandlingWrapper.helpers.tsx b/src/components/PageErrorHandlingWrapper/PageErrorHandlingWrapper.helpers.tsx
@@ -8,7 +8,7 @@ export function getWrongTeamResponseInfo(response): Partial<PageErrorData> {
   if (response) {
     if (response.status === 404) {
       return { isNotFoundError: true };
-    } else if (response.status === 403 && response.data.error_code === 'wrong_team') {
+    } else if (response.status === 403 && response.data?.error_code === 'wrong_team') {
       let res = response.data;
       if (res.owner_team) {
         return { isWrongTeamError: true, switchToTeam: { name: res.owner_team.name, id: res.owner_team.id } };

diff --git a/src/containers/DefaultPageLayout/DefaultPageLayout.helpers.tsx b/src/containers/DefaultPageLayout/DefaultPageLayout.helpers.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { PluginLink } from 'components/PluginLink/PluginLink';
+import { RenderConditionally } from 'components/RenderConditionally/RenderConditionally';
 import { Organization } from 'models/organization/organization.types';
 
 import { SlackError } from './DefaultPageLayout.types';
@@ -10,12 +11,15 @@ export function getSlackMessage(slackError: SlackError, organization: Organizati
     return (
       <>
         Couldn't connect Slack.
-        {Boolean(organization?.slack_team_identity) && (
-          <>
-            {' '}
-            Select <b>{organization.slack_team_identity.cached_name}</b> workspace when connecting please
-          </>
-        )}
+        <RenderConditionally
+          shouldRender={Boolean(organization?.slack_team_identity)}
+          render={() => (
+            <>
+              {' '}
+              Select <b>{organization.slack_team_identity.cached_name}</b> workspace when connecting please
+            </>
+          )}
+        />
       </>
     );
   }

diff --git a/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.tsx b/src/containers/OutgoingWebhookForm/OutgoingWebhookForm.tsx
@@ -74,7 +74,7 @@ function prepareDataForEdit(
 
 function prepareForSave(rawData: Partial<ApiSchemas['Webhook']>, selectedPreset: OutgoingWebhookPreset) {
   const data = { ...rawData };
-  selectedPreset.controlled_fields.forEach((field) => {
+  selectedPreset?.controlled_fields.forEach((field) => {
     delete data[field];
   });
 

diff --git a/src/containers/OutgoingWebhookForm/OutgoingWebhookFormFields.tsx b/src/containers/OutgoingWebhookForm/OutgoingWebhookFormFields.tsx
@@ -354,7 +354,7 @@ export const OutgoingWebhookFormFields = ({
   return (
     <>
       {React.Children.toArray(controls.props.children).filter(
-        (child) => !preset || !preset.controlled_fields.includes((child as React.ReactElement).props.name)
+        (child) => !preset?.controlled_fields.includes((child as React.ReactElement).props.name)
       )}
     </>
   );

diff --git a/src/containers/OutgoingWebhookForm/WebhookPresetIcons.config.tsx b/src/containers/OutgoingWebhookForm/WebhookPresetIcons.config.tsx
@@ -10,7 +10,7 @@ export const additionalWebhookPresetIcons: { [id: string]: () => React.ReactElem
 };
 
 export const getWebhookPresetIcons = (features: Record<string, boolean>) => {
-  if (features[AppFeature.MsTeams]) {
+  if (features?.[AppFeature.MsTeams]) {
     return { ...commonWebhookPresetIconsConfig, ...additionalWebhookPresetIcons };
   }
 

diff --git a/src/containers/RotationForm/RotationForm.tsx b/src/containers/RotationForm/RotationForm.tsx
@@ -202,9 +202,11 @@ export const RotationForm = observer((props: RotationFormProps) => {
     }
   };
 
-  const onError = useCallback((error) => {
-    setErrors(error.response.data);
-  }, []);
+  const onError = (error) => {
+    if (error.response?.data) {
+      setErrors(error.response.data);
+    }
+  };
 
   const handleChange = useDebouncedCallback(updatePreview, 200);
 

diff --git a/src/containers/UsersTimezones/ScheduleUserDetails/ScheduleUserDetails.tsx b/src/containers/UsersTimezones/ScheduleUserDetails/ScheduleUserDetails.tsx
@@ -43,7 +43,7 @@ export const ScheduleUserDetails: FC<ScheduleUserDetailsProps> = observer((props
 
   const { organizationStore } = store;
   const slackWorkspaceName =
-    organizationStore.currentOrganization.slack_team_identity?.cached_name?.replace(/[^0-9a-z]/gi, '') || '';
+    organizationStore.currentOrganization?.slack_team_identity?.cached_name?.replace(/[^0-9a-z]/gi, '') || '';
 
   return (
     <div className={cx('root')} data-testid="schedule-user-details">

diff --git a/src/models/escalation_chain/escalation_chain.ts b/src/models/escalation_chain/escalation_chain.ts
@@ -86,7 +86,7 @@ export class EscalationChainStore extends BaseStore {
     try {
       escalationChain = await this.getById(id, skipErrorHandling);
     } catch (error) {
-      if (error.response.data.error_code === 'wrong_team') {
+      if (error.response.data?.error_code === 'wrong_team') {
         escalationChain = {
           id,
           name: '🔒 Private escalation chain',

diff --git a/src/models/label/label.helpers.ts b/src/models/label/label.helpers.ts
@@ -1,7 +1,7 @@
 import { ApiSchemas } from 'network/oncall-api/api.types';
 
 export const splitToGroups = (labels: Array<ApiSchemas['LabelKey']> | Array<ApiSchemas['LabelValue']>) => {
-  return labels.reduce(
+  return labels?.reduce(
     (memo, option) => {
       memo.find(({ name }) => name === (option.prescribed ? 'System' : 'User added')).options.push(option);
 

diff --git a/src/models/schedule/schedule.ts b/src/models/schedule/schedule.ts
@@ -189,7 +189,7 @@ export class ScheduleStore extends BaseStore {
       try {
         schedule = await this.getById(id, true, fromOrganization);
       } catch (error) {
-        if (error.response.data.error_code === 'wrong_team') {
+        if (error.response.data?.error_code === 'wrong_team') {
           schedule = {
             id,
             name: '🔒 Private schedule',

diff --git a/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.tsx b/src/pages/settings/tabs/ChatOps/tabs/SlackSettings/SlackSettings.tsx
@@ -118,7 +118,7 @@ class _SlackSettings extends Component<SlackProps, SlackState> {
       <div className={cx('root')}>
         <Legend>Slack App settings</Legend>
         <InlineField label="Slack Workspace" grow disabled>
-          <Input value={currentOrganization.slack_team_identity?.cached_name} />
+          <Input value={currentOrganization?.slack_team_identity?.cached_name} />
         </InlineField>
         <InlineField
           label="Default channel for Slack notifications"
@@ -203,34 +203,6 @@ class _SlackSettings extends Component<SlackProps, SlackState> {
     );
   };
 
-  renderSlackWorkspace = () => {
-    const { store } = this.props;
-    return <Text>{store.organizationStore.currentOrganization.slack_team_identity?.cached_name}</Text>;
-  };
-
-  renderSlackChannels = () => {
-    const {
-      store: { organizationStore, slackChannelStore },
-    } = this.props;
-    return (
-      <WithPermissionControlTooltip userAction={UserActions.ChatOpsUpdateSettings}>
-        <GSelect<SlackChannel>
-          className={cx('select', 'control')}
-          items={slackChannelStore.items}
-          fetchItemsFn={slackChannelStore.updateItems}
-          fetchItemFn={slackChannelStore.updateItem}
-          getSearchResult={slackChannelStore.getSearchResult}
-          displayField="display_name"
-          valueField="id"
-          placeholder="Select Slack Channel"
-          value={organizationStore.currentOrganization?.slack_channel?.id}
-          onChange={this.handleSlackChannelChange}
-          nullItemName={PRIVATE_CHANNEL_NAME}
-        />
-      </WithPermissionControlTooltip>
-    );
-  };
-
   removeSlackIntegration = async () => {
     const { store } = this.props;
     try {

diff --git a/src/pages/users/Users.tsx b/src/pages/users/Users.tsx
@@ -367,7 +367,7 @@ class Users extends React.Component<UsersProps, UsersState> {
       warnings.push('Phone not verified');
     }
 
-    if (organizationStore.currentOrganization.slack_team_identity && !user.slack_user_identity) {
+    if (organizationStore.currentOrganization?.slack_team_identity && !user.slack_user_identity) {
       warnings.push('Slack profile is not connected');
     }
 

diff --git a/src/utils/faro.ts b/src/utils/faro.ts
@@ -99,17 +99,17 @@ class BaseFaroHelper {
 
   pushAxiosNetworkResponseEvent = ({ name, res }: { name: string; res: AxiosResponse }) => {
     this.faro?.api.pushEvent(name, {
-      url: res.config.url,
+      url: res.config?.url,
       status: `${res.status}`,
       statusText: `${res.statusText}`,
-      method: res.config.method.toUpperCase(),
+      method: res.config?.method.toUpperCase(),
     });
   };
 
   pushAxiosNetworkError = (res: AxiosResponse) => {
     this.faro?.api.pushError(new Error(`Network error: ${res.status}`), {
       context: {
-        url: res.config.url,
+        url: res.config?.url,
         type: 'network',
         data: `${safeJSONStringify(res.data)}`,
         status: `${res.status}`,