Open platform to collect and prioritize feedback
refactoring: enable jsx-no-lambda (#410)
Guilherme Oenningff024d070b97
diff --git a/public/components/ShowTag.scss b/public/components/ShowTag.scssindex ba8a12bc1..d35925c29 100644--- a/public/components/ShowTag.scss+++ b/public/components/ShowTag.scss@@ -4,7 +4,6 @@display: inline-block;line-height: 1;vertical-align: baseline;- margin: 0 3px 3px 0;padding: 9px 12px;color: $text-color;font-weight: 700;diff --git a/public/components/SignInModal.tsx b/public/components/SignInModal.tsxindex a83bf3e6a..9b18a7115 100644--- a/public/components/SignInModal.tsx+++ b/public/components/SignInModal.tsx@@ -37,6 +37,10 @@ export class SignInModal extends React.Component<SignInModalProps, SignInModalSt});}+ private closeModal = () => {+ this.setState({ isOpen: false, emailSent: false });+ };+public render() {const content = this.state.emailSent ? (<>@@ -45,7 +49,7 @@ export class SignInModal extends React.Component<SignInModalProps, SignInModalStin.</p><p>- <a href="#" onClick={() => this.setState({ isOpen: false, emailSent: false })}>+ <a href="#" onClick={this.closeModal}>OK</a></p>@@ -57,9 +61,7 @@ export class SignInModal extends React.Component<SignInModalProps, SignInModalStreturn (<Modal.Window isOpen={this.state.isOpen}><Modal.Header>Sign in to raise your voice</Modal.Header>-<Modal.Content>{content}</Modal.Content>-<LegalFooter /></Modal.Window>);diff --git a/public/components/SupportCounter.tsx b/public/components/SupportCounter.tsxindex 97295d693..5941e1e1e 100644--- a/public/components/SupportCounter.tsx+++ b/public/components/SupportCounter.tsx@@ -26,7 +26,7 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support};}- public async supportOrUndo() {+ private supportOrUndo = async () => {if (!this.props.user) {this.setState({ showSignIn: true });return;@@ -41,7 +41,7 @@ export class SupportCounter extends React.Component<SupportCounterProps, Supporttotal: state.total + (state.supported ? -1 : 1)}));}- }+ };public render() {const status = IdeaStatus.Get(this.props.idea.status);@@ -53,7 +53,7 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support});const vote = (- <button className={className} onClick={async () => await this.supportOrUndo()}>+ <button className={className} onClick={this.supportOrUndo}><i className="medium caret up icon" />{this.state.total}</button>diff --git a/public/components/common/SignInControl.tsx b/public/components/common/SignInControl.tsxindex b4be889e1..c4c7c7718 100644--- a/public/components/common/SignInControl.tsx+++ b/public/components/common/SignInControl.tsx@@ -48,6 +48,10 @@ export class SignInControl extends React.Component<SignInControlProps, SignInCon}};+ private setEmail = (email: string) => {+ this.setState({ email });+ };+public render() {const google = this.settings.providers.google && (<div className="col-sm l-social-col">@@ -100,7 +104,7 @@ export class SignInControl extends React.Component<SignInControlProps, SignInConfield="email"value={this.state.email}autoFocus={!device.isTouch()}- onChange={email => this.setState({ email })}+ onChange={this.setEmail}onSubmit={this.signIn}placeholder="[email protected]"suffix={diff --git a/public/pages/Administration/components/TagForm.tsx b/public/pages/Administration/components/TagForm.tsxindex 527c73b50..d1710bb1d 100644--- a/public/pages/Administration/components/TagForm.tsx+++ b/public/pages/Administration/components/TagForm.tsx@@ -1,7 +1,17 @@import "./TagForm.scss";import * as React from "react";-import { Button, Input, ButtonClickEvent, ShowTag, DisplayError, Form, RadioButton, Field } from "@fider/components";+import {+ Button,+ Input,+ ButtonClickEvent,+ ShowTag,+ DisplayError,+ Form,+ RadioButton,+ Field,+ SelectOption+} from "@fider/components";import { Tag } from "@fider/models";import { Failure } from "@fider/services";@@ -27,13 +37,13 @@ export class TagForm extends React.Component<TagFormProps, TagFormState> {constructor(props: TagFormProps) {super(props);this.state = {- color: props.color || this.randomizeColor(),+ color: props.color || this.getRandomColor(),name: props.name || "",isPublic: props.isPublic || false};}- private randomizeColor(): string {+ private getRandomColor(): string {const letters = "0123456789ABCDEF";let color = "";for (let i = 0; i < 6; i++) {@@ -42,16 +52,36 @@ export class TagForm extends React.Component<TagFormProps, TagFormState> {return color;}- private async onSave(e: ButtonClickEvent) {+ private handleSave = async () => {const error = await this.props.onSave(this.state);if (error) {this.setState({ error });}- }+ };++ private handleCancel = async () => {+ this.props.onCancel();+ };++ private setName = (name: string) => {+ this.setState({ name });+ };++ private setColor = (color: string) => {+ this.setState({ color });+ };++ private setVisibility = (option: SelectOption) => {+ this.setState({ isPublic: option === this.visibilityPublic });+ };++ private randomize = () => {+ this.setColor(this.getRandomColor());+ };public render() {const randomizer = (- <span className="info clickable" onClick={() => this.setState({ color: this.randomizeColor() })}>+ <span className="info clickable" onClick={this.randomize}>randomize</span>);@@ -60,7 +90,7 @@ export class TagForm extends React.Component<TagFormProps, TagFormState> {<Form error={this.state.error}><div className="row"><div className="col-lg-3">- <Input field="name" label="Name" value={this.state.name} onChange={name => this.setState({ name })} />+ <Input field="name" label="Name" value={this.state.name} onChange={this.setName} /></div><div className="col-lg-2"><Input@@ -68,7 +98,7 @@ export class TagForm extends React.Component<TagFormProps, TagFormState> {label="Color"afterLabel={randomizer}value={this.state.color}- onChange={color => this.setState({ color })}+ onChange={this.setColor}/></div><div className="col-lg-2">@@ -77,7 +107,7 @@ export class TagForm extends React.Component<TagFormProps, TagFormState> {field="visibility"defaultOption={this.state.isPublic ? this.visibilityPublic : this.visibilityPrivate}options={[this.visibilityPublic, this.visibilityPrivate]}- onSelect={opt => this.setState({ isPublic: opt === this.visibilityPublic })}+ onSelect={this.setVisibility}/></div><div className="col-lg-5">@@ -94,10 +124,10 @@ export class TagForm extends React.Component<TagFormProps, TagFormState> {</Field></div></div>- <Button color="positive" onClick={e => this.onSave(e)}>+ <Button color="positive" onClick={this.handleSave}>Save</Button>- <Button onClick={async () => this.props.onCancel()}>Cancel</Button>+ <Button onClick={this.handleCancel}>Cancel</Button></Form>);}diff --git a/public/pages/Administration/components/TagListItem.tsx b/public/pages/Administration/components/TagListItem.tsxnew file mode 100644index 000000000..4292b1e10--- /dev/null+++ b/public/pages/Administration/components/TagListItem.tsx@@ -0,0 +1,136 @@+import "./TagForm.scss";++import * as React from "react";+import { Tag, CurrentUser } from "@fider/models";+import { ListItem, ShowTag, Button } from "@fider/components";+import { TagFormState, TagForm } from "./";+import { actions, Failure } from "@fider/services";++interface TagListItemProps {+ user: CurrentUser;+ tag: Tag;+ onTagEditted: (tag: Tag) => void;+ onTagDeleted: (tag: Tag) => void;+}++interface TagListItemState {+ tag: Tag;+ isDeleting: boolean;+ isEditing: boolean;+}++export class TagListItem extends React.Component<TagListItemProps, TagListItemState> {+ constructor(props: TagListItemProps) {+ super(props);+ this.state = {+ tag: props.tag,+ isDeleting: false,+ isEditing: false+ };+ }++ private startDelete = async () => {+ this.setState({ isDeleting: true, isEditing: false });+ };++ private cancelDelete = async () => {+ this.setState({ isDeleting: false });+ };++ private deleteTag = async () => {+ const result = await actions.deleteTag(this.state.tag.slug);+ if (result.ok) {+ this.setState({+ isDeleting: false+ });+ this.props.onTagDeleted(this.state.tag);+ }+ };++ private startEdit = async () => {+ this.setState({ isDeleting: false, isEditing: true });+ };++ private cancelEdit = async () => {+ this.setState({ isEditing: false });+ };++ private updateTag = async (data: TagFormState): Promise<Failure | undefined> => {+ const result = await actions.updateTag(this.state.tag.slug, data.name, data.color, data.isPublic);+ if (result.ok) {+ const tag = this.state.tag;+ tag.name = result.data.name;+ tag.slug = result.data.slug;+ tag.color = result.data.color;+ tag.isPublic = result.data.isPublic;++ this.setState({+ isEditing: false,+ tag+ });++ this.props.onTagEditted(tag);+ } else {+ return result.error;+ }+ };++ private renderDeleteMode() {+ return (+ <>+ <div className="content">+ <b>Are you sure?</b>{" "}+ <span>+ The tag <ShowTag tag={this.state.tag} /> will be removed from all ideas.+ </span>+ </div>+ <Button className="right" onClick={this.cancelDelete}>+ Cancel+ </Button>+ <Button color="danger" className="right" onClick={this.deleteTag}>+ Delete tag+ </Button>+ </>+ );+ }++ private renderViewMode() {+ const buttons = this.props.user.isAdministrator && [+ <Button key={0} onClick={this.startDelete} className="right">+ <i className="remove icon" />Delete+ </Button>,+ <Button key={1} onClick={this.startEdit} className="right">+ <i className="edit icon" />Edit+ </Button>+ ];++ return (+ <>+ <ShowTag tag={this.state.tag} />+ {buttons}+ </>+ );+ }++ private renderEditMode() {+ return (+ <TagForm+ name={this.props.tag.name}+ color={this.props.tag.color}+ isPublic={this.props.tag.isPublic}+ onSave={this.updateTag}+ onCancel={this.cancelEdit}+ />+ );+ }++ public render() {+ const view = this.state.isDeleting+ ? this.renderDeleteMode()+ : this.state.isEditing+ ? this.renderEditMode()+ : this.renderViewMode();++ return <ListItem>{view}</ListItem>;+ }+}diff --git a/public/pages/Administration/components/UserListItem.tsx b/public/pages/Administration/components/UserListItem.tsxnew file mode 100644index 000000000..4b77888d5--- /dev/null+++ b/public/pages/Administration/components/UserListItem.tsx@@ -0,0 +1,53 @@+import "./TagForm.scss";++import * as React from "react";+import { User, UserRole } from "@fider/models";+import { ListItem, Gravatar, UserName, Button } from "@fider/components";+import { actions } from "@fider/services";++interface UserListItemProps {+ user: User;+ role: UserRole;+ removable: boolean;+ addable: boolean;+ onChange: () => void;+}++export class UserListItem extends React.Component<UserListItemProps, {}> {+ private promote = async () => {+ await this.changeRole(this.props.role);+ };++ private demote = async () => {+ await this.changeRole(UserRole.Visitor);+ };++ private changeRole = async (role: UserRole) => {+ const response = await actions.changeUserRole(this.props.user.id, role);+ if (response.ok) {+ this.props.user.role = role;+ this.props.onChange();+ }+ };++ public render() {+ return (+ <ListItem>+ <Gravatar user={this.props.user} />+ <div className="content">+ <UserName user={this.props.user} />+ </div>+ {this.props.removable && (+ <Button size="tiny" color="danger" onClick={this.demote} className="right showover">+ <i className="remove icon" />Remove+ </Button>+ )}+ {this.props.addable && (+ <Button size="tiny" color="positive" onClick={this.promote} className="right showover">+ <i className="add icon" />Add+ </Button>+ )}+ </ListItem>+ );+ }+}diff --git a/public/pages/Administration/components/index.tsx b/public/pages/Administration/components/index.tsxindex 892f51982..256469fa2 100644--- a/public/pages/Administration/components/index.tsx+++ b/public/pages/Administration/components/index.tsx@@ -1,3 +1,5 @@export * from "./AdminBasePage";export * from "./SideMenu";export * from "./TagForm";+export * from "./TagListItem";+export * from "./UserListItem";diff --git a/public/pages/Administration/pages/AdvancedSettings.page.tsx b/public/pages/Administration/pages/AdvancedSettings.page.tsxindex 221c31103..a6999f961 100644--- a/public/pages/Administration/pages/AdvancedSettings.page.tsx+++ b/public/pages/Administration/pages/AdvancedSettings.page.tsx@@ -32,7 +32,11 @@ export class AdvancedSettingsPage extends AdminBasePage<AdvancedSettingsPageProp};}- private save = async (e: ButtonClickEvent): Promise<void> => {+ private setCustomCSS = (customCSS: string): void => {+ this.setState({ customCSS });+ };++ private handleSave = async (e: ButtonClickEvent): Promise<void> => {const result = await actions.updateTenantAdvancedSettings(this.state.customCSS);if (result.ok) {page.refresh();@@ -50,7 +54,7 @@ export class AdvancedSettingsPage extends AdminBasePage<AdvancedSettingsPagePropdisabled={!this.props.user.isAdministrator}minRows={10}value={this.state.customCSS}- onChange={customCSS => this.setState({ customCSS })}+ onChange={this.setCustomCSS}><p className="info">Custom CSS allows you to change the look and feel of Fider so that you can apply your own branding.@@ -77,8 +81,8 @@ export class AdvancedSettingsPage extends AdminBasePage<AdvancedSettingsPageProp{this.props.user.isAdministrator && (<div className="field">- <Button color="positive" onClick={this.save}>- Save+ <Button color="positive" onClick={this.handleSave}>+ Save changes</Button></div>)}diff --git a/public/pages/Administration/pages/GeneralSettings.page.tsx b/public/pages/Administration/pages/GeneralSettings.page.tsxindex babfd9d94..6fa97d495 100644--- a/public/pages/Administration/pages/GeneralSettings.page.tsx+++ b/public/pages/Administration/pages/GeneralSettings.page.tsx@@ -49,7 +49,7 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,};}- private async save(e: ButtonClickEvent) {+ private handleSave = async (e: ButtonClickEvent) => {const result = await actions.updateTenantSettings(this.state);if (result.ok) {e.preventEnable();@@ -57,7 +57,7 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,} else if (result.error) {this.setState({ error: result.error });}- }+ };public fileChanged = async (e: React.ChangeEvent<HTMLInputElement>) => {if (e.target.files && e.target.files[0]) {@@ -104,6 +104,22 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,);}+ private setTitle = (title: string): void => {+ this.setState({ title });+ };++ private setWelcomeMessage = (welcomeMessage: string): void => {+ this.setState({ welcomeMessage });+ };++ private setInvitation = (invitation: string): void => {+ this.setState({ invitation });+ };++ private setCNAME = (cname: string): void => {+ this.setState({ cname });+ };+public content() {const isRemoving = this.state.logo ? this.state.logo.remove : false;const isUploading = this.state.logo ? !!this.state.logo.upload : false;@@ -121,14 +137,14 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,maxLength={60}value={this.state.title}disabled={!this.props.user.isAdministrator}- onChange={title => this.setState({ title })}+ onChange={this.setTitle}/><TextAreafield="welcomeMessage"label="Welcome Message"value={this.state.welcomeMessage}disabled={!this.props.user.isAdministrator}- onChange={welcomeMessage => this.setState({ welcomeMessage })}+ onChange={this.setWelcomeMessage}/><Inputfield="invitation"@@ -136,7 +152,7 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,maxLength={60}value={this.state.invitation}disabled={!this.props.user.isAdministrator}- onChange={invitation => this.setState({ invitation })}+ onChange={this.setInvitation}/><Field label="Logo" className="c-logo-upload">@@ -167,7 +183,7 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,placeholder="feedback.yourcompany.com"value={this.state.cname}disabled={!this.props.user.isAdministrator}- onChange={cname => this.setState({ cname })}+ onChange={this.setCNAME}><div className="info">{this.state.cname ? (@@ -190,8 +206,8 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,)}<div className="field">- <Button disabled={!this.props.user.isAdministrator} color="positive" onClick={async e => await this.save(e)}>- Save+ <Button disabled={!this.props.user.isAdministrator} color="positive" onClick={this.handleSave}>+ Save changes</Button></div></Form>diff --git a/public/pages/Administration/pages/Invitations.page.tsx b/public/pages/Administration/pages/Invitations.page.tsxindex 591bc7dd7..2ba63adea 100644--- a/public/pages/Administration/pages/Invitations.page.tsx+++ b/public/pages/Administration/pages/Invitations.page.tsx@@ -78,6 +78,14 @@ ${this.props.user.name} (${this.props.tenant.name})`,}};+ private setSubject = (subject: string): void => {+ this.setState({ subject });+ };++ private setMessage = (message: string): void => {+ this.setState({ message });+ };+public content() {return (<Form error={this.state.error}>@@ -99,13 +107,7 @@ ${this.props.user.name} (${this.props.tenant.name})`,</div></TextArea>- <Input- field="subject"- label="Subject"- value={this.state.subject}- maxLength={70}- onChange={subject => this.setState({ subject })}- >+ <Input field="subject" label="Subject" value={this.state.subject} maxLength={70} onChange={this.setSubject}><p className="info">This is the subject that will be used on the invitation email. Keep it short and sweet.</p>@@ -117,7 +119,7 @@ ${this.props.user.name} (${this.props.tenant.name})`,placeholder="[email protected]; [email protected]"minRows={8}value={this.state.message}- onChange={message => this.setState({ message })}+ onChange={this.setMessage}><div className="info"><p>diff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsxindex a393561c3..9316a618d 100644--- a/public/pages/Administration/pages/ManageMembers.page.tsx+++ b/public/pages/Administration/pages/ManageMembers.page.tsx@@ -4,8 +4,7 @@ import * as React from "react";import { Button, Gravatar, UserName, Segment, ListItem, List, Input, Form } from "@fider/components/common";import { User, CurrentUser, UserRole } from "@fider/models";import { actions } from "@fider/services";-import { AdminBasePage } from "../components";-import { Divider } from "semantic-ui-react";+import { AdminBasePage, UserListItem } from "../components";interface ManageMembersPageState {administrators: User[];@@ -34,14 +33,6 @@ export class ManageMembersPage extends AdminBasePage<ManageMembersPageProps, Manthis.state = this.groupUsers();}- private async changeRole(user: User, role: UserRole): Promise<any> {- const response = await actions.changeUserRole(user.id, role);- if (response.ok) {- user.role = role;- this.setState(this.groupUsers());- }- }-private groupUsers(): ManageMembersPageState {const usersByRole = this.props.users.reduce<{ [key: number]: User[] }>((groups, x) => {groups[x.role] = [x].concat(groups[x.role] || []);@@ -59,33 +50,24 @@ export class ManageMembersPage extends AdminBasePage<ManageMembersPageProps, Man};}+ private onRoleChanged = () => {+ this.setState(this.groupUsers());+ };+private showUser(user: User, role: UserRole, addable: boolean, removable: boolean) {if (user.id === this.props.user.id || this.props.user.role !== UserRole.Administrator) {removable = false;}return (- <ListItem>- <Gravatar user={user} />- <div className="content">- <UserName user={user} />- </div>- {removable && (- <Button- size="tiny"- color="danger"- onClick={() => this.changeRole(user, UserRole.Visitor)}- className="right showover"- >- <i className="remove icon" />Remove- </Button>- )}- {addable && (- <Button size="tiny" color="positive" onClick={() => this.changeRole(user, role)} className="right showover">- <i className="add icon" />Add- </Button>- )}- </ListItem>+ <UserListItem+ key={user.id}+ role={role}+ user={user}+ addable={addable}+ removable={removable}+ onChange={this.onRoleChanged}+ />);}@@ -108,6 +90,15 @@ export class ManageMembersPage extends AdminBasePage<ManageMembersPageProps, Man}}+ private handleSearch = {+ administrator: (query: string) => {+ this.filterVisitors("administrator", query);+ },+ collaborator: (query: string) => {+ this.filterVisitors("collaborator", query);+ }+ };+public content() {return (<div className="row">@@ -126,7 +117,7 @@ export class ManageMembersPage extends AdminBasePage<ManageMembersPageProps, Manlabel="Add new administrator"field="new-administrator"value={this.state.newAdministratorFilter}- onChange={x => this.filterVisitors("administrator", x)}+ onChange={this.handleSearch.administrator}placeholder="Search users by name"/><List hover={true}>@@ -152,7 +143,7 @@ export class ManageMembersPage extends AdminBasePage<ManageMembersPageProps, Manlabel="Add new collaborator"field="new-collaborator"value={this.state.newCollaboratorFilter}- onChange={x => this.filterVisitors("collaborator", x)}+ onChange={this.handleSearch.collaborator}placeholder="Search users by name"/><List hover={true}>diff --git a/public/pages/Administration/pages/ManageTags.page.tsx b/public/pages/Administration/pages/ManageTags.page.tsxindex 6d8a42859..6e1d7d797 100644--- a/public/pages/Administration/pages/ManageTags.page.tsx+++ b/public/pages/Administration/pages/ManageTags.page.tsx@@ -2,7 +2,7 @@ import "./ManageTags.page.scss";import * as React from "react";import { ShowTag, Button, Gravatar, UserName, Segment, List, ListItem, Heading } from "@fider/components";-import { AdminBasePage, TagForm, TagFormState } from "../components";+import { AdminBasePage, TagForm, TagFormState, TagListItem } from "../components";import { Tag, CurrentUser, UserRole } from "@fider/models";import { actions, Failure } from "@fider/services";@@ -43,7 +43,19 @@ export class ManageTagsPage extends AdminBasePage<ManageTagsPageProps, ManageTag};}- private async saveNewTag(data: TagFormState): Promise<Failure | undefined> {+ private addNew = async () => {+ this.setState({+ isAdding: true,+ deleting: undefined,+ editing: undefined+ });+ };++ private cancelAdd = () => {+ this.setState({ isAdding: false });+ };++ private saveNewTag = async (data: TagFormState): Promise<Failure | undefined> => {const result = await actions.createTag(data.name, data.color, data.isPublic);if (result.ok) {this.setState({@@ -53,102 +65,31 @@ export class ManageTagsPage extends AdminBasePage<ManageTagsPageProps, ManageTag} else {return result.error;}- }+ };- private async updateTag(tag: Tag, data: TagFormState): Promise<Failure | undefined> {- const result = await actions.updateTag(tag.slug, data.name, data.color, data.isPublic);- if (result.ok) {- tag.name = result.data.name;- tag.slug = result.data.slug;- tag.color = result.data.color;- tag.isPublic = result.data.isPublic;- this.setState({- editing: undefined,- allTags: this.state.allTags.sort(tagSorter)- });- } else {- return result.error;- }- }-- private async deleteTag(tag: Tag) {- const result = await actions.deleteTag(tag.slug);+ private handleTagDeleted = (tag: Tag) => {const idx = this.state.allTags.indexOf(tag);- if (result.ok) {- this.setState({- deleting: undefined,- allTags: this.state.allTags.splice(idx, 1) && this.state.allTags- });- }- }+ this.setState({+ allTags: this.state.allTags.splice(idx, 1) && this.state.allTags+ });+ };++ private handleTagEditted = (tag: Tag) => {+ this.setState({+ allTags: this.state.allTags.sort(tagSorter)+ });+ };private getTagList(filter: (tag: Tag) => boolean) {return this.state.allTags.filter(filter).map(t => {- if (this.state.editing === t.id) {- return (- <ListItem key={t.id}>- <TagForm- name={t.name}- color={t.color}- isPublic={t.isPublic}- onSave={async data => this.updateTag(t, data)}- onCancel={() => this.setState({ editing: undefined })}- />- </ListItem>- );- }-- if (this.state.deleting === t.id) {- return (- <ListItem key={t.id}>- <div className="content">- <b>Are you sure?</b>{" "}- <span>- The tag <ShowTag tag={t} /> will be removed from all ideas.- </span>- </div>- <Button className="right" onClick={async () => this.setState({ deleting: undefined })}>- Cancel- </Button>- <Button color="danger" className="right" onClick={() => this.deleteTag(t)}>- Delete tag- </Button>- </ListItem>- );- }-return (- <ListItem key={t.id}>- <ShowTag tag={t} />- {this.props.user.isAdministrator && [- <Button- key={0}- onClick={async () =>- this.setState({- isAdding: false,- editing: undefined,- deleting: t.id- })- }- className="right"- >- <i className="remove icon" />Remove- </Button>,- <Button- key={1}- onClick={async () =>- this.setState({- isAdding: false,- editing: t.id,- deleting: undefined- })- }- className="right"- >- <i className="edit icon" />Edit- </Button>- ]}- </ListItem>+ <TagListItem+ key={t.id}+ tag={t}+ user={this.props.user}+ onTagDeleted={this.handleTagDeleted}+ onTagEditted={this.handleTagEditted}+ />);});}@@ -161,19 +102,10 @@ export class ManageTagsPage extends AdminBasePage<ManageTagsPageProps, ManageTagthis.props.user.isAdministrator &&(this.state.isAdding ? (<Segment>- <TagForm onSave={async data => this.saveNewTag(data)} onCancel={() => this.setState({ isAdding: false })} />+ <TagForm onSave={this.saveNewTag} onCancel={this.cancelAdd} /></Segment>) : (- <Button- color="positive"- onClick={async e =>- this.setState({- isAdding: true,- deleting: undefined,- editing: undefined- })- }- >+ <Button color="positive" onClick={this.addNew}>Add new</Button>));diff --git a/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsx b/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsxindex 9b92b4912..ff9e33535 100644--- a/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsx+++ b/public/pages/CompleteSignInProfile/CompleteSignInProfile.page.tsx@@ -20,14 +20,18 @@ export class CompleteSignInProfilePage extends React.Component<HomePageProps, Co};}- private async submit() {+ private submit = async () => {const result = await actions.completeProfile(this.key, this.state.name);if (result.ok) {location.href = "/";} else if (result.error) {this.setState({ error: result.error });}- }+ };++ private setName = (name: string) => {+ this.setState({ name });+ };public render() {return (@@ -39,11 +43,11 @@ export class CompleteSignInProfilePage extends React.Component<HomePageProps, Co<Form error={this.state.error}><Inputfield="name"- onChange={name => this.setState({ name })}+ onChange={this.setName}maxLength={100}placeholder="Name"suffix={- <Button onClick={() => this.submit()} color="positive" disabled={this.state.name === ""}>+ <Button onClick={this.submit} color="positive" disabled={this.state.name === ""}>Submit</Button>}diff --git a/public/pages/Home/Home.page.tsx b/public/pages/Home/Home.page.tsxindex 7895c933d..8251b332d 100644--- a/public/pages/Home/Home.page.tsx+++ b/public/pages/Home/Home.page.tsx@@ -41,6 +41,10 @@ export class HomePage extends React.Component<HomePageProps, HomePageState> {};}+ private setTitle = (title: string) => {+ this.setState({ title });+ };+public render() {return (<div id="p-home" className="page container">@@ -54,7 +58,7 @@ export class HomePage extends React.Component<HomePageProps, HomePageState> {<IdeaInputuser={this.props.user}placeholder={this.props.tenant.invitation || "Enter your idea here..."}- onTitleChanged={title => this.setState({ title })}+ onTitleChanged={this.setTitle}/></div><div className="col-md-8">diff --git a/public/pages/Home/components/IdeaFilter.tsx b/public/pages/Home/components/IdeaFilter.tsxindex 020eb2676..56e4e257b 100644--- a/public/pages/Home/components/IdeaFilter.tsx+++ b/public/pages/Home/components/IdeaFilter.tsx@@ -1,6 +1,6 @@import * as React from "react";import { Idea, IdeaStatus } from "@fider/models";-import { Dropdown, DropdownItemProps } from "@fider/components";+import { Dropdown, DropdownItemProps, DropdownProps } from "@fider/components";interface IdeaFilterProps {activeFilter: string;@@ -13,6 +13,10 @@ export class IdeaFilter extends React.Component<IdeaFilterProps, {}> {super(props);}+ private handleChangeFilter = (item: React.SyntheticEvent<HTMLElement>, data: DropdownProps) => {+ this.props.filterChanged(data.value as string);+ };+public render() {const options: DropdownItemProps[] = [{ text: "trending", value: "trending", content: "Trending" },@@ -45,7 +49,7 @@ export class IdeaFilter extends React.Component<IdeaFilterProps, {}> {inline={true}options={options}defaultValue={activeFilter}- onChange={(item, data) => this.props.filterChanged(data.value as string)}+ onChange={this.handleChangeFilter}/></>);diff --git a/public/pages/Home/components/IdeaInput.tsx b/public/pages/Home/components/IdeaInput.tsxindex e5a55f956..e9eee5983 100644--- a/public/pages/Home/components/IdeaInput.tsx+++ b/public/pages/Home/components/IdeaInput.tsx@@ -43,25 +43,25 @@ export class IdeaInput extends React.Component<IdeaInputProps, IdeaInputState> {}}- private onTitleFocused() {+ private handleTitleFocus = () => {if (!this.props.user && this.title) {this.title.blur();this.setState({ showSignIn: true });}- }+ };- private onTitleChanged(title: string) {+ private setTitle = (title: string) => {cache.set(CACHE_TITLE_KEY, title);this.setState({ title });this.props.onTitleChanged(title);- }+ };- private onDescriptionChanged(description: string) {+ private setDescription = (description: string) => {cache.set(CACHE_DESCRIPTION_KEY, description);this.setState({ description });- }+ };- private async submit(event: ButtonClickEvent) {+ private submit = async (event: ButtonClickEvent) => {if (this.state.title) {const result = await actions.createIdea(this.state.title, this.state.description);if (result.ok) {@@ -73,19 +73,23 @@ export class IdeaInput extends React.Component<IdeaInputProps, IdeaInputState> {this.setState({ error: result.error });}}- }+ };++ private setInputRef = (e: HTMLInputElement) => {+ this.title = e;+ };public render() {const details = (<><TextAreafield="description"- onChange={description => this.onDescriptionChanged(description)}+ onChange={this.setDescription}value={this.state.description}minRows={5}placeholder="Describe your idea (optional)"/>- <Button color="positive" onClick={e => this.submit(e)}>+ <Button color="positive" onClick={this.submit}>Submit</Button></>@@ -97,11 +101,11 @@ export class IdeaInput extends React.Component<IdeaInputProps, IdeaInputState> {<Form error={this.state.error}><Inputfield="title"- inputRef={e => (this.title = e!)}- onFocus={() => this.onTitleFocused()}+ inputRef={this.setInputRef}+ onFocus={this.handleTitleFocus}maxLength={100}value={this.state.title}- onChange={title => this.onTitleChanged(title)}+ onChange={this.setTitle}placeholder={this.props.placeholder}/>{this.state.title && details}diff --git a/public/pages/Home/components/IdeasContainer.tsx b/public/pages/Home/components/IdeasContainer.tsxindex f910b643a..1e55b89f0 100644--- a/public/pages/Home/components/IdeasContainer.tsx+++ b/public/pages/Home/components/IdeasContainer.tsx@@ -80,6 +80,26 @@ export class IdeasContainer extends React.Component<IdeasContainerProps, IdeasCo}, delay);}+ private handleFilterChanged = (filter: string) => {+ this.changeFilterCriteria({ filter });+ };++ private handleTagsFilterChanged = (tags: string[]) => {+ this.changeFilterCriteria({ tags });+ };++ private handleSearchFilterChanged = (query: string) => {+ this.changeFilterCriteria({ query }, 200);+ };++ private handleSearchClick = (query: string) => {+ this.changeFilterCriteria({ query }, 200);+ };++ private clearSearch = () => {+ this.changeFilterCriteria({ query: "" });+ };+public render() {if (this.props.newIdeaTitle) {return (@@ -113,12 +133,12 @@ export class IdeasContainer extends React.Component<IdeasContainerProps, IdeasCo<Field><IdeaFilteractiveFilter={this.state.filter}- filterChanged={filter => this.changeFilterCriteria({ filter })}+ filterChanged={this.handleFilterChanged}countPerStatus={this.props.countPerStatus}/><TagsFiltertags={this.props.tags}- selectionChanged={tags => this.changeFilterCriteria({ tags })}+ selectionChanged={this.handleTagsFilterChanged}defaultSelection={this.state.tags}/></Field>@@ -128,10 +148,10 @@ export class IdeasContainer extends React.Component<IdeasContainerProps, IdeasCo<Inputfield="query"icon={this.state.query ? "cancel" : "search"}- onIconClick={this.state.query ? () => this.changeFilterCriteria({ query: "" }) : undefined}+ onIconClick={this.state.query ? this.clearSearch : undefined}placeholder="Search..."value={this.state.query}- onChange={query => this.changeFilterCriteria({ query }, 200)}+ onChange={this.handleSearchFilterChanged}/></div></div>diff --git a/public/pages/Home/components/ListIdeas.scss b/public/pages/Home/components/ListIdeas.scssindex 59bcd792e..b64c9861a 100644--- a/public/pages/Home/components/ListIdeas.scss+++ b/public/pages/Home/components/ListIdeas.scss@@ -19,6 +19,10 @@.c-list-item-content {width: calc(100% - 55px);display: block;++ .c-tag {+ margin: 0 3px 3px 0;+ }}.c-list-item-description {diff --git a/public/pages/Home/components/ListIdeas.tsx b/public/pages/Home/components/ListIdeas.tsxindex f2503e7e4..80314548b 100644--- a/public/pages/Home/components/ListIdeas.tsx+++ b/public/pages/Home/components/ListIdeas.tsx@@ -55,12 +55,12 @@ export class ListIdeas extends React.Component<ListIdeasProps, ListIdeasState> {};}- private showMore(event: React.MouseEvent<HTMLElement> | React.TouchEvent<HTMLElement>): void {+ private showMore = (event: React.MouseEvent<HTMLElement> | React.TouchEvent<HTMLElement>): void => {event.preventDefault();this.setState({showCount: this.state.showCount + defaultShowCount});- }+ };public render() {if (this.props.ideas.length === 0) {@@ -79,7 +79,7 @@ export class ListIdeas extends React.Component<ListIdeasProps, ListIdeasState> {/>))}{this.props.ideas.length > this.state.showCount && (- <h5 className="c-idea-list-show-more" onTouchEnd={e => this.showMore(e)} onClick={e => this.showMore(e)}>+ <h5 className="c-idea-list-show-more" onTouchEnd={this.showMore} onClick={this.showMore}>View {this.props.ideas.length - this.state.showCount} more ideas</h5>)}diff --git a/public/pages/MyNotifications/MyNotifications.page.tsx b/public/pages/MyNotifications/MyNotifications.page.tsxindex c6966a33a..da2b40040 100644--- a/public/pages/MyNotifications/MyNotifications.page.tsx+++ b/public/pages/MyNotifications/MyNotifications.page.tsx@@ -48,12 +48,12 @@ export class MyNotificationsPage extends React.Component<MyNotificationsPageProp});}- private async markAllAsRead(): Promise<void> {+ private markAllAsRead = async () => {const response = await actions.markAllAsRead();if (response.ok) {page.refresh();}- }+ };public render() {return (@@ -63,7 +63,7 @@ export class MyNotificationsPage extends React.Component<MyNotificationsPageProp<h4>Unread{this.state.unread.length > 0 && (- <span className="mark-as-read" onClick={() => this.markAllAsRead()}>+ <span className="mark-as-read" onClick={this.markAllAsRead}>Mark All as Read</span>)}diff --git a/public/pages/MySettings/MySettings.page.tsx b/public/pages/MySettings/MySettings.page.tsxindex 556717ad3..d5ec3f45a 100644--- a/public/pages/MySettings/MySettings.page.tsx+++ b/public/pages/MySettings/MySettings.page.tsx@@ -56,9 +56,37 @@ export class MySettingsPage extends React.Component<MySettingsPageProps, MySetti}};+ private startChangeEmail = () => {+ this.setState({ changingEmail: true });+ };++ private cancelChangeEmail = async () => {+ this.setState({+ changingEmail: false,+ newEmail: "",+ error: undefined+ });+ };++ private setName = (name: string) => {+ this.setState({ name });+ };++ private setNotificationSettings = (settings: UserSettings) => {+ this.setState({ settings });+ };++ private closeModal = () => {+ this.setState({ showModal: false });+ };++ private setNewEmail = (newEmail: string) => {+ this.setState({ newEmail });+ };+public render() {const changeEmail = (- <span className="ui info clickable" onClick={() => this.setState({ changingEmail: true })}>+ <span className="ui info clickable" onClick={this.startChangeEmail}>change</span>);@@ -74,7 +102,7 @@ export class MySettingsPage extends React.Component<MySettingsPageProps, MySettiyour email.</p><p>- <a href="#" onClick={() => this.setState({ showModal: false })}>+ <a href="#" onClick={this.closeModal}>OK</a></p>@@ -110,7 +138,7 @@ export class MySettingsPage extends React.Component<MySettingsPageProps, MySettimaxLength={200}disabled={!this.state.changingEmail}afterLabel={this.state.changingEmail ? undefined : changeEmail}- onChange={newEmail => this.setState({ newEmail })}+ onChange={this.setNewEmail}><p className="info">{this.props.user.email || this.state.changingEmail@@ -122,34 +150,19 @@ export class MySettingsPage extends React.Component<MySettingsPageProps, MySetti<Button color="positive" size="mini" onClick={this.submitNewEmail}>Confirm</Button>- <Button- size="mini"- onClick={async () =>- this.setState({- changingEmail: false,- newEmail: "",- error: undefined- })- }- >+ <Button size="mini" onClick={this.cancelChangeEmail}>Cancel</Button></>)}</Input>- <Input- label="Name"- field="name"- value={this.state.name}- maxLength={100}- onChange={name => this.setState({ name })}- />+ <Input label="Name" field="name" value={this.state.name} maxLength={100} onChange={this.setName} /><NotificationSettingsuser={this.props.user}settings={this.props.settings}- settingsChanged={settings => this.setState({ settings })}+ settingsChanged={this.setNotificationSettings}/><Button color="positive" onClick={this.confirm}>diff --git a/public/pages/ShowIdea/ShowIdea.page.tsx b/public/pages/ShowIdea/ShowIdea.page.tsxindex 3196796f7..6d24b0151 100644--- a/public/pages/ShowIdea/ShowIdea.page.tsx+++ b/public/pages/ShowIdea/ShowIdea.page.tsx@@ -48,7 +48,7 @@ export class ShowIdeaPage extends React.Component<ShowIdeaPageProps, ShowIdeaPag};}- private async saveChanges() {+ private saveChanges = async () => {const result = await actions.updateIdea(this.props.idea.number, this.state.newTitle, this.state.newDescription);if (result.ok) {this.setState({@@ -63,7 +63,23 @@ export class ShowIdeaPage extends React.Component<ShowIdeaPageProps, ShowIdeaPagerror: result.error});}- }+ };++ private setNewTitle = (newTitle: string) => {+ this.setState({ newTitle });+ };++ private setNewDescription = (newDescription: string) => {+ this.setState({ newDescription });+ };++ private cancelEdit = async () => {+ this.setState({ error: undefined, editMode: false });+ };++ private startEdit = async () => {+ this.setState({ editMode: true });+ };public render() {return (@@ -76,12 +92,7 @@ export class ShowIdeaPage extends React.Component<ShowIdeaPageProps, ShowIdeaPag<div className="idea-header">{this.state.editMode ? (<Form error={this.state.error}>- <Input- field="title"- maxLength={100}- value={this.state.newTitle}- onChange={newTitle => this.setState({ newTitle })}- />+ <Input field="title" maxLength={100} value={this.state.newTitle} onChange={this.setNewTitle} /></Form>) : (<h1>{this.props.idea.title}</h1>@@ -98,11 +109,7 @@ export class ShowIdeaPage extends React.Component<ShowIdeaPageProps, ShowIdeaPag<span className="subtitle">Description</span>{this.state.editMode ? (<Form error={this.state.error}>- <TextArea- field="description"- value={this.state.newDescription}- onChange={newDescription => this.setState({ newDescription })}- />+ <TextArea field="description" value={this.state.newDescription} onChange={this.setNewDescription} /></Form>) : (<MultiLineText@@ -124,12 +131,12 @@ export class ShowIdeaPage extends React.Component<ShowIdeaPageProps, ShowIdeaPagthis.state.editMode ? (<List key={1}><ListItem>- <Button color="positive" fluid={true} onClick={async () => this.saveChanges()}>+ <Button color="positive" fluid={true} onClick={this.saveChanges}><i className="save icon" /> Save</Button></ListItem><ListItem>- <Button fluid={true} onClick={async () => this.setState({ error: undefined, editMode: false })}>+ <Button fluid={true} onClick={this.cancelEdit}><i className="cancel icon" /> Cancel</Button></ListItem>@@ -137,7 +144,7 @@ export class ShowIdeaPage extends React.Component<ShowIdeaPageProps, ShowIdeaPag) : (<List key={1}><ListItem>- <Button fluid={true} onClick={async () => this.setState({ editMode: true })}>+ <Button fluid={true} onClick={this.startEdit}><i className="edit icon" /> Edit</Button></ListItem>diff --git a/public/pages/ShowIdea/components/CommentInput.tsx b/public/pages/ShowIdea/components/CommentInput.tsxindex ac8d29c99..c6136a394 100644--- a/public/pages/ShowIdea/components/CommentInput.tsx+++ b/public/pages/ShowIdea/components/CommentInput.tsx@@ -41,14 +41,7 @@ export class CommentInput extends React.Component<CommentInputProps, CommentInputhis.setState({ content });};- private onTextFocused() {- if (!this.props.user) {- this.input.blur();- this.setState({ showSignIn: true });- }- }-- public async submit() {+ public submit = async () => {this.setState({error: undefined});@@ -62,7 +55,18 @@ export class CommentInput extends React.Component<CommentInputProps, CommentInpuerror: result.error});}- }+ };++ private handleOnFocus = () => {+ if (!this.props.user) {+ this.input.blur();+ this.setState({ showSignIn: true });+ }+ };++ private setInputRef = (e: HTMLTextAreaElement) => {+ this.input = e;+ };public render() {return (@@ -78,11 +82,11 @@ export class CommentInput extends React.Component<CommentInputProps, CommentInpuvalue={this.state.content}minRows={1}onChange={this.commentChanged}- onFocus={() => this.onTextFocused()}- inputRef={e => (this.input = e!)}+ onFocus={this.handleOnFocus}+ inputRef={this.setInputRef}/>{this.state.content && (- <Button color="positive" onClick={() => this.submit()}>+ <Button color="positive" onClick={this.submit}>Submit</Button>)}diff --git a/public/pages/ShowIdea/components/CommentList.tsx b/public/pages/ShowIdea/components/CommentList.tsxdeleted file mode 100644index 9dd5869a4..000000000--- a/public/pages/ShowIdea/components/CommentList.tsx+++ /dev/null@@ -1,134 +0,0 @@-import * as React from "react";-import { Idea, Comment, CurrentUser } from "@fider/models";-import { Failure, actions, formatDate } from "@fider/services";-import { DisplayError, Button, UserName, Gravatar, Moment, MultiLineText, TextArea, Form } from "@fider/components";--interface CommentListProps {- idea: Idea;- comments: Comment[];- user?: CurrentUser;- onStartEdit?: () => void;- onStopEdit?: () => void;-}--interface CommentListState {- editingComment?: Comment;- editCommentNewContent: string;- error?: Failure;-}--export class CommentList extends React.Component<CommentListProps, CommentListState> {- constructor(props: CommentListProps) {- super(props);- this.state = {- editCommentNewContent: ""- };- }-- private async startEdit(comment: Comment): Promise<void> {- this.setState({- editingComment: comment,- editCommentNewContent: comment.content,- error: undefined- });-- if (this.props.onStartEdit) {- this.props.onStartEdit();- }- }-- private async cancelEdit(): Promise<void> {- this.setState({- editingComment: undefined,- editCommentNewContent: "",- error: undefined- });-- if (this.props.onStopEdit) {- this.props.onStopEdit();- }- }-- private async confirmEdit(): Promise<void> {- if (this.state.editingComment) {- const response = await actions.updateComment(- this.props.idea.number,- this.state.editingComment.id,- this.state.editCommentNewContent- );- if (response.ok) {- this.state.editingComment.content = this.state.editCommentNewContent;- this.state.editingComment.editedOn = new Date().toISOString();- this.state.editingComment.editedBy = this.props.user;- this.cancelEdit();- } else {- this.setState({ error: response.error });- }- }- }-- private canEditComment(comment: Comment): boolean {- if (this.props.user) {- return this.props.user.isCollaborator || comment.user.id === this.props.user.id;- }- return false;- }-- public render() {- return this.props.comments.map(c => {- return (- <div key={c.id} className="c-comment">- <Gravatar user={c.user} />- <div className="c-comment-content">- <UserName user={c.user} />- <div className="c-comment-metadata">- · <Moment date={c.createdOn} />- </div>- {!!c.editedOn &&- !!c.editedBy && (- <div className="c-comment-metadata">- ·{" "}- <span title={`This comment has been edited by ${c.editedBy!.name} on ${formatDate(c.editedOn)}`}>- edited- </span>- </div>- )}- {this.canEditComment(c) && (- <div className="c-comment-metadata">- ·{" "}- <span className="clickable" onClick={() => this.startEdit(c)}>- edit- </span>- </div>- )}- <div className="c-comment-text">- {c === this.state.editingComment ? (- <Form error={this.state.error}>- <TextArea- field="content"- minRows={1}- value={this.state.editCommentNewContent}- placeholder={c.content}- onChange={editCommentNewContent =>- this.setState({- editCommentNewContent- })- }- />- <Button size="tiny" onClick={() => this.confirmEdit()} color="positive">- Save- </Button>- <Button size="tiny" onClick={() => this.cancelEdit()}>- Cancel- </Button>- </Form>- ) : (- <MultiLineText text={c.content} style="simple" />- )}- </div>- </div>- </div>- );- });- }-}diff --git a/public/pages/ShowIdea/components/DiscussionPanel.tsx b/public/pages/ShowIdea/components/DiscussionPanel.tsxindex 87355f7a4..45bea97fc 100644--- a/public/pages/ShowIdea/components/DiscussionPanel.tsx+++ b/public/pages/ShowIdea/components/DiscussionPanel.tsx@@ -2,7 +2,7 @@ import "./Comments.scss";import * as React from "react";import { CurrentUser, Comment, Idea } from "@fider/models";-import { CommentList, CommentInput } from "../";+import { ShowComment, CommentInput } from "../";import { actions } from "@fider/services";interface DiscussionPanelProps {@@ -11,16 +11,9 @@ interface DiscussionPanelProps {comments: Comment[];}-interface DiscussionPanelState {- isEditing: boolean;-}--export class DiscussionPanel extends React.Component<DiscussionPanelProps, DiscussionPanelState> {+export class DiscussionPanel extends React.Component<DiscussionPanelProps, {}> {constructor(props: DiscussionPanelProps) {super(props);- this.state = {- isEditing: false- };}public render() {@@ -28,14 +21,10 @@ export class DiscussionPanel extends React.Component<DiscussionPanelProps, Discu<div className="comments-col"><div className="c-comment-list"><span className="subtitle">Discussion</span>- <CommentList- idea={this.props.idea}- user={this.props.user}- comments={this.props.comments}- onStartEdit={() => this.setState({ isEditing: true })}- onStopEdit={() => this.setState({ isEditing: false })}- />- {!this.state.isEditing && <CommentInput user={this.props.user} idea={this.props.idea} />}+ {this.props.comments.map(c => (+ <ShowComment key={c.id} idea={this.props.idea} user={this.props.user} comment={c} />+ ))}+ <CommentInput user={this.props.user} idea={this.props.idea} /></div></div>);diff --git a/public/pages/ShowIdea/components/ModerationPanel.tsx b/public/pages/ShowIdea/components/ModerationPanel.tsxindex 227d9da68..ad7e3beb9 100644--- a/public/pages/ShowIdea/components/ModerationPanel.tsx+++ b/public/pages/ShowIdea/components/ModerationPanel.tsx@@ -25,19 +25,27 @@ export class ModerationPanel extends React.Component<ModerationPanelProps, Moder};}- private async delete(): Promise<void> {+ private delete = async () => {const response = await actions.deleteIdea(this.props.idea.number, this.state.text);if (response.ok) {- this.close();+ await this.closeModal();page.goHome();} else if (response.error) {this.setState({ error: this.state.error });}- }+ };- private async close(): Promise<void> {+ private closeModal = async () => {this.setState({ showConfirmation: false });- }+ };++ private showModal = async () => {+ this.setState({ showConfirmation: true });+ };++ private setText = (text: string) => {+ this.setState({ text });+ };public render() {const status = IdeaStatus.Get(this.props.idea.status);@@ -51,7 +59,7 @@ export class ModerationPanel extends React.Component<ModerationPanelProps, Moder<Form error={this.state.error}><TextAreafield="text"- onChange={text => this.setState({ text })}+ onChange={this.setText}value={this.state.text}placeholder="Why are you deleting this idea? (optional)">@@ -63,10 +71,10 @@ export class ModerationPanel extends React.Component<ModerationPanelProps, Moder</Modal.Content><Modal.Footer>- <Button color="danger" onClick={async () => this.delete()}>+ <Button color="danger" onClick={this.delete}>Delete</Button>- <Button onClick={async () => this.close()}>Cancel</Button>+ <Button onClick={this.closeModal}>Cancel</Button></Modal.Footer></Modal.Window>);@@ -77,12 +85,7 @@ export class ModerationPanel extends React.Component<ModerationPanelProps, Moder<span className="subtitle">Moderation</span><List><ListItem>- <Button- color="danger"- size="tiny"- fluid={true}- onClick={async () => this.setState({ showConfirmation: true })}- >+ <Button color="danger" size="tiny" fluid={true} onClick={this.showModal}><i className="delete icon" /> Delete</Button></ListItem>diff --git a/public/pages/ShowIdea/components/ResponseForm.tsx b/public/pages/ShowIdea/components/ResponseForm.tsxindex fa3fcba02..7b179e7e1 100644--- a/public/pages/ShowIdea/components/ResponseForm.tsx+++ b/public/pages/ShowIdea/components/ResponseForm.tsx@@ -1,6 +1,6 @@import * as React from "react";-import { Modal, Button, DisplayError, Textarea, Select, Form, TextArea, Field } from "@fider/components";+import { Modal, Button, DisplayError, Textarea, Select, Form, TextArea, Field, SelectOption } from "@fider/components";import { Comment, Idea, IdeaStatus, User } from "@fider/models";import { IdeaSearch } from "../";@@ -30,7 +30,7 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseFor};}- private async submit() {+ private submit = async () => {const result = await actions.respond(this.props.idea.number, this.state);if (result.ok) {location.reload();@@ -39,11 +39,33 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseForerror: result.error});}- }+ };++ private showModal = async () => {+ this.setState({ showModal: true });+ };++ private closeModal = async () => {+ this.setState({ showModal: false });+ };++ private setStatus = (opt?: SelectOption) => {+ if (opt) {+ this.setState({ status: parseInt(opt.value, 10) });+ }+ };++ private setOriginalNumber = (originalNumber: number) => {+ this.setState({ originalNumber });+ };++ private setText = (text: string) => {+ this.setState({ text });+ };public render() {const button = (- <Button className="respond" fluid={true} onClick={async () => this.setState({ showModal: true })}>+ <Button className="respond" fluid={true} onClick={this.showModal}><i className="announcement icon" /> Respond</Button>);@@ -62,15 +84,12 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseForlabel="Status"defaultValue={this.props.idea.status.toString()}options={options}- onChange={opt => opt && this.setState({ status: parseInt(opt.value, 10) })}+ onChange={this.setStatus}/>{this.state.status === IdeaStatus.Duplicate.value ? (<><Field>- <IdeaSearch- exclude={[this.props.idea.number]}- onChanged={originalNumber => this.setState({ originalNumber })}- />+ <IdeaSearch exclude={[this.props.idea.number]} onChanged={this.setOriginalNumber} /></Field><DisplayError fields={["originalNumber"]} error={this.state.error} /><span className="info">Votes from this idea will be merged into original idea.</span>@@ -78,7 +97,7 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseFor) : (<TextAreafield="text"- onChange={text => this.setState({ text })}+ onChange={this.setText}value={this.state.text}minRows={5}placeholder="What's going on with this idea? Let your users know what are your plans..."@@ -88,10 +107,10 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseFor</Modal.Content><Modal.Footer>- <Button color="positive" onClick={() => this.submit()}>+ <Button color="positive" onClick={this.submit}>Submit</Button>- <Button onClick={async () => this.setState({ showModal: false })}>Cancel</Button>+ <Button onClick={this.closeModal}>Cancel</Button></Modal.Footer></Modal.Window>);diff --git a/public/pages/ShowIdea/components/ShowComment.tsx b/public/pages/ShowIdea/components/ShowComment.tsxnew file mode 100644index 000000000..243429975--- /dev/null+++ b/public/pages/ShowIdea/components/ShowComment.tsx@@ -0,0 +1,121 @@+import * as React from "react";+import { Comment, CurrentUser, Idea } from "@fider/models";+import { Gravatar, UserName, Moment, Form, TextArea, Button, MultiLineText } from "@fider/components";+import { formatDate, Failure, actions } from "@fider/services";++interface ShowCommentProps {+ idea: Idea;+ comment: Comment;+ user?: CurrentUser;+}++interface ShowCommentState {+ comment: Comment;+ isEditting: boolean;+ newContent: string;+ error?: Failure;+}++export class ShowComment extends React.Component<ShowCommentProps, ShowCommentState> {+ constructor(props: ShowCommentProps) {+ super(props);+ this.state = {+ comment: props.comment,+ isEditting: false,+ newContent: ""+ };+ }++ private canEditComment(comment: Comment): boolean {+ if (this.props.user) {+ return this.props.user.isCollaborator || comment.user.id === this.props.user.id;+ }+ return false;+ }++ private startEdit = () => {+ this.setState({ isEditting: true, newContent: this.state.comment.content, error: undefined });+ };++ private cancelEdit = async () => {+ this.setState({+ isEditting: false,+ newContent: "",+ error: undefined+ });+ };++ private saveEdit = async () => {+ const response = await actions.updateComment(this.props.idea.number, this.state.comment.id, this.state.newContent);+ if (response.ok) {+ this.state.comment.content = this.state.newContent;+ this.state.comment.editedOn = new Date().toISOString();+ this.state.comment.editedBy = this.props.user;+ this.setState({+ comment: this.state.comment+ });+ this.cancelEdit();+ } else {+ this.setState({ error: response.error });+ }+ };++ private setNewContent = (newContent: string) => {+ this.setState({ newContent });+ };++ public render() {+ const c = this.state.comment;++ const edittedMetadata = !!c.editedOn &&+ !!c.editedBy && (+ <div className="c-comment-metadata">+ ·{" "}+ <span title={`This comment has been edited by ${c.editedBy!.name} on ${formatDate(c.editedOn)}`}>edited</span>+ </div>+ );++ return (+ <div className="c-comment">+ <Gravatar user={c.user} />+ <div className="c-comment-content">+ <UserName user={c.user} />+ <div className="c-comment-metadata">+ · <Moment date={c.createdOn} />+ </div>+ {edittedMetadata}+ {!this.state.isEditting &&+ this.canEditComment(c) && (+ <div className="c-comment-metadata">+ ·{" "}+ <span className="clickable" onClick={this.startEdit}>+ edit+ </span>+ </div>+ )}+ <div className="c-comment-text">+ {this.state.isEditting ? (+ <Form error={this.state.error}>+ <TextArea+ field="content"+ minRows={1}+ value={this.state.newContent}+ placeholder={c.content}+ onChange={this.setNewContent}+ />+ <Button size="tiny" onClick={this.saveEdit} color="positive">+ Save+ </Button>+ <Button size="tiny" onClick={this.cancelEdit}>+ Cancel+ </Button>+ </Form>+ ) : (+ <MultiLineText text={c.content} style="simple" />+ )}+ </div>+ </div>+ </div>+ );+ }+}diff --git a/public/pages/ShowIdea/components/TagListItem.tsx b/public/pages/ShowIdea/components/TagListItem.tsxnew file mode 100644index 000000000..e71f7a1ad--- /dev/null+++ b/public/pages/ShowIdea/components/TagListItem.tsx@@ -0,0 +1,25 @@+import * as React from "react";+import { Tag } from "@fider/models";+import { ListItem, ShowTag } from "@fider/components";++interface TagListItemProps {+ tag: Tag;+ assigned: boolean;+ onClick: (tag: Tag) => void;+}++export class TagListItem extends React.Component<TagListItemProps, {}> {+ private onClick = () => {+ this.props.onClick(this.props.tag);+ };++ public render() {+ return (+ <ListItem onClick={this.onClick}>+ <i className={`icon ${this.props.assigned && "check"}`} />+ <ShowTag tag={this.props.tag} size="mini" circular={true} />+ <span>{this.props.tag.name}</span>+ </ListItem>+ );+ }+}diff --git a/public/pages/ShowIdea/components/TagsPanel.tsx b/public/pages/ShowIdea/components/TagsPanel.tsxindex 6f51bd5e1..4c8199463 100644--- a/public/pages/ShowIdea/components/TagsPanel.tsx+++ b/public/pages/ShowIdea/components/TagsPanel.tsx@@ -2,6 +2,7 @@ import * as React from "react";import { CurrentUser, Tag, Idea } from "@fider/models";import { actions } from "@fider/services";import { ShowTag, List, ListItem } from "@fider/components";+import { TagListItem } from "./TagListItem";interface TagsPanelProps {user?: CurrentUser;@@ -25,7 +26,7 @@ export class TagsPanel extends React.Component<TagsPanelProps, TagsPanelState> {};}- private async assignOrUnassignTag(tag: Tag) {+ private assignOrUnassignTag = async (tag: Tag) => {const idx = this.state.assignedTags.indexOf(tag);let assignedTags: Tag[] = [];if (idx >= 0) {@@ -43,7 +44,7 @@ export class TagsPanel extends React.Component<TagsPanelProps, TagsPanelState> {this.setState({assignedTags});- }+ };private onSubtitleClick = () => {if (this.state.canEdit) {@@ -72,11 +73,12 @@ export class TagsPanel extends React.Component<TagsPanelProps, TagsPanelState> {const editTagsList = this.props.tags.length > 0 && (<List className="c-tag-list">{this.props.tags.map(tag => (- <ListItem key={tag.id} onClick={async () => this.assignOrUnassignTag(tag)}>- <i className={`icon ${this.state.assignedTags.indexOf(tag) >= 0 && "check"}`} />- <ShowTag tag={tag} size="mini" circular={true} />- <span>{tag.name}</span>- </ListItem>+ <TagListItem+ key={tag.id}+ tag={tag}+ assigned={this.state.assignedTags.indexOf(tag) >= 0}+ onClick={this.assignOrUnassignTag}+ />))}</List>);diff --git a/public/pages/ShowIdea/index.ts b/public/pages/ShowIdea/index.tsindex 364df7dbf..373b553aa 100644--- a/public/pages/ShowIdea/index.ts+++ b/public/pages/ShowIdea/index.ts@@ -1,7 +1,7 @@export * from "./ShowIdea.page";export * from "./components/CommentInput";export * from "./components/ResponseForm";-export * from "./components/CommentList";+export * from "./components/ShowComment";export * from "./components/IdeaSearch";export * from "./components/TagsPanel";export * from "./components/ModerationPanel";diff --git a/public/pages/SignUp/SignUp.page.tsx b/public/pages/SignUp/SignUp.page.tsxindex 67a0721bc..c12a58109 100644--- a/public/pages/SignUp/SignUp.page.tsx+++ b/public/pages/SignUp/SignUp.page.tsx@@ -56,7 +56,7 @@ export class SignUpPage extends React.Component<SignUpPageProps, SignUpPageState}}- private async confirm() {+ private confirm = async () => {const result = await actions.createTenant({token: this.user && this.user.token,legalAgreement: this.state.legalAgreement,@@ -84,9 +84,9 @@ export class SignUpPage extends React.Component<SignUpPageProps, SignUpPageState} else if (result.error) {this.setState({ error: result.error, submitted: false });}- }+ };- private async checkAvailability(subdomain: string) {+ private checkAvailability = async (subdomain: string) => {const result = await actions.checkAvailability(subdomain);this.setState({@@ -96,12 +96,24 @@ export class SignUpPage extends React.Component<SignUpPageProps, SignUpPageStatemessage: result.data.message}});- }+ };private onAgree = (agreed: boolean): void => {this.setState({ legalAgreement: agreed });};+ private setName = (name: string): void => {+ this.setState({ name });+ };++ private setEmail = (email: string): void => {+ this.setState({ email });+ };++ private setTenantName = (tenantName: string): void => {+ this.setState({ tenantName });+ };+public render() {const modal = (<Modal.Window canClose={false} isOpen={this.state.submitted}>@@ -132,8 +144,8 @@ export class SignUpPage extends React.Component<SignUpPageProps, SignUpPageState<p>We need to identify you to setup your new Fider account.</p><SignInControl useEmail={false} /><Form error={this.state.error}>- <Input field="name" maxLength={100} onChange={name => this.setState({ name })} placeholder="Name" />- <Input field="email" maxLength={200} onChange={email => this.setState({ email })} placeholder="Email" />+ <Input field="name" maxLength={100} onChange={this.setName} placeholder="Name" />+ <Input field="email" maxLength={200} onChange={this.setEmail} placeholder="Email" /></Form></>)}@@ -144,14 +156,14 @@ export class SignUpPage extends React.Component<SignUpPageProps, SignUpPageState<Inputfield="tenantName"maxLength={60}- onChange={tenantName => this.setState({ tenantName })}+ onChange={this.setTenantName}placeholder="your company or product name"/>{!page.isSingleHostMode() && (<Inputfield="subdomain"maxLength={40}- onChange={subdomain => this.checkAvailability(subdomain)}+ onChange={this.checkAvailability}placeholder="subdomain"suffix={this.props.system.domain}>@@ -169,7 +181,7 @@ export class SignUpPage extends React.Component<SignUpPageProps, SignUpPageState<LegalAgreement onChange={this.onAgree} /></Form>- <Button color="positive" size="large" onClick={() => this.confirm()}>+ <Button color="positive" size="large" onClick={this.confirm}>Confirm</Button></div>diff --git a/public/pages/UI/UIToolkit.page.tsx b/public/pages/UI/UIToolkit.page.tsxindex 650c7ad17..4ed99a9ba 100644--- a/public/pages/UI/UIToolkit.page.tsx+++ b/public/pages/UI/UIToolkit.page.tsx@@ -19,7 +19,8 @@ import {TextArea,RadioButton,Select,- SocialSignInButton+ SocialSignInButton,+ SelectOption} from "@fider/components";import { User, UserRole, Tag } from "@fider/models";import { notify, Failure } from "@fider/services";@@ -54,6 +55,33 @@ export class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {this.state = {};}+ private notifyError = async () => {+ notify.error("Something went wrong...");+ };++ private notifySuccess = async () => {+ notify.success("Congratulations! It worked!");+ };++ private notifyStatusChange = (opt?: SelectOption) => {+ if (opt) {+ notify.success(opt.value);+ }+ };++ private forceError = async () => {+ this.setState({+ error: {+ messages: [],+ failures: {+ title: ["Title is mandatory"],+ description: ["Error #1", "Error #2"],+ status: ["Status is mandatory"]+ }+ }+ });+ };+public render() {return (<div id="p-ui-toolkit" className="page container">@@ -259,8 +287,8 @@ export class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {<h1>Notification</h1><List><ListItem>- <Button onClick={async () => notify.success("Congratulations! It worked!")}>Success</Button>- <Button onClick={async () => notify.error("Something went wrong...")}>Error</Button>+ <Button onClick={this.notifySuccess}>Success</Button>+ <Button onClick={this.notifyError}>Error</Button></ListItem></List>@@ -322,25 +350,10 @@ export class UIToolkitPage extends React.Component<{}, UIToolkitPageState> {{ value: "started", label: "Started" },{ value: "planned", label: "Planned" }]}- onChange={opt => opt && notify.success(opt.value)}+ onChange={this.notifyStatusChange}/>- <Button- onClick={async e =>- this.setState({- error: {- messages: [],- failures: {- title: ["Title is mandatory"],- description: ["Error #1", "Error #2"],- status: ["Status is mandatory"]- }- }- })- }- >- Save- </Button>+ <Button onClick={this.forceError}>Save</Button></Form><Segment>diff --git a/tslint.json b/tslint.jsonindex 94cd15a58..02c0ed9c9 100644--- a/tslint.json+++ b/tslint.json@@ -2,7 +2,6 @@"extends": ["tslint:recommended", "tslint-react", "tslint-plugin-prettier", "tslint-config-prettier"],"rules": {"interface-name": [false],- "jsx-no-lambda": false,"jsx-no-multiline-js": false,"max-classes-per-file": [false],"member-ordering": [false],