Commit 04542961 authored by Tom Quirk's avatar Tom Quirk

Address backend maintainer feedback

- rename integration.name=>integration.title
- rename integration.type=>integration.name
- update changelog title
parent cf8c8f32
...@@ -38,7 +38,7 @@ export default { ...@@ -38,7 +38,7 @@ export default {
thClass: 'gl-w-10', thClass: 'gl-w-10',
}, },
{ {
key: 'name', key: 'title',
label: __('Integration'), label: __('Integration'),
thClass: 'gl-w-quarter', thClass: 'gl-w-quarter',
}, },
...@@ -58,8 +58,8 @@ export default { ...@@ -58,8 +58,8 @@ export default {
}, },
methods: { methods: {
getStatusTooltipTitle(integration) { getStatusTooltipTitle(integration) {
return sprintf(s__('Integrations|%{integrationName}: active'), { return sprintf(s__('Integrations|%{integrationTitle}: active'), {
integrationName: integration.name, integrationTitle: integration.title,
}); });
}, },
}, },
...@@ -78,13 +78,13 @@ export default { ...@@ -78,13 +78,13 @@ export default {
/> />
</template> </template>
<template #cell(name)="{ item }"> <template #cell(title)="{ item }">
<gl-link <gl-link
:href="item.edit_path" :href="item.edit_path"
class="gl-font-weight-bold" class="gl-font-weight-bold"
:data-qa-selector="`${item.type}_link`" :data-qa-selector="`${item.name}_link`"
> >
{{ item.name }} {{ item.title }}
</gl-link> </gl-link>
</template> </template>
......
...@@ -165,11 +165,11 @@ module ServicesHelper ...@@ -165,11 +165,11 @@ module ServicesHelper
def serialize_integration(integration) def serialize_integration(integration)
{ {
active: integration.operating?, active: integration.operating?,
name: integration.title, title: integration.title,
description: integration.description, description: integration.description,
updated_at: integration.updated_at, updated_at: integration.updated_at,
edit_path: scoped_edit_integration_path(integration), edit_path: scoped_edit_integration_path(integration),
type: integration.to_param name: integration.to_param
} }
end end
end end
......
--- ---
title: Separate active integrations in integrations list to new table title: Display active integrations in separate table
merge_request: 57198 merge_request: 57198
author: author:
type: changed type: changed
...@@ -17056,7 +17056,7 @@ msgstr "" ...@@ -17056,7 +17056,7 @@ msgstr ""
msgid "Integrations" msgid "Integrations"
msgstr "" msgstr ""
msgid "Integrations|%{integrationName}: active" msgid "Integrations|%{integrationTitle}: active"
msgstr "" msgstr ""
msgid "Integrations|%{integration} settings saved and active." msgid "Integrations|%{integration} settings saved and active."
......
...@@ -11,8 +11,8 @@ module QA ...@@ -11,8 +11,8 @@ module QA
def self.prepended(base) def self.prepended(base)
base.class_eval do base.class_eval do
view 'app/assets/javascripts/integrations/index/components/integrations_table.vue' do view 'app/assets/javascripts/integrations/index/components/integrations_table.vue' do
element :jenkins_link, %q(:data-qa-selector="`${item.type}_link`") # rubocop:disable QA/ElementWithPattern element :jenkins_link, %q(:data-qa-selector="`${item.name}_link`") # rubocop:disable QA/ElementWithPattern
element :jira_link, %q(:data-qa-selector="`${item.type}_link`") # rubocop:disable QA/ElementWithPattern element :jira_link, %q(:data-qa-selector="`${item.name}_link`") # rubocop:disable QA/ElementWithPattern
end end
end end
end end
......
...@@ -6,8 +6,8 @@ module QA ...@@ -6,8 +6,8 @@ module QA
module Settings module Settings
class Integrations < QA::Page::Base class Integrations < QA::Page::Base
view 'app/assets/javascripts/integrations/index/components/integrations_table.vue' do view 'app/assets/javascripts/integrations/index/components/integrations_table.vue' do
element :prometheus_link, %q(:data-qa-selector="`${item.type}_link`") # rubocop:disable QA/ElementWithPattern element :prometheus_link, %q(:data-qa-selector="`${item.name}_link`") # rubocop:disable QA/ElementWithPattern
element :jira_link, %q(:data-qa-selector="`${item.type}_link`") # rubocop:disable QA/ElementWithPattern element :jira_link, %q(:data-qa-selector="`${item.name}_link`") # rubocop:disable QA/ElementWithPattern
end end
def click_on_prometheus_integration def click_on_prometheus_integration
......
export const mockActiveIntegrations = [ export const mockActiveIntegrations = [
{ {
active: true, active: true,
name: 'Asana', title: 'Asana',
description: 'Asana - Teamwork without email', description: 'Asana - Teamwork without email',
updated_at: '2021-03-18T00:27:09.634Z', updated_at: '2021-03-18T00:27:09.634Z',
edit_path: edit_path:
'/gitlab-qa-sandbox-group/project_with_jenkins_6a55a67c-57c6ed0597c9319a/-/services/asana/edit', '/gitlab-qa-sandbox-group/project_with_jenkins_6a55a67c-57c6ed0597c9319a/-/services/asana/edit',
type: 'asana', name: 'asana',
}, },
{ {
active: true, active: true,
name: 'Jira', title: 'Jira',
description: 'Jira issue tracker', description: 'Jira issue tracker',
updated_at: '2021-01-29T06:41:25.806Z', updated_at: '2021-01-29T06:41:25.806Z',
edit_path: edit_path:
'/gitlab-qa-sandbox-group/project_with_jenkins_6a55a67c-57c6ed0597c9319a/-/services/jira/edit', '/gitlab-qa-sandbox-group/project_with_jenkins_6a55a67c-57c6ed0597c9319a/-/services/jira/edit',
type: 'jira', name: 'jira',
}, },
]; ];
export const mockInactiveIntegrations = [ export const mockInactiveIntegrations = [
{ {
active: false, active: false,
name: 'Webex Teams', title: 'Webex Teams',
description: 'Receive event notifications in Webex Teams', description: 'Receive event notifications in Webex Teams',
updated_at: null, updated_at: null,
edit_path: edit_path:
'/gitlab-qa-sandbox-group/project_with_jenkins_6a55a67c-57c6ed0597c9319a/-/services/webex_teams/edit', '/gitlab-qa-sandbox-group/project_with_jenkins_6a55a67c-57c6ed0597c9319a/-/services/webex_teams/edit',
type: 'webex_teams', name: 'webex_teams',
}, },
{ {
active: false, active: false,
name: 'YouTrack', title: 'YouTrack',
description: 'YouTrack issue tracker', description: 'YouTrack issue tracker',
updated_at: null, updated_at: null,
edit_path: edit_path:
'/gitlab-qa-sandbox-group/project_with_jenkins_6a55a67c-57c6ed0597c9319a/-/services/youtrack/edit', '/gitlab-qa-sandbox-group/project_with_jenkins_6a55a67c-57c6ed0597c9319a/-/services/youtrack/edit',
type: 'youtrack', name: 'youtrack',
}, },
{ {
active: false, active: false,
name: 'Atlassian Bamboo CI', title: 'Atlassian Bamboo CI',
description: 'A continuous integration and build server', description: 'A continuous integration and build server',
updated_at: null, updated_at: null,
edit_path: edit_path:
'/gitlab-qa-sandbox-group/project_with_jenkins_6a55a67c-57c6ed0597c9319a/-/services/bamboo/edit', '/gitlab-qa-sandbox-group/project_with_jenkins_6a55a67c-57c6ed0597c9319a/-/services/bamboo/edit',
type: 'bamboo', name: 'bamboo',
}, },
]; ];
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