Future/v4.0

[brianbrix]

No description provided.

[Copilot]

Pull request overview

This PR aggregates a set of v4.0 updates across the UI, GIS, reporting views/xmlpatches, Hibernate mappings, backend services, build configuration, and adds a GitHub Actions deployment workflow.

Changes:

• Improves activity ID handling in tab grids and GIS activity filtering (fallbacks to owner/entity IDs when AMP ID cells are missing).
• Updates GIS/map UI assets and fixes markup (OSM tiles over HTTPS, popup/tab default state, basemap select options).
• Adds/updates XML patches for settings/menu changes and introduces a GitHub Actions workflow for build+deploy.

Reviewed changes

Copilot reviewed 27 out of 29 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
amp/TEMPLATE/ampTemplate/tabs/js/business/grid/gridManager.js	Derives row activity IDs more robustly; guards preview link creation.
amp/TEMPLATE/ampTemplate/js_2/esrigis/mainmapPopup.js	Switches OSM tiles/attribution to HTTPS and simplifies subdomains handling.
amp/TEMPLATE/ampTemplate/gisModule/dev/app/js/amp/map/templates/cluster-popup-template.html	Sets the “projects” tab pane to active by default.
amp/src/main/webapp/WEB-INF/jsp/esrigis/view/mainmapPopup.jsp	Fixes basemap <select> option markup.
amp/src/main/resources/xmlpatches/general/views/v_pledges_tertiary_programs_level_3.xml	Adjusts SQL formatting/grouping line placement.
amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_8.xml	Updates GROUP BY to include level.name.
amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_7.xml	Updates GROUP BY to include level.name.
amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_6.xml	Updates GROUP BY to include level.name.
amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_5.xml	Updates GROUP BY to include level.name.
amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_4.xml	Updates GROUP BY to include level.name.
amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_3.xml	Updates GROUP BY to include level.name.
amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_2.xml	Updates GROUP BY to include level.name.
amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_1.xml	Updates GROUP BY to include level.name (and whitespace).
amp/src/main/resources/xmlpatches/general/views/v_nationalobjectives_level_0.xml	Updates GROUP BY to include level.name (and whitespace).
amp/src/main/resources/xmlpatches/4.0/GGW-Prod-change-report-generator-path.xml	Adds patch to update report generator menu URLs.
amp/src/main/resources/xmlpatches/4.0/GGW-207-Require-Login-For-GIS.xml	Adds/updates GIS login-required setting insertion logic.
amp/src/main/resources/xmlpatches/4.0/AMP-31057-Donor-Funding-Admin-Levels-v1.xml	Adds donor funding admin-level setting values/view and global setting insertion.
amp/src/main/resources/xmlpatches/4.0/AMP-31057-Add-Currecies-for-dashboard.xml	Adds a “Dashboard Currencies” global setting patch.
amp/src/main/resources/org/digijava/module/aim/dbentity/AmpStructure.hbm.xml	Changes structure coordinates mapping from <list> to <bag> with ordering.
amp/src/main/java/org/digijava/module/message/jobs/AmpDonorFundingJob.java	Adjusts loops/comments and adds logging for outbound dashboard payload.
amp/src/main/java/org/digijava/module/aim/helper/GlobalSettingsConstants.java	Updates ECOWAS list and adds new global-setting keys.
amp/src/main/java/org/digijava/module/aim/dbentity/AmpStructure.java	Initializes images and adjusts merge/clone handling for images.
amp/src/main/java/org/digijava/module/aim/action/EditActivity.java	Updates structure image copying to avoid replacing collection references.
amp/src/main/java/org/digijava/kernel/ampapi/endpoints/gis/services/LocationService.java	Switches activity ID extraction to ReportArea.getOwner().id.
amp/src/main/java/org/digijava/kernel/ampapi/endpoints/gis/services/ActivityService.java	Falls back to AreaOwner.id when AMP ID cell is absent.
amp/src/main/java/org/dgfoundation/amp/onepager/util/ActivityUtil.java	Replaces saveOrUpdate with merge and changes structure persistence handling.
amp/pom.xml	Adds Maven Central fallback repositories and pins Google Cloud dependency versions.
.github/workflows/deploy.yml	Adds a new manual deployment workflow (build, push, deploy via SSH).

Suppressed comments (1)

amp/src/main/java/org/dgfoundation/amp/onepager/util/ActivityUtil.java:307

• Session.merge(...) returns the managed instance; the passed-in instance remains detached. Because this method continues mutating a after these calls (e.g., updateIndirectPrograms(a, session)), those changes may not be persisted unless a is updated to the merged instance.

                session.merge(a);
            }
        } else {
//            session.saveOrUpdate(a);
            session.merge(a);

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.