Skip to content

Commit 6cd8440

Browse files
lokanandaprabhuvikram-raj
authored andcommitted
Handled on enter issue in task list in builder
1 parent 6f72ebc commit 6cd8440

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

src/components/quick-search/QuickSearchModalBody.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { debounce } from 'lodash-es';
33
import { useHistory } from 'react-router';
44
import { ResizeDirection } from 're-resizable';
55
import { Rnd } from 'react-rnd';
6-
import { CatalogItem } from '@openshift-console/dynamic-plugin-sdk';
6+
import { CatalogItem, useFlag } from '@openshift-console/dynamic-plugin-sdk';
77
import QuickSearchBar from './QuickSearchBar';
88
import QuickSearchContent from './QuickSearchContent';
99
import { DetailsRendererFunction } from './QuickSearchDetails';
@@ -21,6 +21,7 @@ import { TaskSearchCallback } from '../pipeline-builder/types';
2121
import useTasksProvider from '../catalog/providers/useTasksProvider';
2222

2323
import './QuickSearchModalBody.scss';
24+
import { FLAGS } from '../../types';
2425

2526
interface QuickSearchModalBodyProps {
2627
allCatalogItemsLoaded: boolean;
@@ -56,6 +57,7 @@ const QuickSearchModalBody: React.FC<QuickSearchModalBodyProps> = ({
5657
const MIN_HEIGHT = 240;
5758
const MIN_WIDTH = 225;
5859
const history = useHistory();
60+
const isDevConsoleProxyAvailable = useFlag(FLAGS.DEVCONSOLE_PROXY);
5961
const [catalogItems, setCatalogItems] = React.useState<CatalogItem[]>(null);
6062
const [catalogTypes, setCatalogTypes] = React.useState<CatalogType[]>([]);
6163
const [isRndActive, setIsRndActive] = React.useState(false);
@@ -235,7 +237,12 @@ const QuickSearchModalBody: React.FC<QuickSearchModalBodyProps> = ({
235237
if (activeViewAllLink) {
236238
history.push(activeViewAllLink.to);
237239
} else if (selectedItem) {
238-
handleCta(e, selectedItem, closeModal, history);
240+
handleCta(e, selectedItem, closeModal, history, {
241+
callback,
242+
setFailedTasks,
243+
namespace,
244+
isDevConsoleProxyAvailable,
245+
});
239246
}
240247
},
241248
[closeModal, selectedItem, viewAll],

src/components/quick-search/utils/quick-search-utils.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ export const handleCta = async (
1818
const { href, callback } = item.cta;
1919
if (callback) {
2020
closeModal();
21-
await callback(callbackProps);
21+
await callback({
22+
...callbackProps,
23+
selectedVersion: item.data?.version,
24+
selectedItem: item,
25+
});
2226
removeQueryArgument('catalogSearch');
2327
} else history.push(href);
2428
};

0 commit comments

Comments
 (0)