From 0f95910f2bbbdcf6fbbd0a623bd2e50342ec28da Mon Sep 17 00:00:00 2001
From: Frikky <frikky@shuffler.io>
Date: Wed, 26 Feb 2025 12:40:50 +0100
Subject: [PATCH] Minor sync for 2.0

---
 frontend/src/components/AdminNavBar.jsx | 2 +-
 frontend/src/components/LeftSideBar.jsx | 2 +-
 frontend/src/views/AngularWorkflow.jsx  | 2 +-
 frontend/src/views/AppExplorer.jsx      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/AdminNavBar.jsx b/frontend/src/components/AdminNavBar.jsx
index 2c538d7b..c6f70357 100644
--- a/frontend/src/components/AdminNavBar.jsx
+++ b/frontend/src/components/AdminNavBar.jsx
@@ -96,7 +96,7 @@ const AdminNavBar = (props) => {
     return (
         <Wrapper>
             <div style={{ flexDirection: 'column', width: 220, }}>
-                <nav style={{ padding: '25px 25px 3px 25px', height: "calc(100% - 30px)", fontSize: '16px', borderTopLeftRadius: 8, borderBottomLeftRadius: 8, background: '#212121', color: '#9CA3AF' }}>
+                <nav style={{ padding: '25px 25px 3px 25px', height: isCloud ? "calc(100% - 60px)" : "calc(100% - 30px)" , fontSize: '16px', borderTopLeftRadius: 8, borderBottomLeftRadius: 8, background: '#212121', color: '#9CA3AF' }}>
                     <div style={{ display: 'flex', alignItems: 'center', }}>
                         <img loading="lazy" src={imageData} alt="Logo" style={{ width: '30px', borderRadius: 8, height: '30px', marginRight: '8px' }} />
                         <div style={{
diff --git a/frontend/src/components/LeftSideBar.jsx b/frontend/src/components/LeftSideBar.jsx
index 2db47c3a..432075ec 100644
--- a/frontend/src/components/LeftSideBar.jsx
+++ b/frontend/src/components/LeftSideBar.jsx
@@ -525,7 +525,7 @@ useEffect(() => {
         <Divider style={{ marginBottom: 10, }} />
 
         <Typography color="textSecondary" align="center" style={{ marginTop: 5, marginBottom: 5, fontSize: 18 }}>
-          Version: 2.0.0-rc7
+          Version: 2.0.0
         </Typography>
       </Menu>
     </span>
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index ce607d45..91146f9f 100755
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -1687,7 +1687,7 @@ const AngularWorkflow = (defaultprops) => {
     if (filter === undefined || filter === null || filter.toUpperCase() === "ALL") {
 
       // Check for 
-      if (executionFilter !== undefined && executionFilter !== null && executionFilter.length > 0) {
+      if (executionFilter !== undefined && executionFilter !== null && executionFilter.length > 0 && filter !== "ALL") {
         filter = executionFilter
       } else {
         filter = "ALL"
diff --git a/frontend/src/views/AppExplorer.jsx b/frontend/src/views/AppExplorer.jsx
index 93bc9f89..b3cb0d99 100644
--- a/frontend/src/views/AppExplorer.jsx
+++ b/frontend/src/views/AppExplorer.jsx
@@ -2906,7 +2906,7 @@ const AppExplorer = (props) => {
   const deduplicateByName = (array) => {
     const uniqueNames = {};
     return array.filter(item => {
-		if (!item.hasOwnProperty('name') || !item.name.length) {
+		if (!item?.hasOwnProperty('name') || !item?.name?.length) {
 		  return true
 		}
 		if (!uniqueNames[item.name]) {