Merge branch 'LordNayan:main' into main

Author: LordNayan

apps/api/src/controllers/changelog.controller.ts

@@ -13,13 +13,18 @@ async function formatChangelog(entry: any) {
     ? await Post.find({ _id: { $in: entry.postIDs } })
     : [];
 
+  const markdownDetails = entry.markdownDetails || '';
+  const plaintextDetails = entry.plaintextDetails || (markdownDetails ? htmlToPlainText(markdownDetails) : '');
+
   return {
     id: entry._id.toString(),
     created: entry.created?.toISOString(),
     labels: entry.labels || [],
     lastSavedAt: entry.lastSavedAt?.toISOString(),
-    markdownDetails: entry.markdownDetails || '',
-    plaintextDetails: entry.plaintextDetails || '',
+    markdownDetails,
+    plaintextDetails,
+    // description is kept for compatibility with existing frontends
+    description: plaintextDetails,
     posts: posts.map(p => ({
       id: p._id.toString(),
       title: p.title,
@@ -179,6 +184,94 @@ export const createChangelog = asyncHandler(async (req: Request, res: Response):
   res.json(formatted);
 });
 
+/**
+ * POST /entries/update
+ * Update an existing changelog entry
+ */
+export const updateChangelog = asyncHandler(async (req: Request, res: Response): Promise<void> => {
+  const { id, title, details, labels, types, postIDs, publish } = req.body;
+
+  if (!mongoose.Types.ObjectId.isValid(id)) {
+    throw new AppError('invalid entry id', 400);
+  }
+
+  // Determine company context and load existing entry
+  let companyID: mongoose.Types.ObjectId;
+
+  if (req.company) {
+    companyID = req.company._id;
+  } else if ((req as any).user?.companyID) {
+    companyID = (req as any).user.companyID;
+  } else {
+    const existing = await Changelog.findById(id);
+    if (!existing) {
+      throw new AppError('entry not found', 404);
+    }
+    companyID = existing.companyID;
+  }
+
+  const existing = await Changelog.findOne({ _id: id, companyID });
+  if (!existing) {
+    throw new AppError('entry not found', 404);
+  }
+
+  // Validate and map post IDs if provided
+  let validPostIDs: mongoose.Types.ObjectId[] | undefined;
+  if (postIDs && postIDs.length > 0) {
+    const posts = await Post.find({ _id: { $in: postIDs }, companyID });
+    validPostIDs = posts.map(p => p._id);
+  }
+
+  const update: any = { lastSavedAt: new Date() };
+
+  if (typeof title === 'string') {
+    update.title = title;
+  }
+
+  if (typeof details === 'string') {
+    update.markdownDetails = details;
+    update.plaintextDetails = htmlToPlainText(details || '');
+  }
+
+  if (Array.isArray(labels)) {
+    update.labels = labels.map((label: string, index: number) => ({
+      id: `label-${index}`,
+      name: label,
+    }));
+  }
+
+  if (Array.isArray(types)) {
+    update.types = types;
+  }
+
+  if (validPostIDs) {
+    update.postIDs = validPostIDs;
+  }
+
+  if (typeof publish === 'boolean') {
+    if (publish && existing.status !== 'published') {
+      update.status = 'published';
+      update.publishedAt = new Date();
+    } else if (!publish && existing.status === 'published') {
+      update.status = 'draft';
+      update.publishedAt = undefined;
+    }
+  }
+
+  const updated = await Changelog.findOneAndUpdate(
+    { _id: id, companyID },
+    update,
+    { new: true }
+  );
+
+  if (!updated) {
+    throw new AppError('failed to update entry', 500);
+  }
+
+  const formatted = await formatChangelog(updated);
+  res.json(formatted);
+});
+
 /**
  * POST /entries/delete
  * Delete a changelog entry

apps/api/src/middlewares/validate.middleware.ts

@@ -242,3 +242,15 @@ export const changelogCreateSchema = z.object({
   postIDs: z.array(objectIdSchema).optional(),
   notify: z.boolean().default(false).optional(),
 });
+
+export const changelogUpdateSchema = z.object({
+  apiKey: z.string().optional(),
+  id: objectIdSchema,
+  title: z.string().min(1).max(500).optional(),
+  details: z.string().max(100000).optional(),
+  labels: z.array(z.string()).optional(),
+  types: z.array(z.enum(['new', 'improved', 'fixed'])).optional(),
+  postIDs: z.array(objectIdSchema).optional(),
+  // When true, mark as published (and set publishedAt); when false, mark as draft
+  publish: z.boolean().optional(),
+});

apps/api/src/routes/v1/changelog.routes.ts

@@ -1,6 +1,6 @@
 import { Router } from 'express';
-import { optionalSubdomainAuth, flexibleAuth, validate, changelogListSchema, changelogCreateSchema } from '../../middlewares/index.js';
-import { listChangelog, retrieveChangelog, createChangelog, deleteChangelog } from '../../controllers/index.js';
+import { optionalSubdomainAuth, flexibleAuth, validate, changelogListSchema, changelogCreateSchema, changelogUpdateSchema } from '../../middlewares/index.js';
+import { listChangelog, retrieveChangelog, createChangelog, updateChangelog, deleteChangelog } from '../../controllers/index.js';
 
 const router = Router();
 
@@ -19,6 +19,9 @@ router.post('/retrieve', retrieveChangelog);
 // POST /entries/create - Create a changelog entry
 router.post('/create', validate(changelogCreateSchema), createChangelog);
 
+// POST /entries/update - Update a changelog entry
+router.post('/update', validate(changelogUpdateSchema), updateChangelog);
+
 // POST /entries/delete - Delete a changelog entry
 router.post('/delete', deleteChangelog);
 

apps/web/package.json

@@ -36,6 +36,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hot-toast": "^2.6.0",
+    "react-markdown": "^9.0.0",
     "react-router-dom": "^7.13.0",
     "uuid": "^9.0.1",
     "zustand": "^4.4.7"

apps/web/src/App.tsx

@@ -13,6 +13,7 @@ import {
   PostDetailPage,
   AdminBoardsPage,
   AdminSettingsPage,
+  AdminChangelogPage,
 } from './pages';
 
 // Components
@@ -115,6 +116,17 @@ function AppRoutes() {
         }
       />
 
+      <Route
+        path="/admin/changelog"
+        element={
+          <ProtectedRoute requireAdmin>
+            <Layout>
+              <AdminChangelogPage />
+            </Layout>
+          </ProtectedRoute>
+        }
+      />
+
       <Route
         path="/admin/settings"
         element={

apps/web/src/components/shared/Layout.tsx

@@ -31,6 +31,7 @@ export function Layout({ children }: LayoutProps) {
     ...(user?.isAdmin
       ? [
           { name: 'Boards', href: '/admin/boards', icon: Squares2X2Icon },
+          { name: 'Changelog', href: '/admin/changelog', icon: Squares2X2Icon },
           { name: 'Settings', href: '/admin/settings', icon: Cog6ToothIcon },
         ]
       : []),