Merge remote-tracking branch 'origin/campaign' into campaign-for-test

egovernments · Jul 31, 2024 · 8b021fc · 8b021fc
2 parents 8cef4b2 + 89e8563
commit 8b021fc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/...b/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js b/...b/micro-ui-internals/packages/modules/campaign-manager/src/components/BoundaryWithDate.js
@@ -170,7 +170,13 @@ const BoundaryWithDate = ({ project, props, onSelect, dateReducerDispatch, canDe
                   withoutLabel={true}
                   type="date"
                   value={item?.endDate}
-                  nonEditable={item?.endDate?.length > 0 && today >= item?.endDate && today >= cycleDates?.[index + 1]?.startDate ? true : false}
+                  nonEditable={
+                    item?.endDate?.length > 0 &&
+                    today >= item?.endDate &&
+                    (cycleDates?.[index + 1] ? today >= cycleDates?.[index + 1]?.startDate : true)
+                      ? true
+                      : false
+                  }
                   placeholder={t("HCM_END_DATE")}
                   populators={{
                     validation: {

diff --git a/utilities/project-factory/src/server/config/index.ts b/utilities/project-factory/src/server/config/index.ts
@@ -17,11 +17,11 @@ const getDBSchemaName = (dbSchema = "") => {
 // Configuration object containing various environment variables
 const config = {
   cacheTime : 300,
-  enableDynamicTemplateFor: ["MR-DN"],
-  isCallGenerateWhenDeliveryConditionsDiffer: true,
+  enableDynamicTemplateFor: process.env.ENABLE_DYNAMIC_TEMPLATE_FOR || "MR-DN",
+  isCallGenerateWhenDeliveryConditionsDiffer: process.env.IS_CALL_GENERATE_WHEN_DELIVERY_CONDITIONS_DIFFER || false,
   prefixForMicroplanCampaigns: "MP",
-  excludeHierarchyTypeFromBoundaryCodes: false,
-  excludeBoundaryNameAtLastFromBoundaryCodes: false,
+  excludeHierarchyTypeFromBoundaryCodes: process.env.EXCLUDE_HIERARCHY_TYPE_FROM_BOUNDARY_CODES || false,
+  excludeBoundaryNameAtLastFromBoundaryCodes: process.env.EXCLUDE_BOUNDARY_NAME_AT_LAST_FROM_BOUNDARY_CODES || false,
   masterNameForSchemaOfColumnHeaders: "adminSchema",
   masterNameForSplitBoundariesOn: "hierarchyConfig",
   boundary: {

diff --git a/utilities/project-factory/src/server/utils/targetUtils.ts b/utilities/project-factory/src/server/utils/targetUtils.ts
@@ -120,7 +120,8 @@ async function updateTargetColumnsIfDeliveryConditionsDifferForSMC(request: any)
 
 function isDynamicTargetTemplateForProjectType(projectType: string) {
     const projectTypesFromConfig = config?.enableDynamicTemplateFor;
-    return projectTypesFromConfig?.includes(projectType) ?? false;
+    const projectTypesArray = projectTypesFromConfig ? projectTypesFromConfig.split(',') : [];
+    return projectTypesArray.includes(projectType);
 }