Pull request update/231101

d9ad836 OS-6953. Use css-only to set margin for flavor boxes 1bc5802 OS-6967: Hide Nebius recommendations with a flag
hystax · Nov 2, 2023 · a73f9a6 · a73f9a6
2 parents be418e6 + d9ad836
commit a73f9a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/ngui/ui/src/components/CloudCostComparisonTable/columns/flavors.js b/ngui/ui/src/components/CloudCostComparisonTable/columns/flavors.js
@@ -12,7 +12,6 @@ import QuestionMark from "components/QuestionMark";
 import TextWithDataTestId from "components/TextWithDataTestId";
 import Tooltip from "components/Tooltip";
 import { useIsSizeSelected, useSelectionActions } from "reducers/cloudCostComparisonSelectedSizes/hooks";
-import { isLastItem } from "utils/arrays";
 import { AWS_CNR, AZURE_CNR, FORMATTED_MONEY_TYPES, NEBIUS } from "utils/constants";
 
 const Flavor = ({ flavor }) => {
@@ -82,11 +81,13 @@ const Flavor = ({ flavor }) => {
 
 const FlavorsCell = ({ flavors }) => (
   <ExpandableList
-    items={flavors.map((flavor, itemIndex) => (
+    items={flavors.map((flavor) => (
       <Box
         key={flavor.id}
         sx={{
-          marginBottom: isLastItem(itemIndex, flavors.length) ? 0 : 1
+          "&:not(:last-child)": {
+            marginBottom: 1
+          }
         }}
       >
         <Flavor flavor={flavor} />

diff --git a/ngui/ui/src/hooks/useOptscaleRecommendations.js b/ngui/ui/src/hooks/useOptscaleRecommendations.js
@@ -53,14 +53,10 @@ export const useOptscaleRecommendations = () => {
       PublicS3Buckets,
       ObsoleteImages,
       AbandonedImages,
-      AbandonedNebiusS3Buckets,
-      CvocAgreementOpportunities
+      CvocAgreementOpportunities,
+      ...(isNebiusConnectionEnabled ? [AbandonedNebiusS3Buckets, NebiusMigration] : [])
     ];
 
-    if (isNebiusConnectionEnabled) {
-      recommendations.push(NebiusMigration);
-    }
-
     return Object.fromEntries(recommendations.map((Rec) => [new Rec().type, Rec]));
   }, [isNebiusConnectionEnabled]);
 };