From aea293fa7766782fc231f4637a2c46542bc79be2 Mon Sep 17 00:00:00 2001 From: "l1.media" <31551045+traumschule@users.noreply.github.com> Date: Mon, 19 Dec 2022 09:24:45 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20Fix/lint=20(#3988)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lint * drop unused Co-authored-by: Joystream Stats --- .../ui/src/council/hooks/useCouncilRemainingPeriod.ts | 2 +- packages/ui/src/forum/components/ForumPageHeader.tsx | 1 - packages/ui/src/forum/components/category/LatestPost.tsx | 3 +-- .../ui/src/forum/components/category/PopularThread.tsx | 3 +-- packages/ui/src/forum/queries/forum.graphql | 2 +- .../components/MemberProfile/MemberRoleToggle.tsx | 2 +- .../ui/src/working-groups/queries/workingGroups.graphql | 6 +++++- packages/ui/test/_mocks/transactions.ts | 8 ++++---- packages/ui/test/bounty/modals/AddBountyModal.test.tsx | 2 -- .../ui/test/bounty/modals/SubmitJudgementModal.test.tsx | 2 -- .../ui/test/membership/modals/BuyMembershipModal.test.tsx | 2 -- .../ui/test/membership/modals/InviteMemberModal.test.tsx | 2 -- .../working-groups/modals/ChangeAccountModal.test.tsx | 2 -- .../ui/test/working-groups/modals/LeaveRoleModal.test.tsx | 2 -- 14 files changed, 14 insertions(+), 25 deletions(-) diff --git a/packages/ui/src/council/hooks/useCouncilRemainingPeriod.ts b/packages/ui/src/council/hooks/useCouncilRemainingPeriod.ts index f61bbf4cc9..df5a588748 100644 --- a/packages/ui/src/council/hooks/useCouncilRemainingPeriod.ts +++ b/packages/ui/src/council/hooks/useCouncilRemainingPeriod.ts @@ -1,5 +1,5 @@ import { sum } from 'lodash' -import { map, combineLatest, concatMap, EMPTY, merge, Observable, of } from 'rxjs' +import { map, combineLatest } from 'rxjs' import { useApi } from '@/api/hooks/useApi' import { useObservable } from '@/common/hooks/useObservable' diff --git a/packages/ui/src/forum/components/ForumPageHeader.tsx b/packages/ui/src/forum/components/ForumPageHeader.tsx index 0607e5662f..0bf4dce1ad 100644 --- a/packages/ui/src/forum/components/ForumPageHeader.tsx +++ b/packages/ui/src/forum/components/ForumPageHeader.tsx @@ -3,7 +3,6 @@ import React, { useState } from 'react' import { PageHeaderRow, PageHeaderWrapper } from '@/app/components/PageLayout' import { ButtonsGroup } from '@/common/components/buttons' import { SearchBox } from '@/common/components/forms/FilterBox/FilterSearchBox' -import { TextMedium } from '@/common/components/typography' import { useModal } from '@/common/hooks/useModal' interface ForumPageHeaderProps { diff --git a/packages/ui/src/forum/components/category/LatestPost.tsx b/packages/ui/src/forum/components/category/LatestPost.tsx index e2497135a6..85d157cdf0 100644 --- a/packages/ui/src/forum/components/category/LatestPost.tsx +++ b/packages/ui/src/forum/components/category/LatestPost.tsx @@ -2,7 +2,6 @@ import React, { memo } from 'react' import { generatePath } from 'react-router-dom' import styled from 'styled-components' -import { Loading } from '@/common/components/Loading' import { GhostRouterLink } from '@/common/components/RouterLink' import { TextInlineExtraSmall, TextMedium } from '@/common/components/typography' import { Colors, Fonts, Overflow, Transitions } from '@/common/constants' @@ -14,7 +13,7 @@ import { MemberInfo } from '@/memberships/components' import { CategoryItemFieldProps } from './CategoryListItem' export const LatestPost = memo(({ categoryId }: CategoryItemFieldProps) => { - const { post, thread, isLoading } = useCategoryLatestPost(categoryId) + const { post, thread } = useCategoryLatestPost(categoryId) if (!post) return - diff --git a/packages/ui/src/forum/components/category/PopularThread.tsx b/packages/ui/src/forum/components/category/PopularThread.tsx index b79b85cfd6..87297b1500 100644 --- a/packages/ui/src/forum/components/category/PopularThread.tsx +++ b/packages/ui/src/forum/components/category/PopularThread.tsx @@ -2,7 +2,6 @@ import React, { memo } from 'react' import { generatePath } from 'react-router-dom' import styled from 'styled-components' -import { Loading } from '@/common/components/Loading' import { GhostRouterLink } from '@/common/components/RouterLink' import { TextExtraSmall, TextMedium } from '@/common/components/typography' import { Overflow, Fonts, Transitions, Colors } from '@/common/constants' @@ -14,7 +13,7 @@ import { useForumPopularThreads } from '@/forum/hooks/useForumPopularThreads' import { CategoryItemFieldProps } from './CategoryListItem' export const PopularThread = memo(({ categoryId }: CategoryItemFieldProps) => { - const { isLoading, threads } = useForumPopularThreads({ categoryId }) + const { threads } = useForumPopularThreads({ categoryId }) if (!threads?.[0]) return - diff --git a/packages/ui/src/forum/queries/forum.graphql b/packages/ui/src/forum/queries/forum.graphql index f4b17ebe7f..671abfbbc6 100644 --- a/packages/ui/src/forum/queries/forum.graphql +++ b/packages/ui/src/forum/queries/forum.graphql @@ -164,7 +164,7 @@ fragment ForumPostWithoutReplyFields on ForumPost { } threadId thread { - categoryId + categoryId } } diff --git a/packages/ui/src/memberships/components/MemberProfile/MemberRoleToggle.tsx b/packages/ui/src/memberships/components/MemberProfile/MemberRoleToggle.tsx index 7528874aa5..bae136f73a 100644 --- a/packages/ui/src/memberships/components/MemberProfile/MemberRoleToggle.tsx +++ b/packages/ui/src/memberships/components/MemberProfile/MemberRoleToggle.tsx @@ -32,7 +32,7 @@ export const MemberRoleToggle = ({ role }: MemberRoleToggleProps) => { data: { applicationId: role.applicationId }, }) }, [role]) - const { earnings, currentDayEarnings } = useWorkerEarnings(role.id) + const { earnings } = useWorkerEarnings(role.id) const rewardPeriod = useRewardPeriod(role.group.id) const [isOpen, toggleOpen] = useToggle() diff --git a/packages/ui/src/working-groups/queries/workingGroups.graphql b/packages/ui/src/working-groups/queries/workingGroups.graphql index 80cbfd5d1f..377fef292e 100644 --- a/packages/ui/src/working-groups/queries/workingGroups.graphql +++ b/packages/ui/src/working-groups/queries/workingGroups.graphql @@ -384,7 +384,11 @@ fragment WorkingGroupApplicationFields on WorkingGroupApplication { roleAccount } -query GetWorkingGroupApplications($where: WorkingGroupApplicationWhereInput, $orderBy: [WorkingGroupApplicationOrderByInput!], $limit: Int) { +query GetWorkingGroupApplications( + $where: WorkingGroupApplicationWhereInput + $orderBy: [WorkingGroupApplicationOrderByInput!] + $limit: Int +) { workingGroupApplications(where: $where, orderBy: $orderBy, limit: $limit) { ...WorkingGroupApplicationFields } diff --git a/packages/ui/test/_mocks/transactions.ts b/packages/ui/test/_mocks/transactions.ts index 69a6361f29..89ce321f4d 100644 --- a/packages/ui/test/_mocks/transactions.ts +++ b/packages/ui/test/_mocks/transactions.ts @@ -153,9 +153,9 @@ export const stubConst = (api: UseApi, constSubPath: string, value: T) => { export const stubApi = () => { const api: UseApi = { - api: ({ + api: { isConnected: true, - } as unknown) as Api, + } as unknown as Api, isConnected: true, connectionState: 'connected', setQnConnectionState: () => undefined, @@ -267,7 +267,7 @@ export const stubBalances = ({ available, lockId, locked }: Balances) => { const availableBalance = new BN(available ?? 0) const lockedBalance = new BN(locked ?? 0) - const deriveBalances = ({ + const deriveBalances = { availableBalance: createType('Balance', availableBalance), lockedBalance: createType('Balance', lockedBalance), accountId: createType('AccountId', '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY'), @@ -286,7 +286,7 @@ export const stubBalances = ({ available, lockId, locked }: Balances) => { vestingTotal: new BN(0), votingBalance: new BN(0), vesting: [], - } as unknown) as DeriveBalancesAll + } as unknown as DeriveBalancesAll const balance = toBalances(deriveBalances) mockedBalances.mockReturnValue(balance) diff --git a/packages/ui/test/bounty/modals/AddBountyModal.test.tsx b/packages/ui/test/bounty/modals/AddBountyModal.test.tsx index 27d9820804..24792ee409 100644 --- a/packages/ui/test/bounty/modals/AddBountyModal.test.tsx +++ b/packages/ui/test/bounty/modals/AddBountyModal.test.tsx @@ -45,8 +45,6 @@ jest.mock('@/common/hooks/useCurrentBlockNumber', () => ({ useCurrentBlockNumber: () => mockUseCurrentBlockNumber(), })) - - describe('UI: AddNewBountyModal', () => { const api = stubApi() const showModal = jest.fn() diff --git a/packages/ui/test/bounty/modals/SubmitJudgementModal.test.tsx b/packages/ui/test/bounty/modals/SubmitJudgementModal.test.tsx index dcdb351365..2d331b85e8 100644 --- a/packages/ui/test/bounty/modals/SubmitJudgementModal.test.tsx +++ b/packages/ui/test/bounty/modals/SubmitJudgementModal.test.tsx @@ -33,8 +33,6 @@ import { configure({ testIdAttribute: 'id' }) - - jest.mock('@/common/components/CKEditor', () => ({ CKEditor: (props: CKEditorProps) => mockCKEditor(props), })) diff --git a/packages/ui/test/membership/modals/BuyMembershipModal.test.tsx b/packages/ui/test/membership/modals/BuyMembershipModal.test.tsx index 6287c7570d..be398ff4cd 100644 --- a/packages/ui/test/membership/modals/BuyMembershipModal.test.tsx +++ b/packages/ui/test/membership/modals/BuyMembershipModal.test.tsx @@ -31,8 +31,6 @@ import { mockUseModalCall } from '../../setup' configure({ testIdAttribute: 'id' }) - - describe('UI: BuyMembershipModal', () => { const api = stubApi() let transaction: any diff --git a/packages/ui/test/membership/modals/InviteMemberModal.test.tsx b/packages/ui/test/membership/modals/InviteMemberModal.test.tsx index 65021e93ff..4bdb749cdb 100644 --- a/packages/ui/test/membership/modals/InviteMemberModal.test.tsx +++ b/packages/ui/test/membership/modals/InviteMemberModal.test.tsx @@ -31,8 +31,6 @@ import { configure({ testIdAttribute: 'id' }) - - describe('UI: InviteMemberModal', () => { beforeAll(async () => { await cryptoWaitReady() diff --git a/packages/ui/test/working-groups/modals/ChangeAccountModal.test.tsx b/packages/ui/test/working-groups/modals/ChangeAccountModal.test.tsx index 79ac7e61a3..aab4a70c22 100644 --- a/packages/ui/test/working-groups/modals/ChangeAccountModal.test.tsx +++ b/packages/ui/test/working-groups/modals/ChangeAccountModal.test.tsx @@ -34,8 +34,6 @@ import { import { WORKER as worker } from '../../_mocks/working-groups' import { mockUseModalCall } from '../../setup' - - describe('UI: ChangeRoleModal', () => { const api = stubApi() diff --git a/packages/ui/test/working-groups/modals/LeaveRoleModal.test.tsx b/packages/ui/test/working-groups/modals/LeaveRoleModal.test.tsx index 3ab3922f91..871e3f121c 100644 --- a/packages/ui/test/working-groups/modals/LeaveRoleModal.test.tsx +++ b/packages/ui/test/working-groups/modals/LeaveRoleModal.test.tsx @@ -33,8 +33,6 @@ import { } from '../../_mocks/transactions' import { WORKER } from '../../_mocks/working-groups' - - const mockUseModal: UseModal = { modal: null, modalData: { workerId: 'forumWorkingGroup-1' },