visuddhinanda il y a 2 ans
Parent
commit
3cf2023428

+ 2 - 1
dashboard/src/components/discussion/DiscussionItem.tsx

@@ -34,7 +34,6 @@ const DiscussionItemWidget = ({
 }: IWidget) => {
 }: IWidget) => {
   const [edit, setEdit] = useState(false);
   const [edit, setEdit] = useState(false);
   const [currData, setCurrData] = useState<IComment>(data);
   const [currData, setCurrData] = useState<IComment>(data);
-  console.log("isFocus", isFocus);
   return (
   return (
     <div
     <div
       id={`answer-${data.id}`}
       id={`answer-${data.id}`}
@@ -42,6 +41,8 @@ const DiscussionItemWidget = ({
         display: "flex",
         display: "flex",
         width: "100%",
         width: "100%",
         border: isFocus ? "2px solid blue" : "unset",
         border: isFocus ? "2px solid blue" : "unset",
+        borderRadius: 10,
+        padding: 5,
       }}
       }}
     >
     >
       <div style={{ width: "2em" }}>
       <div style={{ width: "2em" }}>

+ 0 - 2
dashboard/src/components/discussion/DiscussionTopic.tsx

@@ -16,13 +16,11 @@ const DiscussionTopicWidget = ({
   onTopicReady,
   onTopicReady,
   onItemCountChange,
   onItemCountChange,
 }: IWidget) => {
 }: IWidget) => {
-  console.log("focus", focus);
   return (
   return (
     <>
     <>
       <DiscussionTopicInfo
       <DiscussionTopicInfo
         topicId={topicId}
         topicId={topicId}
         onReady={(value: IComment) => {
         onReady={(value: IComment) => {
-          console.log("on Topic Ready", value);
           if (typeof onTopicReady !== "undefined") {
           if (typeof onTopicReady !== "undefined") {
             onTopicReady(value);
             onTopicReady(value);
           }
           }

+ 7 - 6
dashboard/src/components/discussion/DiscussionTopicChildren.tsx

@@ -20,7 +20,13 @@ const DiscussionTopicChildrenWidget = ({
   const intl = useIntl();
   const intl = useIntl();
   const [data, setData] = useState<IComment[]>([]);
   const [data, setData] = useState<IComment[]>([]);
   const [loading, setLoading] = useState(true);
   const [loading, setLoading] = useState(true);
-
+  useEffect(() => {
+    if (loading === false) {
+      const ele = document.getElementById(`answer-${focus}`);
+      ele?.scrollIntoView();
+      console.log("after render");
+    }
+  });
   useEffect(() => {
   useEffect(() => {
     if (typeof topicId === "undefined") {
     if (typeof topicId === "undefined") {
       return;
       return;
@@ -29,9 +35,7 @@ const DiscussionTopicChildrenWidget = ({
 
 
     get<ICommentListResponse>(`/v2/discussion?view=answer&id=${topicId}`)
     get<ICommentListResponse>(`/v2/discussion?view=answer&id=${topicId}`)
       .then((json) => {
       .then((json) => {
-        console.log(json);
         if (json.ok) {
         if (json.ok) {
-          console.log("ok", json.data);
           const discussions: IComment[] = json.data.rows.map((item) => {
           const discussions: IComment[] = json.data.rows.map((item) => {
             return {
             return {
               id: item.id,
               id: item.id,
@@ -72,14 +76,12 @@ const DiscussionTopicChildrenWidget = ({
           itemLayout="horizontal"
           itemLayout="horizontal"
           dataSource={data}
           dataSource={data}
           renderItem={(item) => {
           renderItem={(item) => {
-            console.log("focus", item.id, focus);
             return (
             return (
               <List.Item>
               <List.Item>
                 <DiscussionItem
                 <DiscussionItem
                   data={item}
                   data={item}
                   isFocus={item.id === focus ? true : false}
                   isFocus={item.id === focus ? true : false}
                   onDelete={() => {
                   onDelete={() => {
-                    console.log("delete", item.id, data);
                     if (typeof onItemCountChange !== "undefined") {
                     if (typeof onItemCountChange !== "undefined") {
                       onItemCountChange(data.length - 1, item.parent);
                       onItemCountChange(data.length - 1, item.parent);
                     }
                     }
@@ -97,7 +99,6 @@ const DiscussionTopicChildrenWidget = ({
         contentType="markdown"
         contentType="markdown"
         parent={topicId}
         parent={topicId}
         onCreated={(e: IComment) => {
         onCreated={(e: IComment) => {
-          console.log("create", e);
           const newData = JSON.parse(JSON.stringify(e));
           const newData = JSON.parse(JSON.stringify(e));
           setData([...data, newData]);
           setData([...data, newData]);
           if (typeof onItemCountChange !== "undefined") {
           if (typeof onItemCountChange !== "undefined") {

+ 3 - 2
dashboard/src/components/discussion/DiscussionTopicInfo.tsx

@@ -19,9 +19,10 @@ const DiscussionTopicInfoWidget = ({ topicId, onReady }: IWidget) => {
     if (typeof topicId === "undefined") {
     if (typeof topicId === "undefined") {
       return;
       return;
     }
     }
-    get<ICommentResponse>(`/v2/discussion/${topicId}`)
+    const url = `/v2/discussion/${topicId}`;
+    console.log("url", url);
+    get<ICommentResponse>(url)
       .then((json) => {
       .then((json) => {
-        console.log("ICommentResponse", json);
         if (json.ok) {
         if (json.ok) {
           console.log("flashes.success");
           console.log("flashes.success");
           const item = json.data;
           const item = json.data;