- {preview?.type === 'error' ? (
+ {preview?.type === ERROR_STATE ? (
{
- const status = useFailedStatus ? 'failed' : 'error'
+ const status = useFailedStatus ? FAILED_STATE : ERROR_STATE
return [
{ label: 'All', id: FILTER_ALL_ITEMS, status: FILTER_ALL_ITEMS },
diff --git a/src/components/FunctionsPage/functions.util.js b/src/components/FunctionsPage/functions.util.js
index ab1700d75..f0e84b2c1 100644
--- a/src/components/FunctionsPage/functions.util.js
+++ b/src/components/FunctionsPage/functions.util.js
@@ -23,8 +23,7 @@ import { debounce, get, isEmpty, isEqual } from 'lodash'
import {
DETAILS_BUILD_LOG_TAB,
FUNCTION_CREATING_STATE,
- FUNCTION_ERROR_STATE,
- FUNCTION_FAILED_STATE,
+ ERROR_STATE,
FUNCTION_INITIALIZED_STATE,
FUNCTION_PENDINDG_STATE,
FUNCTION_READY_STATE,
@@ -37,7 +36,8 @@ import {
FUNCTION_TYPE_REMOTE,
FUNCTION_TYPE_SERVING,
FUNCTIONS_PAGE,
- PANEL_FUNCTION_CREATE_MODE
+ PANEL_FUNCTION_CREATE_MODE,
+ FAILED_STATE
} from '../../constants'
import jobsActions from '../../actions/jobs'
import functionsApi from '../../api/functions-api'
@@ -68,7 +68,7 @@ export const detailsMenu = [
label: 'build log'
}
]
-export const FUNCTIONS_FAILED_STATES = [FUNCTION_FAILED_STATE, FUNCTION_ERROR_STATE]
+export const FUNCTIONS_FAILED_STATES = [FAILED_STATE, ERROR_STATE]
export const FUNCTIONS_READY_STATES = [FUNCTION_READY_STATE]
export const FUNCTIONS_EDITABLE_STATES = [
FUNCTION_CREATING_STATE,
diff --git a/src/components/Jobs/jobs.util.js b/src/components/Jobs/jobs.util.js
index 8c605c565..4c28002d7 100644
--- a/src/components/Jobs/jobs.util.js
+++ b/src/components/Jobs/jobs.util.js
@@ -33,7 +33,9 @@ import {
JOB_KIND_REMOTE_SPARK,
SCHEDULE_TAB,
JOB_KIND_SPARK,
- JOB_KIND_LOCAL
+ JOB_KIND_LOCAL,
+ ERROR_STATE,
+ FAILED_STATE
} from '../../constants'
import jobsActions from '../../actions/jobs'
import { generateKeyValues, truncateUid } from '../../utils'
@@ -78,7 +80,7 @@ export const getInfoHeaders = (isSpark, selectedJob) => {
}
export const actionsMenuHeader = 'Batch run'
-export const JOB_STEADY_STATES = ['completed', 'error', 'aborted', 'failed']
+export const JOB_STEADY_STATES = ['completed', ERROR_STATE, 'aborted', FAILED_STATE]
export const JOB_RUNNING_STATES = ['running', 'pending']
export const getJobsDetailsMenu = (jobLabels = []) => {
diff --git a/src/components/ProjectsJobsMonitoring/JobsMonitoring/jobsMonitoring.util.js b/src/components/ProjectsJobsMonitoring/JobsMonitoring/jobsMonitoring.util.js
index f9d97ceb7..b45e7203c 100644
--- a/src/components/ProjectsJobsMonitoring/JobsMonitoring/jobsMonitoring.util.js
+++ b/src/components/ProjectsJobsMonitoring/JobsMonitoring/jobsMonitoring.util.js
@@ -20,7 +20,7 @@ such restriction.
import { getJobIdentifier } from '../../../utils/getUniqueIdentifier'
import { validateArguments } from '../../../utils/validateArguments'
import { generateLinkToDetailsPanel } from '../../../utils/link-helper.util'
-import { JOB_KIND_WORKFLOW, JOBS_PAGE, MONITOR_JOBS_TAB } from '../../../constants'
+import { ERROR_STATE, JOB_KIND_WORKFLOW, JOBS_PAGE, MONITOR_JOBS_TAB } from '../../../constants'
import measureTime from '../../../utils/measureTime'
import { formatDatetime } from '../../../utils'
@@ -104,7 +104,7 @@ export const createJobsMonitoringContent = (jobs, jobName, isStagingMode) => {
value: measureTime(
job.startTime || new Date(job.created_at),
(job.state?.value !== 'running' && job.updated) ||
- (job.state?.value !== 'error' && new Date(job.finished_at))
+ (job.state?.value !== ERROR_STATE && new Date(job.finished_at))
),
className: 'table-cell-1',
type: 'duration'
diff --git a/src/constants.js b/src/constants.js
index c572ec0a8..3489bff53 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -62,6 +62,10 @@ export const CANCEL_REQUEST_TIMEOUT = 120000
export const PROJECT_ONLINE_STATUS = 'online'
+export const ERROR_STATE = 'error'
+export const FAIL_STATE = 'fail'
+export const FAILED_STATE = 'failed'
+
/*=========== PAGES & TABS =============*/
export const PROJECTS_PAGE = 'PROJECTS'
@@ -311,9 +315,7 @@ export const SET_NEW_FUNCTION_TRACK_MODELS = 'SET_NEW_FUNCTION_TRACK_MODELS'
export const SET_NEW_FUNCTION_VOLUMES = 'SET_NEW_FUNCTION_VOLUMES'
export const SET_NEW_FUNCTION_VOLUME_MOUNTS = 'SET_NEW_FUNCTION_VOLUME_MOUNTS'
export const FUNCTION_CREATING_STATE = 'creating'
-export const FUNCTION_FAILED_STATE = 'failed'
export const FUNCTION_FAILED_TO_DELETE_STATE = 'failedToDelete'
-export const FUNCTION_ERROR_STATE = 'error'
export const FUNCTION_INITIALIZED_STATE = 'initialized'
export const FUNCTION_READY_STATE = 'ready'
export const FUNCTION_PENDINDG_STATE = 'pending'
diff --git a/src/elements/FeatureValidator/featureValidatior.utils.js b/src/elements/FeatureValidator/featureValidatior.utils.js
index 7a8cb1d63..517936e76 100644
--- a/src/elements/FeatureValidator/featureValidatior.utils.js
+++ b/src/elements/FeatureValidator/featureValidatior.utils.js
@@ -18,10 +18,12 @@ under the Apache 2.0 license is conditioned upon your compliance with
such restriction.
*/
+import { ERROR_STATE, FAIL_STATE } from '../../constants'
+
export const validatorStates = {
- error: 'error',
+ [ERROR_STATE]: 'error',
info: 'info',
warn: 'warning',
warning: 'warning',
- fail: 'fail'
+ [FAIL_STATE]: 'fail'
}
diff --git a/src/elements/ProjectCard/projectCard.util.js b/src/elements/ProjectCard/projectCard.util.js
index 85cc4fa6a..41dd4c267 100644
--- a/src/elements/ProjectCard/projectCard.util.js
+++ b/src/elements/ProjectCard/projectCard.util.js
@@ -18,7 +18,9 @@ under the Apache 2.0 license is conditioned upon your compliance with
such restriction.
*/
import { isEmpty } from 'lodash'
+
import { groupByUniqName } from '../../utils/groupByUniqName'
+import { ERROR_STATE } from '../../constants'
export const generateProjectStatistic = (
projectSummary = {},
@@ -34,7 +36,7 @@ export const generateProjectStatistic = (
0
)
const failedNuclioFunctions = Object.values(grouppedNuclioFunctions).reduce(
- (prev, curr) => (curr.status.state === 'error' ? (prev += 1) : prev),
+ (prev, curr) => (curr.status.state === ERROR_STATE ? (prev += 1) : prev),
0
)
diff --git a/src/elements/ProjectFunctions/ProjectFunctions.js b/src/elements/ProjectFunctions/ProjectFunctions.js
index 115151f8e..70d963ade 100644
--- a/src/elements/ProjectFunctions/ProjectFunctions.js
+++ b/src/elements/ProjectFunctions/ProjectFunctions.js
@@ -30,7 +30,7 @@ import nuclioActions from '../../actions/nuclio'
import { groupByUniqName } from '../../utils/groupByUniqName'
import { useNuclioMode } from '../../hooks/nuclioMode.hook'
import { generateNuclioLink } from '../../utils'
-import { REQUEST_CANCELED } from '../../constants'
+import { ERROR_STATE, REQUEST_CANCELED } from '../../constants'
const ProjectFunctions = ({ fetchApiGateways, fetchNuclioFunctions, nuclioStore }) => {
const params = useParams()
@@ -71,7 +71,7 @@ const ProjectFunctions = ({ fetchApiGateways, fetchNuclioFunctions, nuclioStore
0
)
const functionsFailed = groupeFunctionsRunning.reduce(
- (prev, curr) => (['error', 'unhealthy'].includes(curr.status.state) ? (prev += 1) : prev),
+ (prev, curr) => ([ERROR_STATE, 'unhealthy'].includes(curr.status.state) ? (prev += 1) : prev),
0
)
@@ -129,7 +129,7 @@ const ProjectFunctions = ({ fetchApiGateways, fetchNuclioFunctions, nuclioStore
? 'Running'
: func?.status?.state === 'ready' && func?.spec?.disable
? 'Standby'
- : ['error', 'unhealthy', 'imported', 'scaledToZero'].includes(func?.status?.state)
+ : [ERROR_STATE, 'unhealthy', 'imported', 'scaledToZero'].includes(func?.status?.state)
? upperFirst(lowerCase(func.status.state))
: 'Building',
className: funcClassName
diff --git a/src/elements/ProjectStatistics/ProjectStatistics.js b/src/elements/ProjectStatistics/ProjectStatistics.js
index f9036356e..36f1a011a 100644
--- a/src/elements/ProjectStatistics/ProjectStatistics.js
+++ b/src/elements/ProjectStatistics/ProjectStatistics.js
@@ -30,6 +30,7 @@ import {
datePickerPastOptions,
PAST_24_HOUR_DATE_OPTION
} from '../../utils/datePicker.util'
+import { ERROR_STATE, FAILED_STATE } from '../../constants'
import './projectStatistics.scss'
@@ -52,14 +53,14 @@ const ProjectStatistics = ({ statistics }) => {
initialSelectedOptionId: anyTimeOption.id
}
}
- } else if (key === 'failed') {
+ } else if (key === FAILED_STATE) {
const past24HourOption = datePickerPastOptions.find(
option => option.id === PAST_24_HOUR_DATE_OPTION
)
filters = {
saveFilters: true,
- state: 'error',
+ state: ERROR_STATE,
dates: {
value: past24HourOption.handler(),
isPredefined: past24HourOption.isPredefined,
diff --git a/src/elements/WorkflowsTable/WorkflowsTable.js b/src/elements/WorkflowsTable/WorkflowsTable.js
index 48d6a0d00..dd181fdf0 100644
--- a/src/elements/WorkflowsTable/WorkflowsTable.js
+++ b/src/elements/WorkflowsTable/WorkflowsTable.js
@@ -32,6 +32,8 @@ import Workflow from '../../components/Workflow/Workflow'
import YamlModal from '../../common/YamlModal/YamlModal'
import {
+ ERROR_STATE,
+ FAILED_STATE,
JOB_KIND_JOB,
JOBS_PAGE,
MONITOR_JOBS_TAB,
@@ -253,7 +255,7 @@ const WorkflowsTable = React.forwardRef(
.then(job => {
const selectedJob = findSelectedWorkflowJob()
const graphJobState = selectedJob?.phase?.toLowerCase()
- const isErrorState = ['failed', 'error'].includes(graphJobState)
+ const isErrorState = [FAILED_STATE, ERROR_STATE].includes(graphJobState)
const customJobState = isErrorState ? graphJobState : ''
return modifyAndSelectRun(parseJob(
@@ -471,7 +473,7 @@ const WorkflowsTable = React.forwardRef(
if (isWorkflowStepExecutable(functionToBeSelected)) {
const workflow = { ...workflowsStore.activeWorkflow?.data }
const graphFunctionState = functionToBeSelected?.phase?.toLowerCase()
- const isErrorState = ['failed', 'error'].includes(graphFunctionState)
+ const isErrorState = [FAILED_STATE, ERROR_STATE].includes(graphFunctionState)
const customFunctionState = isErrorState ? graphFunctionState : ''
const pipelineError = getPipelineError(isErrorState)
diff --git a/src/utils/createJobsContent.js b/src/utils/createJobsContent.js
index ec24f912c..d1cd7e424 100644
--- a/src/utils/createJobsContent.js
+++ b/src/utils/createJobsContent.js
@@ -19,6 +19,7 @@ such restriction.
*/
import {
+ ERROR_STATE,
JOB_KIND_WORKFLOW,
JOBS_MONITORING_JOBS_TAB,
JOBS_MONITORING_PAGE,
@@ -104,7 +105,7 @@ export const createJobsMonitorTabContent = (jobs, jobName, isStagingMode) => {
value: measureTime(
job.startTime || new Date(job.created_at),
(job.state?.value !== 'running' && job.updated) ||
- (job.state?.value !== 'error' && new Date(job.finished_at))
+ (job.state?.value !== ERROR_STATE && new Date(job.finished_at))
),
className: 'table-cell-1',
type: 'duration'
@@ -302,7 +303,7 @@ export const createJobsWorkflowsTabContent = (jobs, projectName, isStagingMode,
value: measureTime(
job.startTime || new Date(job.created_at),
(job.state?.value !== 'running' && job.updated) ||
- (job.state?.value !== 'error' && new Date(job.finished_at))
+ (job.state?.value !== ERROR_STATE && new Date(job.finished_at))
),
className: 'table-cell-1',
type: 'duration',
@@ -403,7 +404,7 @@ export const createJobsWorkflowContent = (
id: `duration.${identifierUnique}`,
value: measureTime(
new Date(job.startedAt),
- job.state?.value !== 'error' && new Date(job.finishedAt)
+ job.state?.value !== ERROR_STATE && new Date(job.finishedAt)
),
className: 'table-cell-1',
type: 'duration',
@@ -487,7 +488,7 @@ export const createJobsMonitoringContent = (jobs, jobName, isStagingMode) => {
value: measureTime(
job.startTime || new Date(job.created_at),
(job.state?.value !== 'running' && job.updated) ||
- (job.state?.value !== 'error' && new Date(job.finished_at))
+ (job.state?.value !== ERROR_STATE && new Date(job.finished_at))
),
className: 'table-cell-1',
type: 'duration'
@@ -691,7 +692,7 @@ export const createWorkflowsMonitoringContent = (jobs, isStagingMode, isSelected
value: measureTime(
job.startTime || new Date(job.created_at),
(job.state?.value !== 'running' && job.updated) ||
- (job.state?.value !== 'error' && new Date(job.finished_at))
+ (job.state?.value !== ERROR_STATE && new Date(job.finished_at))
),
className: 'table-cell-1',
type: 'duration',
diff --git a/src/utils/generateMonitoringData.js b/src/utils/generateMonitoringData.js
index 62e41c97f..29bedc23c 100644
--- a/src/utils/generateMonitoringData.js
+++ b/src/utils/generateMonitoringData.js
@@ -26,7 +26,9 @@ import {
JOB_KIND_JOB,
JOB_KIND_WORKFLOW,
STATUS_FILTER,
- TYPE_FILTER
+ TYPE_FILTER,
+ ERROR_STATE,
+ FAILED_STATE
} from '../constants'
import {
ANY_TIME_DATE_OPTION,
@@ -68,7 +70,7 @@ export const generateMonitoringStats = (data, navigate, dispatch, tab) => {
},
{
counter: data.failed,
- link: () => navigateToJobsMonitoringPage({ [STATUS_FILTER]: ['error', 'aborted'] }),
+ link: () => navigateToJobsMonitoringPage({ [STATUS_FILTER]: [ERROR_STATE, 'aborted'] }),
statusClass: 'failed',
tooltip: 'Aborted, Error'
},
@@ -104,7 +106,7 @@ export const generateMonitoringStats = (data, navigate, dispatch, tab) => {
},
{
counter: data.failed,
- link: () => navigateToJobsMonitoringPage({ [STATUS_FILTER]: ['error', 'failed'] }),
+ link: () => navigateToJobsMonitoringPage({ [STATUS_FILTER]: [ERROR_STATE, FAILED_STATE] }),
statusClass: 'failed',
tooltip: 'Error, Failed'
},
diff --git a/src/utils/getState.js b/src/utils/getState.js
index 9055a7f04..71445e322 100644
--- a/src/utils/getState.js
+++ b/src/utils/getState.js
@@ -19,9 +19,18 @@ such restriction.
*/
import { isEmpty } from 'lodash'
-import { FUNCTION_INITIALIZED_STATE, FUNCTIONS_PAGE, JOBS_MONITORING_WORKFLOWS_TAB } from '../constants'
+import {
+ ERROR_STATE,
+ FAIL_STATE,
+ FAILED_STATE,
+ FUNCTION_INITIALIZED_STATE,
+ FUNCTIONS_PAGE,
+ JOBS_MONITORING_WORKFLOWS_TAB
+} from '../constants'
-const getState = (state, page, kind) => {
+const errorStates = [ERROR_STATE, FAIL_STATE, FAILED_STATE]
+
+const getState = (state, page, kind, reason = '') => {
const stateExists = !isEmpty(state)
if (page === FUNCTIONS_PAGE) {
@@ -33,9 +42,12 @@ const getState = (state, page, kind) => {
}`
}
} else {
+ const commonLabel = state ? commonStateLabels(page === JOBS_MONITORING_WORKFLOWS_TAB)[state] : ''
+ const label = reason && errorStates.includes(state) ? `${commonLabel}. Reason: ${reason}` : commonLabel
+
return {
value: state ?? null,
- label: state ? commonStateLabels(page === JOBS_MONITORING_WORKFLOWS_TAB)[state] : '',
+ label: label,
className: `state${state ? '-' + state : ''}${kind ? '-' + kind : ''}`
}
}
@@ -49,9 +61,9 @@ const commonStateLabels = withFailedState => {
completed: 'Completed',
created: 'Created',
creating: 'Creating',
- error: 'Error',
- fail: 'Error',
- failed: withFailedState ? 'Failed' : 'Error',
+ [ERROR_STATE]: 'Error',
+ [FAIL_STATE]: 'Error',
+ [FAILED_STATE]: withFailedState ? 'Failed' : 'Error',
omitted: 'Omitted',
pending: 'Pending',
ready: 'Ready',
@@ -66,8 +78,8 @@ const functionStateLabels = {
build: 'Deploying',
building: 'Deploying',
deploying: 'Deploying',
- error: 'Error',
- failed: 'Error',
+ [ERROR_STATE]: 'Error',
+ [FAILED_STATE]: 'Error',
omitted: 'Omitted',
pending: 'Deploying',
ready: 'Ready',
diff --git a/src/utils/parseJob.js b/src/utils/parseJob.js
index 3945573a0..8bfa06eae 100644
--- a/src/utils/parseJob.js
+++ b/src/utils/parseJob.js
@@ -91,7 +91,7 @@ export const parseJob = (job, tab, customState, customError) => {
results: job.status?.results || {},
resultsChips: parseKeyValues(job.status?.results || {}),
startTime: new Date(job.status?.start_time),
- state: getState(customState || job.status?.state, JOBS_PAGE, JOB_KIND_JOB),
+ state: getState(customState || job.status?.state, JOBS_PAGE, JOB_KIND_JOB, job.status?.reason),
ui_run: job.status?.ui_url,
uid: job.metadata.uid,
updated: new Date(job.status?.last_update),