add redirect util function for project custom actions

Giveth · Oct 29, 2024 · 75ac033 · 75ac033
1 parent 5e9e255
commit 75ac033
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -56,7 +56,6 @@ const envVars = [
   'GIVBACK_MAX_FACTOR',
   'GIVBACK_MIN_FACTOR',
   'DONATION_VERIFICAITON_EXPIRATION_HOURS',
-  'SYNC_USER_MODEL_SCORE_CRONJOB_EXPRESSION',
 ];
 
 interface requiredEnv {

diff --git a/src/server/adminJs/adminJs-types.ts b/src/server/adminJs/adminJs-types.ts
@@ -13,6 +13,7 @@ export interface AdminJsContextInterface {
 export interface AdminJsRequestInterface {
   payload?: any;
   record?: any;
+  rawHeaders?: any;
   query?: {
     recordIds?: string;
   };

diff --git a/src/server/adminJs/adminJsUtils.ts b/src/server/adminJs/adminJsUtils.ts
@@ -0,0 +1,29 @@
+import { logger } from '../../utils/logger';
+
+/**
+ * Extracts the redirect URL from request headers for AdminJS actions
+ * @param request - The AdminJS action request object
+ * @param resourceName - The name of the resource (e.g., 'Project', 'User')
+ * @returns The URL to redirect to after action completion
+ */
+export const getRedirectUrl = (request: any, resourceName: string): string => {
+  const refererIndex = request?.rawHeaders?.findIndex(
+    h => h.toLowerCase() === 'referer',
+  ) || -1;
+  const referrerUrl =
+    refererIndex !== -1 ? request.rawHeaders[refererIndex + 1] : false;
+
+  // Default fallback URL if no referer is found
+  const defaultUrl = `/admin/resources/${resourceName}`;
+
+  try {
+    if (referrerUrl) {
+      const url = new URL(referrerUrl);
+      return url.pathname + url.search;
+    }
+  } catch (error) {
+    logger.error('Error parsing referrer URL:', error);
+  }
+
+  return defaultUrl;
+};
diff --git a/src/server/adminJs/tabs/projectsTab.ts b/src/server/adminJs/tabs/projectsTab.ts
@@ -55,6 +55,7 @@ import { refreshProjectEstimatedMatchingView } from '../../../services/projectVi
 import { extractAdminJsReferrerUrlParams } from '../adminJs';
 import { relateManyProjectsToQfRound } from '../../../repositories/qfRoundRepository2';
 import { Category } from '../../../entities/category';
+import { getRedirectUrl } from '../adminJsUtils';
 
 // add queries depending on which filters were selected
 export const buildProjectsQuery = (
@@ -188,6 +189,7 @@ export const verifyProjects = async (
   request: AdminJsRequestInterface,
   vouchedStatus: boolean = true,
 ) => {
+  const redirectUrl = getRedirectUrl(request, 'Project');
   const { records, currentAdmin } = context;
   try {
     const projectIds = request?.query?.recordIds
@@ -236,7 +238,7 @@ export const verifyProjects = async (
     throw error;
   }
   return {
-    redirectUrl: '/admin/resources/Project',
+    redirectUrl: redirectUrl,
     records: records.map(record => {
       record.toJSON(context.currentAdmin);
     }),
@@ -254,6 +256,7 @@ export const updateStatusOfProjects = async (
   request: AdminJsRequestInterface,
   status,
 ) => {
+  const redirectUrl = getRedirectUrl(request, 'Project');
   const { records, currentAdmin } = context;
   const projectIds = request?.query?.recordIds
     ?.split(',')
@@ -319,7 +322,7 @@ export const updateStatusOfProjects = async (
     ]);
   }
   return {
-    redirectUrl: '/admin/resources/Project',
+    redirectUrl: redirectUrl,
     records: records.map(record => {
       record.toJSON(context.currentAdmin);
     }),
@@ -415,6 +418,7 @@ export const addSingleProjectToQfRound = async (
   request: AdminJsRequestInterface,
   add: boolean = true,
 ) => {
+  const redirectUrl = getRedirectUrl(request, 'Project');
   const { record, currentAdmin } = context;
   let message = messages.PROJECTS_RELATED_TO_ACTIVE_QF_ROUND_SUCCESSFULLY;
   const projectId = Number(request?.params?.recordId);
@@ -431,6 +435,7 @@ export const addSingleProjectToQfRound = async (
     message = messages.THERE_IS_NOT_ANY_ACTIVE_QF_ROUND;
   }
   return {
+    redirectUrl: redirectUrl,
     record: record.toJSON(currentAdmin),
     notice: {
       message,
@@ -523,6 +528,7 @@ export const listDelist = async (
   request,
   reviewStatus: ReviewStatus = ReviewStatus.Listed,
 ) => {
+  const redirectUrl = getRedirectUrl(request, 'Project');
   const { records, currentAdmin } = context;
   let listed;
   switch (reviewStatus) {
@@ -586,7 +592,7 @@ export const listDelist = async (
     throw error;
   }
   return {
-    redirectUrl: '/admin/resources/Project',
+    redirectUrl: redirectUrl,
     records: records.map(record => {
       record.toJSON(context.currentAdmin);
     }),