Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix [Monitor jobs] Unnecessary context: parameter presents in UI #2161

Merged
merged 4 commits into from
Jan 9, 2024
Merged

Fix [Monitor jobs] Unnecessary context: parameter presents in UI #2161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a82bb16
Fix [Monitor jobs] Unnecessary context: parameter presents in UI
ilan7empest Dec 26, 2023
6d49f34
Fix by code review
ilan7empest Dec 27, 2023
c7cd21e
Fix by code review
ilan7empest Dec 31, 2023
339080d
fix by code review
ilan7empest Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions src/components/JobWizard/JobWizard.util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ export const parsePredefinedParameters = funcParams => {
isHyper: false
},
doc: parameter.doc,
isHidden: parameter.name === 'context',
isHidden: parameter.name === 'context' && !parsedValue,
isUnsupportedType: !parameterTypeValueMap[parameter.type],
isRequired: parameterIsRequired,
isDefault: true,
Expand All @@ -666,9 +666,9 @@ export const parseDefaultParameters = (funcParams = {}, runParams = {}, runHyper
const parametersIsRequired = !has(parameter, 'default')
const parameterType = predefinedParameterIsModified
? parseParameterType(
runParams[parameter.name] ?? runHyperParams[parameter.name],
parameter.name in runHyperParams
)
runParams[parameter.name] ?? runHyperParams[parameter.name],
parameter.name in runHyperParams
)
: parameter.type ?? ''

return {
Expand All @@ -680,7 +680,7 @@ export const parseDefaultParameters = (funcParams = {}, runParams = {}, runHyper
isHyper: parameter.name in runHyperParams
},
doc: parameter.doc ?? '',
isHidden: parameter.name === 'context',
isHidden: parameter.name === 'context' && !parsedValue,
isUnsupportedType: !parameterTypeValueMap[parameter.type],
isRequired: parametersIsRequired,
isDefault: true,
Expand Down Expand Up @@ -865,6 +865,8 @@ const generateParameters = parametersTableData => {
parametersTableData?.predefined
?.filter(parameter => !parameter.data.isHyper && parameter.data.isChecked)
.forEach(parameter => {
if (parameter.data.name === 'context' && !parameter.data.value) return false
ilan7empest marked this conversation as resolved.
Show resolved Hide resolved

parameters[parameter.data.name] = convertParameterValue(
parameter.data.value,
parameter.data.type
Expand Down Expand Up @@ -1037,9 +1039,9 @@ export const generateJobRequestData = (
selectedFunction && !has(selectedFunction, 'status')
? `hub://${selectedFunction.metadata.name.replace(/-/g, '_')}`
: formData.function ??
(selectedFunction
? `${selectedFunction.metadata.project}/${selectedFunction.metadata.name}@${selectedFunction.metadata.hash}`
: '')
(selectedFunction
? `${selectedFunction.metadata.project}/${selectedFunction.metadata.name}@${selectedFunction.metadata.hash}`
: '')
}
},
function: {
Expand Down Expand Up @@ -1112,10 +1114,10 @@ export const getNewJobErrorMsg = error => {
return error.response.status === NOTFOUND_ERROR_STATUS_CODE
? 'To run a job, the selected function needs to be built. Make sure to build the function before running the job.'
: error.response.status === FORBIDDEN_ERROR_STATUS_CODE
? 'You are not permitted to run a new job.'
: error.response.status === CONFLICT_ERROR_STATUS_CODE
? 'This job is already scheduled'
: getErrorDetail(error) || 'Unable to create a new job.'
? 'You are not permitted to run a new job.'
: error.response.status === CONFLICT_ERROR_STATUS_CODE
? 'This job is already scheduled'
: getErrorDetail(error) || 'Unable to create a new job.'
}

export const getSaveJobErrorMsg = error => {
Expand Down
7 changes: 5 additions & 2 deletions src/utils/parseJob.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ export const parseJob = (job, tab) => {
}
}
} else {
let jobParameters = { ...job.spec?.parameters } || {}
if ('context' in jobParameters && !jobParameters.context) delete jobParameters.context

jobItem = {
artifacts: job.status.artifacts || [],
error: job.status.error ?? '',
Expand All @@ -67,9 +70,9 @@ export const parseJob = (job, tab) => {
name: job.metadata.name,
outputPath: job.spec?.output_path,
owner: job.metadata.labels?.owner,
parameters: job.spec?.parameters || {},
parameters: jobParameters,
parametersChips: [
...parseKeyValues(job.spec?.parameters || {}),
...parseKeyValues(jobParameters),
...parseKeyValues(job.spec?.hyperparams || {})
],
project: job.metadata.project,
Expand Down