BUGFIX: Don’t crash on unset focus keyword

Yoast · Mar 25, 2019 · ab5ba70 · ab5ba70
1 parent 0af683b
commit ab5ba70
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/Resources/Private/Scripts/YoastInfoView/src/YoastInfoView.js b/Resources/Private/Scripts/YoastInfoView/src/YoastInfoView.js
@@ -80,7 +80,7 @@ export default class YoastInfoView extends PureComponent {
 
         this.state = {
             nodeUri: $get('uri', documentNode),
-            focusKeyword: $get('properties.focusKeyword', documentNode),
+            focusKeyword: $get('properties.focusKeyword', documentNode) || '',
             isCornerstone: $get('properties.isCornerstone', documentNode),
             isAnalyzing: false,
             page: {
@@ -112,7 +112,7 @@ export default class YoastInfoView extends PureComponent {
         const documentNode = getNodeByContextPath(documentNodePath);
         this.setState({
             nodeUri: $get('uri', documentNode),
-            focusKeyword: $get('properties.focusKeyword', documentNode),
+            focusKeyword: $get('properties.focusKeyword', documentNode) || '',
             isCornerstone: $get('properties.isCornerstone', documentNode),
         }, this.fetchContent);
     };

diff --git a/Resources/Private/Scripts/YoastInfoView/src/components/NeosYoastApp.js b/Resources/Private/Scripts/YoastInfoView/src/components/NeosYoastApp.js
@@ -65,7 +65,7 @@ export default class NeosYoastApp extends PureComponent {
                 description: this.props.description || '',
                 slug: this.props.uriPathSegment,
                 url: this.props.pageUrl,
-                focusKeyword: this.props.focusKeyword,
+                focusKeyword: this.props.focusKeyword || '',
             },
             page: {
                 titleTemplate: '{title}',
@@ -319,7 +319,7 @@ export default class NeosYoastApp extends PureComponent {
             data: this.state.editorData,
             baseUrl: this.props.baseUrl,
             locale: this.props.uiLocale,
-            keyword: this.props.focusKeyword,
+            keyword: this.state.editorData.focusKeyword,
             breadcrumbs: this.props.breadcrumbs,
             isAmp: this.props.isAmp,
             hasPaperStyle: false,

diff --git a/Resources/Public/Assets/app.js b/Resources/Public/Assets/app.js
diff --git a/Resources/Public/YoastInfoView/Plugin.js b/Resources/Public/YoastInfoView/Plugin.js
diff --git a/Resources/Public/YoastInfoView/Plugin.js.map b/Resources/Public/YoastInfoView/Plugin.js.map