Move data loading from firstUpdated to connectedCallback

blikblum · Dec 9, 2019 · 4aab874 · 4aab874
1 parent 71982fb
commit 4aab874
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/src/pages/Article/article-page.js b/src/pages/Article/article-page.js
@@ -13,7 +13,8 @@ class ArticlePage extends Component {
     match: {}
   }
 
-  firstUpdated() {
+  connectedCallback() {
+    super.connectedCallback()
     const slug = this.match.params.id
     this.context.stores.articlesStore.loadArticle(slug, { acceptCached: true })
     this.context.stores.commentsStore.setArticleSlug(slug)

diff --git a/src/pages/Home/home-main-view.js b/src/pages/Home/home-main-view.js
@@ -56,9 +56,6 @@ class MainView extends Component {
   connectedCallback() {
     super.connectedCallback()
     this.context.stores.articlesStore.setPredicate(this.getPredicate())
-  }
-
-  firstUpdated() {
     this.context.stores.articlesStore.loadArticles()
   }
 

diff --git a/src/pages/Home/home-page.js b/src/pages/Home/home-page.js
@@ -6,7 +6,8 @@ import './home-main-view'
 class HomePage extends Component {
   static observedContexts = ['stores']
 
-  firstUpdated() {
+  connectedCallback() {
+    super.connectedCallback()
     this.context.stores.commonStore.loadTags()
   }
 

diff --git a/src/pages/editor-page.js b/src/pages/editor-page.js
@@ -15,9 +15,6 @@ class EditorPage extends Component {
   connectedCallback() {
     super.connectedCallback()
     this.context.stores.editorStore.setArticleSlug(this.match.params.slug)
-  }
-
-  firstUpdated() {
     this.context.stores.editorStore.loadInitialData()
   }
 

diff --git a/src/realworld-app.js b/src/realworld-app.js
@@ -22,16 +22,12 @@ class App extends Component {
 
   connectedCallback() {
     super.connectedCallback()
-    if (!this.stores.commonStore.token) {
-      this.stores.commonStore.setAppLoaded()
-    }
-  }
-
-  firstUpdated() {
     if (this.stores.commonStore.token) {
       this.stores.userStore
         .pullUser()
         .finally(() => this.stores.commonStore.setAppLoaded())
+    } else {
+      this.stores.commonStore.setAppLoaded()
     }
   }