Add flow for existing users to accept new policies #1160
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,46 @@ | ||
| <template> | ||
| <v-snackbar | ||
| :value="show" | ||
| color="error" | ||
| :timeout="timeout" | ||
| @input="hide" | ||
| > | ||
| {{ message }} | ||
| <template | ||
| v-if="dismissible" | ||
| v-slot:action="{ attrs }" | ||
| > | ||
| <v-btn | ||
| icon | ||
| v-bind="attrs" | ||
| @click="hide" | ||
| > | ||
| <v-icon>mdi-close</v-icon> | ||
| </v-btn> | ||
| </template> | ||
| </v-snackbar> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| computed: { | ||
| show: function () { | ||
| return this.$store.getters.hasLatestError | ||
| }, | ||
| dismissible: function () { | ||
| return this.$store.getters.latestErrorDismissible | ||
| }, | ||
| timeout: function () { | ||
| return this.dismissible ? 5000 : -1 | ||
| }, | ||
| message: function () { | ||
| return this.$store.getters.latestErrorMessage | ||
| }, | ||
| }, | ||
| methods: { | ||
| hide () { | ||
| this.$store.dispatch('clearLatestError') | ||
| }, | ||
| }, | ||
| } | ||
| </script> |
This file contains hidden or 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,63 @@ | ||
| <template> | ||
| <div style="display: contents"> | ||
| <div | ||
| v-for="(policy, idx) in policies" | ||
| :key="policy.metadata.policy_id" | ||
| style="display: contents" | ||
| > | ||
| <span>{{ getPolicySeparator(idx) }}</span> | ||
| <v-tooltip v-if="clickable" bottom> | ||
| <template v-slot:activator="{ on }"> | ||
| <a | ||
| target="_blank" | ||
| :href="getPolicyUrl(policy)" | ||
| @click.stop | ||
| v-on="on" | ||
| >{{ getPolicyName(policy) }}</a> | ||
| </template> | ||
| Opens in new window | ||
| </v-tooltip> | ||
| <span v-else> | ||
| {{ getPolicyName(policy) }} | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| props: { | ||
| policies: { | ||
| type: Array, | ||
| }, | ||
| article: { | ||
| type: String, | ||
| default: 'the ', | ||
| }, | ||
| clickable: { | ||
| type: Boolean, | ||
| default: true, | ||
| }, | ||
| }, | ||
| methods: { | ||
| getPolicyName (policy) { | ||
| return policy.metadata.type.replaceAll('-', ' ') | ||
| }, | ||
| getPolicyUrl (policy) { | ||
| return `/${policy.metadata.type}/${policy.metadata.active_from}` | ||
| }, | ||
| getPolicySeparator (idx) { | ||
| const count = this.policies.length | ||
| if (idx === 0) { | ||
| return ' ' | ||
| } else if (count === 2) { | ||
| return ` and ${this.article}` | ||
| } else if (idx === count - 1) { | ||
| return `, and ${this.article}` | ||
| } else { | ||
| return `, ${this.article}` | ||
| } | ||
| }, | ||
| }, | ||
| } | ||
| </script> |
This file contains hidden or 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,100 @@ | ||
| <template> | ||
| <div class="overlay"> | ||
| <v-card max-width="580"> | ||
| <v-card-title> | ||
| Updated policies | ||
| </v-card-title> | ||
| <v-card-text> | ||
| <p class="text-body-1"> | ||
| Please accept the updated | ||
| <PolicyList | ||
| :policies="policies" | ||
| article="" | ||
|
Contributor
There was a problem hiding this comment.
|
||
| :clickable="false" | ||
| /> | ||
| to continue using Wikibase Cloud. | ||
| If you prefer not to keep your account, you can contact us to delete it. | ||
| </p> | ||
| <v-checkbox | ||
| v-model="accepted" | ||
| hide-details | ||
| class="mt-2" | ||
| :disabled="inFlight" | ||
| > | ||
| <template v-slot:label> | ||
| <div class="text-body-1"> | ||
| I agree to the | ||
| <PolicyList :policies="policies"/> | ||
| <span>.</span> | ||
| </div> | ||
| </template> | ||
| </v-checkbox> | ||
| </v-card-text> | ||
| <v-card-actions> | ||
| <v-btn | ||
| text | ||
| color="primary" | ||
| @click="onContactForm" | ||
| :disabled="inFlight" | ||
| > | ||
| Contact Form | ||
| </v-btn> | ||
| <v-btn | ||
| color="primary" | ||
| :disabled="!accepted || inFlight" | ||
| @click="onAccept" | ||
| > | ||
| Continue | ||
| </v-btn> | ||
| </v-card-actions> | ||
| </v-card> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import PolicyList from '../Components/PolicyList' | ||
|
|
||
| export default { | ||
| components: { | ||
| PolicyList, | ||
| }, | ||
| data () { | ||
| return { | ||
| accepted: false, | ||
| inFlight: false, | ||
| } | ||
| }, | ||
| computed: { | ||
| policies () { | ||
| return this.$store.getters.missingPolicies | ||
| }, | ||
| }, | ||
| methods: { | ||
| onContactForm () { | ||
| this.$router.push('/contact') | ||
| }, | ||
| async onAccept () { | ||
|
Contributor
There was a problem hiding this comment.
|
||
| this.inFlight = true | ||
| const policyIds = Array.from( | ||
| this.policies, | ||
| policy => policy.metadata.policy_id, | ||
| ) | ||
| await this.$store.dispatch('acceptPolicies', policyIds) | ||
| this.inFlight = false | ||
| }, | ||
|
Contributor
There was a problem hiding this comment. Optional:
|
||
| }, | ||
| } | ||
| </script> | ||
|
|
||
| <style scoped> | ||
| .overlay { | ||
| background: rgba(0, 0, 0, 0.25); | ||
| position: absolute; | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| inset: 0; | ||
| z-index: 10; | ||
| overflow: auto; | ||
| } | ||
| </style> | ||
Oops, something went wrong.
Oops, something went wrong.
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.
I don't really get this bit...
hasMissingPoliciesreturnsmissingPolicies?.length, which is a number (or worst caseundefined). Since this is used inv-if, is it less error-prone to return an explicit boolean (for example,(this.$store.getters.missingPolicies?.length ?? 0) > 0)?