release 1.0.0

themafia98 · Dec 16, 2020 · 5040f95 · 5040f95
1 parent e67b4a8
commit 5040f95
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 34 deletions.
diff --git a/client/.eslintcache b/client/.eslintcache
diff --git a/client/src/Modules/StatisticsModule/Charts/Bar.jsx b/client/src/Modules/StatisticsModule/Charts/Bar.jsx
@@ -55,8 +55,10 @@ const Bar = ({
       });
     });
 
-    setSource(sourceDraft);
-  }, [data, dataKeys]);
+    if (JSON.stringify(source) !== JSON.stringify(sourceDraft)) {
+      setSource(sourceDraft);
+    }
+  }, [data, dataKeys, source]);
 
   const getDefs = () => {
     return [

diff --git a/client/src/Modules/StatisticsModule/StatisticsModule.jsx b/client/src/Modules/StatisticsModule/StatisticsModule.jsx
@@ -43,7 +43,7 @@ const StatisticsModule = memo(({ path, clientDB }) => {
     const { tasks = [] } = currentModule;
     const { bar: barData = {} } = tasks[0] || {};
 
-    const { settings = [] } = settingsStatusSelector(state) || {};
+    const { settings = [] } = settingsStatusSelector(state);
 
     return {
       routeData,

diff --git a/client/src/Modules/WikiModule/WikiPage/WikiPage.jsx b/client/src/Modules/WikiModule/WikiPage/WikiPage.jsx
@@ -58,7 +58,7 @@ const WikiPage = ({ selectedNode, metadata, onChangeWikiPage, udata: { displayNa
       setContent(getValidContent(contentState));
     } catch ({ response: { status = '' } = {}, messsage = 'err wikiPage' }) {
       if (status === 404) {
-        setContent('Not found');
+        setContent(undefined);
       }
 
       if (statusPage) setStatus(0);
@@ -109,7 +109,13 @@ const WikiPage = ({ selectedNode, metadata, onChangeWikiPage, udata: { displayNa
     if (onChangeWikiPage) onChangeWikiPage(paramsState, onChangeStateEditor);
   };
 
-  const fetchWikiPage = useCallback(fetchWikiPageMethod, [loading, models, nodeMetadata, statusPage]);
+  const fetchWikiPage = useCallback(fetchWikiPageMethod, [
+    loading,
+    models,
+    nodeMetadata,
+    statusPage,
+    content,
+  ]);
 
   useEffect(() => {
     fetchWikiPage();
@@ -128,37 +134,33 @@ const WikiPage = ({ selectedNode, metadata, onChangeWikiPage, udata: { displayNa
   return (
     <div className="wikiPage">
       <h2 className="wikiPage__title">{isErrorMessage ? content : title}</h2>
-      {!isErrorMessage && (
-        <>
-          <div className="edit-inform">
-            {lastEditName ? <p className="lastEditName">Последний редактор: {lastEditName}. </p> : null}
-            {lastEditDate ? <p className="lastEditDate">Время редактирования: {lastEditDate}. </p> : null}
+      <div className="edit-inform">
+        {lastEditName ? <p className="lastEditName">Последний редактор: {lastEditName}. </p> : null}
+        {lastEditDate ? <p className="lastEditDate">Время редактирования: {lastEditDate}. </p> : null}
+      </div>
+      <div className="wikiPage-content">
+        {loading ? (
+          <Spin size="large" />
+        ) : !content && readOnly ? (
+          <div className="empty-wikiPage">
+            {editorButton}
+            <div className="empty-wikiPage__msg">Тут ничего нет</div>
           </div>
+        ) : (
           <div className="wikiPage-content">
-            {loading ? (
-              <Spin size="large" />
-            ) : !content && readOnly ? (
-              <div className="empty-wikiPage">
-                {editorButton}
-                <div className="empty-wikiPage__msg">Тут ничего нет</div>
-              </div>
-            ) : (
-              <div className="wikiPage-content">
-                <Textarea
-                  editor={true}
-                  onChange={onChangeContent}
-                  editorKey={pageId}
-                  readOnly={readOnly}
-                  contentState={content}
-                  shouldDisplayButton={true}
-                  onPublish={!readOnly ? onSubmitChanges : content && readOnly ? onChangeStateEditor : null}
-                  buttonName={content && readOnly ? 'Редактировать страницу' : 'Принять изменения'}
-                />
-              </div>
-            )}
+            <Textarea
+              editor={true}
+              onChange={onChangeContent}
+              editorKey={pageId}
+              readOnly={readOnly}
+              contentState={content}
+              shouldDisplayButton={true}
+              onPublish={!readOnly ? onSubmitChanges : content && readOnly ? onChangeStateEditor : null}
+              buttonName={content && readOnly ? 'Редактировать страницу' : 'Принять изменения'}
+            />
           </div>
-        </>
-      )}
+        )}
+      </div>
     </div>
   );
 };

diff --git a/client/src/Utils/selectors/index.js b/client/src/Utils/selectors/index.js
@@ -25,7 +25,7 @@ const settingsLogsSelector = createSelector(cache, (caches) => {
 });
 
 const settingsStatusSelector = createSelector(settings, (list) => {
-  return list.find((item) => item?.idSettings && item?.idSettings === 'statusSettings');
+  return list.find((item) => item?.idSettings && item?.idSettings === 'statusSettings') || {};
 });
 
 const settingsArtifactsSelector = createSelector(artifacts, (list) => {