upcoming: [DI-24470] - Rename resources to entities in labels, placeholders and messages in cloudpulse alerting

packages/manager/.changeset/pr-11977-upcoming-features-1744016876527.md

@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Rename resources to entities in labels, placeholders, messages and warnings in `cloudpulse alerting` section ([#11977](https://github.com/linode/manager/pull/11977))

packages/manager/cypress/e2e/core/cloudpulse/alert-show-details.spec.ts

@@ -132,6 +132,7 @@ describe('Integration Tests for Alert Show Detail Page', () => {
   });
 
   it('should correctly display the details of the DBaaS alert in the alert details view', () => {
+    const searchPlaceholder = 'Search for a Region or Entity';
     cy.visitWithLogin(`/alerts/definitions/detail/${service_type}/${id}`);
     cy.wait(['@getDBaaSAlertDefinitions', '@getMockedDbaasDatabases']);
 
@@ -265,19 +266,17 @@ describe('Integration Tests for Alert Show Detail Page', () => {
     //  Validate the Resources section (Resource and Region columns)
     cy.get('[data-qa-section="Resources"]').within(() => {
       ui.heading
-        .findByText('resource')
+        .findByText('entity')
         .scrollIntoView()
         .should('be.visible')
-        .should('have.text', 'Resource');
+        .should('have.text', 'Entity');
 
       ui.heading
         .findByText('region')
         .should('be.visible')
         .should('have.text', 'Region');
 
-      cy.findByPlaceholderText('Search for a Region or Resource').should(
-        'be.visible'
-      );
+      cy.findByPlaceholderText(searchPlaceholder).should('be.visible');
 
       cy.findByPlaceholderText('Select Regions').should('be.visible');
 
@@ -295,7 +294,7 @@ describe('Integration Tests for Alert Show Detail Page', () => {
           const regionLabel = regionMap.get(db.region) || 'Unknown Region';
 
           cy.wrap(row).within(() => {
-            cy.get(`[data-qa-alert-cell="${rowNumber}_resource"]`).should(
+            cy.get(`[data-qa-alert-cell="${rowNumber}_entity"]`).should(
               'have.text',
               db.label
             );
@@ -307,11 +306,11 @@ describe('Integration Tests for Alert Show Detail Page', () => {
           });
         });
 
-      // Sorting by Resource and Region columns
-      ui.heading.findByText('resource').should('be.visible').click();
+      // Sorting by entity and Region columns
+      ui.heading.findByText('entity').should('be.visible').click();
       verifyRowOrder(['4', '3', '2', '1']);
 
-      ui.heading.findByText('resource').should('be.visible').click();
+      ui.heading.findByText('entity').should('be.visible').click();
       verifyRowOrder(['1', '2', '3', '4']);
 
       ui.heading.findByText('region').should('be.visible').click();
@@ -320,8 +319,8 @@ describe('Integration Tests for Alert Show Detail Page', () => {
       ui.heading.findByText('region').should('be.visible').click();
       verifyRowOrder(['1', '3', '2', '4']);
 
-      // Search by Resource
-      cy.findByPlaceholderText('Search for a Region or Resource')
+      // Search by Entity
+      cy.findByPlaceholderText(searchPlaceholder)
         .should('be.visible')
         .type(databases[0].label);
 
@@ -335,7 +334,7 @@ describe('Integration Tests for Alert Show Detail Page', () => {
       );
 
       // Search by region
-      cy.findByPlaceholderText('Search for a Region or Resource').clear();
+      cy.findByPlaceholderText(searchPlaceholder).clear();
 
       ui.regionSelect.find().click().type(`${regions[0].label}{enter}`);
       ui.regionSelect.find().click();

packages/manager/cypress/e2e/core/cloudpulse/create-user-alert.spec.ts

@@ -209,20 +209,20 @@ describe('Create Alert', () => {
     ui.autocomplete.findByLabel('Severity').should('be.visible').type('Severe');
     ui.autocompletePopper.findByTitle('Severe').should('be.visible').click();
 
-    // Search for Resource
-    cy.findByPlaceholderText('Search for a Region or Resource')
+    // Search for Entity
+    cy.findByPlaceholderText('Search for a Region or Entity')
       .should('be.visible')
       .type('database-2');
 
-    // Find the table and locate the resource cell containing 'database-2', then check the corresponding checkbox
+    // Find the table and locate the entity cell containing 'database-2', then check the corresponding checkbox
     cy.get('[data-qa-alert-table="true"]') // Find the table
-      .contains('[data-qa-alert-cell*="resource"]', 'database-2') // Find resource cell
+      .contains('[data-qa-alert-cell*="entity"]', 'database-2') // Find entity cell
       .parents('tr')
       .find('[type="checkbox"]')
       .check();
 
-    // Assert resource selection notice
-    cy.findByText('1 of 10 resources are selected.');
+    // Assert entity selection notice
+    cy.findByText('1 of 10 entities are selected.');
 
     // Fill metric details for the first rule
     const cpuUsageMetricDetails = {

packages/manager/cypress/e2e/core/cloudpulse/edit-system-alert.spec.ts

@@ -113,14 +113,14 @@ describe('Integration Tests for Edit Alert', () => {
 
     cy.wait(['@getAlertDefinitions', '@getDatabases']);
 
-    // Verify that the heading with text 'resource' is visible
-    ui.heading.findByText('resource').should('be.visible');
+    // Verify that the heading with text 'entity' is visible
+    ui.heading.findByText('entity').should('be.visible');
 
     // Verify that the heading with text 'region' is visible
     ui.heading.findByText('region').should('be.visible');
 
-    // Verify the initial selection of resources, then select all resources.
-    cy.findByText('3 of 50 resources are selected.')
+    // Verify the initial selection of entities, then select all entities.
+    cy.findByText('3 of 50 entities are selected.')
       .should('be.visible')
       .closest('[data-qa-notice]')
       .within(() => {
@@ -133,7 +133,7 @@ describe('Integration Tests for Edit Alert', () => {
       });
 
     // Confirm notice text updates to reflect selection.
-    cy.findByText('50 of 50 resources are selected.').should('be.visible');
+    cy.findByText('50 of 50 entities are selected.').should('be.visible');
 
     // Verify the initial state of the page size
     ui.pagination.findPageSizeSelect().click();
@@ -271,7 +271,7 @@ describe('Integration Tests for Edit Alert', () => {
       cy.url().should('endWith', '/alerts/definitions');
 
       // Confirm toast notification appears
-      ui.toast.assertMessage('Alert resources successfully updated.');
+      ui.toast.assertMessage('Alert entities successfully updated.');
     });
   });
 });

packages/manager/cypress/e2e/core/cloudpulse/edit-user-alert.spec.ts

@@ -187,17 +187,17 @@ describe('Integration Tests for Edit Alert', () => {
       .should('have.value', 'Databases');
     cy.findByLabelText('Severity').should('have.value', 'Severe');
 
-    // Verify alert resource selection
+    // Verify alert entity selection
     cy.get('[data-qa-alert-table="true"]')
-      .contains('[data-qa-alert-cell*="resource"]', 'database-3')
+      .contains('[data-qa-alert-cell*="entity"]', 'database-3')
       .parents('tr')
       .find('[type="checkbox"]')
       .should('be.checked');
 
-    // Verify alert resource selection count message
+    // Verify alert entity selection count message
     cy.get('[data-testid="selection_notice"]').should(
       'contain',
-      '1 of 5 resources are selected.'
+      '1 of 5 entities are selected.'
     );
 
     // Assert rule values 1

packages/manager/src/features/CloudPulse/Alerts/AlertsDetail/AlertDetail.test.tsx

@@ -121,7 +121,7 @@ describe('AlertDetail component tests', () => {
     // validate overview is present with its couple of properties (values will be validated in its own components test)
     expect(getByText('Overview')).toBeInTheDocument();
     expect(getByText('Criteria')).toBeInTheDocument(); // validate if criteria is present
-    expect(getByText('Resources')).toBeInTheDocument(); // validate if resources is present
+    expect(getByText('Entities')).toBeInTheDocument(); // validate if entities is present
     expect(getByText('Notification Channels')).toBeInTheDocument(); // validate if notification channels is present
     expect(getByText('Name:')).toBeInTheDocument();
     expect(getByText('Description:')).toBeInTheDocument();

packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertMaxSelectionText.test.tsx

@@ -11,7 +11,7 @@ describe('AlertMaxSelectionText', () => {
     );
     expect(getByTestId('warning-tip')).toBeInTheDocument();
     expect(getByTestId('warning-tip')).toHaveTextContent(
-      'You can select up to 2 resources.'
+      'You can select up to 2 entities.'
     );
   });
 });

packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertMaxSelectionText.tsx

@@ -12,7 +12,7 @@ export const AlertMaxSelectionText = (props: AlertMaxSelectionTextProps) => {
   const { maxSelectionCount } = props;
   return (
     <Typography data-testid="warning-tip">
-      You can select up to {maxSelectionCount} resources.
+      You can select up to {maxSelectionCount} entities.
     </Typography>
   );
 };

packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResources.test.tsx

@@ -34,7 +34,7 @@ const linodes = linodeFactory.buildList(3).map((value, index) => {
   };
 });
 
-const searchPlaceholder = 'Search for a Region or Resource';
+const searchPlaceholder = 'Search for a Region or Entity';
 const regionPlaceholder = 'Select Regions';
 const checkedAttribute = 'data-qa-checked';
 const cloudPulseResources: CloudPulseResources[] = linodes.map((linode) => {
@@ -147,7 +147,7 @@ describe('AlertResources component tests', () => {
     const { getByTestId } = renderWithTheme(
       <AlertResources {...alertResourcesProp} />
     );
-    const resourceColumn = getByTestId('resource'); // get the resource header column
+    const resourceColumn = getByTestId('entity'); // get the entity header column
     await userEvent.click(resourceColumn);
 
     const tableBody = getByTestId('alert_resources_content');
@@ -211,7 +211,7 @@ describe('AlertResources component tests', () => {
     );
 
     const noticeText = getByTestId('selection_notice');
-    expect(noticeText).toHaveTextContent('2 of 3 resources are selected.');
+    expect(noticeText).toHaveTextContent('2 of 3 entities are selected.');
 
     // validate it selects 3
     await userEvent.click(getByTestId('select_item_3'));
@@ -220,7 +220,7 @@ describe('AlertResources component tests', () => {
       'true'
     );
     expect(handleResourcesSelection).toHaveBeenCalledWith(['1', '2', '3']);
-    expect(noticeText).toHaveTextContent('3 of 3 resources are selected.');
+    expect(noticeText).toHaveTextContent('3 of 3 entities are selected.');
 
     // unselect 3 and test
     await userEvent.click(getByTestId('select_item_3'));

packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResources.tsx

@@ -318,7 +318,7 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
       <Stack gap={2}>
         {!hideLabel && (
           <Typography ref={titleRef} variant="h2">
-            {alertLabel || 'Resources'}
+            {alertLabel || 'Entities'}
             {/* It can be either the passed alert label or just Resources */}
           </Typography>
         )}
@@ -329,8 +329,8 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
             },
           }}
           icon={EntityIcon}
-          subtitle="Once you assign the resources, they will show up here."
-          title="No resources associated with this alert definition."
+          subtitle="Once you assign the entities, they will show up here."
+          title="No entities associated with this alert definition."
         />
       </Stack>
     );
@@ -355,14 +355,14 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
     <Stack gap={2}>
       {!hideLabel && (
         <Typography ref={titleRef} variant="h2">
-          {alertLabel || 'Resources'}
+          {alertLabel || 'Entities'}
           {/* It can be either the passed alert label or just Resources */}
         </Typography>
       )}
       {showEditInformation && (
         <Typography ref={titleRef} variant="body1">
-          You can enable or disable this system alert for each resource you have
-          access to. Select the resources listed below you want to enable the
+          You can enable or disable this system alert for each entities you have
+          access to. Select the entities listed below you want to enable the
           alert for.
         </Typography>
       )}
@@ -384,9 +384,9 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
               }}
               clearable
               hideLabel
-              label="Search for a Region or Resource"
+              label="Search for a Region or Entity"
               onSearch={handleSearchTextChange}
-              placeholder="Search for a Region or Resource"
+              placeholder="Search for a Region or Entity"
               value={searchText || ''}
             />
           </Grid>
@@ -444,7 +444,7 @@ export const AlertResources = React.memo((props: AlertResourcesProp) => {
         {maxSelectionCount !== undefined && (
           <Grid item xs={12}>
             <AlertListNoticeMessages
-              errorMessage={`You can select up to ${maxSelectionCount} resources.`}
+              errorMessage={`You can select up to ${maxSelectionCount} entities.`}
               separator={MULTILINE_ERROR_SEPARATOR}
               style={noticeStyles}
               variant="warning"

packages/manager/src/features/CloudPulse/Alerts/AlertsResources/AlertsResourcesNotice.tsx

@@ -54,7 +54,7 @@ export const AlertsResourcesNotice = React.memo(
           })}
           data-testid="selection_notice"
         >
-          {selectedResources} of {totalResources} resources are selected.
+          {selectedResources} of {totalResources} entities are selected.
         </Typography>
         <Tooltip
           slotProps={{

packages/manager/src/features/CloudPulse/Alerts/AlertsResources/constants.ts

@@ -21,7 +21,7 @@ export const serviceTypeBasedColumns: ServiceColumns<AlertInstance> = {
     // Default fallback case when service type is empty, in the create flow, until we select a service type it will be empty
     {
       accessor: ({ label }) => label,
-      label: 'Resource',
+      label: 'Entity',
       sortingKey: 'label',
     },
     {
@@ -33,7 +33,7 @@ export const serviceTypeBasedColumns: ServiceColumns<AlertInstance> = {
   dbaas: [
     {
       accessor: ({ label }) => label,
-      label: 'Resource',
+      label: 'Entity',
       sortingKey: 'label',
     },
     {
@@ -51,7 +51,7 @@ export const serviceTypeBasedColumns: ServiceColumns<AlertInstance> = {
   linode: [
     {
       accessor: ({ label }) => label,
-      label: 'Resource',
+      label: 'Entity',
       sortingKey: 'label',
     },
     {

packages/manager/src/features/CloudPulse/Alerts/CreateAlert/CreateAlertDefinition.test.tsx

@@ -69,9 +69,9 @@ describe('AlertDefinition Create', () => {
     expect(getByLabelText('Description (optional)')).toBeVisible();
     expect(getByLabelText('Severity')).toBeVisible();
     expect(getByLabelText('Service')).toBeVisible();
-    expect(getByText('2. Resources')).toBeVisible();
+    expect(getByText('2. Entities')).toBeVisible();
     await expect(
-      getByPlaceholderText('Search for a Region or Resource')
+      getByPlaceholderText('Search for a Region or Entity')
     ).toBeInTheDocument();
     await expect(getByPlaceholderText('Select Regions')).toBeInTheDocument();
     expect(getByText('3. Criteria')).toBeVisible();

packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Resources/CloudPulseModifyAlertResources.test.tsx

@@ -86,7 +86,7 @@ describe('CreateAlertResources component tests', () => {
         },
       });
     expect(
-      getByPlaceholderText('Search for a Region or Resource')
+      getByPlaceholderText('Search for a Region or Entity')
     ).toBeInTheDocument();
     expect(getByPlaceholderText('Select Regions')).toBeInTheDocument();
     expect(getByTestId('show_selected_only')).toBeInTheDocument();
@@ -158,15 +158,15 @@ describe('CreateAlertResources component tests', () => {
           },
           errors: {
             entity_ids: {
-              message: 'More than 2 resources selected',
+              message: 'More than 2 entities selected',
             },
           },
         },
       });
 
     expect(getAllByTestId('alert_message_notice').length).toBe(2); // one for error and one for selection warning
-    expect(getByText('You can select up to 2 resources.')).toBeInTheDocument();
-    expect(getByText('More than 2 resources selected')).toBeInTheDocument();
+    expect(getByText('You can select up to 2 entities.')).toBeInTheDocument();
+    expect(getByText('More than 2 entities selected')).toBeInTheDocument();
     const resourceFour = getByTestId('select_item_4');
     expect(resourceFour).toBeInTheDocument();
     expect(resourceFour).toHaveAttribute('aria-disabled', 'true');

packages/manager/src/features/CloudPulse/Alerts/CreateAlert/Resources/CloudPulseModifyAlertResources.tsx

@@ -50,7 +50,7 @@ export const CloudPulseModifyAlertResources = React.memo(
         render={({ field, fieldState }) => (
           <Box display="flex" flexDirection="column" gap={3} paddingTop={3}>
             <Typography ref={titleRef} variant="h2">
-              2. Resources
+              2. Entities
             </Typography>
             <Box
               sx={(theme) => ({

packages/manager/src/features/CloudPulse/Alerts/EditAlert/EditAlertDefinition.test.tsx

@@ -54,9 +54,9 @@ describe('EditAlertDefinition component', () => {
       expect(getByLabelText('Description (optional)')).toBeVisible();
       expect(getByLabelText('Severity')).toBeVisible();
       expect(getByLabelText('Service')).toBeVisible();
-      expect(getByText('2. Resources')).toBeVisible();
+      expect(getByText('2. Entities')).toBeVisible();
       expect(
-        await findByPlaceholderText('Search for a Region or Resource')
+        await findByPlaceholderText('Search for a Region or Entity')
       ).toBeInTheDocument();
       expect(await findByPlaceholderText('Select Regions')).toBeInTheDocument();
       expect(getByText('3. Criteria')).toBeVisible();