Skip to content

Replace Terms of Use checkbox in Instance Creation workflow #1042

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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Replace Terms of Use checkbox in Instance Creation workflow #1042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a2c073
Replace Terms of Use checkbox in Instance Creation workflow
rosalieper Sep 19, 2025
76a4ae2
refactor accept terms of use checkbox deletion
rosalieper Sep 22, 2025
d49c941
fix linting
rosalieper Sep 22, 2025
6193fb9
fix UI error
rosalieper Sep 22, 2025
236568b
Add terms of use title
rosalieper Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/components/Cards/CreateWiki.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
:inFlight="inFlight"
:error="error"
:dismissable="false"
:showTerms="true"
submitButtonText="Create Wiki"
v-model="stepThree"
@previous-step="goToStep(2)"
Expand Down Expand Up @@ -76,8 +75,7 @@ export default {
},
stepThree: {
temporality: '',
otherTemporality: '',
terms: false
otherTemporality: ''
},
hasError: false,
error: [],
Expand Down Expand Up @@ -174,10 +172,6 @@ export default {
this.hasError = true
this.error.username = errors.username[0]
}
if (errors.terms) {
this.hasError = true
this.error.terms = errors.terms[0]
}
if (errors.tooManyWikis) {
this.hasError = true
this.displayGenericError(errors.message)
Expand All @@ -199,7 +193,6 @@ export default {
this.error.sitename = message
this.error.siteaddress = message
this.error.username = message
this.error.terms = message
},
checkCurrentLogin () {
if (!this.currentUser) {
Expand Down
43 changes: 16 additions & 27 deletions src/components/Cards/CreateWikiWizardStepThree.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<h3>How long do you plan to use this Wikibase?</h3>

<v-radio-group
v-model="value.temporality"

Check warning on line 16 in src/components/Cards/CreateWikiWizardStepThree.vue

View workflow job for this annotation

GitHub Actions / build (22) 

Unexpected mutation of "value" prop
:error-messages=error
:rules="[() => !!value.temporality || 'Please select an option.']"
>
Expand Down Expand Up @@ -54,32 +54,22 @@
</template>
</v-radio>
</v-radio-group>

<h3 v-if="showTerms" class="mt-6">Terms of Use</h3>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at Anton's mockup in the ticket, the ToU heading should remain (I guess just without the v-if="showTerms")

<v-checkbox
v-model="value.terms"
:disabled="inFlight"
:rules="[() => !!value.terms || 'You must accept the Terms of Service.']"
v-if="showTerms"
>
<template v-slot:label>
<div>
I agree to the
<v-tooltip bottom>
<template v-slot:activator="{ on }">
<a
target="_blank"
href="/terms-of-use"
@click.stop
v-on="on"
>
Terms of Use</a>
</template>
Opens in new window
</v-tooltip>.
</div>
</template>
</v-checkbox>
<h3 class="mt-6">Terms of Use</h3>
<div class="body-2">
Previously accepted
<v-tooltip top>
<template v-slot:activator="{ on }">
<a
target="_blank"
href="/terms-of-use"
@click.stop
v-on="on"
>
Terms of Use</a>
</template>
Opens in new window
</v-tooltip> still apply.
</div>
</v-form>
</v-card-text>
<v-card-actions>
Expand Down Expand Up @@ -112,7 +102,6 @@
value: Object,
error: Array,
dismissable: Boolean,
showTerms: Boolean,
submitButtonText: String
},
methods: {
Expand Down
Loading