Skip to content

Commit

Permalink
🚀 Release 2.6.0 (#4779)
Browse files Browse the repository at this point in the history
  • Loading branch information
thesan committed Feb 15, 2024
2 parents cd5a6a2 + a460e3b commit a74c38c
Show file tree
Hide file tree
Showing 49 changed files with 994 additions and 349 deletions.
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.6.0] - 2024-02-15

### Added
- Separate urls for each working group tabs.
- Default descriptions for each working group about tab.

### Fixed
- Searching for members by id.
- General search box behavior.
- Show members active roles only.
- Show creation date on member profiles.
- Fix opening creation for lead with separate role and controller accounts.
- OneKey wallet extension support.

## [2.5.0] - 2024-02-05

### Added
Expand Down Expand Up @@ -305,7 +319,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [0.1.1] - 2022-12-02

[unreleased]: https://github.com/Joystream/pioneer/compare/v2.5.0...HEAD
[unreleased]: https://github.com/Joystream/pioneer/compare/v2.6.0...HEAD
[2.6.0]: https://github.com/Joystream/pioneer/compare/v2.5.0...v2.6.0
[2.5.0]: https://github.com/Joystream/pioneer/compare/v2.4.2...v2.5.0
[2.4.2]: https://github.com/Joystream/pioneer/compare/v2.4.1...v2.4.2
[2.4.1]: https://github.com/Joystream/pioneer/compare/v2.4.0...v2.4.1
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
<strong>
<a href="https://pioneerapp.xyz">Live app</a>
•
<a href="https://pioneer-2-storybook.vercel.app">Storybook</a>
•
<a href="docs/README.md">Docs</a>
•
<a href="https://pioneer-2-storybook.vercel.app">Storybook</a>
<a href="CHANGELOG.md">Changelog</a>
</strong>
</p>

Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@joystream/pioneer",
"version": "2.5.0",
"version": "2.6.0",
"license": "GPL-3.0-only",
"scripts": {
"build": "node --max_old_space_size=4096 ./build.js",
Expand Down
2 changes: 2 additions & 0 deletions packages/ui/src/app/GlobalModals.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ const GUEST_ACCESSIBLE_MODALS: ModalNames[] = [
'EmailConfirmationModal',
'VoteRationaleModal',
'NominatingRedirect',
'CreateOpening',
'LeaveRole',
]

export const MODAL_WITH_CLOSE_CONFIRMATION: ModalNames[] = [
Expand Down
41 changes: 24 additions & 17 deletions packages/ui/src/app/components/PageHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,29 @@ export interface PageHeaderProps {
tabs?: ReactNode
video?: ReactNode
badges?: ReactNode
status?: ReactNode
}

export const PageHeader = React.memo(({ title, buttons, tabs, video, badges, canGoBack = false }: PageHeaderProps) => (
<PageHeaderWrapper>
<PageHeaderRow>
{canGoBack ? (
<PreviousPage>
<PageTitle>{title}</PageTitle>
</PreviousPage>
) : (
<PageTitle>{title}</PageTitle>
)}
<ButtonsGroup>{buttons}</ButtonsGroup>
</PageHeaderRow>
{badges}
{tabs}
{video}
</PageHeaderWrapper>
))
export const PageHeader = React.memo(
({ title, buttons, tabs, video, badges, status, canGoBack = false }: PageHeaderProps) => (
<PageHeaderWrapper>
<PageHeaderRow>
{canGoBack ? (
<PreviousPage>
<PageTitle>{title}</PageTitle>
{status}
</PreviousPage>
) : (
<>
<PageTitle>{title}</PageTitle>
{status}
</>
)}
<ButtonsGroup>{buttons}</ButtonsGroup>
</PageHeaderRow>
{badges}
{tabs}
{video}
</PageHeaderWrapper>
)
)
36 changes: 15 additions & 21 deletions packages/ui/src/app/pages/WorkingGroups/WorkingGroup/AboutTab.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React from 'react'
import React, { useMemo } from 'react'

import { ExternalLinkButtonGhost } from '@/common/components/buttons/LinkButtons'
import { LinkSymbol } from '@/common/components/icons/symbols'
import { Loading } from '@/common/components/Loading'
import { MarkdownPreview } from '@/common/components/MarkdownPreview'
import { MainPanel, RowGapBlock } from '@/common/components/page/PageContent'
import { SidePanel } from '@/common/components/page/SidePanel'
import { StatisticItem, Statistics, TokenValueStat } from '@/common/components/statistics'
import { NumericValueStat } from '@/common/components/statistics/NumericValueStat'
import { wgListItemMappings } from '@/common/helpers'
import { isDefined } from '@/common/utils'
import { WorkersList } from '@/working-groups/components/WorkersList'
import { useGroupStatistics } from '@/working-groups/hooks/useGroupStatistics'
import { useWorkers } from '@/working-groups/hooks/useWorkers'
import { WorkingGroup } from '@/working-groups/types'

import { StatusBadge, StatusGroup, StatusTitleGroup } from '../components/StatusBadges'
Expand All @@ -20,6 +20,7 @@ interface Props {

export const AboutTab = ({ workingGroup }: Props) => {
const { statistics } = useGroupStatistics(workingGroup.id)
const { defaultDescription, handbookLink } = useMemo(() => wgListItemMappings(workingGroup.name), [workingGroup.name])

return (
<MainPanel>
Expand Down Expand Up @@ -68,24 +69,17 @@ export const AboutTab = ({ workingGroup }: Props) => {
{workingGroup.statusMessage && <MarkdownPreview markdown={workingGroup.statusMessage} />}
</RowGapBlock>
)}
{workingGroup.about && (
<RowGapBlock gap={16}>
<h4>About</h4>
<MarkdownPreview markdown={workingGroup.about} />
</RowGapBlock>
)}
<RowGapBlock gap={16}>
<h4>About</h4>
<MarkdownPreview markdown={workingGroup.about || defaultDescription} />
{handbookLink && (
<ExternalLinkButtonGhost size="small" href={handbookLink} disabled={false} target="_blank">
Learn more from the Handbook
<LinkSymbol />
</ExternalLinkButtonGhost>
)}
</RowGapBlock>
</RowGapBlock>
</MainPanel>
)
}

export const AboutTabSidebar = ({ workingGroup }: Props) => {
const { workers } = useWorkers({ groupId: workingGroup.id ?? '', status: 'active' })
const lead = workers?.find((worker) => worker.member.id === workingGroup.leadId)

return (
<SidePanel scrollable>
<WorkersList lead={lead} workers={workers} />
</SidePanel>
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ import styled from 'styled-components'

import { CountBadge } from '@/common/components/CountBadge'
import { MainPanel } from '@/common/components/page/PageContent'
import { SidePanel } from '@/common/components/page/SidePanel'
import { Statistics, TokenValueStat } from '@/common/components/statistics'
import { Label } from '@/common/components/typography'
import { LoadingOpenings } from '@/working-groups/components/OpeningsList'
import { WorkersList } from '@/working-groups/components/WorkersList'
import { useGroupDebt } from '@/working-groups/hooks/useGroupDebt'
import { useOpenings } from '@/working-groups/hooks/useOpenings'
import { useUpcomingOpenings } from '@/working-groups/hooks/useUpcomingOpenings'
import { useWorkers } from '@/working-groups/hooks/useWorkers'
import { WorkingGroup } from '@/working-groups/types'

interface Props {
Expand Down Expand Up @@ -67,17 +64,6 @@ export const OpeningsTab = ({ workingGroup }: Props) => {
)
}

export const OpeningsTabSidebar = ({ workingGroup }: Props) => {
const { workers } = useWorkers({ groupId: workingGroup.id ?? '', status: 'active' })
const lead = workers?.find((worker) => worker.member.id === workingGroup.leadId)

return (
<SidePanel scrollable>
<WorkersList lead={lead} workers={workers} />
</SidePanel>
)
}

const OpeningsCategories = styled.div`
display: grid;
grid-row-gap: 24px;
Expand Down

0 comments on commit a74c38c

Please sign in to comment.