Commit 8957029e authored by Tom Quirk's avatar Tom Quirk

Remove new_jira_connect_ui feature flag

- removes yaml file
- removes all references in source code
parent f1873c68
......@@ -31,9 +31,6 @@ export default {
},
computed: {
...mapState(['errorMessage']),
showNewUI() {
return this.glFeatures.newJiraConnectUi;
},
usersPathWithReturnTo() {
if (this.location) {
return `${this.usersPath}?return_to=${this.location}`;
......@@ -67,7 +64,6 @@ export default {
<h2 class="gl-text-center">{{ s__('JiraService|GitLab for Jira Configuration') }}</h2>
<div
v-if="showNewUI"
class="jira-connect-app-body gl-display-flex gl-justify-content-space-between gl-my-7 gl-pb-4 gl-border-b-solid gl-border-b-1 gl-border-b-gray-200"
>
<h5 class="gl-align-self-center gl-mb-0" data-testid="new-jira-connect-ui-heading">
......
......@@ -19,9 +19,6 @@ class JiraConnect::SubscriptionsController < JiraConnect::ApplicationController
before_action :allow_rendering_in_iframe, only: :index
before_action :verify_qsh_claim!, only: :index
before_action :authenticate_user!, only: :create
before_action do
push_frontend_feature_flag(:new_jira_connect_ui, type: :development, default_enabled: :yaml)
end
def index
@subscriptions = current_jira_installation.subscriptions.preload_namespace_route
......
# frozen_string_literal: true
module JiraConnectHelper
def new_jira_connect_ui?
Feature.enabled?(:new_jira_connect_ui, type: :development, default_enabled: :yaml)
end
def jira_connect_app_data(subscriptions)
return {} unless new_jira_connect_ui?
skip_groups = subscriptions.map(&:namespace_id)
{
......
......@@ -15,8 +15,7 @@
%p= s_('JiraService|Sign in to GitLab.com to get started.')
.gl-mt-7
- sign_in_button_class = new_jira_connect_ui? ? 'btn gl-button btn-confirm' : 'ak-button ak-button__appearance-primary'
= external_link _('Sign in to GitLab'), jira_connect_users_path, class: "#{sign_in_button_class} js-jira-connect-sign-in"
= external_link _('Sign in to GitLab'), jira_connect_users_path, class: "btn gl-button btn-confirm js-jira-connect-sign-in"
.gl-mt-7
%p= s_('Integrations|Note: this integration only works with accounts on GitLab.com (SaaS).')
......@@ -24,16 +23,6 @@
.js-jira-connect-app{ data: jira_connect_app_data(@subscriptions) }
.jira-connect-app-body
- unless new_jira_connect_ui?
%form#add-subscription-form.subscription-form.gl-mb-5{ action: jira_connect_subscriptions_path }
.ak-field-group
%label= _('GitLab namespace')
.ak-field-group.field-group-input
%input#namespace-input.ak-field-text{ type: 'text', required: true, placeholder: 'e.g. "MyCompany" or "MyCompany/GroupName"' }
%button.ak-button.ak-button__appearance-primary{ type: 'submit' }
= s_('Integrations|Link namespace to Jira')
- if @subscriptions.present?
%table.subscriptions.gl-w-full
%thead
......
......@@ -3,9 +3,6 @@
%meta{ content: "text/html; charset=utf-8", "http-equiv" => "Content-Type" }
%title
GitLab
- unless new_jira_connect_ui?
= stylesheet_link_tag 'https://unpkg.com/@atlaskit/css-reset@3.0.6/dist/bundle.css'
= stylesheet_link_tag 'https://unpkg.com/@atlaskit/reduced-ui-pack@10.5.5/dist/bundle.css'
= yield :page_specific_styles
= javascript_include_tag 'https://connect-cdn.atl-paas.net/all.js'
......
---
title: 'Jira Connect app: add ability to select namespace from list of available namespaces'
merge_request: 54037
author:
type: added
---
name: new_jira_connect_ui
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50692
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/295647
milestone: '13.8'
type: development
group: group::ecosystem
default_enabled: true
......@@ -13813,9 +13813,6 @@ msgstr ""
msgid "GitLab metadata URL"
msgstr ""
msgid "GitLab namespace"
msgstr ""
msgid "GitLab project export"
msgstr ""
......@@ -16162,9 +16159,6 @@ msgstr ""
msgid "Integrations|Issues created in Jira are shown here once you have created the issues in project setup in Jira."
msgstr ""
msgid "Integrations|Link namespace to Jira"
msgstr ""
msgid "Integrations|Link namespaces"
msgstr ""
......
......@@ -24,9 +24,6 @@ describe('JiraConnectApp', () => {
wrapper = extendedWrapper(
shallowMount(JiraConnectApp, {
store,
provide: {
glFeatures: { newJiraConnectUi: true },
},
...options,
}),
);
......@@ -49,7 +46,6 @@ describe('JiraConnectApp', () => {
beforeEach(() => {
createComponent({
provide: {
glFeatures: { newJiraConnectUi: true },
usersPath: '/users',
},
});
......@@ -72,18 +68,6 @@ describe('JiraConnectApp', () => {
});
});
describe('newJiraConnectUi is false', () => {
it('does not render new UI', () => {
createComponent({
provide: {
glFeatures: { newJiraConnectUi: false },
},
});
expect(findHeader().exists()).toBe(false);
});
});
it.each`
errorMessage | errorShouldRender
${'Test error'} | ${true}
......
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