Merge branch 'main' into feat/fe-misc-clone

Author: shivani170

src/components/ResourceBrowser/ResourceList/ClusterSelector.tsx

@@ -116,7 +116,7 @@ const ClusterSelector: React.FC<ClusterSelectorType> = ({
 
             {defaultOption?.isProd && <span className="px-6 py-2 br-4 bcb-1 cb-7 fs-12 lh-16 fw-5">Production</span>}
 
-            {defaultOption?.value !== String(DEFAULT_CLUSTER_ID) ? (
+            {defaultOption?.value !== String(DEFAULT_CLUSTER_ID) && (
                 <PopupMenu autoClose>
                     <PopupMenu.Button rootClassName="flex ml-auto p-4 border__secondary" isKebab>
                         <MenuDots className="icon-dim-16 fcn-7" data-testid="popup-menu-button" />
@@ -136,7 +136,7 @@ const ClusterSelector: React.FC<ClusterSelectorType> = ({
                         </div>
                     </PopupMenu.Body>
                 </PopupMenu>
-            ) : null}
+            )}
 
             {openDeleteClusterModal && (
                 <DeleteClusterConfirmationModal

yarn.lock

@@ -1125,10 +1125,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected].1-pre-5":
-  version "1.15.1-pre-5"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.15.1-pre-5.tgz#5a0e58d329f066193961700c7eb2ac9f4f3e0757"
-  integrity sha512-71Ik06tlMy/Zd7l/XwyGeJqEkQcCxUjMyz+kDMz0jKVPCCyHSyZys2TvcHCTYRf/WRM3rmt0jvUvm+v5HL2WxA==
+"@devtron-labs/[email protected].2":
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.15.2.tgz#a420e9187c8bfd5fb9a5f3e5bbe1744278718d53"
+  integrity sha512-PNg9S/UjHNqVac8V0JGi3RgxPt0D48hy4eMbJCvOLSn/aUXVe5t+Ik7CNyjeiiQ5SOG2Ly4ry1wDGQkqXm2Wdw==
   dependencies:
     "@codemirror/lang-json" "6.0.1"
     "@codemirror/lang-yaml" "6.1.2"