Feliday/Feliday-UI
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #344 from LemmyNet/fix/add_communities_listing_type_filter

Browse source 
Fix/add communities listing type filter
This commit is contained in:
Dessalines 2021-07-19 10:09:00 -04:00 committed by GitHub
commit d964bd3d1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lemmy-translations

@ -1 +1 @@
Subproject commit 6baf8609698c19f698d3056a3d804cb2ae6eddb4 Subproject commit e34e6fc90f5702683870ab548ebe98a29c70abb3

12
src/shared/components/community/communities.tsx
View file

@ -13,10 +13,10 @@ import {
import { Subscription } from "rxjs"; import { Subscription } from "rxjs";
import { InitialFetchRequest } from "shared/interfaces"; import { InitialFetchRequest } from "shared/interfaces";
import { i18n } from "../../i18next"; import { i18n } from "../../i18next";
import { UserService, WebSocketService } from "../../services"; import { WebSocketService } from "../../services";
import { import {
authField, authField,
getListingTypeFromProps, getListingTypeFromPropsNoDefault,
getPageFromProps, getPageFromProps,
isBrowser, isBrowser,
setIsoData, setIsoData,
@ -57,7 +57,7 @@ export class Communities extends Component<any, CommunitiesState> {
communities: [], communities: [],
loading: true, loading: true,
page: getPageFromProps(this.props), page: getPageFromProps(this.props),
listingType: getListingTypeFromProps(this.props), listingType: getListingTypeFromPropsNoDefault(this.props),
site_view: this.isoData.site_res.site_view, site_view: this.isoData.site_res.site_view,
searchText: "", searchText: "",
}; };
@ -88,7 +88,7 @@ export class Communities extends Component<any, CommunitiesState> {
static getDerivedStateFromProps(props: any): CommunitiesProps { static getDerivedStateFromProps(props: any): CommunitiesProps {
return { return {
listingType: getListingTypeFromProps(props), listingType: getListingTypeFromPropsNoDefault(props),
page: getPageFromProps(props), page: getPageFromProps(props),
}; };
} }
@ -298,10 +298,6 @@ export class Communities extends Component<any, CommunitiesState> {
let pathSplit = req.path.split("/"); let pathSplit = req.path.split("/");
let type_: ListingType = pathSplit[3] let type_: ListingType = pathSplit[3]
? ListingType[pathSplit[3]] ? ListingType[pathSplit[3]]
: UserService.Instance.localUserView
? Object.values(ListingType)[
UserService.Instance.localUserView.local_user.default_listing_type
]
: ListingType.Local; : ListingType.Local;
let page = pathSplit[5] ? Number(pathSplit[5]) : 1; let page = pathSplit[5] ? Number(pathSplit[5]) : 1;
let listCommunitiesForm: ListCommunities = { let listCommunitiesForm: ListCommunities = {

6
src/shared/utils.ts
View file

@ -854,6 +854,12 @@ export function getListingTypeFromProps(props: any): ListingType {
: ListingType.Local; : ListingType.Local;
} }
export function getListingTypeFromPropsNoDefault(props: any): ListingType {
return props.match.params.listing_type
? routeListingTypeToEnum(props.match.params.listing_type)
: ListingType.Local;
}
// TODO might need to add a user setting for this too // TODO might need to add a user setting for this too
export function getDataTypeFromProps(props: any): DataType { export function getDataTypeFromProps(props: any): DataType {
return props.match.params.data_type return props.match.params.data_type