changed the source of Owner and updated field to be searchable and so…

frontend/src/__mocks__/mockRegisteredModel.ts

@@ -4,13 +4,15 @@ import { createModelRegistryLabelsObject } from './utils';
 type MockRegisteredModelType = {
   id?: string;
   name?: string;
+  owner?: string;
   state?: ModelState;
   description?: string;
   labels?: string[];
 };
 
 export const mockRegisteredModel = ({
   name = 'test',
+  owner = 'Author 1',
   state = ModelState.LIVE,
   description = '',
   labels = [],
@@ -23,5 +25,6 @@ export const mockRegisteredModel = ({
   lastUpdateTimeSinceEpoch: '1710404288975',
   name,
   state,
+  owner,
   customProperties: createModelRegistryLabelsObject(labels),
 });

frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts

@@ -30,8 +30,8 @@ class ModelRegistryTableRow extends TableRow {
     return this.find().findByTestId('description');
   }
 
-  findAuthor() {
-    return this.find().findByTestId('registered-model-author');
+  findOwner() {
+    return this.find().findByTestId('registered-model-owner');
   }
 
   findLabelPopoverText() {

frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts

@@ -178,7 +178,7 @@ describe('Model Registry core', () => {
         .contains(
           'A machine learning model trained to detect fraudulent transactions in financial data',
         );
-      registeredModelRow.findAuthor().contains('Author 1');
+      registeredModelRow.findOwner().contains('Author 1');
 
       // Label popover
       registeredModelRow.findLabelPopoverText().contains('2 more');

frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/registeredModelArchive.cy.ts

@@ -171,6 +171,7 @@ describe('Restoring archive model', () => {
         description: '',
         externalID: '1234132asdfasdf',
         state: 'LIVE',
+        owner: 'Author 1',
       });
     });
   });
@@ -200,6 +201,7 @@ describe('Restoring archive model', () => {
         description: '',
         externalID: '1234132asdfasdf',
         state: 'LIVE',
+        owner: 'Author 1',
       });
     });
   });
@@ -233,6 +235,7 @@ describe('Archiving model', () => {
         description: '',
         externalID: '1234132asdfasdf',
         state: 'ARCHIVED',
+        owner: 'Author 1',
       });
     });
   });
@@ -266,6 +269,7 @@ describe('Archiving model', () => {
         description: '',
         externalID: '1234132asdfasdf',
         state: 'ARCHIVED',
+        owner: 'Author 1',
       });
     });
   });

frontend/src/concepts/dashboard/DashboardSearchField.tsx

