From 1760032d63901e9e8415479506d639667f7e0cc7 Mon Sep 17 00:00:00 2001 From: Thomas Arrow Date: Fri, 25 Sep 2026 11:36:06 +0100 Subject: [PATCH 1/6] WIP add new submit component for handover to Ollie --- src/components/Cards/CreateWiki.vue | 37 +------ .../KnowledgeEquityCreateWikiWizardStep.vue | 102 ------------------ .../Cards/SubmitCreateWikiWizardStep.vue | 53 +++++++++ 3 files changed, 56 insertions(+), 136 deletions(-) delete mode 100644 src/components/Cards/KnowledgeEquityCreateWikiWizardStep.vue create mode 100644 src/components/Cards/SubmitCreateWikiWizardStep.vue diff --git a/src/components/Cards/CreateWiki.vue b/src/components/Cards/CreateWiki.vue index 7eb3ef66..9a17acfd 100644 --- a/src/components/Cards/CreateWiki.vue +++ b/src/components/Cards/CreateWiki.vue @@ -22,24 +22,12 @@ @next-step="goToStep(3)" /> - - - @@ -49,16 +37,14 @@ import config from '~/config' import SiteDetailsCreateWikiWizardStep from './SiteDetailsCreateWikiWizardStep.vue' import AudienceAndPurposeWizardStep from './AudienceAndPurposeWizardStep.vue' -import TemporalityCreateWikiWizardStep from './TemporalityCreateWikiWizardStep.vue' -import KnowledgeEquityCreateWikiWizardStep from './KnowledgeEquityCreateWikiWizardStep.vue' +import SubmitCreateWikiWizardStep from './SubmitCreateWikiWizardStep.vue' export default { name: 'CreateWiki', components: { SiteDetailsCreateWikiWizardStep, AudienceAndPurposeWizardStep, - TemporalityCreateWikiWizardStep, - KnowledgeEquityCreateWikiWizardStep, + SubmitCreateWikiWizardStep, }, props: [ 'title', @@ -83,14 +69,6 @@ export default { audience: '', otherAudience: '', }, - stepThree: { - temporality: '', - otherTemporality: '', - }, - stepFour: { - selectedOption: '', - freeTextResponse: '', - }, hasError: false, error: [], inFlight: false, @@ -141,8 +119,6 @@ export default { ...(this.stepTwo.otherPurpose && { purpose_other: this.stepTwo.otherPurpose }), ...(this.stepTwo.audience && { audience: this.stepTwo.audience }), ...(this.stepTwo.otherAudience && { audience_other: this.stepTwo.otherAudience }), - temporality: this.stepThree.temporality, - ...(this.stepThree.otherTemporality && { temporality_other: this.stepThree.otherTemporality }), } const requestBody = { @@ -152,13 +128,6 @@ export default { profile: JSON.stringify(profileObject), } - if (this.stepThree.temporality === 'permanent' && this.stepFour.selectedOption) { - requestBody.knowledgeEquityResponse = { - selectedOption: this.stepFour.selectedOption, - freeTextResponse: this.stepFour.freeTextResponse, - } - } - this.$api.createWiki(requestBody) .then(wikiDetails => this.createSuccess(wikiDetails)) .catch(errors => this.createFail(errors)) diff --git a/src/components/Cards/KnowledgeEquityCreateWikiWizardStep.vue b/src/components/Cards/KnowledgeEquityCreateWikiWizardStep.vue deleted file mode 100644 index 01efcb1f..00000000 --- a/src/components/Cards/KnowledgeEquityCreateWikiWizardStep.vue +++ /dev/null @@ -1,102 +0,0 @@ - - - - - diff --git a/src/components/Cards/SubmitCreateWikiWizardStep.vue b/src/components/Cards/SubmitCreateWikiWizardStep.vue new file mode 100644 index 00000000..747ad229 --- /dev/null +++ b/src/components/Cards/SubmitCreateWikiWizardStep.vue @@ -0,0 +1,53 @@ + + + + + \ No newline at end of file From 35ec7d3e734720cb065492c1f5d26d3b13a93a29 Mon Sep 17 00:00:00 2001 From: Ollie Hyde Date: Fri, 25 Sep 2026 14:26:59 +0100 Subject: [PATCH 2/6] Tom + Ollie pairing --- src/components/Cards/CreateWiki.vue | 1 - .../Cards/SubmitCreateWikiWizardStep.vue | 92 ++++++++++++++++--- 2 files changed, 81 insertions(+), 12 deletions(-) diff --git a/src/components/Cards/CreateWiki.vue b/src/components/Cards/CreateWiki.vue index 9a17acfd..05a30fd9 100644 --- a/src/components/Cards/CreateWiki.vue +++ b/src/components/Cards/CreateWiki.vue @@ -26,7 +26,6 @@ v-show="step === 3" :title="title" :inFlight="inFlight" - :error="error" @previous-step="goToStep(2)" @submit="createWiki" /> diff --git a/src/components/Cards/SubmitCreateWikiWizardStep.vue b/src/components/Cards/SubmitCreateWikiWizardStep.vue index 747ad229..e043e1d5 100644 --- a/src/components/Cards/SubmitCreateWikiWizardStep.vue +++ b/src/components/Cards/SubmitCreateWikiWizardStep.vue @@ -7,22 +7,46 @@ -
This Wikibase will go offline on 15 December 2026
+
This Wikibase will go offline on {{ suspensionDate }}
unless it is submitted for review and approved.

All Wikibases on our platform are temporary by default.

Once you're confident you want to keep this Wikibase for more than 3 months, submit it for review.

Some uses can't be approved for a longer stay - for example, primarily commercial or promotional projects, or content under non-free licenses. To make sure your use case qualifies, check the Hosting Policy before you invest time in building anything.

- + I understand that this Wikibase will go offline on {{ suspensionDate }} unless it is submitted for review and approved to stay. + +
+ Failed to load policies. Please + click here + to retry. +
+ +
+ Previously accepted + + still apply. +
+
- I understand that this Wikibase will go offline on 15 December 2026 unless it is submitted for review and approved to stay.
+ < Previous @@ -31,7 +55,7 @@ type="button" color="primary" :disabled="inFlight || policiesLoading || policiesError" - @click="primaryBtnAction" + @click="createWiki" > Create Wiki @@ -40,14 +64,60 @@ \ No newline at end of file + From 1ab7eb33e5c6b9197ab3238a05cb5546363be586 Mon Sep 17 00:00:00 2001 From: Ollie Hyde Date: Fri, 25 Sep 2026 14:27:36 +0100 Subject: [PATCH 3/6] Ollie improvements attempt 1 --- .../Cards/SubmitCreateWikiWizardStep.vue | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/components/Cards/SubmitCreateWikiWizardStep.vue b/src/components/Cards/SubmitCreateWikiWizardStep.vue index e043e1d5..d631bab3 100644 --- a/src/components/Cards/SubmitCreateWikiWizardStep.vue +++ b/src/components/Cards/SubmitCreateWikiWizardStep.vue @@ -7,56 +7,56 @@ -
This Wikibase will go offline on {{ suspensionDate }}
- unless it is submitted for review and approved. - + + + + + + + + +
+ This Wikibase will go offline on {{ suspensionDate }} +
+

unless it is submitted for review and approved.

+ +

All Wikibases on our platform are temporary by default.

Once you're confident you want to keep this Wikibase for more than 3 months, submit it for review.

-

Some uses can't be approved for a longer stay - for example, primarily commercial or promotional projects, or content under non-free licenses. To make sure your use case qualifies, check the Hosting Policy before you invest time in building anything.

+

+ Some uses can't be approved for a longer stay - for example, primarily commercial or promotional projects, + or content under non-free licenses. To make sure your use case qualifies, check the + Hosting Policy before you invest time in building anything. +

- I understand that this Wikibase will go offline on {{ suspensionDate }} unless it is submitted for review and approved to stay. - -
+ + I understand that this Wikibase will go offline on {{ suspensionDate }} unless it is submitted for review and approved to stay. + + +
Failed to load policies. Please - click here + click here to retry.
- +
- Previously accepted - - still apply. + Previously accepted still apply.
- + < Previous - - + Create Wiki From f6f70c04afc6df41ecb4416dfeaf0746730a0e16 Mon Sep 17 00:00:00 2001 From: Ollie Hyde Date: Mon, 28 Sep 2026 08:57:28 +0100 Subject: [PATCH 4/6] Add comment, remove commented out code, change copy, set temporality --- src/components/Cards/CreateWiki.vue | 3 +++ .../Cards/SubmitCreateWikiWizardStep.vue | 17 ++--------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/components/Cards/CreateWiki.vue b/src/components/Cards/CreateWiki.vue index 05a30fd9..086ea668 100644 --- a/src/components/Cards/CreateWiki.vue +++ b/src/components/Cards/CreateWiki.vue @@ -118,6 +118,9 @@ export default { ...(this.stepTwo.otherPurpose && { purpose_other: this.stepTwo.otherPurpose }), ...(this.stepTwo.audience && { audience: this.stepTwo.audience }), ...(this.stepTwo.otherAudience && { audience_other: this.stepTwo.otherAudience }), + // need to set this for now otherwise temporality defaults to 'permanent' + temporality: 'other', + temporality_other: 'T433687', } const requestBody = { diff --git a/src/components/Cards/SubmitCreateWikiWizardStep.vue b/src/components/Cards/SubmitCreateWikiWizardStep.vue index d631bab3..48e6856b 100644 --- a/src/components/Cards/SubmitCreateWikiWizardStep.vue +++ b/src/components/Cards/SubmitCreateWikiWizardStep.vue @@ -7,20 +7,6 @@ - - - - - - - -
This Wikibase will go offline on {{ suspensionDate }}
@@ -28,7 +14,7 @@

All Wikibases on our platform are temporary by default.

-

Once you're confident you want to keep this Wikibase for more than 3 months, submit it for review.

+

Once you're confident you want to keep this Wikibase longer, submit it for review.

Some uses can't be approved for a longer stay - for example, primarily commercial or promotional projects, or content under non-free licenses. To make sure your use case qualifies, check the @@ -80,6 +66,7 @@ export default { computed: { suspensionDate () { const date = new Date() + // TODO: don't hard-code the temporary wiki duration of 91 days here date.setDate(date.getDate() + 91) return date.toLocaleDateString( From cd73407c26afb57935037f013a45659ee3ad6131 Mon Sep 17 00:00:00 2001 From: Ollie Hyde Date: Mon, 28 Sep 2026 12:18:05 +0100 Subject: [PATCH 5/6] Remove the "Intended use" section from the Manage Wiki Profile tab Bug: T433687 --- .../Cards/TemporalityCreateWikiWizardStep.vue | 181 ----------- .../Pages/ManageWiki/Cards/Profile.vue | 285 ------------------ .../TemporalityProfileEditWizardStep.vue | 134 -------- .../Pages/ManageWiki/Tabs/ManageProfile.vue | 7 - 4 files changed, 607 deletions(-) delete mode 100644 src/components/Cards/TemporalityCreateWikiWizardStep.vue delete mode 100644 src/components/Pages/ManageWiki/Cards/Profile.vue delete mode 100644 src/components/Pages/ManageWiki/Cards/TemporalityProfileEditWizardStep.vue diff --git a/src/components/Cards/TemporalityCreateWikiWizardStep.vue b/src/components/Cards/TemporalityCreateWikiWizardStep.vue deleted file mode 100644 index afeae6f0..00000000 --- a/src/components/Cards/TemporalityCreateWikiWizardStep.vue +++ /dev/null @@ -1,181 +0,0 @@ - - - - - diff --git a/src/components/Pages/ManageWiki/Cards/Profile.vue b/src/components/Pages/ManageWiki/Cards/Profile.vue deleted file mode 100644 index 65de2824..00000000 --- a/src/components/Pages/ManageWiki/Cards/Profile.vue +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - diff --git a/src/components/Pages/ManageWiki/Cards/TemporalityProfileEditWizardStep.vue b/src/components/Pages/ManageWiki/Cards/TemporalityProfileEditWizardStep.vue deleted file mode 100644 index 65e8b308..00000000 --- a/src/components/Pages/ManageWiki/Cards/TemporalityProfileEditWizardStep.vue +++ /dev/null @@ -1,134 +0,0 @@ - - - - - diff --git a/src/components/Pages/ManageWiki/Tabs/ManageProfile.vue b/src/components/Pages/ManageWiki/Tabs/ManageProfile.vue index 43f540c9..d1c70278 100644 --- a/src/components/Pages/ManageWiki/Tabs/ManageProfile.vue +++ b/src/components/Pages/ManageWiki/Tabs/ManageProfile.vue @@ -6,24 +6,17 @@

- - - - -