Skip to content
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

Jump to bottom

Merge nara into dev #4799

Merged
merged 10 commits into from
Mar 13, 2024
Merged

Merge nara into dev #4799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0a7a13d
🆙 Uprade `@joystream/types` to `4.1.0` (#4552)
thesan Nov 6, 2023
68fb187
Freeze pallet proposal creation (#4625)
vrrayz Nov 14, 2023
4af43dc
Preview freeze pallet proposal (#4627)
vrrayz Nov 14, 2023
63ace20
Create freeze pallet proposal design followup (#4632)
vrrayz Nov 15, 2023
04cf9a8
Merge branch 'dev' of github.com:Joystream/pioneer into nara
thesan Feb 6, 2024
f399117
🔧 Fix freeze pallet proposal (#4763)
thesan Feb 6, 2024
3a494a8
Merge branch 'dev' of github.com:Joystream/pioneer into nara
thesan Mar 12, 2024
8dc136b
Fix failing test
thesan Mar 12, 2024
5d62726
Fix proposal creation tests
thesan Mar 13, 2024
577afc9
Update the QN schema
thesan Mar 12, 2024
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
18,946 changes: 9,756 additions & 9,190 deletions packages/server/src/common/queries/schema.graphql
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@joystream/js": "1.2.0",
"@joystream/markdown-editor": "^0.1.0",
"@joystream/metadata-protobuf": "^2.10.0",
"@joystream/types": "^2.0.0",
"@joystream/types": "4.2.0",
"@nivo/bar": "^0.79.1",
"@nivo/core": "^0.79.0",
"@noble/hashes": "^1.1.5",
Expand Down
84 changes: 58 additions & 26 deletions packages/ui/src/app/pages/Proposals/CurrentProposals.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ type Args = {
onCreateProposal: jest.Mock
onChangeThreadMode: jest.Mock
onVote: jest.Mock
palletFrozen: boolean
}
type Story = StoryObj<FC<Args>>

Expand All @@ -91,6 +92,7 @@ export default {
args: {
isCouncilMember: false,
proposalCount: 15,
palletFrozen: false,
},

parameters: {
Expand All @@ -106,7 +108,7 @@ export default {

stakingAccountIdMemberStatus: {
memberId: 0,
confirmed: { isTrue: true },
confirmed: true,
size: 1,
},

Expand Down Expand Up @@ -164,6 +166,9 @@ export default {
members: {
stakingAccountIdMemberStatus: parameters.stakingAccountIdMemberStatus,
},
projectToken: {
palletFrozen: args.palletFrozen,
},
},
tx: {
proposalsEngine: {
Expand Down Expand Up @@ -293,7 +298,7 @@ export const AddNewProposalHappy: Story = {

stakingAccountIdMemberStatus: {
memberId: 0,
confirmed: { isTrue: false },
confirmed: false,
size: 0,
},
},
Expand Down Expand Up @@ -473,7 +478,7 @@ export const AddNewProposalHappy: Story = {
expect(await waitForModal(modal, 'Success'))
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
expect(args.onAddStakingAccountCandidate).toHaveBeenCalledWith(alice.controllerAccount, alice.id)

expect(args.onConfirmStakingAccount).toHaveBeenCalledWith(
Expand Down Expand Up @@ -578,7 +583,7 @@ export const BindAccountFailure: Story = {
parameters: {
stakingAccountIdMemberStatus: {
memberId: 0,
confirmed: { isTrue: false },
confirmed: false,
size: 0,
},
addStakingAccountCandidateFailure: 'It failed 🙀',
Expand All @@ -603,7 +608,7 @@ export const BindAccountThenCreateProposalFailure: Story = {
parameters: {
stakingAccountIdMemberStatus: {
memberId: 0,
confirmed: { isTrue: false },
confirmed: false,
size: 0,
},
createProposalFailure: 'It failed 🙀',
Expand All @@ -629,7 +634,7 @@ export const ConfirmAccountThenCreateProposalFailure: Story = {
parameters: {
stakingAccountIdMemberStatus: {
memberId: 0,
confirmed: { isTrue: false },
confirmed: false,
size: 1,
},
createProposalFailure: 'It failed 🙀',
Expand Down Expand Up @@ -752,7 +757,7 @@ export const SpecificParametersSignal: Story = {
expect(nextButton).toBeEnabled()
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toHuman()).toEqual({ Signal: 'Lorem ipsum...' })
})
Expand Down Expand Up @@ -780,7 +785,7 @@ export const SpecificParametersFundingRequest: Story = {
await waitFor(() => expect(modal.queryByText(/Maximal amount allowed is \d+/)).toBeNull())
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({
fundingRequest: [{ account: alice.controllerAccount, amount: 100_0000000000 }],
Expand Down Expand Up @@ -870,7 +875,7 @@ export const SpecificParametersMultipleFundingRequest: Story = {
await userEvent.click(modal.getByTestId('sidePanel-overlay'))
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({
fundingRequest: [
Expand Down Expand Up @@ -907,7 +912,7 @@ export const SpecificParametersSetReferralCut: Story = {
userEvent.click(modal.getByText(EXECUTION_WARNING_BOX))
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({ setReferralCut: 100 })
})
Expand Down Expand Up @@ -954,7 +959,7 @@ export const SpecificParametersDecreaseWorkingGroupLeadStake: Story = {
expect(amountField).toHaveValue('500')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const leaderId = 10 // Set on the mock QN query
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({
Expand Down Expand Up @@ -992,7 +997,7 @@ export const SpecificParametersTerminateWorkingGroupLead: Story = {
userEvent.type(amountField, '2000')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const leaderId = 10 // Set on the mock QN query
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({
Expand Down Expand Up @@ -1058,7 +1063,7 @@ export const SpecificParametersCreateWorkingGroupLeadOpening: Story = {
await userEvent.type(modal.getByLabelText('Reward amount per Block'), '0.1')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
const { description, ...data } = specificParameters.asCreateWorkingGroupLeadOpening.toJSON()

Expand Down Expand Up @@ -1123,7 +1128,7 @@ export const SpecificParametersSetWorkingGroupLeadReward: Story = {
await userEvent.type(amountField, '10')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const leaderId = 10 // Set on the mock QN query
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({
Expand Down Expand Up @@ -1160,7 +1165,7 @@ export const SpecificParametersSetMaxValidatorCount: Story = {
await userEvent.type(amountField, '10')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({ setMaxValidatorCount: 10 })
})
Expand All @@ -1180,7 +1185,7 @@ export const SpecificParametersCancelWorkingGroupLeadOpening: Story = {
userEvent.click(body.getByText('Hire Storage Working Group Lead'))
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({ cancelWorkingGroupLeadOpening: [12, 'Storage'] })
})
Expand Down Expand Up @@ -1213,7 +1218,7 @@ export const SpecificParametersSetCouncilBudgetIncrement: Story = {
await userEvent.type(amountField, '500')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({ setCouncilBudgetIncrement: 500_0000000000 })
})
Expand All @@ -1240,7 +1245,7 @@ export const SpecificParametersSetCouncilorReward: Story = {
await userEvent.type(amountField, '10')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({ setCouncilorReward: 10_0000000000 })
})
Expand Down Expand Up @@ -1277,7 +1282,7 @@ export const SpecificParametersSetMembershipLeadInvitationQuota: Story = {
await userEvent.type(amountField, '3')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({ setMembershipLeadInvitationQuota: 3 })
})
Expand Down Expand Up @@ -1315,7 +1320,7 @@ export const SpecificParametersFillWorkingGroupLeadOpening: Story = {
expect(modal.getByText('Bar'))
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({
fillWorkingGroupLeadOpening: {
Expand Down Expand Up @@ -1356,7 +1361,7 @@ export const SpecificParametersSetInitialInvitationCount: Story = {
await userEvent.type(countField, '7')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({ setInitialInvitationCount: 7 })
})
Expand Down Expand Up @@ -1386,7 +1391,7 @@ export const SpecificParametersSetInitialInvitationBalance: Story = {
await userEvent.type(amountField, '7')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({ setInitialInvitationBalance: 7_0000000000 })
})
Expand All @@ -1411,13 +1416,40 @@ export const SpecificParametersSetMembershipPrice: Story = {
await userEvent.type(amountField, '8')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({ setMembershipPrice: 8_0000000000 })
})
}),
}

export const SpecificParametersUpdatePalletFrozenStatus: Story = {
play: specificParametersTest('Update Pallet Frozen Status', async ({ args, createProposal, modal, step }) => {
await createProposal(async () => {
const nextButton = getButtonByText(modal, 'Create proposal')

await userEvent.click(modal.getByText('Enable'))
expect(
await modal.findByText(
/The ProjectToken pallet is currently enabled, so presently this proposal would fail due to execution constraints./
)
)
expect(await modal.findByText(/Warning/))
expect(nextButton).toBeDisabled()

await userEvent.click(modal.getByText('Disable'))
await waitFor(() => expect(nextButton).toBeEnabled())
})

await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({
setPalletFozenStatus: [true, 'ProjectToken'],
})
})
}),
}

export const SpecificParametersUpdateWorkingGroupBudget: Story = {
parameters: {
councilSize: 3,
Expand Down Expand Up @@ -1470,7 +1502,7 @@ export const SpecificParametersUpdateWorkingGroupBudget: Story = {
await userEvent.type(amountField, '99')
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({
updateWorkingGroupBudget: [99_0000000000, 'Forum', 'Negative'],
Expand Down Expand Up @@ -1505,9 +1537,9 @@ export const SpecificParametersRuntimeUpgrade: Story = {
expect(within(confirmation).getByText('valid.wasm'))
})

step('Transaction parameters', () => {
await step('Transaction parameters', () => {
const [, , specificParameters] = args.onCreateProposal.mock.calls.at(-1)
expect(specificParameters.toJSON()).toEqual({ runtimeUpgrade: '0x' })
expect(specificParameters.toJSON()).toEqual({ runtimeUpgrade: '0x00' })
})
}),
}
3 changes: 3 additions & 0 deletions packages/ui/src/app/pages/Proposals/ProposalPreview.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@ export const TerminateWorkingGroupLead: Story = {
export const UpdateChannelPayouts: Story = {
args: { type: 'UpdateChannelPayoutsProposalDetails' },
}
export const UpdatePalletFrozenStatus: Story = {
args: { type: 'UpdatePalletFrozenStatusProposalDetails' },
}
export const UpdateWorkingGroupBudget: Story = {
args: { type: 'UpdateWorkingGroupBudgetProposalDetails' },
}
Expand Down
Loading
Loading