diff --git a/src/elements/ArtifactsTableRow/ArtifactsTableRow.js b/src/elements/ArtifactsTableRow/ArtifactsTableRow.js index f1563704d..e45c7c22d 100644 --- a/src/elements/ArtifactsTableRow/ArtifactsTableRow.js +++ b/src/elements/ArtifactsTableRow/ArtifactsTableRow.js @@ -27,10 +27,7 @@ import ActionsMenu from '../../common/ActionsMenu/ActionsMenu' import TableCell from '../TableCell/TableCell' import { ACTIONS_MENU } from '../../types' -import { - DETAILS_OVERVIEW_TAB, - MODEL_ENDPOINTS_TAB -} from '../../constants' +import { DETAILS_OVERVIEW_TAB, MODEL_ENDPOINTS_TAB } from '../../constants' import { getArtifactIdentifier } from '../../utils/getUniqueIdentifier' const ArtifactsTableRow = ({ @@ -40,7 +37,7 @@ const ArtifactsTableRow = ({ mainRowItemsCount = 1, rowItem, selectedItem, - tab = '', + tab = '' }) => { const parent = useRef() const params = useParams() @@ -49,45 +46,45 @@ const ArtifactsTableRow = ({ 'table-row', 'table-body-row', 'parent-row', - (selectedItem?.db_key || selectedItem?.spec?.model) && + (selectedItem?.db_key || selectedItem?.spec?.model_name) && getArtifactIdentifier(selectedItem, true) === rowItem.data.ui.identifierUnique && 'table-row_active' ) return ( - <> - {rowItem.content.map((value, index) => { - const cellClassNames = classnames( - !isEmpty(selectedItem) && index >= mainRowItemsCount && 'table-body__cell_hidden' - ) + <> + {rowItem.content.map((value, index) => { + const cellClassNames = classnames( + !isEmpty(selectedItem) && index >= mainRowItemsCount && 'table-body__cell_hidden' + ) - return ( - !value.hidden && ( - - ) - ) - })} - {!hideActionsMenu && ( - - - - )} - + ) + ) + })} + {!hideActionsMenu && ( + + + + )} + ) } @@ -99,7 +96,7 @@ ArtifactsTableRow.propTypes = { rowIndex: PropTypes.number.isRequired, rowItem: PropTypes.shape({}).isRequired, selectedItem: PropTypes.shape({}).isRequired, - tab: PropTypes.string, + tab: PropTypes.string } export default React.memo(ArtifactsTableRow) diff --git a/src/utils/getUniqueIdentifier.js b/src/utils/getUniqueIdentifier.js index c897e4680..9da4fa4bd 100644 --- a/src/utils/getUniqueIdentifier.js +++ b/src/utils/getUniqueIdentifier.js @@ -30,8 +30,8 @@ export const getArtifactIdentifier = (artifact, unique) => { if (artifact?.db_key || artifact?.spec?.db_key) { identifier = artifact?.db_key || artifact?.spec?.db_key - } else if (artifact?.spec?.model) { - identifier = `${artifact?.spec?.model}.${artifact?.spec?.function_uri}` + } else if (artifact?.spec?.model_name) { + identifier = `${artifact?.spec?.model_name}.${artifact?.spec?.function_uri}` } if (unique) { @@ -80,7 +80,7 @@ export const getWorkflowJobIdentifier = (job, unique) => { } if (unique) { - jobId = job.customData.run_uid ? job.customData.run_uid : job.customData?.functionHash ?? '' + jobId = job.customData.run_uid ? job.customData.run_uid : (job.customData?.functionHash ?? '') } if (jobId) identifier += `.${jobId}`