Skip to content

Commit 72bb820

Browse files
committed
fix failing test cases and other marketplace references
1 parent 4e71453 commit 72bb820

File tree

5 files changed

+20
-7
lines changed

5 files changed

+20
-7
lines changed

packages/manager/src/GoTo.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import * as React from 'react';
55

66
import { useIsDatabasesEnabled } from './features/Databases/utilities';
77
import { usePermissions } from './features/IAM/hooks/usePermissions';
8+
import { useIsMarketplaceEnabled } from './features/Marketplace/utils';
89
import { useIsPlacementGroupsEnabled } from './features/PlacementGroups/utils';
910
import { useFlags } from './hooks/useFlags';
1011
import { useGlobalKeyboardListener } from './hooks/useGlobalKeyboardListener';
@@ -24,6 +25,8 @@ export const GoTo = React.memo(() => {
2425

2526
const { isPlacementGroupsEnabled } = useIsPlacementGroupsEnabled();
2627
const { isDatabasesEnabled } = useIsDatabasesEnabled();
28+
const { isMarketplaceFeatureEnabled } = useIsMarketplaceEnabled();
29+
2730
const { goToOpen, setGoToOpen } = useGlobalKeyboardListener();
2831

2932
const onClose = () => {
@@ -99,9 +102,10 @@ export const GoTo = React.memo(() => {
99102
display: 'Longview',
100103
href: '/longview',
101104
},
102-
103105
{
104-
display: 'Marketplace',
106+
display: !isMarketplaceFeatureEnabled
107+
? 'Marketplace'
108+
: 'Quick Deploy Apps',
105109
href: '/linodes/create/marketplace',
106110
},
107111
...(iamRbacPrimaryNavChanges
@@ -133,6 +137,7 @@ export const GoTo = React.memo(() => {
133137
permissions.is_account_admin,
134138
isDatabasesEnabled,
135139
isManagedAccount,
140+
isMarketplaceFeatureEnabled,
136141
isPlacementGroupsEnabled,
137142
iamRbacPrimaryNavChanges,
138143
]

packages/manager/src/components/PrimaryNav/PrimaryNav.test.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,10 @@ describe('PrimaryNav', () => {
605605
flags,
606606
});
607607

608-
const marketplaceNavItem = await findByTestId('menu-item-Partner Referral');
608+
const partnerReferralNavItem = await findByTestId(
609+
'menu-item-Partner Referrals'
610+
);
609611

610-
expect(marketplaceNavItem).toBeVisible();
612+
expect(partnerReferralNavItem).toBeVisible();
611613
});
612614
});

packages/manager/src/components/PrimaryNav/PrimaryNav.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export type NavEntity =
5555
| 'Longview'
5656
| 'Maintenance'
5757
| 'Managed'
58+
| 'Marketplace' // TODO: Cloud Manager Marketplace - Remove marketplace references once 'Quick Deploy Apps' is fully rolled out
5859
| 'Metrics'
5960
| 'Monitor'
6061
| 'Network Load Balancer'

packages/manager/src/features/TopMenu/CreateMenu/CreateMenu.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import DatabaseIcon from 'src/assets/icons/entityIcons/database.svg';
77
import NetworkIcon from 'src/assets/icons/entityIcons/networking.svg';
88
import StorageIcon from 'src/assets/icons/entityIcons/storage.svg';
99
import { useIsDatabasesEnabled } from 'src/features/Databases/utilities';
10+
import { useIsMarketplaceEnabled } from 'src/features/Marketplace/utils';
1011
import { useIsPlacementGroupsEnabled } from 'src/features/PlacementGroups/utils';
1112

1213
import {
@@ -30,10 +31,11 @@ export type CreateEntity =
3031
| 'Image'
3132
| 'Kubernetes'
3233
| 'Linode'
33-
| 'Marketplace'
34+
| 'Marketplace' // TODO: Cloud Manager Marketplace - Remove marketplace references once 'Quick Deploy Apps' is fully rolled out
3435
| 'NodeBalancer'
3536
| 'Object Storage'
3637
| 'Placement Group'
38+
| 'Quick Deploy Apps'
3739
| 'Volume'
3840
| 'VPC';
3941

@@ -52,6 +54,7 @@ export const CreateMenu = () => {
5254

5355
const { isDatabasesEnabled } = useIsDatabasesEnabled();
5456
const { isPlacementGroupsEnabled } = useIsPlacementGroupsEnabled();
57+
const { isMarketplaceFeatureEnabled } = useIsMarketplaceEnabled();
5558

5659
const handleClick = (event: React.MouseEvent<HTMLButtonElement>) => {
5760
setAnchorEl(event.currentTarget);
@@ -90,7 +93,9 @@ export const CreateMenu = () => {
9093
{
9194
attr: { 'data-qa-one-click-add-new': true },
9295
description: 'Deploy applications with ease',
93-
display: 'Marketplace',
96+
display: !isMarketplaceFeatureEnabled
97+
? 'Marketplace'
98+
: 'Quick Deploy Apps',
9499
to: '/linodes/create/marketplace',
95100
},
96101
],

packages/manager/src/routes/marketplace/MarketplaceRoute.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const MarketplaceRoute = () => {
1515
}
1616
return (
1717
<React.Suspense fallback={<SuspenseLoader />}>
18-
<DocumentTitleSegment segment="Marketplace" />
18+
<DocumentTitleSegment segment="Partner Referrals" />
1919
<ProductInformationBanner bannerLocation="Marketplace" />
2020
<Outlet />
2121
</React.Suspense>

0 commit comments

Comments
 (0)