fedi/lemmy-ui
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-30 17:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into route-data-refactor

Browse source
This commit is contained in:
abias 2023-05-29 20:41:54 -04:00
parent feb4c434d1 7720e37a63
commit 72b4d14b47
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/shared/components/post/create-post.tsx
View file

@ -21,7 +21,6 @@ import {
enableNsfw, enableNsfw,
getIdFromString, getIdFromString,
getQueryParams, getQueryParams,
getQueryString,
isBrowser, isBrowser,
myAuth, myAuth,
setIsoData, setIsoData,
@ -80,7 +79,7 @@ export class CreatePost extends Component<
if (communityResponse) { if (communityResponse) {
const communityChoice: Choice = { const communityChoice: Choice = {
label: communityResponse.community_view.community.name, label: communityResponse.community_view.community.title,
value: communityResponse.community_view.community.id.toString(), value: communityResponse.community_view.community.id.toString(),
}; };
@ -179,18 +178,21 @@ export class CreatePost extends Component<
updateUrl({ communityId }: Partial<CreatePostProps>) { updateUrl({ communityId }: Partial<CreatePostProps>) {
const { communityId: urlCommunityId } = getCreatePostQueryParams(); const { communityId: urlCommunityId } = getCreatePostQueryParams();
const queryParams: QueryParams<CreatePostProps> = {
communityId: (communityId ?? urlCommunityId)?.toString(),
};
const locationState = this.props.history.location.state as const locationState = this.props.history.location.state as
| PostFormParams | PostFormParams
| undefined; | undefined;
this.props.history.replace( const url = new URL(location.href);
`/create_post${getQueryString(queryParams)}`,
locationState const newId = (communityId ?? urlCommunityId)?.toString();
);
if (newId !== undefined) {
url.searchParams.set("communityId", newId);
} else {
url.searchParams.delete("communityId");
}
history.replaceState(locationState, "", url);
this.fetchCommunity(); this.fetchCommunity();
} }
@ -237,12 +239,12 @@ export class CreatePost extends Component<
if (op === UserOperation.GetCommunity) { if (op === UserOperation.GetCommunity) {
const { const {
community_view: { community_view: {
community: { name, id }, community: { title, id },
}, },
} = wsJsonToRes<GetCommunityResponse>(msg); } = wsJsonToRes<GetCommunityResponse>(msg);
this.setState({ this.setState({
selectedCommunityChoice: { label: name, value: id.toString() }, selectedCommunityChoice: { label: title, value: id.toString() },
loading: false, loading: false,
}); });
} }

6
src/shared/components/post/post-form.tsx
View file

@ -644,13 +644,7 @@ export class PostForm extends Component<PostFormProps, PostFormState> {
handleCommunitySelect(choice: Choice) { handleCommunitySelect(choice: Choice) {
if (this.props.onSelectCommunity) { if (this.props.onSelectCommunity) {
this.setState({
loading: true,
});
this.props.onSelectCommunity(choice); this.props.onSelectCommunity(choice);
this.setState({ loading: false });
} }
} }