A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
feat: add queued review content
shuai7d0b4121c623
diff --git a/i18n/en_US.yaml b/i18n/en_US.yamlindex e640b642..8dd7f55c 100644--- a/i18n/en_US.yaml+++ b/i18n/en_US.yaml@@ -1563,6 +1563,7 @@ ui:status: Statusaction: Actionchange: Change+ pending: Pendingfilter:placeholder: "Filter by title, question:id"answers:@@ -1814,10 +1815,15 @@ ui:edit_answer: Edit answeredit_tag: Edit tagempty: No review tasks left.- approve_this_type: Do you approve this {{ type }}?+ approve_revision_tip: Do you approve this revision?+ approve_flag_tip: Do you approve this flag?+ approve_post_tip: Do you approve this post?+ approve_user_tip: Do you approve this user?suggest_edits: Suggested editsflag_post: Flag postflag_user: Flag user+ queued_post: Queued post+ queued_user: Queued userfilter_label: Typereputation: reputationflag_post_type: Flagged this post as {{ type }}diff --git a/ui/src/common/constants.ts b/ui/src/common/constants.tsindex d11dc7f8..71ad6223 100644--- a/ui/src/common/constants.ts+++ b/ui/src/common/constants.ts@@ -54,6 +54,11 @@ export const ADMIN_LIST_STATUS = {variant: 'text-bg-danger',name: 'deleted',},+ // pending+ 11: {+ variant: 'text-bg-warning',+ name: 'pending',+ },normal: {variant: 'text-bg-success',name: 'normal',diff --git a/ui/src/common/interface.ts b/ui/src/common/interface.tsindex 847c4fb7..7c4c5e71 100644--- a/ui/src/common/interface.ts+++ b/ui/src/common/interface.ts@@ -597,7 +597,7 @@ export interface ReasonItem {reason_type: number;}-export interface FlagReviewItem {+export interface BaseReviewItem {object_type: 'question' | 'answer' | 'comment' | 'user';object_id: string;object_show_status: number;@@ -605,9 +605,7 @@ export interface FlagReviewItem {tags: Tag[];title: string;original_text: string;- reason: ReasonItem;author_user_info: UserInfoBase;- submitter_user: UserInfoBase;created_at: number;submit_at: number;comment_id: string;@@ -618,11 +616,26 @@ export interface FlagReviewItem {flag_id: string;}+export interface FlagReviewItem extends BaseReviewItem {+ reason: ReasonItem;+ submitter_user: UserInfoBase;+}+export interface FlagReviewResp {count: number;list: FlagReviewItem[];}+export interface QueuedReviewItem extends BaseReviewItem {+ reason: string;+ submitter_display_name: string;+}++export interface QueuedReviewResp {+ count: number;+ list: QueuedReviewItem[];+}+export interface UserRoleItem {id: number;name: string;diff --git a/ui/src/pages/Review/components/FlagContent/index.tsx b/ui/src/pages/Review/components/FlagContent/index.tsxindex 526e273b..a509ccd0 100644--- a/ui/src/pages/Review/components/FlagContent/index.tsx+++ b/ui/src/pages/Review/components/FlagContent/index.tsx@@ -7,13 +7,17 @@ import classNames from 'classnames';import { getFlagReviewPostList, putFlagReviewAction } from '@/services';import { BaseUserCard, Tag, FormatTime } from '@/components';-import { pathFactory } from '@/router/pathFactory';import { scrollToDocTop } from '@/utils';import type * as Type from '@/common/interface';import { ADMIN_LIST_STATUS } from '@/common/constants';import ApproveDropdown from '../ApproveDropdown';+import generateData from '../../utils/generateData';-const Index: FC = () => {+interface IProps {+ refreshCount: () => void;+}++const Index: FC<IProps> = ({ refreshCount }) => {const { t } = useTranslation('translation', { keyPrefix: 'page_review' });const [noTasks, setNoTasks] = useState(false);const [isLoading, setIsLoading] = useState(false);@@ -63,6 +67,7 @@ const Index: FC = () => {if (!flagItemData) {return;}+ refreshCount();queryNextOne(page);};@@ -73,7 +78,8 @@ const Index: FC = () => {flag_id: String(flagItemData?.flag_id),}).then(() => {- queryNextOne(page + 1);+ refreshCount();+ queryNextOne(page);}).finally(() => {setIsLoading(false);@@ -93,41 +99,8 @@ const Index: FC = () => {reason: null,object_status: 0,};- let itemLink = '';- let itemId = '';- let itemTimePrefix = '';- if (object_type === 'question') {- itemLink = pathFactory.questionLanding(- String(flagItemData?.question_id),- flagItemData?.title,- );- itemId = String(flagItemData?.question_id);- itemTimePrefix = 'asked';- } else if (object_type === 'answer') {- itemLink = pathFactory.answerLanding({- // @ts-ignore- questionId: flagItemData?.question_id,- slugTitle: flagItemData?.title,- answerId: String(flagItemData?.object_id),- });- itemId = String(flagItemData?.object_id);- itemTimePrefix = 'answered';- } else if (object_type === 'comment') {- if (flagItemData?.question_id && flagItemData?.answer_id) {- itemLink = `${pathFactory.answerLanding({- questionId: flagItemData?.question_id,- answerId: flagItemData?.answer_id,- })}?commentId=${flagItemData?.comment_id}`;- } else {- itemLink = `${pathFactory.questionLanding(- String(flagItemData?.question_id),- flagItemData?.title,- )}?commentId=${flagItemData?.comment_id}`;- }- itemId = String(flagItemData?.comment_id);- itemTimePrefix = 'commented';- }+ const { itemLink, itemId, itemTimePrefix } = generateData(flagItemData);if (noTasks) return null;return (@@ -214,7 +187,7 @@ const Index: FC = () => {</Card.Body><Card.Footer className="p-3">- <p>{t('approve_this_type', { type: 'revision' })}</p>+ <p>{t('approve_flag_tip')}</p><Stack direction="horizontal" gap={2}><ApproveDropdownobjectType={object_type}diff --git a/ui/src/pages/Review/components/QueuedContent/index.tsx b/ui/src/pages/Review/components/QueuedContent/index.tsxnew file mode 100644index 00000000..630a8e9b--- /dev/null+++ b/ui/src/pages/Review/components/QueuedContent/index.tsx@@ -0,0 +1,197 @@+import { FC, useEffect, useState } from 'react';+import { Card, Alert, Stack, Button } from 'react-bootstrap';+import { useTranslation } from 'react-i18next';+import { Link } from 'react-router-dom';++import classNames from 'classnames';++import { getPendingReviewPostList, putPendingReviewAction } from '@/services';+import { BaseUserCard, Tag, FormatTime, Icon } from '@/components';+import { scrollToDocTop } from '@/utils';+import type * as Type from '@/common/interface';+import { ADMIN_LIST_STATUS } from '@/common/constants';+import generateData from '../../utils/generateData';++interface IProps {+ refreshCount: () => void;+}++const Index: FC<IProps> = ({ refreshCount }) => {+ const { t } = useTranslation('translation', { keyPrefix: 'page_review' });+ const [noTasks, setNoTasks] = useState(false);+ const [isLoading, setIsLoading] = useState(false);+ const [page, setPage] = useState(1);+ const [reviewResp, setReviewResp] = useState<Type.QuestionDetailRes>();+ const flagItemData = reviewResp?.list[0] as Type.QueuedReviewItem;++ console.log('pendingResp', reviewResp);++ const resolveNextOne = (resp, pageNumber) => {+ const { count, list = [] } = resp;+ // auto rollback+ if (!list.length && count && page !== 1) {+ pageNumber = 1;+ setPage(pageNumber);+ // eslint-disable-next-line @typescript-eslint/no-use-before-define+ queryNextOne(pageNumber);+ return;+ }+ if (pageNumber !== page) {+ setPage(pageNumber);+ }+ setReviewResp(resp);+ if (!list.length) {+ setNoTasks(true);+ }+ setTimeout(() => {+ scrollToDocTop();+ }, 150);+ };++ const queryNextOne = (pageNumber) => {+ getPendingReviewPostList(pageNumber).then((resp) => {+ resolveNextOne(resp, pageNumber);+ });+ };++ useEffect(() => {+ queryNextOne(page);+ }, []);++ const handleAction = (type: 'approve' | 'reject') => {+ if (!flagItemData) {+ return;+ }+ setIsLoading(true);+ putPendingReviewAction({+ status: type,+ review_id: String(flagItemData?.flag_id),+ })+ .then(() => {+ refreshCount();+ queryNextOne(page + 1);+ })+ .finally(() => {+ setIsLoading(false);+ });+ };++ const { object_type, author_user_info, object_status, reason } =+ flagItemData || {+ object_type: '',+ author_user_info: null,+ reason: null,+ object_status: 0,+ };++ const { itemLink, itemId, itemTimePrefix } = generateData(flagItemData);++ if (noTasks) return null;+ return (+ <Card>+ <Card.Header>+ {object_type !== 'user' ? t('queued_post') : t('queued_post_user')}+ </Card.Header>+ <Card.Body className="p-0">+ <Alert variant="info" className="border-0 rounded-0 mb-0">+ <Stack+ direction="horizontal"+ gap={1}+ className="align-items-center mb-2">+ <div className="small d-flex align-items-center">+ <Icon type="bi" name="plugin" size="24px" className="me-1" />+ <span>{flagItemData?.submitter_display_name}</span>+ </div>+ {flagItemData?.submit_at && (+ <FormatTime+ time={flagItemData.submit_at}+ className="small text-secondary"+ preFix={t('proposed')}+ />+ )}+ </Stack>+ <Stack className="align-items-start">+ <p className="mb-0">{reason}</p>+ </Stack>+ </Alert>+ <div className="p-3">+ <small className="d-block text-secondary mb-4">+ <span>{t(object_type, { keyPrefix: 'btns' })} </span>+ <Link to={itemLink} target="_blank" className="link-secondary">+ #{itemId}+ </Link>+ </small>+ {object_type === 'question' && (+ <>+ <h5 className="mb-3">{flagItemData?.title}</h5>+ <div className="mb-4">+ {flagItemData?.tags?.map((item) => {+ return (+ <Tag key={item.slug_name} className="me-1" data={item} />+ );+ })}+ </div>+ </>+ )}+ <div className="small font-monospace">+ {flagItemData?.original_text}+ </div>+ <div className="d-flex flex-wrap align-items-center justify-content-between mt-4">+ <div>+ <span+ className={classNames(+ 'badge',+ ADMIN_LIST_STATUS[object_status]?.variant,+ )}>+ {t(ADMIN_LIST_STATUS[object_status]?.name, {+ keyPrefix: 'admin.questions',+ })}+ </span>+ {flagItemData?.object_show_status === 2 && (+ <span+ className={classNames(+ 'ms-1 badge',+ ADMIN_LIST_STATUS.unlist.variant,+ )}>+ {t(ADMIN_LIST_STATUS.unlist.name, { keyPrefix: 'btns' })}+ </span>+ )}+ </div>+ <div className="d-flex align-items-center small">+ <BaseUserCard data={author_user_info} avatarSize="24" />+ <FormatTime+ time={Number(flagItemData?.created_at)}+ className="text-secondary ms-1 flex-shrink-0"+ preFix={t(itemTimePrefix, { keyPrefix: 'question_detail' })}+ />+ </div>+ </div>+ </div>+ </Card.Body>++ <Card.Footer className="p-3">+ <p>+ {object_type !== 'user'+ ? t('approve_post_tip')+ : t('approve_user_tip')}+ </p>+ <Stack direction="horizontal" gap={2}>+ <Button+ variant="outline-primary"+ disabled={isLoading}+ onClick={() => handleAction('approve')}>+ {t('approve', { keyPrefix: 'btns' })}+ </Button>+ <Button+ variant="outline-primary"+ disabled={isLoading}+ onClick={() => handleAction('reject')}>+ {t('reject', { keyPrefix: 'btns' })}+ </Button>+ </Stack>+ </Card.Footer>+ </Card>+ );+};++export default Index;diff --git a/ui/src/pages/Review/components/Filter/index.tsx b/ui/src/pages/Review/components/ReviewType/index.tsxsimilarity index 100%rename from ui/src/pages/Review/components/Filter/index.tsxrename to ui/src/pages/Review/components/ReviewType/index.tsxdiff --git a/ui/src/pages/Review/components/SuggestEditContent/index.tsx b/ui/src/pages/Review/components/SuggestContent/index.tsxsimilarity index 97%rename from ui/src/pages/Review/components/SuggestEditContent/index.tsxrename to ui/src/pages/Review/components/SuggestContent/index.tsxindex 9e45b97d..b30c16fb 100644--- a/ui/src/pages/Review/components/SuggestEditContent/index.tsx+++ b/ui/src/pages/Review/components/SuggestContent/index.tsx@@ -28,7 +28,11 @@ import { pathFactory } from '@/router/pathFactory';import { scrollToDocTop } from '@/utils';import type * as Type from '@/common/interface';-const Index: FC = () => {+interface IProps {+ refreshCount: () => void;+}++const Index: FC<IProps> = ({ refreshCount }) => {const { t } = useTranslation('translation', { keyPrefix: 'page_review' });const [isLoading, setIsLoading] = useState(false);const [noTasks, setNoTasks] = useState(false);@@ -79,6 +83,7 @@ const Index: FC = () => {setIsLoading(true);revisionAudit(unreviewed_info.id, 'approve').then(() => {+ refreshCount();queryNextOne(page);}).catch((ex) => {@@ -96,6 +101,7 @@ const Index: FC = () => {setIsLoading(true);revisionAudit(unreviewed_info.id, 'reject').then(() => {+ refreshCount();queryNextOne(page);}).catch((ex) => {@@ -223,7 +229,7 @@ const Index: FC = () => {</div></Card.Body><Card.Footer className="p-3">- <p>{t('approve_this_type', { type: 'revision' })}</p>+ <p>{t('approve_revision_tip')}</p><Stack direction="horizontal" gap={2}><Buttonvariant="outline-primary"diff --git a/ui/src/pages/Review/components/index.ts b/ui/src/pages/Review/components/index.tsindex ff1950b1..0e02a69b 100644--- a/ui/src/pages/Review/components/index.ts+++ b/ui/src/pages/Review/components/index.ts@@ -1,13 +1,15 @@-import Filter from './Filter';+import ReviewType from './ReviewType';import ApproveDropdown from './ApproveDropdown';import EditPostModal from './EditPostModal';-import SuggestEditContent from './SuggestEditContent';+import SuggestContent from './SuggestContent';import FlagContent from './FlagContent';+import QueuedContent from './QueuedContent';export {- Filter,+ ReviewType,ApproveDropdown,EditPostModal,FlagContent,- SuggestEditContent,+ SuggestContent,+ QueuedContent,};diff --git a/ui/src/pages/Review/index.tsx b/ui/src/pages/Review/index.tsxindex c73ba9b7..40bf6b3b 100644--- a/ui/src/pages/Review/index.tsx+++ b/ui/src/pages/Review/index.tsx@@ -26,19 +26,29 @@ import { Empty } from '@/components';import { getReviewType } from '@/services';import type * as Type from '@/common/interface';-import { Filter, FlagContent, SuggestEditContent } from './components';+import {+ ReviewType,+ FlagContent,+ SuggestContent,+ QueuedContent,+} from './components';const Index: FC = () => {const { t } = useTranslation('translation', { keyPrefix: 'page_review' });const [reviewTypeList, setReviewTypeList] = useState<Type.ReviewTypeItem[]>();const [currentReviewType, setCurrentReviewType] = useState('');+ const [isEmpty, setIsEmpty] = useState(false);- const fetchReviewType = () => {+ const fetchReviewType = (changeReviewType: boolean) => {getReviewType().then((resp) => {const filterData = resp.filter((item) => item.todo_amount > 0);if (filterData.length > 0) {- setCurrentReviewType(filterData[0].name);+ if (changeReviewType) {+ setCurrentReviewType(filterData[0].name);+ }+ } else {+ setIsEmpty(true);}setReviewTypeList(resp);})@@ -48,7 +58,7 @@ const Index: FC = () => {};useEffect(() => {- fetchReviewType();+ fetchReviewType(true);}, []);usePageTags({@@ -59,15 +69,22 @@ const Index: FC = () => {<Row className="pt-4 mb-5"><h3 className="mb-4">{t('review')}</h3><Col className="page-main flex-auto">- {currentReviewType === 'suggested_post_edit' && <SuggestEditContent />}+ {currentReviewType === 'suggested_post_edit' && (+ <SuggestContent refreshCount={() => fetchReviewType(false)} />+ )}- {/* {currentReviewType === 'flagged_post' && <FlagContent />} */}- <FlagContent />- <Empty>{t('empty')}</Empty>+ {currentReviewType === 'flagged_post' && (+ <FlagContent refreshCount={() => fetchReviewType(false)} />+ )}++ {currentReviewType === 'queued_post' && (+ <QueuedContent refreshCount={() => fetchReviewType(false)} />+ )}+ {isEmpty && <Empty>{t('empty')}</Empty>}</Col><Col className="page-right-side mt-4 mt-xl-0">- <Filter+ <ReviewTypelist={reviewTypeList}checked={currentReviewType}callback={(name) => {diff --git a/ui/src/pages/Review/utils/generateData.ts b/ui/src/pages/Review/utils/generateData.tsnew file mode 100644index 00000000..42d80726--- /dev/null+++ b/ui/src/pages/Review/utils/generateData.ts@@ -0,0 +1,58 @@+import { pathFactory } from '@/router/pathFactory';++export default (data: any) => {+ if (!data?.object_id) {+ return {+ itemLink: '',+ itemId: '',+ itemTimePrefix: '',+ };+ }++ const {+ object_type = '',+ object_id = '',+ question_id = '',+ answer_id = '',+ comment_id = '',+ title = '',+ } = data;+ let itemLink = '';+ let itemId = '';+ let itemTimePrefix = '';++ if (object_type === 'question') {+ itemLink = pathFactory.questionLanding(String(object_id), title);+ itemId = String(question_id);+ itemTimePrefix = 'asked';+ } else if (object_type === 'answer') {+ itemLink = pathFactory.answerLanding({+ // @ts-ignore+ questionId: question_id,+ slugTitle: title,+ answerId: String(object_id),+ });+ itemId = String(object_id);+ itemTimePrefix = 'answered';+ } else if (object_type === 'comment') {+ if (question_id && answer_id) {+ itemLink = `${pathFactory.answerLanding({+ questionId: question_id,+ answerId: answer_id,+ })}?commentId=${comment_id}`;+ } else {+ itemLink = `${pathFactory.questionLanding(+ String(question_id),+ title,+ )}?commentId=${comment_id}`;+ }+ itemId = String(comment_id);+ itemTimePrefix = 'commented';+ }++ return {+ itemLink,+ itemId,+ itemTimePrefix,+ };+};diff --git a/ui/src/services/client/review.ts b/ui/src/services/client/review.tsindex 09278914..22d95ecd 100644--- a/ui/src/services/client/review.ts+++ b/ui/src/services/client/review.ts@@ -38,3 +38,15 @@ export const getFlagReviewPostList = (page: number) => {export const putFlagReviewAction = (params: Type.PutFlagReviewParams) => {return request.put('/answer/api/v1/report/review', params);};++export const getPendingReviewPostList = (page: number) => {+ const apiUrl = `/answer/api/v1/review/pending/post/page?page=${page}`;+ return request.get<Type.QueuedReviewResp>(apiUrl);+};++export const putPendingReviewAction = (params: {+ review_id: string;+ status: 'approve' | 'reject';+}) => {+ return request.put('/answer/api/v1/review/pending/post', params);+};