Merge pull request #109 from jaegertracing/issue-92-browser-prompt-error

Fix #92 browser prompt error
jaegertracing · Oct 27, 2017 · 01fd7f4 · 01fd7f4
2 parents 4e02e45 + 53e9a92
commit 01fd7f4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/reducers/services.js b/src/reducers/services.js
@@ -29,10 +29,8 @@ function fetchStarted(state) {
 }
 
 function fetchServicesDone(state, { payload }) {
-  const services = payload.data;
-  if (Array.isArray(services)) {
-    services.sort(baseStringComparator);
-  }
+  const services = payload.data || [];
+  services.sort(baseStringComparator);
   return { ...state, services, error: null, loading: false };
 }
 

diff --git a/src/reducers/services.test.js b/src/reducers/services.test.js
@@ -29,6 +29,20 @@ function verifyInitialState() {
 beforeEach(verifyInitialState);
 afterEach(verifyInitialState);
 
+it('#92 - ensures services is at least an empty array', () => {
+  const services = null;
+  const state = serviceReducer(initialState, {
+    type: `${fetchServices}_FULFILLED`,
+    payload: { data: services },
+  });
+  expect(state).toEqual({
+    services: [],
+    operationsForService: {},
+    loading: false,
+    error: null,
+  });
+});
+
 it('should handle a fetch services with loading state', () => {
   const state = serviceReducer(initialState, {
     type: `${fetchServices}_PENDING`,