#3430

added autoElectFacet and autoStateFacet to replace electFacet and stateFacet from project explorer

Author: temi

.github/workflows/build.yml

@@ -81,7 +81,7 @@ jobs:
         run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless
 
       - name: Run MERIT functional tests
-        run: ./src/main/scripts/runFunctionalTests.sh
+        run: ./src/main/scripts/runFunctionalTests.sh chromeHeadless /tmp/ecodata feature/issue3430
         env:
           GPR_USER: ${{env.GITHUB_ACTOR}}
           GPR_TOKEN: ${{secrets.GITHUB_TOKEN}}

grails-app/conf/data/meritHub.json

@@ -1,6 +1,6 @@
 {
   "adminFacets" : [
-    "electFacet",
+    "autoElectFacet",
     "cmzFacet",
     "meriPlanAssetFacet",
     "partnerOrganisationTypeFacet",
@@ -13,14 +13,14 @@
     "associatedProgramFacet",
     "associatedSubProgramFacet",
     "mainThemeFacet",
-    "stateFacet",
+    "autoStateFacet",
     "nrmFacet",
     "lgaFacet",
     "mvgFacet",
     "ibraFacet",
     "imcra4_pbFacet",
     "otherFacet",
-    "electFacet",
+    "autoElectFacet",
     "cmzFacet",
     "meriPlanAssetFacet",
     "partnerOrganisationTypeFacet",
@@ -34,12 +34,12 @@
     "organisationFacet",
     "associatedProgramFacet",
     "associatedSubProgramFacet",
-    "stateFacet",
+    "autoStateFacet",
     "nrmFacet",
     "lgaFacet",
     "ibraFacet",
     "imcra4_pbFacet",
-    "electFacet",
+    "autoElectFacet",
     "cmzFacet",
     "primaryOutcomeFacet"
   ],

grails-app/i18n/messages.properties

@@ -275,6 +275,7 @@ label.associatedProgramFacet=Program
 label.associatedSubProgramFacet=Sub Program
 label.assessment=Assessment
 label.stateFacet=State
+label.autoStateFacet=State
 label.lgaFacet=<abbr title="Local Government Areas">LGA</abbr>
 label.nrmFacet=<abbr title="Natural Resource Management Areas">Management Areas</abbr>
 label.muFacet=<abbr title="Management Unit">Management Unit</abbr>
@@ -285,6 +286,7 @@ label.imcra4_pbFacet=<abbr title="Marine Region">Marine Regions</abbr>
 label.otherFacet=<abbr title="Other areas">Other Regions</abbr>
 label.status=<abbr title="Project status">Project Status</abbr>
 label.electFacet = <abbr title="Project status">Federal Electorates</abbr>
+label.autoElectFacet = <abbr title="Project linked to electorates">Federal Electorates</abbr>
 label.cmzFacet = <abbr title="Conservation Management Zones">CMZ</abbr>
 label.meriPlanAssetFacet=<abbr title="Assets addressed in the MERI plan">Assets Addressed</abbr>
 label.partnerOrganisationTypeFacet=<abbr title="Organisation type of partner organisations">Partner Organisations</abbr>

grails-app/services/au/org/ala/merit/SearchService.groovy

@@ -60,7 +60,7 @@ class SearchService {
         params.fsort = "term"
         params.offset = 0
         params.query = "geo.loc.lat:*"
-        params.facets = "stateFacet,nrmFacet,lgaFacet,mvgFacet"
+        params.facets = "autoStateFacet,nrmFacet,lgaFacet,mvgFacet"
         def url = elasticBaseUrl + commonService.buildUrlParamsFromMap(params)
         log.debug "allGeoPoints - $url with $params"
         webService.getJson(url)
@@ -225,7 +225,7 @@ class SearchService {
             params.remove("ids");
             def idList = ids.tokenize(",")
             params.query = "_id:" + idList.join(" OR _id:")
-            params.facets = "stateFacet,nrmFacet,lgaFacet,mvgFacet"
+            params.facets = "autoStateFacet,nrmFacet,lgaFacet,mvgFacet"
             def url = grailsApplication.config.getProperty('ecodata.baseUrl') + 'search/elasticPost'
             webService.doPost(url, params)
         } else if (params.query) {

grails-app/services/au/org/ala/merit/SettingService.groovy

@@ -88,9 +88,9 @@ class SettingService {
                     title:'Default',
                     skin:'ala2',
                     urlPath:grailsApplication.config.getProperty('app.default.hub', String, 'default'),
-                    availableFacets: ['status', 'organisationFacet','associatedProgramFacet','associatedSubProgramFacet','mainThemeFacet','stateFacet','nrmFacet','lgaFacet','mvgFacet','ibraFacet','imcra4_pbFacet','otherFacet', 'gerSubRegionFacet','electFacet'],
-                    adminFacets: ['electFacet'],
-                    availableMapFacets: ['status', 'organisationFacet','associatedProgramFacet','associatedSubProgramFacet','stateFacet','nrmFacet','lgaFacet','mvgFacet','ibraFacet','imcra4_pbFacet','electFacet']
+                    availableFacets: ['status', 'organisationFacet','associatedProgramFacet','associatedSubProgramFacet','mainThemeFacet','autoStateFacet','nrmFacet','lgaFacet','mvgFacet','ibraFacet','imcra4_pbFacet','otherFacet', 'gerSubRegionFacet','autoElectFacet'],
+                    adminFacets: ['autoElectFacet'],
+                    availableMapFacets: ['status', 'organisationFacet','associatedProgramFacet','associatedSubProgramFacet','autoStateFacet','nrmFacet','lgaFacet','mvgFacet','ibraFacet','imcra4_pbFacet','autoElectFacet']
             )
         }
         if (log.isDebugEnabled()) {

src/integration-test/resources/data/meritHub.js

@@ -1,6 +1,6 @@
 var meritHub = {
   "adminFacets" : [
-    "electFacet",
+    "autoElectFacet",
     "cmzFacet",
     "meriPlanAssetFacet",
     "partnerOrganisationTypeFacet",
@@ -14,14 +14,14 @@ var meritHub = {
     "associatedSubProgramFacet",
     "muFacet",
     "mainThemeFacet",
-    "stateFacet",
+    "autoStateFacet",
     "nrmFacet",
     "lgaFacet",
     "mvgFacet",
     "ibraFacet",
     "imcra4_pbFacet",
     "otherFacet",
-    "electFacet",
+    "autoElectFacet",
     "cmzFacet",
     "meriPlanAssetFacet",
     "partnerOrganisationTypeFacet",
@@ -35,12 +35,12 @@ var meritHub = {
     "organisationFacet",
     "associatedProgramFacet",
     "associatedSubProgramFacet",
-    "stateFacet",
+    "autoStateFacet",
     "nrmFacet",
     "lgaFacet",
     "ibraFacet",
     "imcra4_pbFacet",
-    "electFacet",
+    "autoElectFacet",
     "cmzFacet",
     "primaryOutcomeFacet"
   ],

src/main/scripts/releases/4.2/updateMeritHub.js

@@ -0,0 +1,22 @@
+load( "../../utils/audit.js");
+var oldAndNewFacets = {electFacet: 'autoElectFacet', stateFacet: 'autoStateFacet'}
+var propsToCheck = ["adminFacets", "availableFacets", "availableMapFacets", "officerFacets"]
+var oldFacets = Object.keys(oldAndNewFacets);
+var adminUserId = "system";
+db.hub.find({urlPath:'merit'}).forEach(function (hub){
+    propsToCheck.forEach(function (prop){
+        if (hub[prop]) {
+            for(var index = 0; index < oldFacets.length; index++) {
+                var oldFacet = oldFacets[index];
+                var indexOfOldFacet = hub[prop].indexOf(oldFacet);
+                if( indexOfOldFacet >= 0) {
+                    hub[prop][indexOfOldFacet] = oldAndNewFacets[oldFacet];
+                }
+            }
+        }
+    });
+
+    db.hub.updateOne({hubId: hub.hubId}, {$set: hub});
+    audit(hub, hub.hubId, 'au.org.ala.ecodata.Hub', adminUserId, undefined, "Update");
+    print(`Updated hub - ${hub.urlPath}`);
+});