Skip to content

Commit

Permalink
🟣 Release 4.15.2
Browse files Browse the repository at this point in the history
Merge pull request #5957 from WRadoslaw/release/4.15.2
  • Loading branch information
WRadoslaw committed Mar 7, 2024
2 parents e209fdb + 66c7545 commit d8fac26
Show file tree
Hide file tree
Showing 50 changed files with 1,192 additions and 591 deletions.
1 change: 1 addition & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ module.exports = {
importOrderParserPlugins: ['jsx', 'typescript'],
importOrderSeparation: true,
importOrderSortSpecifiers: true,
'plugins': ['@trivago/prettier-plugin-sort-imports'],
}
21 changes: 19 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,26 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [4.15.2] - 2024-03-07

### Added

- Short video filtering
- New search UI

### Fixed

- Overall performance improvements
- Asset download improvements

### Changed

- Error message on login
- Homepage feed is now semi curated

## [4.15.1] - 2024-02-22

## Added
### Added

- Page for curators
- Video preloading for homepage and video view
Expand All @@ -23,7 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [4.15.0] - 2024-02-09

## Added
### Added

- Request response time logging

Expand Down
2 changes: 1 addition & 1 deletion packages/atlas/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@joystream/atlas",
"description": "UI for consuming Joystream - a user governed video platform",
"version": "4.15.1",
"version": "4.15.2",
"license": "GPL-3.0",
"scripts": {
"start": "vite",
Expand Down
27 changes: 16 additions & 11 deletions packages/atlas/src/MainLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,21 @@ const LoadablePlaygroundLayout = loadable(
)

export const MainLayout: FC = () => {
return (
<>
<CookiePopover />
<MiscUtils />
<Routes>
<Route path={BASE_PATHS.viewer + '/*'} element={<ViewerLayout />} />
<Route path={BASE_PATHS.legal + '/*'} element={<LegalLayout />} />
<Route path={BASE_PATHS.studio + '/*'} element={<LoadableStudioLayout />} />
<Route path={BASE_PATHS.playground + '/*'} element={<LoadablePlaygroundLayout />} />
</Routes>
</>
)
}

const MiscUtils = () => {
useTimeMismatchWarning()
const scrollPosition = useRef<number>(0)
const location = useLocation()
Expand Down Expand Up @@ -111,15 +126,5 @@ export const MainLayout: FC = () => {
}, parseInt(transitions.timings.routing) + ROUTING_ANIMATION_OFFSET)
}, [location, cachedLocation, locationState, navigationType, clearOverlays])

return (
<>
<CookiePopover />
<Routes>
<Route path={BASE_PATHS.viewer + '/*'} element={<ViewerLayout />} />
<Route path={BASE_PATHS.legal + '/*'} element={<LegalLayout />} />
<Route path={BASE_PATHS.studio + '/*'} element={<LoadableStudioLayout />} />
<Route path={BASE_PATHS.playground + '/*'} element={<LoadablePlaygroundLayout />} />
</Routes>
</>
)
return null
}
3 changes: 2 additions & 1 deletion packages/atlas/src/api/client/cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ const getChannelKeyArgs = (args: Partial<QueryChannelsConnectionArgs> | null) =>
const sortingArray = args?.orderBy != null ? (Array.isArray(args.orderBy) ? args.orderBy : [args.orderBy]) : []
const sorting = stringifyValue(sortingArray)
const titleContains = args?.where?.title_contains || ''
const titleContainsInsensitive = args?.where?.title_containsInsensitive || ''

return `${language}:${idIn}:${sorting}:${titleContains}`
return `${language}:${idIn}:${sorting}:${titleContains}:${titleContainsInsensitive}`
}

const getCommentKeyArgs = (
Expand Down
7 changes: 6 additions & 1 deletion packages/atlas/src/api/hooks/videosConnection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@ import {
useGetVideosCountQuery,
} from '@/api/queries/__generated__/videos.generated'

type UseBasicVideosConnectionOptions = {
skipCountQuery?: boolean
} & QueryHookOptions<GetBasicVideosConnectionQuery>

export const useBasicVideosConnection = (
variables?: GetBasicVideosConnectionQueryVariables,
opts?: QueryHookOptions<GetBasicVideosConnectionQuery>
opts?: UseBasicVideosConnectionOptions
) => {
const { data: countData } = useGetVideosCountQuery({
variables: {
where: variables?.where,
},
skip: opts?.skipCountQuery,
})
const { data, ...rest } = useGetBasicVideosConnectionQuery({
...opts,
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d8fac26

Please sign in to comment.