Commit 308c7ba9 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'port-ci-lint-to-vue-intial-setup' into 'master'

Setup boilerplate for CI lint to Vue

See merge request gitlab-org/gitlab!42401
parents c6da83ef 5bba07f4
<script>
export default {
props: {
endpoint: {
type: String,
required: true,
},
},
};
</script>
<template
><div></div
></template>
<script>
export default {
props: {},
};
</script>
<template
><div></div
></template>
import Vue from 'vue';
import CILint from './components/ci_lint.vue';
export default (containerId = '#js-ci-lint') => {
const containerEl = document.querySelector(containerId);
const { endpoint } = containerEl.dataset;
return new Vue({
el: containerEl,
render(createElement) {
return createElement(CILint, {
props: {
endpoint,
},
});
},
});
};
import CILintEditor from '../ci_lint_editor'; import CILintEditor from '../ci_lint_editor';
import initCILint from '~/ci_lint/index';
document.addEventListener('DOMContentLoaded', () => new CILintEditor()); document.addEventListener('DOMContentLoaded', () => {
if (gon?.features?.ciLintVue) {
initCILint();
} else {
// eslint-disable-next-line no-new
new CILintEditor();
}
});
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
class Projects::Ci::LintsController < Projects::ApplicationController class Projects::Ci::LintsController < Projects::ApplicationController
before_action :authorize_create_pipeline! before_action :authorize_create_pipeline!
before_action do
push_frontend_feature_flag(:ci_lint_vue, project)
end
def show def show
end end
......
...@@ -6,7 +6,11 @@ ...@@ -6,7 +6,11 @@
%h2.pt-3.pb-3= _("Validate your GitLab CI configuration") %h2.pt-3.pb-3= _("Validate your GitLab CI configuration")
.project-ci-linter - if Feature.enabled?(:ci_lint_vue, @project)
#js-ci-lint{ data: { endpoint: project_ci_lint_path(@project) } }
- else
.project-ci-linter
= form_tag project_ci_lint_path(@project), method: :post, class: 'js-ci-lint-form' do = form_tag project_ci_lint_path(@project), method: :post, class: 'js-ci-lint-form' do
.row .row
.col-sm-12 .col-sm-12
......
---
name: ci_lint_vue
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42401
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/249661
group: group::continuous intergration
type: development
default_enabled: false
\ No newline at end of file
...@@ -12,6 +12,7 @@ RSpec.describe 'CI Lint', :js do ...@@ -12,6 +12,7 @@ RSpec.describe 'CI Lint', :js do
describe 'YAML parsing' do describe 'YAML parsing' do
shared_examples 'validates the YAML' do shared_examples 'validates the YAML' do
before do before do
stub_feature_flags(ci_lint_vue: false)
click_on 'Validate' click_on 'Validate'
end end
...@@ -86,6 +87,7 @@ RSpec.describe 'CI Lint', :js do ...@@ -86,6 +87,7 @@ RSpec.describe 'CI Lint', :js do
before do before do
stub_feature_flags(monaco_ci: false) stub_feature_flags(monaco_ci: false)
stub_feature_flags(ci_lint_vue: false)
project.add_developer(user) project.add_developer(user)
sign_in(user) sign_in(user)
...@@ -107,6 +109,7 @@ RSpec.describe 'CI Lint', :js do ...@@ -107,6 +109,7 @@ RSpec.describe 'CI Lint', :js do
before do before do
stub_feature_flags(monaco_ci: true) stub_feature_flags(monaco_ci: true)
stub_feature_flags(ci_lint_vue: false)
project.add_developer(user) project.add_developer(user)
sign_in(user) sign_in(user)
......
...@@ -13,6 +13,7 @@ RSpec.describe 'projects/ci/lints/show' do ...@@ -13,6 +13,7 @@ RSpec.describe 'projects/ci/lints/show' do
before do before do
assign(:project, project) assign(:project, project)
assign(:result, result) assign(:result, result)
stub_feature_flags(ci_lint_vue: false)
end end
context 'when builds attrbiutes contain HTML nodes' do context 'when builds attrbiutes contain HTML nodes' do
...@@ -66,6 +67,7 @@ RSpec.describe 'projects/ci/lints/show' do ...@@ -66,6 +67,7 @@ RSpec.describe 'projects/ci/lints/show' do
before do before do
assign(:project, project) assign(:project, project)
assign(:result, result) assign(:result, result)
stub_feature_flags(ci_lint_vue: false)
end end
it 'shows the correct values' do it 'shows the correct values' do
...@@ -103,6 +105,7 @@ RSpec.describe 'projects/ci/lints/show' do ...@@ -103,6 +105,7 @@ RSpec.describe 'projects/ci/lints/show' do
assign(:project, project) assign(:project, project)
assign(:result, result) assign(:result, result)
stub_feature_flags(ci_lint_vue: false)
end end
it 'shows error message' do it 'shows error message' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment