fixes storytopic bugs and linting errors

Datawheel · Feb 11, 2019 · d5923e5 · d5923e5
1 parent eb7dd61
commit d5923e5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/packages/cms/src/components/cards/TextCard.jsx b/packages/cms/src/components/cards/TextCard.jsx
@@ -207,8 +207,8 @@ class TextCard extends Component {
           inline="true"
         >
           <div className="bp3-dialog-body">
-            <PlainTextEditor data={minData} locale={locale} fields={plainfields} />
-            <TextEditor data={minData} locale={locale} variables={variables} fields={fields.sort((a, b) => displaySort.indexOf(a) - displaySort.indexOf(b))} />
+            {plainfields && <PlainTextEditor data={minData} locale={locale} fields={plainfields} />}
+            {fields && <TextEditor data={minData} locale={locale} variables={variables} fields={fields.sort((a, b) => displaySort.indexOf(a) - displaySort.indexOf(b))} />}
           </div>
           <FooterButtons
             onDelete={["profile", "section", "topic", "story", "storytopic"].includes(type) ? false : this.maybeDelete.bind(this)}

diff --git a/packages/cms/src/components/editors/PlainTextEditor.jsx b/packages/cms/src/components/editors/PlainTextEditor.jsx
@@ -27,13 +27,16 @@ class PlainTextEditor extends Component {
   render() {
 
     const {data, fields} = this.state;
+    const {locale} = this.props;
 
     if (!data || !fields) return null;
 
+    const thisLocale = data.content.find(c => c.lang === locale); 
+
     const inputs = fields.map(f =>
       <div key={f}>
         <label htmlFor={f}>{f}</label>
-        <input id={f} className="bp3-input" type="text" value={data[f]} onChange={this.changeField.bind(this, f)}/>
+        <input id={f} className="bp3-input" type="text" value={thisLocale[f]} onChange={this.changeField.bind(this, f)}/>
       </div>
     );
 

diff --git a/packages/cms/src/profile/ProfileEditor.jsx b/packages/cms/src/profile/ProfileEditor.jsx
@@ -120,8 +120,8 @@ class ProfileEditor extends Component {
 
     const dataLoaded = minData;
     const varsLoaded = variables;
-    const defLoaded = locale || (variables && !locale && variables[localeDefault]);
-    const locLoaded = !locale || (variables && locale && variables[localeDefault] && variables[locale]);
+    const defLoaded = locale || variables && !locale && variables[localeDefault];
+    const locLoaded = !locale || variables && locale && variables[localeDefault] && variables[locale];
 
     if (!dataLoaded || !varsLoaded || !defLoaded || !locLoaded) return <Loading />;
 

diff --git a/packages/cms/src/profile/TopicEditor.jsx b/packages/cms/src/profile/TopicEditor.jsx
@@ -123,8 +123,8 @@ class TopicEditor extends Component {
 
     const dataLoaded = minData;
     const varsLoaded = variables;
-    const defLoaded = locale || (variables && !locale && variables[localeDefault]);
-    const locLoaded = !locale || (variables && locale && variables[localeDefault] && variables[locale]);
+    const defLoaded = locale || variables && !locale && variables[localeDefault];
+    const locLoaded = !locale || variables && locale && variables[localeDefault] && variables[locale];
 
     if (!dataLoaded || !varsLoaded || !defLoaded || !locLoaded) return <Loading />;
 

diff --git a/packages/cms/src/story/StoryTopicEditor.jsx b/packages/cms/src/story/StoryTopicEditor.jsx
@@ -135,7 +135,6 @@ class StoryTopicEditor extends Component {
             locale={localeDefault}
             localeDefault={localeDefault}
             fields={["title"]}
-            plainfields={["image"]}
             type="storytopic"
             onSave={this.onSave.bind(this)}
             variables={{}}
@@ -145,7 +144,6 @@ class StoryTopicEditor extends Component {
             locale={locale}
             localeDefault={localeDefault}
             fields={["title"]}
-            plainfields={["image"]}
             type="storytopic"
             onSave={this.onSave.bind(this)}
             variables={{}}