Merge branch '5.0' into 5.0.1

avniproject · Oct 23, 2023 · e91bd3d · e91bd3d
2 parents 0db49d2 + 6b722c9
commit e91bd3d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -158,6 +158,8 @@ release_dev: setup_hosts as_dev release
 release_prod_without_clean: as_prod release upload-release-sourcemap
 release_prod: renew_env release_prod_without_clean
 
+release_prod_dev_without_clean: as_prod_dev release upload-release-sourcemap
+
 bundle_release_prod_without_clean: as_prod bundle_release upload-release-sourcemap
 bundle_release_prod: renew_env bundle_release_prod_without_clean
 
@@ -365,6 +367,7 @@ upload-prod-apk-unsigned: ; $(call _upload_apk,prod)
 upload-staging-apk: ; $(call _upload_apk,staging)
 upload-prerelease-apk: ; $(call _upload_apk,prerelease)
 upload-uat-apk: ; $(call _upload_apk,uat)
+upload-prod_dev-apk: ; $(call _upload_apk,prod_dev)
 
 define _inpremise_upload_prod_apk
  @aws s3 cp --acl public-read packages/openchs-android/android/app/build/outputs/apk/release/app-release.apk s3://samanvay/openchs/$(orgname)/apks/prod-$(sha)-$(dat).apk;

diff --git a/packages/openchs-android/src/service/RuleEvaluationService.js b/packages/openchs-android/src/service/RuleEvaluationService.js
@@ -151,8 +151,9 @@ class RuleEvaluationService extends BaseService {
  getRuleServiceLibraryInterfaceForSharingModules() {
  return {
  log: console.log,
- common: common,
- motherCalculations: motherCalculations
+ common,
+ motherCalculations,
+ models
  };
  }
 

diff --git a/packages/openchs-android/src/service/RuleService.js b/packages/openchs-android/src/service/RuleService.js
@@ -27,12 +27,20 @@ class RuleService extends BaseService {
  motherCalculations: motherCalculations,
  models: models
  };
- eval(RuleDependency.getCode(ruleDependency));
+ rulesConfig = eval(this.trimRuleDependencyCode(ruleDependency));
  /**********/
  this.allRules = {...rulesConfig};
  General.logDebug("RuleService", "\n>>>>>>>>>RULES LOADED<<<<<<<<<\n")
  }
 
+ trimRuleDependencyCode(ruleDependency) {
+ let ruleDependencyCodeString = RuleDependency.getCode(ruleDependency)
+ if (ruleDependencyCodeString && ruleDependencyCodeString.trim().startsWith('var')) {
+ ruleDependencyCodeString = ruleDependencyCodeString.trim().substring(3);
+ }
+ return ruleDependencyCodeString;
+ }
+
  getApplicableRules(ruledEntity, ruleType, ruledEntityType) {
  General.logDebug("RuleService",
  `Getting Rules of Type ${ruleType} for ${ruledEntityType} - ${ruledEntity.name} ${ruledEntity.uuid}`);