fix unit test and e2e

Author: hasyed-akamai

packages/manager/cypress/e2e/core/vpc/vpc-create.spec.ts

@@ -21,7 +21,7 @@ import {
 } from 'support/util/random';
 import { extendRegion } from 'support/util/regions';
 
-import { getUniqueLinodesFromSubnets } from 'src/features/VPCs/utils';
+import { getUniqueResourcesFromSubnets } from 'src/features/VPCs/utils';
 
 import type { Subnet, VPC } from '@linode/api-v4';
 
@@ -72,7 +72,7 @@ describe('VPC create flow', () => {
     const ipValidationErrorMessage1 = 'A subnet must have an IPv4 range.';
     const ipValidationErrorMessage2 = 'The IPv4 range must be in CIDR format.';
     const vpcCreationErrorMessage = 'An unknown error has occurred.';
-    const totalSubnetUniqueLinodes = getUniqueLinodesFromSubnets(mockSubnets);
+    const totalSubnetUniqueLinodes = getUniqueResourcesFromSubnets(mockSubnets);
 
     mockGetRegions([mockVPCRegion]).as('getRegions');
 
@@ -232,7 +232,9 @@ describe('VPC create flow', () => {
       .should('be.visible')
       .within(() => {
         cy.contains(`Subnets ${mockVpc.subnets.length}`).should('be.visible');
-        cy.contains(`Linodes ${totalSubnetUniqueLinodes}`).should('be.visible');
+        cy.contains(`Resources ${totalSubnetUniqueLinodes}`).should(
+          'be.visible'
+        );
         cy.contains(`VPC ID ${mockVpc.id}`).should('be.visible');
         cy.contains(`Region ${mockVPCRegion.label}`).should('be.visible');
       });
@@ -270,7 +272,7 @@ describe('VPC create flow', () => {
       subnets: [],
     });
 
-    const totalSubnetUniqueLinodes = getUniqueLinodesFromSubnets([]);
+    const totalSubnetUniqueLinodes = getUniqueResourcesFromSubnets([]);
 
     mockGetRegions([mockVPCRegion]).as('getRegions');
 
@@ -320,7 +322,9 @@ describe('VPC create flow', () => {
       .should('be.visible')
       .within(() => {
         cy.contains(`Subnets ${mockVpc.subnets.length}`).should('be.visible');
-        cy.contains(`Linodes ${totalSubnetUniqueLinodes}`).should('be.visible');
+        cy.contains(`Resources ${totalSubnetUniqueLinodes}`).should(
+          'be.visible'
+        );
         cy.contains(`VPC ID ${mockVpc.id}`).should('be.visible');
         cy.contains(`Region ${mockVPCRegion.label}`).should('be.visible');
       });

packages/manager/src/features/VPCs/VPCDetail/VPCDetail.test.tsx

@@ -42,7 +42,7 @@ describe('VPC Detail Summary section', () => {
     });
   });
 
-  it('should display number of subnets and linodes, region, id, creation and update dates', async () => {
+  it('should display number of subnets and resources, region, id, creation and update dates', async () => {
     const vpcFactory1 = vpcFactory.build({ id: 1, subnets: [] });
     server.use(
       http.get('*/vpcs/:vpcId', () => {
@@ -60,7 +60,7 @@ describe('VPC Detail Summary section', () => {
     }
 
     getAllByText('Subnets');
-    getAllByText('Linodes');
+    getAllByText('Resources');
     getAllByText('0');
 
     getAllByText('Region');

packages/manager/src/features/VPCs/VPCDetail/VPCDetail.tsx

@@ -20,7 +20,7 @@ import { VPC_DOCS_LINK, VPC_LABEL } from 'src/features/VPCs/constants';
 
 import {
   getIsVPCLKEEnterpriseCluster,
-  getUniqueLinodesFromSubnets,
+  getUniqueResourcesFromSubnets,
 } from '../utils';
 import { VPCDeleteDialog } from '../VPCLanding/VPCDeleteDialog';
 import { VPCEditDrawer } from '../VPCLanding/VPCEditDrawer';
@@ -92,7 +92,7 @@ const VPCDetail = () => {
   const regionLabel =
     regions?.find((r) => r.id === vpc.region)?.label ?? vpc.region;
 
-  const numLinodes = getUniqueLinodesFromSubnets(vpc.subnets);
+  const numLinodes = getUniqueResourcesFromSubnets(vpc.subnets);
 
   const summaryData = [
     [

packages/manager/src/features/VPCs/VPCLanding/VPCLanding.test.tsx

@@ -41,7 +41,7 @@ describe('VPC Landing Table', () => {
     getAllByText('Region');
     getAllByText('VPC ID');
     getAllByText('Subnets');
-    getAllByText('Linodes');
+    getAllByText('Resources');
   });
 
   it('should render vpc landing with empty state', async () => {

packages/manager/src/features/VPCs/VPCLanding/VPCRow.tsx

@@ -12,7 +12,7 @@ import { useIsResourceRestricted } from 'src/hooks/useIsResourceRestricted';
 
 import {
   getIsVPCLKEEnterpriseCluster,
-  getUniqueLinodesFromSubnets,
+  getUniqueResourcesFromSubnets,
 } from '../utils';
 
 import type { VPC } from '@linode/api-v4/lib/vpcs/types';
@@ -29,7 +29,7 @@ export const VPCRow = ({ handleDeleteVPC, handleEditVPC, vpc }: Props) => {
   const { data: regions } = useRegionsQuery();
 
   const regionLabel = regions?.find((r) => r.id === vpc.region)?.label ?? '';
-  const numLinodes = getUniqueLinodesFromSubnets(vpc.subnets);
+  const numLinodes = getUniqueResourcesFromSubnets(vpc.subnets);
 
   const isVPCReadOnly = useIsResourceRestricted({
     grantLevel: 'read_only',

packages/manager/src/features/VPCs/utils.test.ts

@@ -13,7 +13,7 @@ import {
 import {
   getLinodeInterfacePrimaryIPv4,
   getLinodeInterfaceRanges,
-  getUniqueLinodesFromSubnets,
+  getUniqueResourcesFromSubnets,
   getVPCInterfacePayload,
   hasUnrecommendedConfiguration,
   hasUnrecommendedConfigurationLinodeInterface,
@@ -26,8 +26,8 @@ const subnetLinodeInfoList1 = subnetAssignedLinodeDataFactory.buildList(4);
 const subnetLinodeInfoId1 = subnetAssignedLinodeDataFactory.build({ id: 1 });
 const subnetLinodeInfoId3 = subnetAssignedLinodeDataFactory.build({ id: 3 });
 
-describe('getUniqueLinodesFromSubnets', () => {
-  it(`returns the number of unique linodes within a VPC's subnets`, () => {
+describe('getUniqueResourcesFromSubnets', () => {
+  it(`returns the number of unique linodes and nodeBalancers within a VPC's subnets`, () => {
     const subnets0 = [subnetFactory.build({ linodes: [] })];
     const subnets1 = [subnetFactory.build({ linodes: subnetLinodeInfoList1 })];
     const subnets2 = [
@@ -55,11 +55,11 @@ describe('getUniqueLinodesFromSubnets', () => {
       }),
     ];
 
-    expect(getUniqueLinodesFromSubnets(subnets0)).toBe(0);
-    expect(getUniqueLinodesFromSubnets(subnets1)).toBe(4);
-    expect(getUniqueLinodesFromSubnets(subnets2)).toBe(2);
+    expect(getUniqueResourcesFromSubnets(subnets0)).toBe(0);
+    expect(getUniqueResourcesFromSubnets(subnets1)).toBe(4);
+    expect(getUniqueResourcesFromSubnets(subnets2)).toBe(2);
     // updated factory for generating linode ids, so unique linodes will be different
-    expect(getUniqueLinodesFromSubnets(subnets3)).toBe(8);
+    expect(getUniqueResourcesFromSubnets(subnets3)).toBe(8);
   });
 });
 

packages/manager/src/features/VPCs/utils.ts

@@ -11,7 +11,7 @@ import type {
 } from '@linode/api-v4';
 import type { ExtendedIP } from 'src/utilities/ipUtils';
 
-export const getUniqueLinodesFromSubnets = (subnets: Subnet[]) => {
+export const getUniqueResourcesFromSubnets = (subnets: Subnet[]) => {
   const linodes: number[] = [];
   const nodeBalancer: number[] = [];
   for (const subnet of subnets) {