Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
93902c3b
Commit
93902c3b
authored
Jul 31, 2020
by
Kyle Wiebers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '229532-status-page-incidents' into 'master'"
This reverts merge request !37971
parent
bbf94418
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
4 additions
and
264 deletions
+4
-264
app/assets/javascripts/incidents/components/incidents_list.vue
...ssets/javascripts/incidents/components/incidents_list.vue
+3
-31
app/assets/javascripts/incidents/constants.js
app/assets/javascripts/incidents/constants.js
+0
-1
app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql
...pts/incidents/graphql/queries/get_incidents.query.graphql
+0
-1
app/assets/javascripts/incidents/list.js
app/assets/javascripts/incidents/list.js
+1
-8
app/assets/stylesheets/pages/incident_management_list.scss
app/assets/stylesheets/pages/incident_management_list.scss
+0
-5
app/graphql/types/issue_type.rb
app/graphql/types/issue_type.rb
+0
-3
app/helpers/projects/incidents_helper.rb
app/helpers/projects/incidents_helper.rb
+0
-2
doc/api/graphql/reference/gitlab_schema.graphql
doc/api/graphql/reference/gitlab_schema.graphql
+0
-10
doc/api/graphql/reference/gitlab_schema.json
doc/api/graphql/reference/gitlab_schema.json
+0
-28
doc/api/graphql/reference/index.md
doc/api/graphql/reference/index.md
+0
-2
ee/app/assets/javascripts/incidents/components/published_cell.vue
...ssets/javascripts/incidents/components/published_cell.vue
+0
-35
ee/app/helpers/ee/projects/incidents_helper.rb
ee/app/helpers/ee/projects/incidents_helper.rb
+0
-26
ee/changelogs/unreleased/229532-status-page-incidents.yml
ee/changelogs/unreleased/229532-status-page-incidents.yml
+0
-5
ee/spec/frontend/incidents/components/published_cell_spec.js
ee/spec/frontend/incidents/components/published_cell_spec.js
+0
-56
ee/spec/helpers/ee/projects/incidents_helper_spec.rb
ee/spec/helpers/ee/projects/incidents_helper_spec.rb
+0
-41
locale/gitlab.pot
locale/gitlab.pot
+0
-9
spec/frontend/incidents/components/incidents_list_spec.js
spec/frontend/incidents/components/incidents_list_spec.js
+0
-1
No files found.
app/assets/javascripts/incidents/components/incidents_list.vue
View file @
93902c3b
...
...
@@ -72,18 +72,11 @@ export default {
GlPagination
,
GlTabs
,
GlTab
,
PublishedCell
:
()
=>
import
(
'
ee_component/incidents/components/published_cell.vue
'
),
},
directives
:
{
GlTooltip
:
GlTooltipDirective
,
},
inject
:
[
'
projectPath
'
,
'
newIssuePath
'
,
'
incidentTemplateName
'
,
'
issuePath
'
,
'
publishedAvailable
'
,
],
inject
:
[
'
projectPath
'
,
'
newIssuePath
'
,
'
incidentTemplateName
'
,
'
issuePath
'
],
apollo
:
{
incidents
:
{
query
:
getIncidents
,
...
...
@@ -151,20 +144,6 @@ export default {
newIncidentPath
()
{
return
mergeUrlParams
({
issuable_template
:
this
.
incidentTemplateName
},
this
.
newIssuePath
);
},
availableFields
()
{
return
this
.
publishedAvailable
?
[
...
this
.
$options
.
fields
,
...[
{
key
:
'
published
'
,
label
:
s__
(
'
IncidentManagement|Published
'
),
thClass
:
'
gl-pointer-events-none
'
,
},
],
]
:
this
.
$options
.
fields
;
},
},
methods
:
{
onInputChange
:
debounce
(
function
debounceSearch
(
input
)
{
...
...
@@ -251,7 +230,7 @@ export default {
</h4>
<gl-table
:items=
"incidents.list || []"
:fields=
"
availableF
ields"
:fields=
"
$options.f
ields"
:show-empty=
"true"
:busy=
"loading"
stacked=
"md"
...
...
@@ -266,7 +245,7 @@ export default {
<gl-icon
v-if=
"item.state === 'closed'"
name=
"issue-close"
class=
"gl-
ml-1 gl-
fill-blue-500"
class=
"gl-fill-blue-500"
data-testid=
"incident-closed"
/>
</div>
...
...
@@ -306,13 +285,6 @@ export default {
</div>
</template>
<
template
v-if=
"publishedAvailable"
#cell(published)=
"{ item }"
>
<published-cell
:status-page-published-incident=
"item.statusPagePublishedIncident"
:un-published=
"$options.i18n.unPublished"
/>
</
template
>
<
template
#table-busy
>
<gl-loading-icon
size=
"lg"
color=
"dark"
class=
"mt-3"
/>
</
template
>
...
...
app/assets/javascripts/incidents/constants.js
View file @
93902c3b
...
...
@@ -6,7 +6,6 @@ export const I18N = {
unassigned
:
s__
(
'
IncidentManagement|Unassigned
'
),
createIncidentBtnLabel
:
s__
(
'
IncidentManagement|Create incident
'
),
searchPlaceholder
:
__
(
'
Search or filter results...
'
),
unPublished
:
s__
(
'
IncidentManagement|Unpublished
'
),
};
export
const
INCIDENT_STATE_TABS
=
[
...
...
app/assets/javascripts/incidents/graphql/queries/get_incidents.query.graphql
View file @
93902c3b
...
...
@@ -37,7 +37,6 @@ query getIncidents(
webUrl
}
}
statusPagePublishedIncident
}
pageInfo
{
hasNextPage
...
...
app/assets/javascripts/incidents/list.js
View file @
93902c3b
...
...
@@ -8,13 +8,7 @@ export default () => {
const
selector
=
'
#js-incidents
'
;
const
domEl
=
document
.
querySelector
(
selector
);
const
{
projectPath
,
newIssuePath
,
incidentTemplateName
,
issuePath
,
publishedAvailable
,
}
=
domEl
.
dataset
;
const
{
projectPath
,
newIssuePath
,
incidentTemplateName
,
issuePath
}
=
domEl
.
dataset
;
const
apolloProvider
=
new
VueApollo
({
defaultClient
:
createDefaultClient
(),
...
...
@@ -27,7 +21,6 @@ export default () => {
incidentTemplateName
,
newIssuePath
,
issuePath
,
publishedAvailable
,
},
apolloProvider
,
components
:
{
...
...
app/assets/stylesheets/pages/incident_management_list.scss
View file @
93902c3b
...
...
@@ -98,9 +98,4 @@
@include
gl-w-full
;
}
}
// TODO: Abstract to `@gitlab/ui` utility set: https://gitlab.com/gitlab-org/gitlab-ui/-/issues/921
.gl-fill-green-500
{
fill
:
$gray-500
;
}
}
app/graphql/types/issue_type.rb
View file @
93902c3b
...
...
@@ -97,9 +97,6 @@ module Types
field
:design_collection
,
Types
::
DesignManagement
::
DesignCollectionType
,
null:
true
,
description:
'Collection of design images associated with this issue'
field
:status_page_published_incident
,
GraphQL
::
BOOLEAN_TYPE
,
null:
true
,
description:
'Indicates whether an issue is published to the status page'
end
end
...
...
app/helpers/projects/incidents_helper.rb
View file @
93902c3b
...
...
@@ -10,5 +10,3 @@ module Projects::IncidentsHelper
}
end
end
Projects
::
IncidentsHelper
.
prepend_if_ee
(
'EE::Projects::IncidentsHelper'
)
doc/api/graphql/reference/gitlab_schema.graphql
View file @
93902c3b
...
...
@@ -4475,11 +4475,6 @@ type EpicIssue implements Noteable {
"""
state
:
IssueState
!
"""
Indicates
whether
an
issue
is
published
to
the
status
page
"""
statusPagePublishedIncident
:
Boolean
"""
Indicates
the
currently
logged
in
user
is
subscribed
to
the
issue
"""
...
...
@@ -6113,11 +6108,6 @@ type Issue implements Noteable {
"""
state
:
IssueState
!
"""
Indicates
whether
an
issue
is
published
to
the
status
page
"""
statusPagePublishedIncident
:
Boolean
"""
Indicates
the
currently
logged
in
user
is
subscribed
to
the
issue
"""
...
...
doc/api/graphql/reference/gitlab_schema.json
View file @
93902c3b
...
...
@@ -12471,20 +12471,6 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "statusPagePublishedIncident",
"description": "Indicates whether an issue is published to the status page",
"args": [
],
"type": {
"kind": "SCALAR",
"name": "Boolean",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "subscribed",
"description": "Indicates the currently logged in user is subscribed to the issue",
...
...
@@ -16841,20 +16827,6 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "statusPagePublishedIncident",
"description": "Indicates whether an issue is published to the status page",
"args": [
],
"type": {
"kind": "SCALAR",
"name": "Boolean",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "subscribed",
"description": "Indicates the currently logged in user is subscribed to the issue",
doc/api/graphql/reference/index.md
View file @
93902c3b
...
...
@@ -750,7 +750,6 @@ Relationship between an epic and an issue
|
`relationPath`
| String | URI path of the epic-issue relation |
|
`relativePosition`
| Int | Relative position of the issue (used for positioning in epic tree and issue boards) |
|
`state`
| IssueState! | State of the issue |
|
`statusPagePublishedIncident`
| Boolean | Indicates whether an issue is published to the status page |
|
`subscribed`
| Boolean! | Indicates the currently logged in user is subscribed to the issue |
|
`taskCompletionStatus`
| TaskCompletionStatus! | Task completion status of the issue |
|
`timeEstimate`
| Int! | Time estimate of the issue |
...
...
@@ -917,7 +916,6 @@ Represents a Group Member
|
`reference`
| String! | Internal reference of the issue. Returned in shortened format by default |
|
`relativePosition`
| Int | Relative position of the issue (used for positioning in epic tree and issue boards) |
|
`state`
| IssueState! | State of the issue |
|
`statusPagePublishedIncident`
| Boolean | Indicates whether an issue is published to the status page |
|
`subscribed`
| Boolean! | Indicates the currently logged in user is subscribed to the issue |
|
`taskCompletionStatus`
| TaskCompletionStatus! | Task completion status of the issue |
|
`timeEstimate`
| Int! | Time estimate of the issue |
...
...
ee/app/assets/javascripts/incidents/components/published_cell.vue
deleted
100644 → 0
View file @
bbf94418
<
script
>
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
export
default
{
i18n
:
{
published
:
s__
(
'
IncidentManagement|Published to status page
'
),
},
components
:
{
GlIcon
,
},
props
:
{
statusPagePublishedIncident
:
{
type
:
Boolean
,
required
:
false
,
default
:
null
,
},
unPublished
:
{
type
:
String
,
required
:
true
,
},
},
};
</
script
>
<
template
>
<div
data-testid=
"published-cell"
>
<gl-icon
v-if=
"statusPagePublishedIncident"
name=
"status_success"
class=
"gl-fill-green-500"
:aria-label=
"$options.i18n.published"
/>
<div
v-else
>
{{
unPublished
}}
</div>
</div>
</
template
>
ee/app/helpers/ee/projects/incidents_helper.rb
deleted
100644 → 0
View file @
bbf94418
# frozen_string_literal: true
module
EE
module
Projects
module
IncidentsHelper
extend
::
Gitlab
::
Utils
::
Override
override
:incidents_data
def
incidents_data
(
project
)
super
.
merge
(
incidents_data_published_available
(
project
)
)
end
private
def
incidents_data_published_available
(
project
)
return
{}
unless
project
.
feature_available?
(
:status_page
)
{
'published-available'
=>
'true'
}
end
end
end
end
ee/changelogs/unreleased/229532-status-page-incidents.yml
deleted
100644 → 0
View file @
bbf94418
---
title
:
Add status page published column for incidents
merge_request
:
37971
author
:
type
:
changed
ee/spec/frontend/incidents/components/published_cell_spec.js
deleted
100644 → 0
View file @
bbf94418
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
GlIcon
}
from
'
@gitlab/ui
'
;
import
PublishedCell
from
'
ee/incidents/components/published_cell.vue
'
;
describe
(
'
Incidents Published Cell
'
,
()
=>
{
let
wrapper
;
const
findCell
=
()
=>
wrapper
.
find
(
"
[data-testid='published-cell']
"
);
function
mountComponent
({
props
=
{
statusPagePublishedIncident
:
null
,
unPublished
:
'
Unpublished
'
},
})
{
wrapper
=
shallowMount
(
PublishedCell
,
{
propsData
:
{
...
props
,
},
stubs
:
{
GlIcon
:
true
,
},
});
}
afterEach
(()
=>
{
if
(
wrapper
)
{
wrapper
.
destroy
();
wrapper
=
null
;
}
});
describe
(
'
Published cell
'
,
()
=>
{
beforeEach
(()
=>
{
mountComponent
({});
});
it
(
'
render a cell with unpublished by default
'
,
()
=>
{
expect
(
findCell
()
.
find
(
GlIcon
)
.
exists
(),
).
toBe
(
false
);
expect
(
findCell
().
text
()).
toBe
(
'
Unpublished
'
);
});
it
(
'
render a status success icon if statusPagePublishedIncident returns true
'
,
()
=>
{
wrapper
.
setProps
({
statusPagePublishedIncident
:
true
});
return
wrapper
.
vm
.
$nextTick
().
then
(()
=>
{
expect
(
findCell
()
.
find
(
GlIcon
)
.
exists
(),
).
toBe
(
true
);
});
});
});
});
ee/spec/helpers/ee/projects/incidents_helper_spec.rb
deleted
100644 → 0
View file @
bbf94418
# frozen_string_literal: true
require
'spec_helper'
RSpec
.
describe
Projects
::
IncidentsHelper
do
include
Gitlab
::
Routing
.
url_helpers
let_it_be
(
:project
)
{
create
(
:project
)
}
let
(
:project_path
)
{
project
.
full_path
}
let
(
:new_issue_path
)
{
new_project_issue_path
(
project
)
}
let
(
:issue_path
)
{
project_issues_path
(
project
)
}
describe
'#incidents_data'
do
let
(
:expected_incidents_data
)
do
{
'project-path'
=>
project_path
,
'new-issue-path'
=>
new_issue_path
,
'incident-template-name'
=>
'incident'
,
'issue-path'
=>
issue_path
}
end
subject
{
helper
.
incidents_data
(
project
)
}
before
do
allow
(
project
).
to
receive
(
:feature_available?
).
with
(
:status_page
).
and_return
(
status_page_feature_available
)
end
context
'when status page feature is available'
do
let
(
:status_page_feature_available
)
{
true
}
it
{
is_expected
.
to
eq
(
expected_incidents_data
.
merge
(
'published-available'
=>
'true'
))
}
end
context
'when status page issue is not available'
do
let
(
:status_page_feature_available
)
{
false
}
it
{
is_expected
.
to
eq
(
expected_incidents_data
)
}
end
end
end
locale/gitlab.pot
View file @
93902c3b
...
...
@@ -12752,21 +12752,12 @@ msgstr ""
msgid "IncidentManagement|Open"
msgstr ""
msgid "IncidentManagement|Published"
msgstr ""
msgid "IncidentManagement|Published to status page"
msgstr ""
msgid "IncidentManagement|There was an error displaying the incidents."
msgstr ""
msgid "IncidentManagement|Unassigned"
msgstr ""
msgid "IncidentManagement|Unpublished"
msgstr ""
msgid "IncidentSettings|Alert integration"
msgstr ""
...
...
spec/frontend/incidents/components/incidents_list_spec.js
View file @
93902c3b
...
...
@@ -56,7 +56,6 @@ describe('Incidents List', () => {
newIssuePath
,
incidentTemplateName
,
issuePath
:
'
/project/isssues
'
,
publishedAvailable
:
true
,
},
stubs
:
{
GlButton
:
true
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment