Merge pull request #63 from ResilientApp/SCM-28

Updated Build
ResilientApp · Sep 30, 2024 · c5211ec · c5211ec
2 parents aa12551 + 4be18dc
commit c5211ec
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 57 deletions.
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.0a585a7c.css",
-    "main.js": "/static/js/main.d7bc5658.js",
+    "main.js": "/static/js/main.dc048ff4.js",
     "static/js/1927.8bd9ca2b.chunk.js": "/static/js/1927.8bd9ca2b.chunk.js",
     "static/js/7590.4eeecba0.chunk.js": "/static/js/7590.4eeecba0.chunk.js",
     "static/js/6725.7c418f57.chunk.js": "/static/js/6725.7c418f57.chunk.js",
@@ -73,7 +73,7 @@
     "static/media/defaultProfileImage.png": "/static/media/defaultProfileImage.6c9586e38b84a1d6a118.png",
     "index.html": "/index.html",
     "main.0a585a7c.css.map": "/static/css/main.0a585a7c.css.map",
-    "main.d7bc5658.js.map": "/static/js/main.d7bc5658.js.map",
+    "main.dc048ff4.js.map": "/static/js/main.dc048ff4.js.map",
     "1927.8bd9ca2b.chunk.js.map": "/static/js/1927.8bd9ca2b.chunk.js.map",
     "7590.4eeecba0.chunk.js.map": "/static/js/7590.4eeecba0.chunk.js.map",
     "6725.7c418f57.chunk.js.map": "/static/js/6725.7c418f57.chunk.js.map",
@@ -145,6 +145,6 @@
   },
   "entrypoints": [
     "static/css/main.0a585a7c.css",
-    "static/js/main.d7bc5658.js"
+    "static/js/main.dc048ff4.js"
   ]
 }
