-
Notifications
You must be signed in to change notification settings - Fork 157
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
UI Modal for Flagging ContentNodes #4375
Draft
vkWeb
wants to merge
1
commit into
learningequality:unstable
Choose a base branch
from
vkWeb:feedback-is-the-king
base: unstable
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+228
−73
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
129 changes: 129 additions & 0 deletions
129
contentcuration/contentcuration/frontend/channelEdit/components/FlagFeedbackModal.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| <template> | ||
|
|
||
| <KModal | ||
| :title="$tr('flagFeedBackModalTitle')" | ||
| :submitText="$tr('flagSubmitButtonLabel')" | ||
| :cancelText="$tr('flagCancelButtonLabel')" | ||
| :submitDisabled="isSubmitDisabled" | ||
| @cancel="modalShowing = false" | ||
| @submit="handleSubmit" | ||
| @dblclick.native.capture.stop | ||
| > | ||
| <VList> | ||
| <VListTile @click.stop> | ||
| <VListTileAction> | ||
| <VCheckbox v-model="reportViolent" color="primary" /> | ||
| </VListTileAction> | ||
| <VListTileContent @click="reportViolent = !reportViolent"> | ||
| <VListTileTitle>{{ $tr('reportViolentTitle') }}</VListTileTitle> | ||
| </VListTileContent> | ||
| </VListTile> | ||
|
|
||
| <VListTile @click.stop> | ||
| <VListTileAction> | ||
| <VCheckbox v-model="reportHateful" color="primary" /> | ||
| </VListTileAction> | ||
| <VListTileContent @click="reportHateful = !reportHateful"> | ||
| <VListTileTitle>{{ $tr('reportHatefulTitle') }}</VListTileTitle> | ||
| </VListTileContent> | ||
| </VListTile> | ||
|
|
||
| <VListTile @click.stop> | ||
| <VListTileAction> | ||
| <VCheckbox v-model="reportHarmful" color="primary" /> | ||
| </VListTileAction> | ||
| <VListTileContent @click="reportHarmful = !reportHarmful"> | ||
| <VListTileTitle>{{ $tr('reportHarmfulTitle') }}</VListTileTitle> | ||
| </VListTileContent> | ||
| </VListTile> | ||
|
|
||
| <VListTile @click.stop> | ||
| <VListTileAction> | ||
| <VCheckbox v-model="reportSpam" color="primary" /> | ||
| </VListTileAction> | ||
| <VListTileContent @click="reportSpam = !reportSpam"> | ||
| <VListTileTitle>{{ $tr('reportSpamTitle') }}</VListTileTitle> | ||
| </VListTileContent> | ||
| </VListTile> | ||
|
|
||
| <VListTile @click.stop> | ||
| <VListTileAction> | ||
| <VCheckbox v-model="reportSexual" color="primary" /> | ||
| </VListTileAction> | ||
| <VListTileContent @click="reportSexual = !reportSexual"> | ||
| <VListTileTitle>{{ $tr('reportSexualTitle') }}</VListTileTitle> | ||
| </VListTileContent> | ||
| </VListTile> | ||
| </VList> | ||
| </KModal> | ||
|
|
||
| </template> | ||
|
|
||
| <script> | ||
|
|
||
| import { mapGetters } from 'vuex'; | ||
|
|
||
| export default { | ||
| name: 'FlagFeedbackModal', | ||
| props: { | ||
| nodeId: { | ||
| type: String, | ||
| required: true, | ||
| }, | ||
| }, | ||
| data() { | ||
| return { | ||
| reportViolent: false, | ||
| reportHateful: false, | ||
| reportHarmful: false, | ||
| reportSpam: false, | ||
| reportSexual: false, | ||
| }; | ||
| }, | ||
| computed: { | ||
| ...mapGetters('contentNode', ['getContentNode']), | ||
| targetContentNode() { | ||
| return this.getContentNode(this.nodeId); | ||
| }, | ||
| modalShowing: { | ||
| get() { | ||
| return this.value; | ||
| }, | ||
| set(value) { | ||
| this.$emit('input', value); | ||
| }, | ||
| }, | ||
| reportList() { | ||
| return [ | ||
| this.reportViolent, | ||
| this.reportHateful, | ||
| this.reportHarmful, | ||
| this.reportSpam, | ||
| this.reportSexual, | ||
| ]; | ||
| }, | ||
| isSubmitDisabled() { | ||
| const anyOneCheckboxTick = this.reportList.some(report => report === true); | ||
| return !anyOneCheckboxTick; // if any one checkbox is tick, enable submit. | ||
| }, | ||
| }, | ||
| methods: { | ||
| handleSubmit() { | ||
| /* NOTE: This is just a placeholder method. It will be implemented after | ||
| feedbackApiUtils PR is merged. */ | ||
| console.log(`Node with title "${this.targetContentNode.title}" is flagged!`); | ||
| }, | ||
| }, | ||
| $trs: { | ||
| flagFeedBackModalTitle: 'Flag content', | ||
| reportViolentTitle: 'Violent or repulsive content', | ||
| reportHatefulTitle: 'Hateful or abusive content', | ||
| reportHarmfulTitle: 'Harmful or dangerous acts', | ||
| reportSpamTitle: 'Spam or misleading', | ||
| reportSexualTitle: 'Sexual Content', | ||
| flagCancelButtonLabel: 'Cancel', | ||
| flagSubmitButtonLabel: 'Flag', | ||
| }, | ||
| }; | ||
|
|
||
| </script> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of embedding the modal in each content node list item, having the component emit an event to a common place in the UI, makes more sense.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't remember why I did this way 🤔
@ozer550 will you be willing to refactor this and take this forward?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah no worries @vkWeb! I talked to @ozer550 about this. Happy to make the update too
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good :D
Btw upon trying to remember, my mind trace says that --
Most probably I did this because Vue allows emmiting events from a parent to a direct child only. So I had to catch the event on contentnode list item, I was not able to catch the event anywhere else.
The workaround for this was to utilise an event bus. So to keep things simple I might have done this.