Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Delete post working

Matt Robertsb1e7f2cfc724
diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsx
index 3d893701f..ccacf8636 100644
--- a/public/pages/ShowPost/ShowPost.page.tsx
+++ b/public/pages/ShowPost/ShowPost.page.tsx
@@ -23,21 +23,22 @@ import {
Avatar,
Dropdown,
} from "@fider/components"
-import { ResponseForm } from "./components/ResponseForm"
-import { TagsPanel } from "./components/TagsPanel"
-import { NotificationsPanel } from "./components/NotificationsPanel"
-import { ModerationPanel } from "./components/ModerationPanel"
+// import { ResponseForm } from "./components/ResponseForm"
+// import { TagsPanel } from "./components/TagsPanel"
+// import { NotificationsPanel } from "./components/NotificationsPanel"
+// import { ModerationPanel } from "./components/ModerationPanel"
import { DiscussionPanel } from "./components/DiscussionPanel"
-import { VotesPanel } from "./components/VotesPanel"
+// import { VotesPanel } from "./components/VotesPanel"
import IconX from "@fider/assets/images/heroicons-x.svg"
-import IconPencilAlt from "@fider/assets/images/heroicons-pencil-alt.svg"
+// import IconPencilAlt from "@fider/assets/images/heroicons-pencil-alt.svg"
import IconThumbsUp from "@fider/assets/images/heroicons-thumbsup.svg"
import { HStack, VStack } from "@fider/components/layout"
import { Trans } from "@lingui/macro"
import { TagsPanel2 } from "./components/TagsPanel2"
import { NotificationsPanel2 } from "./components/NotificationsPanel2"
import { VoteSection } from "./components/VoteSection"
+import { ModerationPanel } from "./components/ModerationPanel"
interface ShowPostPageProps {
post: Post
@@ -51,6 +52,7 @@ interface ShowPostPageProps {
interface ShowPostPageState {
editMode: boolean
newTitle: string
+ showDeleteModal: boolean
attachments: ImageUpload[]
newDescription: string
highlightedComment?: number
@@ -72,6 +74,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
this.state = {
editMode: false,
+ showDeleteModal: false,
newTitle: this.props.post.title,
newDescription: this.props.post.description,
attachments: [],
@@ -118,6 +121,10 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
this.setState({ attachments })
}
+ private setShowDeleteModal = (showDeleteModal: boolean) => {
+ this.setState({ showDeleteModal })
+ }
+
private cancelEdit = async () => {
this.setState({ error: undefined, editMode: false })
}
@@ -158,7 +165,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
navigator.clipboard.writeText(window.location.href)
notify.success(<Trans id="showpost.copylink.success">Link copied to clipboard</Trans>)
} else if (action === "delete") {
- // actions.deletePost(this.props.post.number)
+ this.setShowDeleteModal(true)
} else if (action === "status") {
// actions.changeStatus(this.props.post.number, this.props.post.status)
} else if (action === "edit") {
@@ -174,8 +181,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
<div className="p-show-post">
<div className="p-show-post__main-col">
<div className="p-show-post__header-col">
- <VStack spacing={6}>
-
+ <VStack spacing={8}>
<HStack justify="between">
<div className="flex-grow">
{this.state.editMode ? (
@@ -191,6 +197,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
</>
)}
</div>
+ <ModerationPanel onModalClose={() => this.setShowDeleteModal(false)} showModal={this.state.showDeleteModal} post={this.props.post} />
{!this.state.editMode && (
<Dropdown position="left" renderHandle={<Icon sprite={IconDotsHorizontal} width="24" height="24" />}>
<Dropdown.ListItem onClick={this.onActionSelected("copy")}>
@@ -278,7 +285,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
</div>
</div>
<div className="p-show-post__action-col">
- <VStack spacing={4}>
+ {/* <VStack spacing={4}>
<VotesPanel post={this.props.post} votes={this.props.votes} />
{Fider.session.isAuthenticated && canEditPost(Fider.session.user, this.props.post) && (
@@ -318,7 +325,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
<TagsPanel post={this.props.post} tags={this.props.tags} />
<NotificationsPanel post={this.props.post} subscribed={this.props.subscribed} />
<ModerationPanel post={this.props.post} />
- </VStack>
+ </VStack> */}
<PoweredByFider slot="show-post" className="mt-3" />
</div>
</div>
diff --git a/public/pages/ShowPost/components/ModerationPanel.tsx b/public/pages/ShowPost/components/ModerationPanel.tsx
index e37b356a6..019234c8d 100644
--- a/public/pages/ShowPost/components/ModerationPanel.tsx
+++ b/public/pages/ShowPost/components/ModerationPanel.tsx
@@ -3,26 +3,23 @@ import { PostStatus, Post } from "@fider/models"
import { actions, navigator, Failure } from "@fider/services"
import { Form, Modal, Button, TextArea } from "@fider/components"
import { useFider } from "@fider/hooks"
-import { VStack } from "@fider/components/layout"
import { t, Trans } from "@lingui/macro"
interface ModerationPanelProps {
post: Post
+ showModal: boolean
+ onModalClose: () => void
}
export const ModerationPanel = (props: ModerationPanelProps) => {
const fider = useFider()
- const [showConfirmation, setShowConfirmation] = useState(false)
const [text, setText] = useState("")
const [error, setError] = useState<Failure>()
- const hideModal = async () => setShowConfirmation(false)
- const showModal = async () => setShowConfirmation(true)
-
const handleDelete = async () => {
const response = await actions.deletePost(props.post.number, text)
if (response.ok) {
- hideModal()
+ props.onModalClose()
navigator.goHome()
} else if (response.error) {
setError(response.error)
@@ -35,7 +32,7 @@ export const ModerationPanel = (props: ModerationPanelProps) => {
}
const modal = (
- <Modal.Window isOpen={showConfirmation} onClose={hideModal} center={false} size="large">
+ <Modal.Window isOpen={props.showModal} onClose={props.onModalClose} center={false} size="large">
<Modal.Content>
<Form error={error}>
<TextArea
@@ -57,22 +54,12 @@ export const ModerationPanel = (props: ModerationPanelProps) => {
<Button variant="danger" onClick={handleDelete}>
<Trans id="action.delete">Delete</Trans>
</Button>
- <Button variant="tertiary" onClick={hideModal}>
+ <Button variant="tertiary" onClick={props.onModalClose}>
<Trans id="action.cancel">Cancel</Trans>
</Button>
</Modal.Footer>
</Modal.Window>
)
- return (
- <VStack>
- {modal}
- <span className="text-category">
- <Trans id="label.moderation">Moderation</Trans>
- </span>
- <Button disabled={fider.isReadOnly} variant="danger" size="small" className="w-full" onClick={showModal}>
- <Trans id="action.delete">Delete</Trans>
- </Button>
- </VStack>
- )
+ return modal
}