Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
admin-fe
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Angelina Filippova
admin-fe
Commits
3657b49a
Commit
3657b49a
authored
May 23, 2019
by
Angelina Filippova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ability to change state of reports
parent
b14805d8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
7 deletions
+34
-7
src/api/reports.js
src/api/reports.js
+10
-0
src/lang/en.js
src/lang/en.js
+2
-1
src/store/modules/reports.js
src/store/modules/reports.js
+10
-5
src/views/reports/components/TimelineItem.vue
src/views/reports/components/TimelineItem.vue
+12
-1
No files found.
src/api/reports.js
View file @
3657b49a
...
...
@@ -2,6 +2,16 @@ import request from '@/utils/request'
import
{
getToken
}
from
'
@/utils/auth
'
import
{
baseName
}
from
'
./utils
'
export
async
function
changeState
(
state
,
id
,
authHost
,
token
)
{
return
await
request
({
baseURL
:
baseName
(
authHost
),
url
:
`/api/pleroma/admin/reports/
${
id
}
`
,
method
:
'
put
'
,
headers
:
authHeaders
(
token
),
data
:
{
state
}
})
}
export
async
function
fetchReports
(
limit
,
max_id
,
authHost
,
token
)
{
return
await
request
({
baseURL
:
baseName
(
authHost
),
...
...
src/lang/en.js
View file @
3657b49a
...
...
@@ -212,7 +212,8 @@ export default {
cancel
:
'
Cancel
'
,
deleteCompleted
:
'
Delete comleted
'
,
deleteCanceled
:
'
Delete canceled
'
,
noNotes
:
'
No notes to display
'
noNotes
:
'
No notes to display
'
,
changeState
:
'
Change state
'
},
reportsFilter
:
{
inputPlaceholder
:
'
Select filter
'
,
...
...
src/store/modules/reports.js
View file @
3657b49a
import
{
fetchReports
,
filterReports
}
from
'
@/api/reports
'
import
{
changeState
,
fetchReports
,
filterReports
}
from
'
@/api/reports
'
const
reports
=
{
state
:
{
...
...
@@ -15,18 +15,23 @@ const reports = {
SET_LOADING
:
(
state
,
status
)
=>
{
state
.
loading
=
status
},
SET_REPORT
:
(
state
,
{
reportIndex
,
data
})
=>
{
state
.
fetchedReports
[
reportIndex
]
=
data
},
SET_REPORTS
:
(
state
,
reports
)
=>
{
state
.
fetchedReports
=
reports
},
SET_REPORTS_FILTER
:
(
state
,
filter
)
=>
{
state
.
stateFilter
=
filter
}
// SET_REPORT: (state, { index, report }) => {
// state.fetchedReports[index] = report
// },
},
actions
:
{
async
FetchReports
({
commit
,
state
,
getters
})
{
async
ChangeReportState
({
commit
,
getters
,
state
},
{
reportState
,
reportId
})
{
const
{
data
}
=
await
changeState
(
reportState
,
reportId
,
getters
.
authHost
,
getters
.
token
)
const
reportIndex
=
state
.
fetchedReports
.
findIndex
(
report
=>
report
.
id
===
reportId
)
commit
(
'
SET_REPORT
'
,
{
reportIndex
,
data
})
},
async
FetchReports
({
commit
,
getters
,
state
})
{
commit
(
'
SET_LOADING
'
,
true
)
const
response
=
await
fetchReports
(
state
.
page_limit
,
state
.
idOfLastReport
,
getters
.
authHost
,
getters
.
token
)
const
reports
=
state
.
fetchedReports
.
concat
(
response
.
data
.
reports
)
...
...
src/views/reports/components/TimelineItem.vue
View file @
3657b49a
...
...
@@ -4,7 +4,15 @@
<div
class=
"header-container"
>
<h3
class=
"report-title"
>
Report on
{{
report
.
account
.
display_name
}}
</h3>
<div>
<el-tag
:type=
"getStateType(report.state)"
size=
"large"
>
{{
capitalizeFirstLetter
(
report
.
state
)
}}
</el-tag>
<el-tag
:type=
"getStateType(report.state)"
:key=
"report.state"
size=
"large"
>
{{
capitalizeFirstLetter
(
report
.
state
)
}}
</el-tag>
<el-dropdown>
<el-button
plain
size=
"small"
icon=
"el-icon-edit"
>
{{
$t
(
'
reports.changeState
'
)
}}
<i
class=
"el-icon-arrow-down el-icon--right"
/></el-button>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-item
v-if=
"report.state !== 'resolved'"
@
click.native=
"changeReportState('resolved', report.id)"
>
Resolve
</el-dropdown-item>
<el-dropdown-item
v-if=
"report.state !== 'open'"
@
click.native=
"changeReportState('open', report.id)"
>
Open
</el-dropdown-item>
<el-dropdown-item
v-if=
"report.state !== 'closed'"
@
click.native=
"changeReportState('closed', report.id)"
>
Close
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<!--
<el-button
plain
size=
"small"
@
click=
"toggleNoteInput"
>
{{
$t
(
'
reports.reply
'
)
}}
</el-button>
-->
</div>
</div>
...
...
@@ -121,6 +129,9 @@ export default {
this
.
$data
.
note
=
''
}
},
changeReportState
(
reportState
,
reportId
)
{
this
.
$store
.
dispatch
(
'
ChangeReportState
'
,
{
reportState
,
reportId
})
},
deleteNote
(
reportId
,
noteId
)
{
this
.
$confirm
(
i18n
.
t
(
'
reports.confirmMsg
'
),
{
confirmButtonText
:
i18n
.
t
(
'
reports.delete
'
),
...
...
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