fix(ui): error in updateQuery handlers on store reset

Guillaume Chau · Guillaume Chau · commit 92fe96e68b9c · 2018-06-21T15:36:44.000+02:00
diff --git a/packages/@vue/cli-ui/src/components/ProjectNav.vue b/packages/@vue/cli-ui/src/components/ProjectNav.vue
@@ -64,6 +64,7 @@ export default {
         {
           document: VIEW_REMOVED,
           updateQuery: (previousResult, { subscriptionData }) => {
+            if (!previousResult.views) return { views: [] }
             const index = previousResult.views.findIndex(r => r.id === subscriptionData.data.viewRemoved.id)
             if (index === -1) return previousResult
             const views = previousResult.views.slice()
@@ -77,6 +78,11 @@ export default {
           document: VIEW_CHANGED,
           updateQuery: (previousResult, { subscriptionData }) => {
             const view = subscriptionData.data.viewChanged
+            if (!previousResult.views) {
+              return {
+                views: [view]
+              }
+            }
             const index = previousResult.views.findIndex(r => r.id === view.id)
             if (index === -1) return previousResult
             const views = previousResult.views.slice()
diff --git a/packages/@vue/cli-ui/src/components/SuggestionBar.vue b/packages/@vue/cli-ui/src/components/SuggestionBar.vue
@@ -7,6 +7,11 @@
       :document="require('../graphql/suggestionAdded.gql')"
       :updateQuery="(previousResult, { subscriptionData }) => {
         const newSuggestion = subscriptionData.data.suggestionAdded
+        if (!previousResult.suggestions) {
+          return {
+            suggestions: [newSuggestion]
+          }
+        }
         if (previousResult.suggestions.find(s => s.id === newSuggestion.id)) {
           return previousResult
         }
@@ -26,9 +31,9 @@
     <ApolloSubscribeToMore
       :document="require('../graphql/suggestionRemoved.gql')"
       :updateQuery="(previousResult, { subscriptionData }) => ({
-        suggestions: previousResult.suggestions.filter(
+        suggestions: previousResult.suggestions ? previousResult.suggestions.filter(
           s => s.id !== subscriptionData.data.suggestionRemoved.id
-        )
+        ) : []
       })"
     />
 
