jeena/lemmy-ui
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Removing monads. Fixes #884 (#886)

Browse source 
* Removing monads. Fixes #884

* Fixing post fetching.

* Dont show not_logged_in error for navbar.

* Adding the lemmy-js-client RC.

* Fixing registration application mode
This commit is contained in:
Dessalines 2023-01-04 11:56:24 -05:00 • committed by GitHub
parent 37c200571b
commit b64f47cfe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
66 changed files with 5186 additions and 6250 deletions
Download patch file Download diff file Expand all files Collapse all files

119
src/shared/components/common/registration-application.tsx
View file

@ -1,4 +1,3 @@
import { None, Option, Some } from "@sniptt/monads";
import { Component, linkEvent } from "inferno";
import { T } from "inferno-i18next-dess";
import {
@ -7,7 +6,7 @@ import {
} from "lemmy-js-client";
import { i18n } from "../../i18next";
import { WebSocketService } from "../../services";
import { auth, mdToHtml, wsClient } from "../../utils";
import { mdToHtml, myAuth, wsClient } from "../../utils";
import { PersonListing } from "../person/person-listing";
import { MarkdownTextArea } from "./markdown-textarea";
import { MomentTime } from "./moment-time";
@ -17,7 +16,7 @@ interface RegistrationApplicationProps {
}
interface RegistrationApplicationState {
denyReason: Option<string>;
denyReason?: string;
denyExpanded: boolean;
}
@ -25,15 +24,13 @@ export class RegistrationApplication extends Component<
RegistrationApplicationProps,
RegistrationApplicationState
> {
private emptyState: RegistrationApplicationState = {
state: RegistrationApplicationState = {
denyReason: this.props.application.registration_application.deny_reason,
denyExpanded: false,
};
constructor(props: any, context: any) {
super(props, context);
this.state = this.emptyState;
this.handleDenyReasonChange = this.handleDenyReasonChange.bind(this);
}
@ -48,44 +45,37 @@ export class RegistrationApplication extends Component<
{i18n.t("applicant")}: <PersonListing person={a.creator} />
</div>
<div>
{i18n.t("created")}:{" "}
<MomentTime showAgo published={ra.published} updated={None} />
{i18n.t("created")}: <MomentTime showAgo published={ra.published} />
</div>
<div>{i18n.t("answer")}:</div>
<div className="md-div" dangerouslySetInnerHTML={mdToHtml(ra.answer)} />
{a.admin.match({
some: admin => (
<div>
{accepted ? (
<T i18nKey="approved_by">
{a.admin && (
<div>
{accepted ? (
<T i18nKey="approved_by">
#
<PersonListing person={a.admin} />
</T>
) : (
<div>
<T i18nKey="denied_by">
#
<PersonListing person={admin} />
<PersonListing person={a.admin} />
</T>
) : (
<div>
<T i18nKey="denied_by">
#
<PersonListing person={admin} />
</T>
{ra.deny_reason.match({
some: deny_reason => (
<div>
{i18n.t("deny_reason")}:{" "}
<div
className="md-div d-inline-flex"
dangerouslySetInnerHTML={mdToHtml(deny_reason)}
/>
</div>
),
none: <></>,
})}
</div>
)}
</div>
),
none: <></>,
})}
{ra.deny_reason && (
<div>
{i18n.t("deny_reason")}:{" "}
<div
className="md-div d-inline-flex"
dangerouslySetInnerHTML={mdToHtml(ra.deny_reason)}
/>
</div>
)}
</div>
)}
</div>
)}
{this.state.denyExpanded && (
<div className="form-group row">
@ -95,11 +85,7 @@ export class RegistrationApplication extends Component<
<div className="col-sm-10">
<MarkdownTextArea
initialContent={this.state.denyReason}
initialLanguageId={None}
onContentChange={this.handleDenyReasonChange}
placeholder={None}
buttonTitle={None}
maxLength={None}
hideNavigationWarnings
allLanguages={[]}
siteLanguages={[]}
@ -107,7 +93,7 @@ export class RegistrationApplication extends Component<
</div>
</div>
)}
{(ra.admin_id.isNone() || (ra.admin_id.isSome() && !accepted)) && (
{(!ra.admin_id || (ra.admin_id && !accepted)) && (
<button
className="btn btn-secondary mr-2 my-2"
onClick={linkEvent(this, this.handleApprove)}
@ -116,7 +102,7 @@ export class RegistrationApplication extends Component<
{i18n.t("approve")}
</button>
)}
{(ra.admin_id.isNone() || (ra.admin_id.isSome() && accepted)) && (
{(!ra.admin_id || (ra.admin_id && accepted)) && (
<button
className="btn btn-secondary mr-2"
onClick={linkEvent(this, this.handleDeny)}
@ -130,36 +116,41 @@ export class RegistrationApplication extends Component<
}
handleApprove(i: RegistrationApplication) {
i.setState({ denyExpanded: false });
let form = new ApproveRegistrationApplication({
id: i.props.application.registration_application.id,
deny_reason: None,
approve: true,
auth: auth().unwrap(),
});
WebSocketService.Instance.send(
wsClient.approveRegistrationApplication(form)
);
let auth = myAuth();
if (auth) {
i.setState({ denyExpanded: false });
let form: ApproveRegistrationApplication = {
id: i.props.application.registration_application.id,
approve: true,
auth,
};
WebSocketService.Instance.send(
wsClient.approveRegistrationApplication(form)
);
}
}
handleDeny(i: RegistrationApplication) {
if (i.state.denyExpanded) {
i.setState({ denyExpanded: false });
let form = new ApproveRegistrationApplication({
id: i.props.application.registration_application.id,
approve: false,
deny_reason: i.state.denyReason,
auth: auth().unwrap(),
});
WebSocketService.Instance.send(
wsClient.approveRegistrationApplication(form)
);
let auth = myAuth();
if (auth) {
let form: ApproveRegistrationApplication = {
id: i.props.application.registration_application.id,
approve: false,
deny_reason: i.state.denyReason,
auth,
};
WebSocketService.Instance.send(
wsClient.approveRegistrationApplication(form)
);
}
} else {
i.setState({ denyExpanded: true });
}
}
handleDenyReasonChange(val: string) {
this.setState({ denyReason: Some(val) });
this.setState({ denyReason: val });
}
}