Skip to content

Commit

Permalink
Fix [Functions] function build logs for untagged function (#2497)
Browse files Browse the repository at this point in the history
  • Loading branch information
mariana-furyk committed May 30, 2024
1 parent 131a0ae commit 899aa17
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ const DetailsTabsContent = ({
additionalLogsTitle={pageData.details.additionalLogsTitle}
item={selectedItem}
logsTitle={pageData.details.logsTitle}
noDataMessage={pageData.details.logsNoDataMessage}
refreshAdditionalLogs={pageData.details.refreshAdditionalLogs}
refreshLogs={pageData.details.refreshLogs}
removeAdditionalLogs={pageData.details.removeAdditionalLogs}
Expand Down
31 changes: 14 additions & 17 deletions src/components/DetailsLogs/DetailsLogs.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ import Logs from './Logs'
import NoData from '../../common/NoData/NoData'

const DetailsLogs = ({
additionalLogsTitle,
additionalLogsTitle = '',
functionsStore,
item,
jobsStore,
logsTitle,
refreshAdditionalLogs,
logsTitle = '',
noDataMessage = '',
refreshAdditionalLogs = false,
refreshLogs,
removeAdditionalLogs,
removeAdditionalLogs = false,
removeLogs,
withLogsRefreshBtn
}) => {
Expand All @@ -53,11 +54,13 @@ const DetailsLogs = ({
}, [functionsStore.nuclioLogs.loading])

useEffect(() => {
refreshLogs(item, item.project, setDetailsLogs, streamLogsRef)
if (refreshLogs) {
refreshLogs(item, item.project, setDetailsLogs, streamLogsRef)

return () => {
setDetailsLogs('')
removeLogs()
return () => {
setDetailsLogs('')
removeLogs()
}
}
}, [item, refreshLogs, removeLogs, withLogsRefreshBtn])

Expand All @@ -72,7 +75,7 @@ const DetailsLogs = ({
}, [item, withLogsRefreshBtn, refreshAdditionalLogs, removeAdditionalLogs])

return !detailsLogs.length && !detailsAdditionalLogs.length && !logsAreLoading ? (
<NoData />
<NoData message={noDataMessage} />
) : (
<div className="table__item-logs-container">
{mainLogsAreLoading || detailsLogs.length ? (
Expand Down Expand Up @@ -116,19 +119,13 @@ const DetailsLogs = ({
)
}

DetailsLogs.defaultProps = {
additionalLogsTitle: '',
logsTitle: '',
refreshAdditionalLogs: false,
removeAdditionalLogs: false
}

DetailsLogs.propTypes = {
additionalLogsTitle: PropTypes.string,
item: PropTypes.object.isRequired,
logsTitle: PropTypes.string,
noDataMessage: PropTypes.string,
refreshAdditionalLogs: PropTypes.oneOfType([PropTypes.func, PropTypes.bool]),
refreshLogs: PropTypes.func.isRequired,
refreshLogs: PropTypes.oneOfType([PropTypes.func, PropTypes.bool]),
removeAdditionalLogs: PropTypes.oneOfType([PropTypes.func, PropTypes.bool]),
removeLogs: PropTypes.func.isRequired,
withLogsRefreshBtn: PropTypes.bool.isRequired
Expand Down
16 changes: 13 additions & 3 deletions src/components/FunctionsPage/functions.util.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,12 @@ export const generateFunctionsPageData = (
logsTitle: 'Application',
menu: generateFunctionsDetailsMenu(selectedFunction),
infoHeaders: generateFunctionsInfoHeaders(selectedFunction),
refreshLogs: handleFetchFunctionLogs,
refreshAdditionalLogs: showAdditionalLogs && handleFetchFunctionApplicationLogs,
logsNoDataMessage: selectedFunction.tag
? 'No data to show'
: 'Cannot show build logs for an untagged function.',
refreshLogs: Boolean(selectedFunction.tag) && handleFetchFunctionLogs,
refreshAdditionalLogs:
showAdditionalLogs && Boolean(selectedFunction.tag) && handleFetchFunctionApplicationLogs,
removeLogs: handleRemoveLogs,
removeAdditionalLogs: showAdditionalLogs && handleRemoveApplicationLogs,
withLogsRefreshBtn: false,
Expand Down Expand Up @@ -272,7 +276,13 @@ export const generateActionsMenu = (
]
}

export const pollDeletingFunctions = (project, terminatePollRef, deletingFunctions, refresh, dispatch) => {
export const pollDeletingFunctions = (
project,
terminatePollRef,
deletingFunctions,
refresh,
dispatch
) => {
const taskIds = Object.keys(deletingFunctions)

const pollMethod = () => {
Expand Down

0 comments on commit 899aa17

Please sign in to comment.