Merge branch 'improve-mr-enhance-style-of-the-shared-runners-limit' into 'master'

Refactor passing props to jobs/index.js

See merge request gitlab-org/gitlab-ce!31472
This commit is contained in:
Kushal Pandya 2019-08-05 14:23:10 +00:00
commit f10208a341
2 changed files with 22 additions and 9 deletions

View File

@ -10,17 +10,29 @@ export default () => {
JobApp,
},
render(createElement) {
const {
deploymentHelpUrl,
runnerHelpUrl,
runnerSettingsUrl,
variablesSettingsUrl,
endpoint,
pagePath,
logState,
buildStatus,
projectPath,
} = element.dataset;
return createElement('job-app', {
props: {
deploymentHelpUrl: element.dataset.deploymentHelpUrl,
runnerHelpUrl: element.dataset.runnerHelpUrl,
runnerSettingsUrl: element.dataset.runnerSettingsUrl,
variablesSettingsUrl: element.dataset.variablesSettingsUrl,
endpoint: element.dataset.endpoint,
pagePath: element.dataset.buildOptionsPagePath,
logState: element.dataset.buildOptionsLogState,
buildStatus: element.dataset.buildOptionsBuildStatus,
projectPath: element.dataset.projectPath,
deploymentHelpUrl,
runnerHelpUrl,
runnerSettingsUrl,
variablesSettingsUrl,
endpoint,
pagePath,
logState,
buildStatus,
projectPath,
},
});
},

View File

@ -12,4 +12,5 @@
runner_help_url: help_page_path('ci/runners/README.html', anchor: 'setting-maximum-job-timeout-for-a-runner'),
runner_settings_url: project_runners_path(@build.project, anchor: 'js-runners-settings'),
variables_settings_url: project_variables_path(@build.project, anchor: 'js-cicd-variables-settings'),
page_path: project_job_path(@project, @build), build_status: @build.status, build_stage: @build.stage, log_state: '',
build_options: javascript_build_options } }