From de16440efd40a811e178404ac0b01a0493fff7c0 Mon Sep 17 00:00:00 2001 From: illia-prokopchuk <78905712+illia-prokopchuk@users.noreply.github.com> Date: Tue, 28 Jan 2025 15:39:04 +0200 Subject: [PATCH] Fix [UI] "Failed to retrieve model data" on attempt to click on "Show details" of run artifact (#3062) --- src/components/DetailsInfo/DetailsInfo.js | 4 +- .../DetailsInfo/detailsInfo.util.js | 2 +- .../ArtifactPopUp/ArtifactPopUp.js | 45 ++++++++++++++----- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/components/DetailsInfo/DetailsInfo.js b/src/components/DetailsInfo/DetailsInfo.js index 0fabd7db7..19dad5765 100644 --- a/src/components/DetailsInfo/DetailsInfo.js +++ b/src/components/DetailsInfo/DetailsInfo.js @@ -108,8 +108,8 @@ const DetailsInfo = React.forwardRef( ) const sources = useMemo( - () => generateSourcesDetailsInfo(selectedItem, params.projectName), - [params.projectName, selectedItem] + () => generateSourcesDetailsInfo(selectedItem), + [selectedItem] ) const producer = useMemo( diff --git a/src/components/DetailsInfo/detailsInfo.util.js b/src/components/DetailsInfo/detailsInfo.util.js index 5e913d246..b2c9c4e19 100644 --- a/src/components/DetailsInfo/detailsInfo.util.js +++ b/src/components/DetailsInfo/detailsInfo.util.js @@ -347,7 +347,7 @@ export const generateDocumentLoaderDetailsInfo = (selectedItem, isDetailsPopUp) } } -export const generateSourcesDetailsInfo = (selectedItem, projectName) => { +export const generateSourcesDetailsInfo = selectedItem => { const reduceHandler = (acc, [key, value]) => { let source = {} const parsedUri = parseUri(value) diff --git a/src/elements/DetailsPopUp/ArtifactPopUp/ArtifactPopUp.js b/src/elements/DetailsPopUp/ArtifactPopUp/ArtifactPopUp.js index 15e9a3e8e..d9f16b754 100644 --- a/src/elements/DetailsPopUp/ArtifactPopUp/ArtifactPopUp.js +++ b/src/elements/DetailsPopUp/ArtifactPopUp/ArtifactPopUp.js @@ -39,8 +39,26 @@ import { generatePageData as generateModelPageData } from '../../../components/ModelsPage/Models/models.util' -import { fetchDataSets, fetchFiles, fetchModels } from '../../../reducers/artifactsReducer' -import { DATASETS_TAB, FILES_TAB, MODEL_TYPE, MODELS_TAB } from '../../../constants' +import { + generateActionsMenu as generateDocumentActionsMenu, + generatePageData as generateDocumentPageData +} from '../../../components/Documents/documents.util' + +import { + fetchDataSets, + fetchDocuments, + fetchFiles, + fetchModels +} from '../../../reducers/artifactsReducer' +import { + DATASET_TYPE, + DATASETS_TAB, + DOCUMENT_TYPE, + DOCUMENTS_TAB, + FILES_TAB, + MODEL_TYPE, + MODELS_TAB +} from '../../../constants' import { toggleYaml } from '../../../reducers/appReducer' const ArtifactPopUp = ({ artifactData, isOpen, onResolve }) => { @@ -51,26 +69,33 @@ const ArtifactPopUp = ({ artifactData, isOpen, onResolve }) => { const viewMode = getViewMode(window.location.search) const artifactContext = useMemo(() => { - return artifactData.kind === DATASETS_TAB + return [DATASETS_TAB, DATASET_TYPE].includes(artifactData.kind) ? { type: DATASETS_TAB, generateActionsMenu: generateDatasetActionsMenu, pageData: generateDatasetPageData(selectedArtifact, viewMode, {}, true), fetchArtifact: fetchDataSets } - : artifactData.kind === MODEL_TYPE + : [MODELS_TAB, MODEL_TYPE].includes(artifactData.kind) ? { type: MODELS_TAB, generateActionsMenu: generateModelActionsMenu, pageData: generateModelPageData(selectedArtifact, viewMode), fetchArtifact: fetchModels } - : { - type: FILES_TAB, - generateActionsMenu: generateFileActionsMenu, - pageData: generateFilePageData(viewMode), - fetchArtifact: fetchFiles - } + : [DOCUMENTS_TAB, DOCUMENT_TYPE].includes(artifactData.kind) + ? { + type: DOCUMENTS_TAB, + generateActionsMenu: generateDocumentActionsMenu, + pageData: generateDocumentPageData(viewMode), + fetchArtifact: fetchDocuments + } + : { + type: FILES_TAB, + generateActionsMenu: generateFileActionsMenu, + pageData: generateFilePageData(viewMode), + fetchArtifact: fetchFiles + } }, [selectedArtifact, artifactData.kind, viewMode]) const toggleConvertedYaml = useCallback(