Resolve merge conflict in ActiveEditor.tsx

Author: Ubuntu

src/components/post/PostHead.tsx

@@ -176,6 +176,7 @@ const PostHead: React.FC<PostHeadProps> = ({
     toggleAskRemove();
     onRemove();
   };
+
   return (
     <PostHeadBlock>
       <div className="head-wrapper">

src/components/write/WriteMarkdownEditor.tsx

@@ -21,6 +21,7 @@ require('codemirror/mode/markdown/markdown');
 require('codemirror/mode/javascript/javascript');
 require('codemirror/mode/jsx/jsx');
 require('codemirror/addon/display/placeholder');
+require('codemirror/mode/dockerfile/dockerfile');
 
 export interface MarkdownEditorProps {
   onChangeMarkdown: (markdown: string) => void;

src/containers/post/PostViewer.tsx

@@ -101,6 +101,7 @@ const PostViewer: React.FC<PostViewerProps> = ({
   );
   const prefetched = useRef(false);
 
+  const [isRemoveLoading, setIsRemoveLoading] = useState(false);
   const [removePost] = useMutation(REMOVE_POST);
   const [postView] = useMutation(POST_VIEW);
   const [likePost, { loading: loadingLike }] = useMutation(LIKE_POST);
@@ -252,15 +253,27 @@ const PostViewer: React.FC<PostViewerProps> = ({
 
   const onRemove = async () => {
     if (!data || !data.post) return;
+    setIsRemoveLoading(true);
     try {
       await removePost({
         variables: {
           id: data.post.id,
         },
       });
-      history.push('/');
-      await client.resetStore();
-    } catch (e) {}
+
+      toast.success('게시글이 성공적으로 삭제되었습니다.', {
+        autoClose: 800,
+        onClose: () => {
+          const redirect = `${process.env
+            .REACT_APP_CLIENT_V3_HOST!}/@${username}/posts`;
+          window.location.href = redirect;
+        },
+      });
+    } catch (e) {
+      toast.error('게시글 삭제 실패');
+      console.error('Post deletion failed:', e);
+      setIsRemoveLoading(false);
+    }
   };
 
   if (error) {
@@ -377,7 +390,7 @@ const PostViewer: React.FC<PostViewerProps> = ({
     }
   };
 
-  if (!data || !data.post) return <PostSkeleton />;
+  if (!data || !data.post || isRemoveLoading) return <PostSkeleton />;
 
   const { post } = data;
 

src/containers/velog/SeriesPosts.tsx

@@ -40,33 +40,48 @@ const SeriesPosts: React.FC<SeriesPostsProps> = ({ username, urlSlug }) => {
   const user = useUser();
   const isOwnSeries = user && user.username === username;
   const [askRemove, setAskRemove] = useState(false);
+  const [isSkip, setIsSkip] = useState(false);
   const [removeSeries] = useMutation(REMOVE_SERIES);
   const { data } = useQuery<GetSeriesResponse>(GET_SERIES, {
     variables: {
       username,
       url_slug: urlSlug,
     },
     fetchPolicy: 'cache-and-network',
+    skip: isSkip,
   });
 
   const client = useApolloClient();
 
   const onAskRemove = () => setAskRemove(true);
   const onConfirmRemove = async () => {
     try {
+      setIsSkip(true);
+      setAskRemove(false);
+
+      if (!data?.series?.id) {
+        throw new Error('Series ID is not available');
+      }
+
       await removeSeries({
         variables: {
-          id: data?.series?.id,
+          id: data.series.id,
         },
       });
 
       await client.resetStore();
 
-      const redirect = `${process.env
-        .REACT_APP_CLIENT_V3_HOST!}/@${username}/series`;
-      window.location.href = redirect;
+      toast.success('시리즈가 성공적으로 삭제되었습니다.', {
+        autoClose: 800,
+        onClose: () => {
+          const redirect = `${process.env
+            .REACT_APP_CLIENT_V3_HOST!}/@${username}/series`;
+          window.location.href = redirect;
+        },
+      });
     } catch (e) {
       toast.error('시리즈 삭제 실패');
+      console.error('Series deletion failed:', e);
     }
   };
 

src/containers/write/ActiveEditor.tsx

@@ -76,7 +76,10 @@ const ActiveEditor: React.FC<ActiveEditorProps> = () => {
   const post = safe(() => readPostForEdit.data!.post);
   useEffect(() => {
     if (!post) return;
+<<<<<<< HEAD
     console.log('post.series', post.series);
+=======
+>>>>>>> 73f12a01808fdb526603ead04a10d55780b4da6d
     if (initialized.current) return;
     dispatch(
       prepareEdit({

src/lib/remark/prismPlugin.js

@@ -28,6 +28,7 @@ import 'prismjs/components/prism-ruby.min';
 import 'prismjs/components/prism-rust.min';
 import 'prismjs/components/prism-yaml.min';
 import 'prismjs/components/prism-dart';
+import 'prismjs/components/prism-docker';
 
 import { ssrEnabled } from '../utils';
 
@@ -73,5 +74,5 @@ export default function attacher({ include, exclude } = {}) {
     //   'language-' + lang,
     // ];
   }
-  return ast => visit(ast, 'code', visitor);
+  return (ast) => visit(ast, 'code', visitor);
 }