@@ -19,6 +19,7 @@ export enum SearchType {
   IDENTIFIER = 'Identifier',
   KEYWORD = 'Keyword',
   AUTHOR = 'Author',
+  OWNER = 'Owner',
 }
 
 type DashboardSearchFieldProps = {

frontend/src/concepts/modelRegistry/types.ts

@@ -111,6 +111,7 @@ export type ModelVersion = ModelRegistryBase & {
 
 export type RegisteredModel = ModelRegistryBase & {
   state?: ModelState;
+  owner?: string;
 };
 
 export type InferenceService = ModelRegistryBase & {

frontend/src/pages/modelRegistry/screens/ModelVersions/ModelDetailsView.tsx

@@ -1,11 +1,10 @@
 import * as React from 'react';
-import { ClipboardCopy, DescriptionList, Flex, FlexItem } from '@patternfly/react-core';
+import { ClipboardCopy, DescriptionList, Flex, FlexItem, Text } from '@patternfly/react-core';
 import { RegisteredModel } from '~/concepts/modelRegistry/types';
 import { ModelRegistryContext } from '~/concepts/modelRegistry/context/ModelRegistryContext';
 import DashboardDescriptionListGroup from '~/components/DashboardDescriptionListGroup';
 import EditableTextDescriptionListGroup from '~/components/EditableTextDescriptionListGroup';
 import EditableLabelsDescriptionListGroup from '~/components/EditableLabelsDescriptionListGroup';
-import RegisteredModelAuthor from '~/pages/modelRegistry/screens/RegisteredModels/RegisteredModelAuthor';
 import ModelTimestamp from '~/pages/modelRegistry/screens/components/ModelTimestamp';
 import {
   getLabels,
@@ -82,8 +81,8 @@ const ModelDetailsView: React.FC<ModelDetailsViewProps> = ({ registeredModel: rm
               {rm.id}
             </ClipboardCopy>
           </DashboardDescriptionListGroup>
-          <DashboardDescriptionListGroup title="Author">
-            <RegisteredModelAuthor registeredModelId={rm.id} />
+          <DashboardDescriptionListGroup title="Owner">
+            <Text data-testid="registered-model-owner">{rm.owner || '-'}</Text>
           </DashboardDescriptionListGroup>
           <DashboardDescriptionListGroup
             title="Last modified at"

frontend/src/pages/modelRegistry/screens/RegisterModel/utils.ts

@@ -33,6 +33,7 @@ export const registerModel = async (
       name: formData.modelName,
       description: formData.modelDescription,
       customProperties: {},
+      owner: author,
       state: ModelState.LIVE,
     },
   );

frontend/src/pages/modelRegistry/screens/RegisteredModels/RegisteredModelListView.tsx

@@ -30,7 +30,7 @@ const RegisteredModelListView: React.FC<RegisteredModelListViewProps> = ({
   const [searchType, setSearchType] = React.useState<SearchType>(SearchType.KEYWORD);
   const [search, setSearch] = React.useState('');
 
-  const searchTypes = React.useMemo(() => [SearchType.KEYWORD], []); // TODO Add owner once RHOAIENG-7566 is completed.
+  const searchTypes = React.useMemo(() => [SearchType.KEYWORD, SearchType.OWNER], []);
 
   if (unfilteredRegisteredModels.length === 0) {
     return (

frontend/src/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow.tsx

@@ -14,7 +14,6 @@ import { ModelRegistryContext } from '~/concepts/modelRegistry/context/ModelRegi
 import { ArchiveRegisteredModelModal } from '~/pages/modelRegistry/screens/components/ArchiveRegisteredModelModal';
 import { getPatchBodyForRegisteredModel } from '~/pages/modelRegistry/screens/utils';
 import { RestoreRegisteredModelModal } from '~/pages/modelRegistry/screens/components/RestoreRegisteredModel';
-import RegisteredModelAuthor from './RegisteredModelAuthor';
 
 type RegisteredModelTableRowProps = {
   registeredModel: RegisteredModel;
@@ -76,8 +75,8 @@ const RegisteredModelTableRow: React.FC<RegisteredModelTableRowProps> = ({
       <Td dataLabel="Last modified">
         <ModelTimestamp timeSinceEpoch={rm.lastUpdateTimeSinceEpoch} />
       </Td>
-      <Td dataLabel="Author">
-        <RegisteredModelAuthor registeredModelId={rm.id} />
+      <Td dataLabel="Owner">
+        <Text data-testid="registered-model-owner">{rm.owner || '-'}</Text>
       </Td>
       <Td isActionCell>
         <ActionsColumn items={actions} />

frontend/src/pages/modelRegistry/screens/RegisteredModels/RegisteredModelsTableColumns.ts

@@ -24,9 +24,9 @@ export const rmColumns: SortableData<RegisteredModel>[] = [
     },
   },
   {
-    field: 'author',
-    label: 'Author',
-    sortable: false, // TODO Add sortable once RHOAIENG-7566 is completed.
+    field: 'owner',
+    label: 'Owner',
+    sortable: true,
     info: {
       tooltip: 'The owner is the user who registered the model.',
       tooltipProps: {

frontend/src/pages/modelRegistry/screens/__tests__/utils.spec.ts

@@ -270,6 +270,7 @@ describe('getPatchBody', () => {
   it('returns a given RegisteredModel with id/name/timestamps removed, customProperties updated and other values unchanged', () => {
     const registeredModel = mockRegisteredModel({
       id: '1',
+      owner: 'Author 1',
       name: 'test-model',
       description: 'Description here',
       labels: [],
@@ -289,6 +290,7 @@ describe('getPatchBody', () => {
       customProperties: {
         label1: { string_value: '', metadataType: ModelRegistryMetadataType.STRING },
       },
+      owner: 'Author 1',
       state: ModelState.LIVE,
       externalID: '1234132asdfasdf',
     } satisfies Partial<RegisteredModel>);

frontend/src/pages/modelRegistry/screens/utils.ts

@@ -154,9 +154,8 @@ export const filterRegisteredModels = (
           (rm.description && rm.description.toLowerCase().includes(search.toLowerCase()))
         );
 
-      case SearchType.AUTHOR:
-        // TODO Implement owner search functionality once RHOAIENG-7566 is completed.
-        return;
+      case SearchType.OWNER:
+        return rm.owner && rm.owner.toLowerCase().includes(search.toLowerCase());
 
       default:
         return true;