another review of chatgpt

Author: Ahtesham Quraish

frontends/main/src/app-pages/WebsiteContent/WebsiteContentDetail.tsx

@@ -42,12 +42,14 @@ const WebsiteContentDetail = ({
     return notFound()
   }
 
-  const Editor = article.content_type === "article" ? ArticleEditor : NewsEditor
-
   return (
     <PageContainer>
       <LearningResourceProvider resourceIds={learningResourceIds}>
-        <Editor article={article} readOnly />
+        {article.content_type === "article" ? (
+          <ArticleEditor article={article} readOnly />
+        ) : (
+          <NewsEditor newsItem={article} readOnly />
+        )}
       </LearningResourceProvider>
     </PageContainer>
   )

frontends/main/src/app-pages/WebsiteContent/WebsiteContentEditPage.tsx

@@ -35,13 +35,17 @@ const PUBLISHED_VIEW_URL: Record<string, (slug: string) => string> = {
 const EDITORS: Record<
   string,
   React.ComponentType<{
-    onSave?: (article: WebsiteContent) => void
+    onSave?: (savedContent: WebsiteContent) => void
     readOnly?: boolean
-    article?: WebsiteContent
+    contentItem?: WebsiteContent
   }>
 > = {
-  article: ArticleEditor,
-  news: NewsEditor,
+  article: ({ contentItem, ...props }) => (
+    <ArticleEditor article={contentItem} {...props} />
+  ),
+  news: ({ contentItem, ...props }) => (
+    <NewsEditor newsItem={contentItem} {...props} />
+  ),
 }
 
 interface WebsiteContentEditPageProps {
@@ -78,7 +82,7 @@ const WebsiteContentEditPage = ({
     <RestrictedRoute requires={Permission.ArticleEditor}>
       <PageContainer>
         <Editor
-          article={article}
+          contentItem={article}
           onSave={(saved) => {
             if (saved.is_published) {
               invariant(saved.slug, "Published content must have a slug")

frontends/main/src/app-pages/WebsiteContent/WebsiteContentNewPage.tsx

@@ -26,13 +26,15 @@ const PUBLISHED_VIEW_URL: Record<string, (slug: string) => string> = {
 const EDITORS: Record<
   string,
   React.ComponentType<{
-    onSave?: (article: WebsiteContent) => void
+    onSave?: (savedContent: WebsiteContent) => void
     readOnly?: boolean
-    article?: WebsiteContent
+    contentItem?: WebsiteContent
   }>
 > = {
-  article: ArticleEditor,
-  news: NewsEditor,
+  article: ({ contentItem, ...props }) => (
+    <ArticleEditor article={contentItem} {...props} />
+  ),
+  news: ({ contentItem: _contentItem, ...props }) => <NewsEditor {...props} />,
 }
 
 interface WebsiteContentNewPageProps {

frontends/main/src/page-components/TiptapEditor/NewsViewer.test.tsx

@@ -64,7 +64,7 @@ describe("NewsViewer", () => {
       },
     })
 
-    renderWithProviders(<NewsEditor article={newsItem} readOnly />)
+    renderWithProviders(<NewsEditor newsItem={newsItem} readOnly />)
 
     await screen.findByRole("heading", { name: "Test Title", level: 1 })
     await screen.findByText("Test subheading")
@@ -83,7 +83,7 @@ describe("NewsViewer", () => {
       author_name: authorName,
     })
 
-    renderWithProviders(<NewsEditor article={newsItem} readOnly />)
+    renderWithProviders(<NewsEditor newsItem={newsItem} readOnly />)
 
     await screen.findByText(`By ${authorName}`)
   })
@@ -202,7 +202,7 @@ describe("NewsViewer", () => {
       },
     })
 
-    renderWithProviders(<NewsEditor article={newsItem} readOnly />)
+    renderWithProviders(<NewsEditor newsItem={newsItem} readOnly />)
 
     await screen.findByRole("heading", { level: 1, name: "Heading Level 1" })
     await screen.findByRole("heading", { level: 2, name: "Heading Level 2" })
@@ -294,7 +294,7 @@ describe("NewsViewer", () => {
       },
     })
 
-    renderWithProviders(<NewsEditor article={newsItem} readOnly />)
+    renderWithProviders(<NewsEditor newsItem={newsItem} readOnly />)
 
     const firstUnordered = await screen.findByText("First unordered item")
     const secondUnordered = await screen.findByText("Second unordered item")
@@ -398,7 +398,7 @@ describe("NewsViewer", () => {
       },
     })
 
-    renderWithProviders(<NewsEditor article={newsItem} readOnly />)
+    renderWithProviders(<NewsEditor newsItem={newsItem} readOnly />)
 
     const boldText = await screen.findByText("bold text")
     expect(boldText).toBeInTheDocument()
@@ -486,7 +486,7 @@ describe("NewsViewer", () => {
       },
     })
 
-    renderWithProviders(<NewsEditor article={newsItem} readOnly />)
+    renderWithProviders(<NewsEditor newsItem={newsItem} readOnly />)
 
     const link = await screen.findByRole("link", { name: "example.com" })
     expect(link).toBeInTheDocument()
@@ -501,7 +501,7 @@ describe("NewsViewer", () => {
     })
     setMockResponse.get(urls.userMe.get(), user)
     const newsItem = factories.websiteContent.websiteContent()
-    renderWithProviders(<NewsEditor article={newsItem} readOnly />)
+    renderWithProviders(<NewsEditor newsItem={newsItem} readOnly />)
 
     await screen.findByRole("link", { name: "Edit" })
   })

frontends/main/src/page-components/TiptapEditor/contentTypes/news/NewsEditor.happydom.test.tsx

@@ -44,9 +44,12 @@ describe("NewsEditor - Content Editing and Saving", () => {
     })
     setMockResponse.get(urls.websiteContent.details(articleId), newsItem)
 
-    renderWithProviders(<NewsEditor article={newsItem} onSave={mockOnSave} />, {
-      user,
-    })
+    renderWithProviders(
+      <NewsEditor newsItem={newsItem} onSave={mockOnSave} />,
+      {
+        user,
+      },
+    )
 
     await screen.findByTestId("editor")
     return newsItem
@@ -646,7 +649,7 @@ describe("NewsEditor - Document Rendering", () => {
     setMockResponse.get(urls.websiteContent.details(articleId), newsItem)
 
     renderWithProviders(
-      <NewsEditor article={newsItem} onSave={mockOnSave} readOnly />,
+      <NewsEditor newsItem={newsItem} onSave={mockOnSave} readOnly />,
       { user },
     )
 

frontends/main/src/page-components/TiptapEditor/contentTypes/news/NewsEditor.tsx

@@ -23,24 +23,24 @@ const extractNewsExtraFields = (content: {
 }
 
 interface NewsEditorProps {
-  onSave?: (article: WebsiteContent) => void
+  onSave?: (savedContent: WebsiteContent) => void
   readOnly?: boolean
-  article?: WebsiteContent
+  newsItem?: WebsiteContent
 }
 
 /**
  * Editor shell configured for the news content type (served under /news).
  * Owns its own save mutations (websiteContent API) and passes them to
  * WebsiteContentEditor — keeping the generic shell decoupled from any specific API.
  */
-const NewsEditor = ({ onSave, readOnly, article }: NewsEditorProps) => {
-  // News content type uses the websiteContent (articles) API.
+const NewsEditor = ({ onSave, readOnly, newsItem }: NewsEditorProps) => {
+  // News content type uses the websiteContent API.
   // A different content type would call different hooks here.
   const createMutation = useWebsiteContentCreate()
   const updateMutation = useWebsiteContentPartialUpdate()
 
-  const editUrl = article
-    ? `/website_content/news/${article.is_published ? article.slug : article.id}/edit`
+  const editUrl = newsItem
+    ? `/website_content/news/${newsItem.is_published ? newsItem.slug : newsItem.id}/edit`
     : "/website_content/news/new"
 
   const toolbarSlot = readOnly ? (
@@ -68,7 +68,7 @@ const NewsEditor = ({ onSave, readOnly, article }: NewsEditorProps) => {
       saveMutations={{ create: createMutation, update: updateMutation }}
       onSave={onSave}
       readOnly={readOnly}
-      article={article}
+      article={newsItem}
     />
   )
 }