@@ -195,12 +295,8 @@ export const NewReport = {
setup(props, { emit }) {
const client = useClient()
const loading = client.loading
-
- const contentType = computed(() => props.refId.indexOf('-') < 0
- ? 'Question'
- : props.refId.indexOf('-') !== props.refId.lastIndexOf('-')
- ? 'Comment'
- : 'Answer')
+
+ const contentType = computed(() => getContentType(props.refId))
const request = ref(new FlagContent({
refId: props.refId
@@ -254,9 +350,9 @@ export const NewReport = {
}
const QuestionDialogs = {
- components: { NewReport },
+ components: { ReportDialog },
template: `
-
+
`,
props:['bus'],
setup(props, { emit }) {
@@ -270,8 +366,8 @@ const QuestionDialogs = {
}
onMounted(() => {
- props.bus.subscribe('showNewReport', id => {
- show.value = 'NewReport'
+ props.bus.subscribe('showReportDialog', id => {
+ show.value = 'ReportDialog'
refId.value = id
})
props.bus.subscribe('showShare', id => {
@@ -318,7 +414,7 @@ const QuestionAside = {
}
}
-const AddComment = {
+const Comments = {
template:`
@@ -351,7 +447,7 @@ const AddComment = {
@@ -367,20 +463,32 @@ const AddComment = {
add comment
`,
- props:['id','bus'],
+ props:['id'],
setup(props) {
const { user, hasRole } = useAuth()
const userName = user.value?.userName
const isModerator = hasRole('Moderator')
const client = useClient()
const loading = client.loading
+ const editing = ref(false)
const txt = ref('')
- const editing = ref(true)
const comments = ref(getComments(props.id))
const error = ref('')
const input = ref()
+ const instance = getCurrentInstance()
+ const postId = parseInt(leftPart(props.id, '-'))
+
+ pageBus.subscribe('meta:load', () => {
+ comments.value = getComments(props.id)
+ instance?.proxy?.$forceUpdate()
+ })
+ pageBus.subscribe('userPostData:load', () => {
+ instance?.proxy?.$forceUpdate()
+ })
- function hasVoted(comment) { return userPostVotes.upVoteIds.includes(`${props.id}-${comment.created}`) }
+ function hasVoted(comment) {
+ return userPostVotes.upVoteIds.includes(`${props.id}-${comment.created}`)
+ }
function keyDown(e) {
if (e.key === 'Enter') {
@@ -402,6 +510,7 @@ const AddComment = {
txt.value = ''
editing.value = false
comments.value = api.response.comments || []
+ close()
} else {
error.value = api.errorMessage
}
@@ -430,19 +539,15 @@ const AddComment = {
const refId = `${props.id}-${comment.created}`
const api = await client.apiVoid(new CommentVote({ refId, created: comment.created, up: true }))
if (api.succeeded) {
-
+ await updateUserData(postId)
}
}
function flag(comment) {
- pageBus.publish('showNewReport', `${props.id}-${comment.created}`)
+ pageBus.publish('showReportDialog', `${props.id}-${comment.created}`)
}
-
- onMounted(() => {
- input.value.focus()
- })
- return { userName, isModerator, txt, input, editing, comments, keyDown, startEditing,
+ return { editing, userName, isModerator, txt, input, comments, keyDown, startEditing,
formatDate, loading, error, submit, close, removeComment, voteUp, flag, hasVoted }
}
}
@@ -499,13 +604,14 @@ const EditQuestion = {