From 1bc580256f662f28bc2ba96e8366813947fd5626 Mon Sep 17 00:00:00 2001 From: v-hx <146182370+v-hx@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:39:00 +0300 Subject: [PATCH 1/2] OS-6967: Hide Nebius recommendations with a flag --- ngui/ui/src/hooks/useOptscaleRecommendations.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ngui/ui/src/hooks/useOptscaleRecommendations.js b/ngui/ui/src/hooks/useOptscaleRecommendations.js index 7197ca127..1b1187a71 100644 --- 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]); }; From d9ad8363504d9c2e55da27dafb60faeca12874d1 Mon Sep 17 00:00:00 2001 From: ek-hystax <33006768+ek-hystax@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:46:37 +0400 Subject: [PATCH 2/2] OS-6953. Use css-only to set margin for flavor boxes --- .../components/CloudCostComparisonTable/columns/flavors.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ngui/ui/src/components/CloudCostComparisonTable/columns/flavors.js b/ngui/ui/src/components/CloudCostComparisonTable/columns/flavors.js index f98670836..8141c133d 100644 --- 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 }) => ( ( + items={flavors.map((flavor) => (