Merge branch 'main' into fix/registry-name-field-validation

Author: Philip-Carneiro

frontend/src/pages/modelRegistrySettings/ModelRegistriesTableRow.tsx

@@ -6,6 +6,7 @@ import { BellIcon, InfoCircleIcon } from '@patternfly/react-icons';
 import { ModelRegistryKind, RoleBindingKind } from '#~/k8sTypes';
 import { FetchStateObject } from '#~/utilities/useFetch';
 import ResourceNameTooltip from '#~/components/ResourceNameTooltip';
+import TruncatedText from '#~/components/TruncatedText';
 import { filterRoleBindingSubjects } from '#~/concepts/roleBinding/utils';
 import { RoleBindingPermissionsRBType } from '#~/concepts/roleBinding/types';
 import { ModelRegistryTableRowStatus } from './ModelRegistryTableRowStatus';
@@ -85,7 +86,10 @@ const ModelRegistriesTableRow: React.FC<ModelRegistriesTableRowProps> = ({
           )}
         </Flex>
         {mr.metadata.annotations?.['openshift.io/description'] && (
-          <p>{mr.metadata.annotations['openshift.io/description']}</p>
+          <TruncatedText
+            maxLines={2}
+            content={mr.metadata.annotations['openshift.io/description']}
+          />
         )}
       </Td>
       <Td dataLabel="Status">

frontend/src/pages/modelServing/screens/metrics/__tests__/utils.spec.ts

@@ -1,4 +1,8 @@
-import { convertInputType } from '#~/pages/modelServing/screens/metrics/utils';
+import {
+  convertInputType,
+  toPercentage,
+  per100,
+} from '#~/pages/modelServing/screens/metrics/utils';
 
 describe('convertInputType', () => {
   describe('string inputs', () => {
@@ -40,3 +44,82 @@ describe('convertInputType', () => {
     });
   });
 });
+
+describe('toPercentage', () => {
+  it('should round percentage values to 2 decimal places', () => {
+    const input = { x: 1000, y: 0.09896161479334678, name: 'test' };
+    const result = toPercentage(input);
+    expect(result.y).toBe(9.9);
+  });
+
+  it('should handle values that round up', () => {
+    const input = { x: 1000, y: Number('0.15228456789012345'), name: 'test' };
+    const result = toPercentage(input);
+    expect(result.y).toBe(15.23);
+  });
+
+  it('should handle values that round down', () => {
+    const input = { x: 1000, y: 0.15224, name: 'test' };
+    const result = toPercentage(input);
+    expect(result.y).toBe(15.22);
+  });
+
+  it('should handle edge case near 100%', () => {
+    const input = { x: 1000, y: 0.999999, name: 'test' };
+    const result = toPercentage(input);
+    expect(result.y).toBe(100);
+  });
+
+  it('should handle edge case near 0%', () => {
+    const input = { x: 1000, y: 0.005, name: 'test' };
+    const result = toPercentage(input);
+    expect(result.y).toBe(0.5);
+  });
+
+  it('should handle exact zero', () => {
+    const input = { x: 1000, y: 0, name: 'test' };
+    const result = toPercentage(input);
+    expect(result.y).toBe(0);
+  });
+
+  it('should preserve x and name properties', () => {
+    const input = { x: 12345, y: 0.5, name: 'Memory Usage' };
+    const result = toPercentage(input);
+    expect(result.x).toBe(12345);
+    expect(result.name).toBe('Memory Usage');
+  });
+
+  it('should handle floating-point precision artifacts', () => {
+    // Test that floating-point errors like 99.99999999999999 get properly rounded
+    const input = { x: 1000, y: 0.9999999999999999, name: 'test' };
+    const result = toPercentage(input);
+    expect(result.y).toBe(100);
+  });
+});
+
+describe('per100', () => {
+  it('should divide by 100 and round to 2 decimal places', () => {
+    const input = { x: 1000, y: 989.6161479334678, name: 'test' };
+    const result = per100(input);
+    expect(result.y).toBe(9.9);
+  });
+
+  it('should handle values that round up', () => {
+    const input = { x: 1000, y: Number('1522.8456789012345'), name: 'test' };
+    const result = per100(input);
+    expect(result.y).toBe(15.23);
+  });
+
+  it('should handle exact zero', () => {
+    const input = { x: 1000, y: 0, name: 'test' };
+    const result = per100(input);
+    expect(result.y).toBe(0);
+  });
+
+  it('should preserve x and name properties', () => {
+    const input = { x: 12345, y: 5000, name: 'CPU Usage' };
+    const result = per100(input);
+    expect(result.x).toBe(12345);
+    expect(result.name).toBe('CPU Usage');
+  });
+});

frontend/src/pages/modelServing/screens/metrics/utils.tsx

@@ -107,7 +107,7 @@ export const per100: TranslatePoint = (point) => ({
 
 export const toPercentage: TranslatePoint = (point) => ({
   ...point,
-  y: point.y * 100,
+  y: Number((point.y * 100).toFixed(2)),
 });
 
 export const createGraphMetricLine = ({

packages/cypress/cypress/pages/modelsAsAService.ts

@@ -409,6 +409,30 @@ class APIKeysPage {
   findCreateApiKeyButton(): Cypress.Chainable<JQuery<HTMLElement>> {
     return cy.findByTestId('create-api-key-button');
   }
+
+  findStatusFilterToggle(): Cypress.Chainable<JQuery<HTMLElement>> {
+    return cy.findByTestId('api-key-status-filter-toggle');
+  }
+
+  findStatusFilterOption(status: string): Cypress.Chainable<JQuery<HTMLElement>> {
+    return cy.findByRole('menuitem', { name: new RegExp(status, 'i') });
+  }
+
+  findColumnSortButton(columnLabel: string): Cypress.Chainable<JQuery<HTMLElement>> {
+    return this.findTable().find('thead').contains('th', columnLabel).findByRole('button');
+  }
+
+  findFilterInput(): Cypress.Chainable<JQuery<HTMLElement>> {
+    return cy.findByTestId('username-filter-input');
+  }
+
+  findFilterSearchButton(): Cypress.Chainable<JQuery<HTMLElement>> {
+    return this.findFilterInput().find('button[type="submit"]');
+  }
+
+  findUsernameFilterTooltip(): Cypress.Chainable<JQuery<HTMLElement>> {
+    return cy.findByTestId('username-filter-tooltip');
+  }
 }
 
 class APIKeyTableRow extends TableRow {

packages/cypress/cypress/support/commands/odh.ts

@@ -1118,11 +1118,6 @@ declare global {
           type: 'POST /maas/api/v1/api-keys/search',
           response: { data: OdhResponse<APIKeyListResponse> },
         ) => Cypress.Chainable<null>) &
-        ((
-          type: 'POST /maas/api/v1/api-keys/search',
-          options: { query?: { page?: string; limit?: string } },
-          response: { data: OdhResponse<APIKeyListResponse> },
-        ) => Cypress.Chainable<null>) &
         ((
           type: 'POST /maas/api/v1/api-keys/bulk-revoke',
           response: { data: OdhResponse<BulkRevokeResponse> },