address review comments #1659

Author: joshdimanteto

cypress/e2e/with_mock_data/catalogueCategories.cy.ts

@@ -65,14 +65,14 @@ describe('Catalogue Category', () => {
     cy.findByTestId('WarningIcon').should('exist');
     cy.findByTestId('WarningIcon').trigger('mouseover');
     cy.findByText(
-      'A catalogue category is considered critical if any of its nested child categories or catalogue items are marked as critical.'
+      'A catalogue category is considered critical if any of its nested child categories or catalogue items are flagged as critical.'
     );
     cy.findByText('Beam Characterization').click();
 
     cy.findByTestId('WarningIcon').should('exist');
     cy.findByTestId('WarningIcon').trigger('mouseover');
     cy.findByText(
-      'A catalogue category is considered critical if any of its nested child categories or catalogue items are marked as critical.'
+      'A catalogue category is considered critical if any of its nested child categories or catalogue items are flagged as critical.'
     );
   });
 
@@ -99,7 +99,7 @@ describe('Catalogue Category', () => {
         cy.findByTestId('WarningIcon').trigger('mouseover');
       });
     cy.findByText(
-      'A catalogue category is considered critical if any of its nested child categories or catalogue items are marked as critical.'
+      'A catalogue category is considered critical if any of its nested child categories or catalogue items are flagged as critical.'
     );
   });
 
@@ -1507,7 +1507,7 @@ describe('Catalogue Category', () => {
 
   it('edits an existing property unit (as admin)', () => {
     cy.visit('/catalogue/10');
-    cy.setCurrentUserToAdmin();
+    cy.setMode({ admin: true });
 
     cy.findAllByRole('button', {
       name: 'Card Actions',
@@ -1703,7 +1703,7 @@ describe('Catalogue Category', () => {
 
   it('deletes a property (admin)', () => {
     cy.visit('/catalogue/10');
-    cy.setCurrentUserToAdmin();
+    cy.setMode({ admin: true });
 
     cy.findAllByRole('button', {
       name: 'Card Actions',

src/catalogue/category/catalogueCard.component.tsx

@@ -1,4 +1,5 @@
 import {
+  alpha,
   Button,
   Card,
   CardActions,
@@ -17,7 +18,7 @@ import { CatalogueCategory } from '../../api/api.types';
 import CriticalityTooltipIcon from '../../common/criticalityTooltipIcon.component';
 import { useAppSelector } from '../../state/hook';
 import { selectCriticality } from '../../state/slices/criticalitySlice';
-import { OverflowTip, formatDateTimeStrings } from '../../utils';
+import { formatDateTimeStrings, OverflowTip } from '../../utils';
 import { CriticalTooltipText } from './catalogueCardView.component';
 export interface CatalogueCardProps {
   table: MRT_TableInstance<CatalogueCategory>;
@@ -65,7 +66,7 @@ function CatalogueCard(props: CatalogueCardProps) {
             : undefined,
 
           boxShadow: showFlagged
-            ? `0 0 10px 3px ${theme.palette.error.main}88` // 88 = ~53% opacity for fuzzy glow
+            ? `0 0 10px 3px ${alpha(theme.palette.error.main, 0.53)}` //  ~53% opacity for fuzzy glow
             : undefined,
         })}
       >

src/catalogue/category/catalogueCardView.component.test.tsx

@@ -335,7 +335,7 @@ describe('CardView', () => {
 
     expect(
       await screen.findByText(
-        'A catalogue category is considered critical if any of its nested child categories or catalogue items are marked as critical.'
+        'A catalogue category is considered critical if any of its nested child categories or catalogue items are flagged as critical.'
       )
     ).toBeInTheDocument();
   });
@@ -365,7 +365,7 @@ describe('CardView', () => {
 
     expect(
       await screen.findByText(
-        'A catalogue category is considered critical if any of its nested child categories or catalogue items are marked as critical.'
+        'A catalogue category is considered critical if any of its nested child categories or catalogue items are flagged as critical.'
       )
     ).toBeInTheDocument();
   });

src/catalogue/category/catalogueCardView.component.tsx

@@ -160,7 +160,7 @@ const CopyCategoriesButton = (props: {
 export const CriticalTooltipText = (
   <Typography style={{ whiteSpace: 'pre-line' }}>
     A catalogue category is considered critical if any of its nested child
-    categories or catalogue items are marked as critical.
+    categories or catalogue items are flagged as critical.
   </Typography>
 );
 
@@ -323,7 +323,7 @@ function CatalogueCardView() {
         enableGrouping: false,
       },
       {
-        header: 'is Critical',
+        header: 'Is Critical',
         Header: ({ column }) => (
           <Box sx={{ display: 'flex', alignItems: 'center' }}>
             <Tooltip title={CriticalTooltipText}>

src/catalogue/category/catalogueCategoryTableView.component.test.tsx

@@ -404,7 +404,7 @@ describe('CatalogueCategoryTableView', () => {
 
     expect(
       await screen.findByText(
-        'A catalogue category is considered critical if any of its nested child categories or catalogue items are marked as critical.'
+        'A catalogue category is considered critical if any of its nested child categories or catalogue items are flagged as critical.'
       )
     ).toBeInTheDocument();
   });

src/utils.tsx

@@ -1,4 +1,5 @@
 import {
+  alpha,
   Link as MuiLink,
   SxProps,
   TableCell,
@@ -332,8 +333,9 @@ function getNestedProperty(obj: any, path: string): any {
     .reduce((o, p) => (o && o[p] !== undefined ? o[p] : undefined), obj);
 }
 
-interface ModifiedMRTGroupedCellProps<TData extends MRT_RowData>
-  extends MRTGroupedCellProps<TData> {
+interface ModifiedMRTGroupedCellProps<
+  TData extends MRT_RowData,
+> extends MRTGroupedCellProps<TData> {
   outputType?: 'Link' | 'Date'; // default is Text
 }
 
@@ -694,6 +696,6 @@ export function isExactFilterActive<TData extends MRT_RowData>(
 
 export const criticalityRowStyle = (theme: Theme) => {
   return {
-    backgroundColor: theme.palette.error.main + '11', // ~7% tint
+    backgroundColor: alpha(theme.palette.error.main, 0.07), // ~7% tint
   };
 };