diff --git a/app/src/components/layout/sidebarRight/simulation/Simulations.tsx b/app/src/components/layout/sidebarRight/simulation/Simulations.tsx index c6c76b1..80745ff 100644 --- a/app/src/components/layout/sidebarRight/simulation/Simulations.tsx +++ b/app/src/components/layout/sidebarRight/simulation/Simulations.tsx @@ -137,6 +137,7 @@ const Simulations: React.FC = () => { } ); } + }, [selectedProduct.productUuid, products]); return ( diff --git a/app/src/components/ui/compareVersion/ComparisonResult.tsx b/app/src/components/ui/compareVersion/ComparisonResult.tsx index 0f91a36..79fa57c 100644 --- a/app/src/components/ui/compareVersion/ComparisonResult.tsx +++ b/app/src/components/ui/compareVersion/ComparisonResult.tsx @@ -1,7 +1,7 @@ import React, { useMemo } from "react"; import PerformanceResult from "./result-card/PerformanceResult"; import EnergyUsage from "./result-card/EnergyUsage"; -import { Bar, Line } from "react-chartjs-2"; +import { Bar, Line, Pie } from "react-chartjs-2"; const ComparisonResult = () => { const options = useMemo( @@ -33,21 +33,22 @@ const ComparisonResult = () => { backgroundColor: [purpleDark, purpleLight], borderColor: [purpleDark, purpleLight], borderWidth: 1, + borderRadius: 10, // ✅ Rounded all corners (TypeScript-safe) + // borderSkipped: "bottom", // ✅ This is allowed by the Chart.js types }, ], }; - const cycleTimeData = { + + const cycleTimePieData = { labels: ["Layout 1", "Layout 2"], datasets: [ { label: "Cycle Time (sec)", - data: [110, 110], - backgroundColor: [purpleLight], - borderColor: purpleDark, + data: [120, 110], + backgroundColor: [purpleDark, purpleLight], + borderColor: "#fff", borderWidth: 2, - tension: 0.4, - fill: false, }, ], }; @@ -61,6 +62,8 @@ const ComparisonResult = () => { backgroundColor: [purpleDark, purpleLight], borderColor: [purpleDark, purpleLight], borderWidth: 1, + borderRadius: 10, + borderSkipped: false, }, ], }; @@ -74,6 +77,8 @@ const ComparisonResult = () => { backgroundColor: [purpleDark, purpleLight], borderColor: [purpleDark, purpleLight], borderWidth: 1, + borderRadius: 10, + borderSkipped: false, }, ], }; @@ -83,7 +88,6 @@ const ComparisonResult = () => {
Performance Comparison
-

Throughput (units/hr)

@@ -95,9 +99,9 @@ const ComparisonResult = () => {
Layout 2
550/ hr
-
-
- +
+ +
@@ -122,7 +126,7 @@ const ComparisonResult = () => {
- +
diff --git a/app/src/modules/visualization/widgets/panel/Panel.tsx b/app/src/modules/visualization/widgets/panel/Panel.tsx index add1855..c9c62c9 100644 --- a/app/src/modules/visualization/widgets/panel/Panel.tsx +++ b/app/src/modules/visualization/widgets/panel/Panel.tsx @@ -340,4 +340,4 @@ const Panel: React.FC = ({ ); }; -export default Panel; +export default Panel; \ No newline at end of file diff --git a/app/src/store/builder/store.ts b/app/src/store/builder/store.ts index 6018694..4502c71 100644 --- a/app/src/store/builder/store.ts +++ b/app/src/store/builder/store.ts @@ -626,11 +626,12 @@ interface CompareStore { } export const useCompareStore = create((set) => ({ - comparePopUp: true, + comparePopUp: false, setComparePopUp: (value) => set({ comparePopUp: value }), toggleComparePopUp: () => set((state) => ({ comparePopUp: !state.comparePopUp })), })); + // Save state store interface SaveVersionStore { isVersionSaved: boolean; diff --git a/app/src/styles/layout/compareLayout.scss b/app/src/styles/layout/compareLayout.scss index 07b5ad2..31966be 100644 --- a/app/src/styles/layout/compareLayout.scss +++ b/app/src/styles/layout/compareLayout.scss @@ -463,6 +463,7 @@ width: 100%; display: flex; justify-content: space-between; + position: relative; .layer-wrapper { display: flex; @@ -472,6 +473,12 @@ justify-content: end; } } + + .chart { + width: 60%; + height: 70%; + position: absolute; + } } .chart { @@ -484,6 +491,8 @@ } .cycle-time-container { + position: relative; + .cycle-main { display: flex; justify-content: space-between; @@ -519,6 +528,14 @@ } } } + + .chart { + position: absolute; + bottom: 0; + left: 10px; + width: 60%; + height: 80%; + } } .overallDowntime-container { diff --git a/app/src/styles/pages/dashboard.scss b/app/src/styles/pages/dashboard.scss index a136974..95898db 100644 --- a/app/src/styles/pages/dashboard.scss +++ b/app/src/styles/pages/dashboard.scss @@ -144,7 +144,7 @@ &.active { background: var(--background-color-button); - color: var(--text-color); + color: var(--text-button-color); } } } @@ -342,4 +342,4 @@ font-family: #{$font-roboto}; cursor: pointer; } -} +} \ No newline at end of file