Merge pull request #416 from PagerDuty/issue-415

PagerDuty · Mar 1, 2024 · 72fa1f6 · 72fa1f6
2 parents 43ec762 + 59fdcbe
commit 72fa1f6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/cd-workflow.yml b/.github/workflows/cd-workflow.yml
@@ -30,7 +30,7 @@ jobs:
       VITE_PD_SUBDOMAIN_ALLOW_LIST: '*'
       VITE_PD_OAUTH_CLIENT_ID: ${{ secrets.PD_OAUTH_CLIENT_ID }}
       VITE_PD_OAUTH_CLIENT_SECRET: ${{ secrets.PD_OAUTH_CLIENT_SECRET }}
-      VITE_PD_REQUIRED_ABILITY: ${{ secrets.PD_REQUIRED_ABILITY }}
+      VITE_PD_REQUIRED_ABILITY: 'teams'
       VITE_DD_APPLICATION_ID: ${{ secrets.DD_APPLICATION_ID }}
       VITE_DD_CLIENT_TOKEN: ${{ secrets.DD_CLIENT_TOKEN }}
       VITE_DD_SITE: ${{ secrets.DD_SITE }}

diff --git a/src/components/IncidentTable/subcomponents/NumAlertsComponent.jsx b/src/components/IncidentTable/subcomponents/NumAlertsComponent.jsx
@@ -51,7 +51,7 @@ const NumAlertsComponent = ({
   };
   const getAlertsForIncidents = useCallback(
     (ids) => {
-      dispatch(getAlertsForIncidentsAsyncConnected(ids));
+      dispatch(getAlertsForIncidentsAsyncConnected(ids, true));
     },
     [dispatch],
   );

diff --git a/src/redux/incidents/actions.js b/src/redux/incidents/actions.js
@@ -37,9 +37,10 @@ export const getIncidentsAsync = () => ({
   type: FETCH_INCIDENTS_REQUESTED,
 });
 
-export const getAlertsForIncidentsAsync = (incidentIds) => ({
+export const getAlertsForIncidentsAsync = (incidentIds, isRefetch = false) => ({
   type: FETCH_ALERTS_FOR_INCIDENTS_REQUESTED,
   incidentIds,
+  isRefetch,
 });
 
 export const getNotesForIncidentsAsync = (incidentIds) => ({

diff --git a/src/redux/incidents/reducers.js b/src/redux/incidents/reducers.js
@@ -63,17 +63,19 @@ const incidents = produce(
         break;
 
       case FETCH_ALERTS_FOR_INCIDENTS_REQUESTED:
-        draft.incidentAlerts = {
-          ...draft.incidentAlerts,
-          // dict with keys as the strings of incident ids array and values as { status: 'fetching' }
-          ...action.incidentIds.reduce((acc, incidentId) => {
-            // eslint-disable-next-line no-param-reassign
-            acc[incidentId] = {
-              status: 'fetching',
-            };
-            return acc;
-          }, {}),
-        };
+        if (!(action.isRefetch)) {
+          draft.incidentAlerts = {
+            ...draft.incidentAlerts,
+            // dict with keys as the strings of incident ids array and values as { status: 'fetching' }
+            ...action.incidentIds.reduce((acc, incidentId) => {
+              // eslint-disable-next-line no-param-reassign
+              acc[incidentId] = {
+                status: 'fetching',
+              };
+              return acc;
+            }, {}),
+          };
+        }
         draft.status = FETCH_ALERTS_FOR_INCIDENTS_REQUESTED;
         break;