#1310 - gramin staging config. use correct props name for filters

avniproject · Feb 20, 2024 · 9fdf184 · 9fdf184
1 parent b3fbf72
commit 9fdf184
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -135,6 +135,7 @@ as_prod_dev: ; $(call _create_config,prod_dev)
 as_no_env: ; $(call _create_config,no_env)
 as_prod_lfe_dev: ; $(call _create_config,prod_lfe_dev)
 as_prod_gramin_dev: ; $(call _create_config,prod_gramin_dev)
+as_staging_gramin_dev: ; $(call _create_config,staging_gramin_dev)
 
 as_gramin_staging: ; $(call _create_config,gramin_staging)
 as_gramin_staging_dev: ; $(call _create_config,gramin_staging_dev)

diff --git a/makefiles/androidDevice.mk b/makefiles/androidDevice.mk
@@ -67,7 +67,8 @@ run_app_prod: as_prod _run_app
 run_app_prod_dev: as_prod_dev _run_app
 run_app_no_env: as_no_env _run_app
 run_app_prod_lfe_dev: as_prod_lfe_dev _run_app
-run_app_prod_rwb_dev: as_prod_rwb_dev _run_app
+run_app_prod_gramin_dev: as_prod_gramin_dev _run_app
+run_app_staging_gramin_dev: as_staging_gramin_dev _run_app
 
 stop_app:
 	adb shell am force-stop ${app_android_package_name}

diff --git a/packages/openchs-android/config/env/staging_gramin_dev.json b/packages/openchs-android/config/env/staging_gramin_dev.json
@@ -0,0 +1,5 @@
+{
+  "SERVER_URL": "https://staging.rwb.avniproject.org",
+  "ENV": "ext-dev",
+  "DISABLE_AUTO_SYNC": true
+}
diff --git a/packages/openchs-android/src/views/approval/ApprovalListingView.js b/packages/openchs-android/src/views/approval/ApprovalListingView.js
@@ -26,7 +26,7 @@ class ApprovalListingView extends AbstractComponent {
         backFunction: PropTypes.func.isRequired,
         reportCardUUID: PropTypes.string.isRequired,
         approvalStatus_status: PropTypes.string.isRequired,
-        reportsFilter: PropTypes.object
+        reportFilters: PropTypes.object
     };
 
     constructor(props, context) {
@@ -51,9 +51,9 @@ class ApprovalListingView extends AbstractComponent {
     }
 
     onFilterChange(filterItem) {
-        const {reportCardUUID, reportsFilter} = this.props;
+        const {reportCardUUID, reportFilters} = this.props;
         const reportCard = this.getService(EntityService).findByUUID(reportCardUUID, ReportCard.schema.name);
-        const subjects = this.getService(ReportCardService).getResultForApprovalCardsType(reportCard.standardReportCardType, reportsFilter, filterItem.value);
+        const subjects = this.getService(ReportCardService).getResultForApprovalCardsType(reportCard.standardReportCardType, reportFilters, filterItem.value);
         this.setState({subjects: subjects, formMapping: filterItem.value});
     }