diff --git a/build/index.html b/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><meta name="msapplication-TileColor" content="#da532c"><meta name="theme-color" content="#ffffff"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Visualizer for the ResilientDB Blockchain fabric"/><meta name="author" description="aunshx"/><link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css"/><title>ResView</title><script defer="defer" src="/static/js/main.d7bc5658.js"></script><link href="/static/css/main.0a585a7c.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="https://unpkg.com/aos@next/dist/aos.js"></script><script>AOS.init({delay:0,duration:600,offset:10})</script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><meta name="msapplication-TileColor" content="#da532c"><meta name="theme-color" content="#ffffff"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Visualizer for the ResilientDB Blockchain fabric"/><meta name="author" description="aunshx"/><link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css"/><title>ResView</title><script defer="defer" src="/static/js/main.dc048ff4.js"></script><link href="/static/css/main.0a585a7c.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="https://unpkg.com/aos@next/dist/aos.js"></script><script>AOS.init({delay:0,duration:600,offset:10})</script></body></html>
diff --git a/build/static/js/main.d7bc5658.js.map b/build/static/js/main.d7bc5658.js.map
diff --git a/build/static/js/main.d7bc5658.js → build/static/js/main.dc048ff4.js b/build/static/js/main.d7bc5658.js → build/static/js/main.dc048ff4.js
diff --git a/build/static/js/main.d7bc5658.js.LICENSE.txt → build/static/js/main.dc048ff4.js.LICENSE.txt b/build/static/js/main.d7bc5658.js.LICENSE.txt → build/static/js/main.dc048ff4.js.LICENSE.txt
diff --git a/build/static/js/main.dc048ff4.js.map b/build/static/js/main.dc048ff4.js.map
diff --git a/src/Components/Pages/Visualizer/Ancilliary/Computation/MVT.js b/src/Components/Pages/Visualizer/Ancilliary/Computation/MVT.js
@@ -1,7 +1,6 @@
 import { COLORS_MVT_GRAPH } from "../../../../../Constants";
 
 export const mvtGraphComputation = (transactionData, labelToggle = {}) => {
-
     let startTime = 0;
     let firstPrepareTime = 0;
     let prePrepareTimes = [];
@@ -11,7 +10,6 @@ export const mvtGraphComputation = (transactionData, labelToggle = {}) => {
     let labelList = [];
 
     Object.keys(transactionData).forEach((key) => {
-
         labelList.push("Replica " + key);
         if (transactionData[key].primary_id !== transactionData[key].replica_id) {
             prePrepareTimes.push(Math.floor(transactionData[key].propose_pre_prepare_time / 10000));
@@ -85,53 +83,29 @@ export const mvtGraphComputation = (transactionData, labelToggle = {}) => {
     }
 
     let preparePoints = [];
-    let data = {};
+    let commitPoints = [];
 
     for (let i = 0; i < labelList.length; i++) {
         const label = labelList[i];
         const isEnabled = labelToggle.hasOwnProperty(label) ? labelToggle[label] : true;
 
-        if (!isEnabled) {
-            data = {
-                id: label,
-                color: COLORS_MVT_GRAPH[i],
-                data: [],
-            };
-        } else {
-            data = {
+        if (isEnabled) {
+            preparePoints.push({
                 id: label,
                 color: COLORS_MVT_GRAPH[i],
                 data: prepareChartData[i],
-            };
-        }
-        preparePoints.push(data);
-    }
-
-    let commitPoints = [];
-
-    for (let i = 0; i < labelList.length; i++) {
-        const label = labelList[i];
-        const isEnabled = labelToggle.hasOwnProperty(label) ? labelToggle[label] : true;
+            });
 
-        if (!isEnabled) {
-            data = {
-                id: label,
-                color: COLORS_MVT_GRAPH[i],
-                data: [],
-            };
-        } else {
-            data = {
+            commitPoints.push({
                 id: label,
                 color: COLORS_MVT_GRAPH[i],
                 data: commitChartData[i],
-            };
+            });
         }
-
-        commitPoints.push(data);
     }
 
     let pointData = { 1: preparePoints, 2: commitPoints };
     let maxPointData = { 1: maxPrepareTS, 2: maxCommitTS };
 
     return { pointData, maxPointData };
-};
+};
diff --git a/src/Components/Pages/Visualizer/Graphs/MVT/index.js b/src/Components/Pages/Visualizer/Graphs/MVT/index.js
@@ -27,7 +27,7 @@ const updateFaultToggles = (status) => {
         let str = `Replica ${index + 1}`;
         updatedFaultToggles = {
             ...updatedFaultToggles,
-            [str]: !value 
+            [str]: !value
         };
     });
     return updatedFaultToggles;
@@ -72,31 +72,30 @@ const Mvt = () => {
         setLabelToggle((prevLabels) => {
             const updatedLabels = { ...prevLabels };
             updatedLabels[label] = !updatedLabels[label];
-            return updatedLabels; 
+            return updatedLabels;
         });
     };
 
-
-    const chartMaxDataUpdate = (value) => setChartMaxData(value);
-    const messageChartDataUpdate = (value) => setMessageChartData(value);
-
     useEffect(() => {
-
         const transactionData = messageHistory[currentTransaction];
-
         const updatedLabelToggles = updateLabelToggles(replicaStatus);
         const updatedFaultToggles = updateFaultToggles(replicaStatus);
 
         setLabelToggle(updatedLabelToggles);
         setLabelToggleFaulty(updatedFaultToggles);
 
-        const { pointData, maxPointData } = mvtGraphComputation(transactionData, updatedLabelToggles, chartMaxDataUpdate, messageChartDataUpdate);
-
-        chartMaxDataUpdate(maxPointData);
-        messageChartDataUpdate(pointData);
+        const { pointData, maxPointData } = mvtGraphComputation(transactionData, updatedLabelToggles);
 
+        setChartMaxData(maxPointData);
+        setMessageChartData(pointData);
     }, [messageHistory, currentTransaction, replicaStatus]);
 
+    // Filter the chart data based on labelToggle
+    const filteredChartData = {
+        1: messageChartData[1]?.filter(item => labelToggle[item.id]) || [],
+        2: messageChartData[2]?.filter(item => labelToggle[item.id]) || []
+    };
+
     return (
         <div className="flex flex-col">
             <div className="grid grid-cols-2 gap-x-6 w-full">
@@ -108,7 +107,7 @@ const Mvt = () => {
                                 <div className='inner' />
                             </div>
                         ) : (
-                            <MvtGraph chartData={messageChartData} chartMaxData={chartMaxData} mvtGraphNo={1} />
+                            <MvtGraph chartData={filteredChartData} chartMaxData={chartMaxData} mvtGraphNo={1} />
                         )}
                     </div>
                 </ResizableContainer>
@@ -120,7 +119,7 @@ const Mvt = () => {
                                 <div className='inner' />
                             </div>
                         ) : (
-                            <MvtGraph chartData={messageChartData} chartMaxData={chartMaxData} mvtGraphNo={2} />
+                            <MvtGraph chartData={filteredChartData} chartMaxData={chartMaxData} mvtGraphNo={2} />
                         )}
                     </div>
                 </ResizableContainer>
@@ -142,4 +141,4 @@ const Mvt = () => {
     );
 };
 
-export default Mvt;
+export default Mvt;
diff --git a/src/Components/Shared/Footer.js b/src/Components/Shared/Footer.js
@@ -27,7 +27,7 @@ const Footer = () => {
           </span>
         </div>
         <div className='text-12p text-gray-100 bold'>
-        v3.1.2 &middot; &copy; 2023-2024 &middot; All rights reserved
+        v3.1.3 &middot; &copy; 2023-2024 &middot; All rights reserved
         </div>
     </div>
     </div>