From 60ace745f3e7552a887b0adab2ad1a7e27477d47 Mon Sep 17 00:00:00 2001 From: Ashir Ali <32892597+AshirAli@users.noreply.github.com> Date: Fri, 1 May 2026 01:27:33 +0530 Subject: [PATCH 1/3] feat: disableConcurrentBuilds --- Jenkinsfile | 4 ++++ Jenkinsfile.prod | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 6bde369..d41e248 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,6 +22,10 @@ def ENV_LAYOUT = [ pipeline { agent { label 'jagent06' } + options { + disableConcurrentBuilds() + } + triggers { GenericTrigger( causeString: 'Triggered by Gitea webhook', diff --git a/Jenkinsfile.prod b/Jenkinsfile.prod index ccab6a6..2a5c068 100644 --- a/Jenkinsfile.prod +++ b/Jenkinsfile.prod @@ -24,6 +24,10 @@ pipeline { label 'jagent06' } + options { + disableConcurrentBuilds() + } + environment { REMOTE_HOST = "root@170.187.237.83" REMOTE_DEPLOY_DIR = "/root/gg-backend" From eab661bb4a0ad1b0b8bfc099acaf83707516c1cb Mon Sep 17 00:00:00 2001 From: Ashir Ali <32892597+AshirAli@users.noreply.github.com> Date: Fri, 1 May 2026 01:31:41 +0530 Subject: [PATCH 2/3] refactor: email updates --- Jenkinsfile | 6 +++--- Jenkinsfile.prod | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d41e248..7dc2df4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -153,7 +153,7 @@ pipeline { success { script { emailext( - subject: "[Jenkins] ${env.JOB_NAME} #${env.BUILD_NUMBER} succeeded", + subject: "[DEV] ${env.JOB_NAME} #${env.BUILD_NUMBER} succeeded", body: renderEmail('Build succeeded', '#16a34a', buildInfo()), mimeType: 'text/html', to: 'admin@msigmagokulam.com, ashir@mgsigma.net, kailasdevdas@msigmagokulam.com' @@ -163,7 +163,7 @@ pipeline { failure { script { emailext( - subject: "[Jenkins] ${env.JOB_NAME} #${env.BUILD_NUMBER} failed", + subject: "[DEV] ${env.JOB_NAME} #${env.BUILD_NUMBER} failed", body: renderEmail('Build failed', '#dc2626', buildInfo()), mimeType: 'text/html', to: 'admin@msigmagokulam.com, ashir@mgsigma.net, kailasdevdas@msigmagokulam.com' @@ -193,7 +193,7 @@ def renderEmail(String label, String accent, Map info) {
-
${label}
+
${label} ยท development
${env.JOB_NAME} · #${env.BUILD_NUMBER}
diff --git a/Jenkinsfile.prod b/Jenkinsfile.prod index 2a5c068..039ca40 100644 --- a/Jenkinsfile.prod +++ b/Jenkinsfile.prod @@ -156,7 +156,7 @@ pipeline { success { script { emailext( - subject: "[PRODUCTION] ${env.JOB_NAME} #${env.BUILD_NUMBER} succeeded", + subject: "[PROD] ${env.JOB_NAME} #${env.BUILD_NUMBER} succeeded", body: renderEmail('Build succeeded', '#16a34a', buildInfo()), mimeType: 'text/html', to: 'admin@msigmagokulam.com, ashir@mgsigma.net, kailasdevdas@msigmagokulam.com' @@ -166,7 +166,7 @@ pipeline { failure { script { emailext( - subject: "[PRODUCTION] ${env.JOB_NAME} #${env.BUILD_NUMBER} failed", + subject: "[PROD] ${env.JOB_NAME} #${env.BUILD_NUMBER} failed", body: renderEmail('Build failed', '#dc2626', buildInfo()), mimeType: 'text/html', to: 'admin@msigmagokulam.com, ashir@mgsigma.net, kailasdevdas@msigmagokulam.com' From d8477895641d1f77dbbf017162b931270b10d5a2 Mon Sep 17 00:00:00 2001 From: Kailasdevdas Date: Tue, 5 May 2026 10:48:18 +0530 Subject: [PATCH 3/3] fix: edit form fields and update form submission logic --- .../src/controllers/newsMedia.controller.js | 15 +++++----- frontend/src/pages/newsMedia.tsx | 30 +++++++++---------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/backend/src/controllers/newsMedia.controller.js b/backend/src/controllers/newsMedia.controller.js index 4bf935f..052e181 100644 --- a/backend/src/controllers/newsMedia.controller.js +++ b/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 limit = parseInt(req.query.limit) || 10; + const page = req.query.page ? parseInt(req.query.page) : null; + 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, - limit, - totalPages: Math.ceil(total / limit), + page: page || 1, + limit: limit || total, + totalPages: limit ? Math.ceil(total / limit) : 1, }, }); } catch (error) { diff --git a/frontend/src/pages/newsMedia.tsx b/frontend/src/pages/newsMedia.tsx index 3e10021..e9427bc 100644 --- a/frontend/src/pages/newsMedia.tsx +++ b/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() {
- +