Fixing merge errors

Author: FalkWolsky

client/packages/lowcoder/src/components/layout/Layout.tsx

@@ -140,19 +140,6 @@ export function Layout(props: LayoutProps) {
 
       {/* Desktop Layout */}
       <AntdLayout>
-        <SideBarV2
-          className={CNSidebar}
-          $bgColor={brandingSettings?.adminSidebarColor}
-          $fontColor={brandingSettings?.adminSidebarFontColor}
-          $activeBgColor={brandingSettings?.adminSidebarActiveBgColor}
-          $activeFontColor={brandingSettings?.adminSidebarActiveFontColor}
-        >
-          {props.sections
-            .filter((section) => section.items.length > 0)
-            .map((section, index) => (
-              <SideBarSection key={index} {...section} />
-            ))}
-        </SideBarV2>
         {!isMobile && (
           <SideBarV2 className={`${CNSidebar} desktop-only`}>
             {desktopSections

client/packages/lowcoder/src/components/layout/SideBarSection.tsx

@@ -49,10 +49,6 @@ export const SideBarSection = (props: SideBarSectionProps) => {
               }
               selectedBgColor={brandingSettings?.adminSidebarActiveBgColor}
               selectedFontColor={brandingSettings?.adminSidebarActiveFontColor}
-              onClick={
-                item.onClick ??
-                (() => currentPath !== item.routePath && history.push(item.routePath))
-              }
               onClick={() => {
                 // Trigger item's onClick if defined
                 item.onClick