Merge pull request 'fix: edit form fields and update form submission logic' (#21) from fix/news-media-UI into dev

Reviewed-on: #21

backend/src/controllers/newsMedia.controller.js

@@ -4,8 +4,8 @@ import prisma from "../prisma/client.js";
 
 export const getAllNews = async (req, res) => {
 	try {
-		const page = parseInt(req.query.page) || 1;
+		const page = req.query.page ? parseInt(req.query.page) : null;
-		const limit = parseInt(req.query.limit) || 10;
+		const limit = req.query.limit ? parseInt(req.query.limit) : null;
 		const search = req.query.search?.trim() || "";
 
 		const includeImages = {
@@ -25,7 +25,8 @@ export const getAllNews = async (req, res) => {
 			...searchFilter,
 		};
 
-		const skip = (page - 1) * limit;
+		const skip = page && limit ? (page - 1) * limit : undefined;
+		const take = limit ? limit : undefined;
 
 		const [news, total] = await Promise.all([
 			prisma.newsMedia.findMany({
@@ -33,7 +34,7 @@ export const getAllNews = async (req, res) => {
 				include: includeImages,
 				orderBy: { createdAt: "desc" },
 				skip,
-				take: limit,
+				take,
 			}),
 			prisma.newsMedia.count({
 				where: whereCondition,
@@ -59,9 +60,9 @@ export const getAllNews = async (req, res) => {
 			data: response,
 			meta: {
 				total,
-				page,
+				page: page || 1,
-				limit,
+				limit: limit || total,
-				totalPages: Math.ceil(total / limit),
+				totalPages: limit ? Math.ceil(total / limit) : 1,
 			},
 		});
 	} catch (error) {

frontend/src/pages/newsMedia.tsx

@@ -136,10 +136,19 @@ export default function NewsPage() {
 
 	async function handleSubmit() {
 		try {
+			const submissionData = {
+				...form,
+				firstPara: form.headline,
+				content:
+					form.secondPara.length > 100
+						? form.secondPara.substring(0, 100) + "..."
+						: form.secondPara,
+			};
+
 			if (editing) {
-				await updateNewsApi(editing.Id, form);
+				await updateNewsApi(editing.Id, submissionData);
 			} else {
-				await createNewsApi(form);
+				await createNewsApi(submissionData);
 			}
 			setOpenModal(false);
 			fetchAll();
@@ -411,21 +420,10 @@ export default function NewsPage() {
 								</div>
 							</div>
 							<div className="space-y-1">
-								<label className="text-sm font-semibold">Intro Paragraph</label>
+								<label className="text-sm font-semibold">Story Content</label>
 								<Textarea
-									name="firstPara"
+									name="secondPara"
-									value={form.firstPara}
+									value={form.secondPara}
-									onChange={handleChange}
-									className="min-h-[100px] text-base"
-								/>
-							</div>
-							<div className="space-y-1">
-								<label className="text-sm font-semibold">
-									Full Story Content
-								</label>
-								<Textarea
-									name="content"
-									value={form.content}
 									onChange={handleChange}
 									className="min-h-[200px] text-base"
 								/>