From a3b163d10da5a64339b166806a4355763f5518eb Mon Sep 17 00:00:00 2001 From: "l1.media" <31551045+traumschule@users.noreply.github.com> Date: Wed, 24 May 2023 18:06:47 +0100 Subject: [PATCH 1/3] Remove unused proposal types (#4390) --- packages/ui/src/proposals/model/proposalDescriptions.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/ui/src/proposals/model/proposalDescriptions.ts b/packages/ui/src/proposals/model/proposalDescriptions.ts index 8c4bae5902..7669e9922b 100644 --- a/packages/ui/src/proposals/model/proposalDescriptions.ts +++ b/packages/ui/src/proposals/model/proposalDescriptions.ts @@ -18,7 +18,6 @@ export const proposalDescriptions: ProposalDescriptions = { setWorkingGroupLeadReward: 'Same effect as updating the reward of the worker.', terminateWorkingGroupLead: 'Same as when terminating a worker in group with given inputs, and removing lead designation.', - amendConstitution: 'Proposal to amend constitution. Does not effect platform parameters.', cancelWorkingGroupLeadOpening: 'Same as when cancelling an opening for workers in the given group with given inputs.', setMembershipPrice: 'Sets new membership price.', setCouncilBudgetIncrement: @@ -36,9 +35,5 @@ export const proposalDescriptions: ProposalDescriptions = { updateChannelPayouts: 'Proposal to submit the Channel Incentives Payout payload, update the min/max claimable amounts and block/allow claiming of awarded JOYs by channels.', runtimeUpgrade: 'Proposal to upgrade version to the new runtime.', - createBlogPost: 'Council blog', - editBlogPost: 'Unlocked blog post can be edited.', - lockBlogPost: 'When a post is locked it can no longer be modified.', - unlockBlogPost: 'Unlocked post can be modified.', - veto: 'Veto for a particular, previously issued proposal. Vetoed proposal is automatically discarded.', + //veto: 'Veto for a particular, previously issued proposal. Vetoed proposal is automatically discarded.', } From 2a33c0d6efbbf6751c5360f44e10d79b0e533911 Mon Sep 17 00:00:00 2001 From: "l1.media" <31551045+traumschule@users.noreply.github.com> Date: Thu, 1 Jun 2023 12:09:44 +0100 Subject: [PATCH 2/3] Drop unused proposal types --- packages/ui/src/proposals/types/proposals.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/ui/src/proposals/types/proposals.ts b/packages/ui/src/proposals/types/proposals.ts index 9f80843397..7a4c290e50 100644 --- a/packages/ui/src/proposals/types/proposals.ts +++ b/packages/ui/src/proposals/types/proposals.ts @@ -46,7 +46,6 @@ export type ProposalType = | 'slashWorkingGroupLead' | 'setWorkingGroupLeadReward' | 'terminateWorkingGroupLead' - | 'amendConstitution' | 'cancelWorkingGroupLeadOpening' | 'setMembershipPrice' | 'setCouncilBudgetIncrement' @@ -55,11 +54,7 @@ export type ProposalType = | 'setInitialInvitationCount' | 'setMembershipLeadInvitationQuota' | 'setReferralCut' - | 'createBlogPost' - | 'editBlogPost' - | 'lockBlogPost' | 'unlockBlogPost' - | 'veto' | 'updateChannelPayouts' ) From 72c0a3078507750f775d8a829d8d3a7b24e7c7bc Mon Sep 17 00:00:00 2001 From: Joystream Stats Date: Sat, 17 Jun 2023 05:03:31 +0000 Subject: [PATCH 3/3] restore veto; type fixes --- packages/ui/src/proposals/hooks/useProposalConstants.ts | 1 - packages/ui/src/proposals/model/proposalDescriptions.ts | 2 +- packages/ui/src/proposals/model/proposalDetails.ts | 1 - packages/ui/src/proposals/types/proposals.ts | 4 ++-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/ui/src/proposals/hooks/useProposalConstants.ts b/packages/ui/src/proposals/hooks/useProposalConstants.ts index 903368d927..736ec7bc78 100644 --- a/packages/ui/src/proposals/hooks/useProposalConstants.ts +++ b/packages/ui/src/proposals/hooks/useProposalConstants.ts @@ -36,7 +36,6 @@ const extendsProposalPallet = ( const proposalTypeToConstantKey = new Map([ ['updateChannelPayouts', 'updateChannelPayoutsProposalParameters'], - ['amendConstitution', 'amendConstitutionProposalParameters'], ['cancelWorkingGroupLeadOpening', 'cancelWorkingGroupLeadOpeningProposalParameters'], ['createWorkingGroupLeadOpening', 'createWorkingGroupLeadOpeningProposalParameters'], ['decreaseWorkingGroupLeadStake', 'decreaseWorkingGroupLeadStakeProposalParameters'], diff --git a/packages/ui/src/proposals/model/proposalDescriptions.ts b/packages/ui/src/proposals/model/proposalDescriptions.ts index 7669e9922b..a56297a265 100644 --- a/packages/ui/src/proposals/model/proposalDescriptions.ts +++ b/packages/ui/src/proposals/model/proposalDescriptions.ts @@ -35,5 +35,5 @@ export const proposalDescriptions: ProposalDescriptions = { updateChannelPayouts: 'Proposal to submit the Channel Incentives Payout payload, update the min/max claimable amounts and block/allow claiming of awarded JOYs by channels.', runtimeUpgrade: 'Proposal to upgrade version to the new runtime.', - //veto: 'Veto for a particular, previously issued proposal. Vetoed proposal is automatically discarded.', + veto: 'Veto for a particular, previously issued proposal. Vetoed proposal is automatically discarded.', } diff --git a/packages/ui/src/proposals/model/proposalDetails.ts b/packages/ui/src/proposals/model/proposalDetails.ts index 8a19600e14..4daf6c4585 100644 --- a/packages/ui/src/proposals/model/proposalDetails.ts +++ b/packages/ui/src/proposals/model/proposalDetails.ts @@ -13,7 +13,6 @@ export const proposalDetails: ProposalType[] = [ 'slashWorkingGroupLead', 'setWorkingGroupLeadReward', 'terminateWorkingGroupLead', - 'amendConstitution', 'cancelWorkingGroupLeadOpening', 'setMembershipPrice', 'setCouncilBudgetIncrement', diff --git a/packages/ui/src/proposals/types/proposals.ts b/packages/ui/src/proposals/types/proposals.ts index 7a4c290e50..9d72b045e8 100644 --- a/packages/ui/src/proposals/types/proposals.ts +++ b/packages/ui/src/proposals/types/proposals.ts @@ -54,11 +54,11 @@ export type ProposalType = | 'setInitialInvitationCount' | 'setMembershipLeadInvitationQuota' | 'setReferralCut' - | 'unlockBlogPost' + | 'veto' | 'updateChannelPayouts' ) -export type DisabledProposal = 'createBlogPost' | 'editBlogPost' | 'lockBlogPost' | 'unlockBlogPost' +export type DisabledProposal = 'veto' export interface Proposal { id: string