Merge pull request #46 from tomaszrondio/master

fix: targeted publishing update rule state
superdesk · Jun 20, 2018 · ffe9475 · ffe9475
2 parents 3fa6145 + 82e8df0
commit ffe9475
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/client/extensions/targetedPublishing/TargetedPublishing.js b/client/extensions/targetedPublishing/TargetedPublishing.js
@@ -69,9 +69,6 @@ export class TargetedPublishing extends React.Component {
     }
 
     evaluate() {
-        this.setState({
-            loading: true
-        });
         return axios.post(this.state.apiUrl + 'organization/rules/evaluate',this.state.item, {headers: this.state.apiHeader})
             .then(res => {
                 if (!_.isEmpty(res.data)) {
@@ -201,7 +198,7 @@ export class TargetedPublishing extends React.Component {
 
         if (this.state.newSite.id) {
             newRuleForm = (
-                 <NewDestination
+                <NewDestination
                     key={this.state.newSite.id}
                     site={this.state.newSite}
                     apiHeader={this.state.apiHeader}

diff --git a/client/extensions/targetedPublishing/Tenant.js b/client/extensions/targetedPublishing/Tenant.js
@@ -28,6 +28,16 @@ export default class Tenant extends Component {
         this.getRoutes();
     }
 
+    componentWillReceiveProps(nextProps) {
+        if (nextProps.rule) {
+            const rule = nextProps.rule;
+            this.setState({
+                rule: rule,
+                newRule: rule
+            });
+        }
+    }
+
     getRoutes() {
         return axios.get(this.state.apiUrl + 'content/routes/', {headers: this.state.apiHeader, params: {limit: 1000, type: 'collection'}})
             .then(res => {