Ivan - Fix issues with release block 2 part 2

client/src/app-components/articles-list.js

@@ -54,6 +54,7 @@ class ArticlesList extends React.Component {
                         <div key={index}>
                             <TopicViewer
                                 {...topic}
+                                id={topic.id * 1}
                                 editable={this.props.editable}
                                 onChange={this.retrieveArticles.bind(this)}
                                 articlePath={this.props.articlePath} />
@@ -68,7 +69,7 @@ class ArticlesList extends React.Component {
     renderAddTopicButton() {
         return (
             <div className="articles-list__add-topic-button">
-                <Button onClick={() => ModalContainer.openModal(<TopicEditModal addForm/>)} type="secondary" className="articles-list__add">
+                <Button onClick={() => ModalContainer.openModal(<TopicEditModal addForm onChange={this.retrieveArticles.bind(this)} />)} type="secondary" className="articles-list__add">
                     <Icon name="plus-circle" size="2x" className="articles-list__add-icon"/> {i18n('ADD_TOPIC')}
                 </Button>
             </div>

client/src/app-components/topic-edit-modal.js

@@ -24,7 +24,7 @@ class TopicEditModal extends React.Component {
     };
 
     state = {
-        values: this.props.defaultValues || {title: ''}
+        values: this.props.defaultValues || {title: '', icon: 'address-card', color: '#ff6900'}
     };
 
     render() {
@@ -56,7 +56,13 @@ class TopicEditModal extends React.Component {
                 icon: this.state.values['icon'],
                 iconColor: this.state.values['color']
             }
-        }).then(this.context.closeModal);
+        }).then(() => {
+            this.context.closeModal();
+            
+            if(this.props.onChange) {
+                this.props.onChange();
+            }
+        });
     }
 
     onFormChange(form) {

client/src/app-components/topic-viewer.js

@@ -30,10 +30,20 @@ class TopicViewer extends React.Component {
     };
 
     state = {
-        articles: this.props.articles,
+        articles: this.props.articles.sort((a, b) => {
+            return (a.position*1) - (b.position*1);
+        }),
         currentDraggedId: 0
     };
 
+    componentWillReceiveProps(nextProps) {
+        this.setState({
+            articles: nextProps.articles.sort((a, b) => {
+                return (a.position*1) - (b.position*1);
+            })
+        });
+    }
+
     render() {
         return (
             <div className="topic-viewer">
@@ -90,6 +100,7 @@ class TopicViewer extends React.Component {
     renderEditModal() {
         let props = {
             topicId: this.props.id,
+            onChange: this.props.onChange,
             defaultValues: {
                 title: this.props.name,
                 icon: this.props.icon,
@@ -106,6 +117,7 @@ class TopicViewer extends React.Component {
         let props = {
             topicId: this.props.id,
             position: this.props.articles.length,
+            onChange: this.props.onChange,
             topicName: this.props.name
         };
 
@@ -231,7 +243,7 @@ class TopicViewer extends React.Component {
                     path: '/article/edit',
                     data: {
                         articleId: id,
-                        position: index
+                        position: index + 1
                     }
                 });
             }

client/src/app/admin/panel/articles/admin-panel-view-article.js

@@ -99,7 +99,7 @@ class AdminPanelViewArticle extends React.Component {
 
         _.forEach(this.props.topics, (topic) => {
             if(!article) {
-                article = _.find(topic.articles, {id: this.props.params.articleId * 1});
+                article = _.find(topic.articles, {id: this.props.params.articleId});
             }
         });
 
@@ -120,6 +120,7 @@ class AdminPanelViewArticle extends React.Component {
         API.call({
             path: '/article/edit',
             data: {
+                articleId: this.findArticle().id,
                 title: form.title,
                 content: form.content
             }

client/src/app/admin/panel/users/admin-panel-list-users.js

@@ -69,16 +69,16 @@ class AdminPanelListUsers extends React.Component {
                 value: i18n('TICKETS'),
                 className: 'admin-panel-list-users__table-tickets col-md-2',
                 order: true,
-                onOrderUp: this.orderByTickets.bind(this, false),
+                onOrderUp: this.orderByTickets.bind(this, 0),
-                onOrderDown: this.orderByTickets.bind(this, true)
+                onOrderDown: this.orderByTickets.bind(this, 1)
             },
             {
                 key: 'signupDate',
                 value: i18n('SIGNUP_DATE'),
                 className: 'admin-panel-list-users__table-date col-md-2',
                 order: true,
-                onOrderUp: this.orderById.bind(this, false),
+                onOrderUp: this.orderById.bind(this, 0),
-                onOrderDown: this.orderById.bind(this, true)
+                onOrderDown: this.orderById.bind(this, 1)
             }
         ];
     }
@@ -153,7 +153,7 @@ class AdminPanelListUsers extends React.Component {
             pages: result.data.pages,
             users: result.data.users,
             orderBy: result.data.orderBy,
-            desc: result.data.desc,
+            desc: (result.data.desc === '1'),
             loading: false
         });
     }

client/src/app/admin/panel/users/admin-panel-view-user.js

@@ -107,7 +107,12 @@ class AdminPanelViewUser extends React.Component {
                 userId: this.props.params.userId
             }
         }).then(() => {
-            browserHistory.push('/admin/panel/user/list-users');
+            API.call({
+                path: '/user/ban',
+                data: {
+                    email: this.state.email
+                }
+            }).then(() => browserHistory.push('/admin/panel/users/list-users'));
         });
     }
 }

client/src/app/main/dashboard/dashboard-article/dashboard-article-page.js

@@ -68,7 +68,7 @@ class DashboardArticlePage extends React.Component {
 
         _.forEach(this.props.topics, (topic) => {
             if(!article) {
-                article = _.find(topic.articles, {id: this.props.params.articleId * 1});
+                article = _.find(topic.articles, {id: this.props.params.articleId});
             }
         });
 
@@ -79,7 +79,7 @@ class DashboardArticlePage extends React.Component {
         let topicFound = {};
 
         _.forEach(this.props.topics, (topic) => {
-            if(_.find(topic.articles, {id: this.props.params.articleId * 1})) {
+            if(_.find(topic.articles, {id: this.props.params.articleId})) {
                 topicFound = topic;
             }
         });

client/src/lib-core/date-transformer.js

@@ -1,4 +1,4 @@
-let month = ["", "Jan", "Feb", "Mar", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+let month = ["", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
 
 export default {
     transformToString (date) {

server/controllers/article/edit.php

@@ -21,14 +21,9 @@ class EditArticleController extends Controller {
         $article = Article::getDataStore(Controller::request('articleId'));
 
         if (Controller::request('topicId')) {
-            $currentArticleTopic = $article->topic;
             $newArticleTopic = Topic::getDataStore(Controller::request('topicId'));
 
-            if (!$newArticleTopic->isNull() /*&& $currentArticleTopic->ownArticleList->remove($article)*/) {
+            if (!$newArticleTopic->isNull()) {
-                /*$newArticleTopic->ownArticleList->add($article);
-
-                $currentArticleTopic->store();
-                $newArticleTopic->store();*/
                 $article->topic = $newArticleTopic;
             } else {
                 Response::respondError(ERRORS::INVALID_TOPIC);

server/models/Topic.php

@@ -20,6 +20,7 @@ class Topic extends DataStore {
         }
 
         return [
+            'id' => $this->id,
             'name' => $this->name,
             'icon' => $this->icon,
             'iconColor' => $this->iconColor,