From d0446c790f3bce15f918dbe84d5b64a8216ea2df Mon Sep 17 00:00:00 2001
From: NikolaBorislavovHristov <hristovnikola@protonmail.com>
Date: Fri, 13 Sep 2019 16:26:30 +0300
Subject: [PATCH] Board adapted to the new state container

---
 src/routes/Board/Board.js       | 18 +++++++++---------
 src/routes/Board/useCatalogs.js |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js
index c33016aab..b7dc6a13d 100644
--- a/src/routes/Board/Board.js
+++ b/src/routes/Board/Board.js
@@ -23,15 +23,15 @@ const Board = () => {
         <div className={styles['board-container']}>
             <MainNavBar className={styles['nav-bar']} />
             <div className={styles['board-content']}>
-                {catalogs.map(([request, response], index) => {
-                    switch (response.type) {
+                {catalogs.map(({ req, content }, index) => {
+                    switch (content.type) {
                         case 'Ready':
                             return (
                                 <BoardRow
-                                    key={`${index}${request.transport_url}${response.type}`}
+                                    key={`${index}${req.base}${content.type}`}
                                     className={styles['board-row']}
-                                    title={`${request.resource_ref.id} - ${request.resource_ref.type_name}`}
-                                    items={response.content.map((item) => ({
+                                    title={`${req.path.id} - ${req.path.type_name}`}
+                                    items={content.content.map((item) => ({
                                         ...item,
                                         posterShape: item.posterShape || 'poster'
                                     }))}
@@ -40,16 +40,16 @@ const Board = () => {
                         case 'Message':
                             return (
                                 <BoardRow
-                                    key={`${index}${request.transport_url}${response.type}`}
+                                    key={`${index}${req.base}${content.type}`}
                                     className={styles['board-row']}
-                                    title={`${request.resource_ref.id} - ${request.resource_ref.type_name}`}
-                                    message={response.content}
+                                    title={`${req.path.id} - ${req.path.type_name}`}
+                                    message={content.content}
                                 />
                             );
                         case 'Loading':
                             return (
                                 <BoardRowPlaceholder
-                                    key={`${index}${request.transport_url}${response.type}`}
+                                    key={`${index}${req.base}${content.type}`}
                                     className={classnames(styles['board-row-placeholder'], placeholderStyles['placeholder-container'])}
                                 />
                             );
diff --git a/src/routes/Board/useCatalogs.js b/src/routes/Board/useCatalogs.js
index e4d20d1d9..a6efb4b35 100644
--- a/src/routes/Board/useCatalogs.js
+++ b/src/routes/Board/useCatalogs.js
@@ -5,9 +5,9 @@ const useCatalogs = () => {
     React.useEffect(() => {
         const onNewState = () => {
             const state = window.stateContainer.getState();
-            setCatalogs(state.groups);
+            setCatalogs(state.catalogs.groups);
         };
-        window.stateContainer.on('NewState', onNewState);
+        window.stateContainer.on('NewModel', onNewState);
         window.stateContainer.dispatch({
             action: 'Load',
             args: {
@@ -16,7 +16,7 @@ const useCatalogs = () => {
             }
         });
         return () => {
-            window.stateContainer.off('NewState', onNewState);
+            window.stateContainer.off('NewModel', onNewState);
         };
     }, []);
     return catalogs;