From dff58ed8cfa8d8297516a635532de35148a67c41 Mon Sep 17 00:00:00 2001 From: Max Strasinsky Date: Tue, 26 Mar 2024 13:28:52 +0100 Subject: [PATCH] remove createIsActionableProposalStore --- .../derived/actionable-proposals.derived.ts | 34 -------- .../actionable-proposals.derived.spec.ts | 79 +------------------ 2 files changed, 1 insertion(+), 112 deletions(-) diff --git a/frontend/src/lib/derived/actionable-proposals.derived.ts b/frontend/src/lib/derived/actionable-proposals.derived.ts index c2d44bba9ab..fa84a9e6b85 100644 --- a/frontend/src/lib/derived/actionable-proposals.derived.ts +++ b/frontend/src/lib/derived/actionable-proposals.derived.ts @@ -2,14 +2,10 @@ import { OWN_CANISTER_ID_TEXT } from "$lib/constants/canister-ids.constants"; import { AppPath } from "$lib/constants/routes.constants"; import { authSignedInStore } from "$lib/derived/auth.derived"; import { pageStore } from "$lib/derived/page.derived"; -import { selectedUniverseIdStore } from "$lib/derived/selected-universe.derived"; import { actionableNnsProposalsStore } from "$lib/stores/actionable-nns-proposals.store"; import { actionableSnsProposalsStore } from "$lib/stores/actionable-sns-proposals.store"; import { isSelectedPath } from "$lib/utils/navigation.utils"; -import { snsProposalId } from "$lib/utils/sns-proposals.utils"; -import { isUniverseNns } from "$lib/utils/universe.utils"; import { mapEntries } from "$lib/utils/utils"; -import { isNullish } from "@dfinity/utils"; import { derived, type Readable } from "svelte/store"; export interface ActionableProposalCountData { @@ -62,33 +58,3 @@ export const actionableProposalSupportedStore: Readable - derived( - [ - selectedUniverseIdStore, - actionableNnsProposalsStore, - actionableSnsProposalsStore, - ], - ([selectedUniverseId, actionableNnsProposals, actionableSnsProposals]) => - isNullish(proposalId) - ? // undefined proposalId - undefined - : isUniverseNns(selectedUniverseId) - ? // nns proposalId - actionableNnsProposals.proposals?.some(({ id }) => id === proposalId) - : // sns proposalId - actionableSnsProposals[selectedUniverseId.toText()]?.proposals?.some( - (proposal) => snsProposalId(proposal) === proposalId - ) - ); diff --git a/frontend/src/tests/lib/derived/actionable-proposals.derived.spec.ts b/frontend/src/tests/lib/derived/actionable-proposals.derived.spec.ts index 807be26916e..6648a1f5d39 100644 --- a/frontend/src/tests/lib/derived/actionable-proposals.derived.spec.ts +++ b/frontend/src/tests/lib/derived/actionable-proposals.derived.spec.ts @@ -4,7 +4,6 @@ import { actionableProposalCountStore, actionableProposalIndicationEnabledStore, actionableProposalSupportedStore, - createIsActionableProposalStore, } from "$lib/derived/actionable-proposals.derived"; import { actionableNnsProposalsStore } from "$lib/stores/actionable-nns-proposals.store"; import { actionableSnsProposalsStore } from "$lib/stores/actionable-sns-proposals.store"; @@ -12,14 +11,8 @@ import { page } from "$mocks/$app/stores"; import { resetIdentity, setNoIdentity } from "$tests/mocks/auth.store.mock"; import { mockProposalInfo } from "$tests/mocks/proposal.mock"; import { principal } from "$tests/mocks/sns-projects.mock"; -import { - createSnsProposal, - mockSnsProposal, -} from "$tests/mocks/sns-proposals.mock"; -import { mockSnsCanisterIdText } from "$tests/mocks/sns.api.mock"; +import { mockSnsProposal } from "$tests/mocks/sns-proposals.mock"; import type { ProposalInfo } from "@dfinity/nns"; -import { Principal } from "@dfinity/principal"; -import { SnsProposalDecisionStatus } from "@dfinity/sns"; import { get } from "svelte/store"; describe("actionable proposals derived stores", () => { @@ -155,74 +148,4 @@ describe("actionable proposals derived stores", () => { }); }); }); - - describe("createIsActionableProposalStore", () => { - const nnsProposal0: ProposalInfo = { - ...mockProposalInfo, - id: 0n, - }; - const nnsProposal1: ProposalInfo = { - ...mockProposalInfo, - id: 1n, - }; - const snsProposal0 = createSnsProposal({ - proposalId: 0n, - status: SnsProposalDecisionStatus.PROPOSAL_DECISION_STATUS_OPEN, - }); - const snsProposal1 = createSnsProposal({ - proposalId: 1n, - status: SnsProposalDecisionStatus.PROPOSAL_DECISION_STATUS_OPEN, - }); - - beforeEach(() => { - page.reset(); - actionableNnsProposalsStore.reset(); - actionableSnsProposalsStore.resetForTesting(); - }); - - it("returns actionable state for nns proposal", async () => { - const isActionableProposalStore = createIsActionableProposalStore(1n); - // no nns proposals - expect(get(isActionableProposalStore)).toBe(undefined); - - actionableNnsProposalsStore.setProposals([nnsProposal0]); - expect(get(isActionableProposalStore)).toBe(false); - - actionableNnsProposalsStore.setProposals([nnsProposal0, nnsProposal1]); - expect(get(isActionableProposalStore)).toBe(true); - - // selected project contains no data - page.mock({ data: { universe: mockSnsCanisterIdText } }); - expect(get(isActionableProposalStore)).toBe(undefined); - }); - - it("returns actionable state for sns proposal", async () => { - const isActionableProposalStore = createIsActionableProposalStore(1n); - expect(get(isActionableProposalStore)).toBe(undefined); - - actionableSnsProposalsStore.set({ - rootCanisterId: Principal.fromText(mockSnsCanisterIdText), - proposals: [snsProposal0, snsProposal1], - includeBallotsByCaller: true, - }); - // selected project contains no data - expect(get(isActionableProposalStore)).toBe(undefined); - - page.mock({ data: { universe: mockSnsCanisterIdText } }); - expect(get(isActionableProposalStore)).toBe(true); - - actionableSnsProposalsStore.set({ - rootCanisterId: Principal.fromText(mockSnsCanisterIdText), - proposals: [snsProposal0], - includeBallotsByCaller: true, - }); - expect(get(isActionableProposalStore)).toBe(false); - }); - - it("returns undefined when proposal id equals undefined", async () => { - const isActionableProposalStore = - createIsActionableProposalStore(undefined); - expect(get(isActionableProposalStore)).toBe(undefined); - }); - }); });