Merge branch 'refs/heads/master' into 8437_useUnknownInCatchVariables

# Conflicts:
#	webapp/src/ts/modules/tasks/tasks.component.ts
#	webapp/src/ts/services/user-contact.service.ts
#	webapp/tests/karma/ts/services/training-cards.service.spec.ts

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,6 +25,7 @@ https://docs.communityhealthtoolkit.org/contribute/code/workflow/#commit-message
 
 # Code review checklist
 <!-- Remove or comment out any items that do not apply to this PR; in the remaining boxes, replace the [ ] with [x]. -->
+- [ ] UI/UX backwards compatible: Test it works for the new design (enabled by default). And test it works in the old design, enable `can_view_old_navigation` permission to see the old design.
 - [ ] Readable: Concise, well named, follows the [style guide](https://docs.communityhealthtoolkit.org/contribute/code/style-guide/), documented if necessary.
 - [ ] Documented: Configuration and user documentation on [cht-docs](https://github.com/medic/cht-docs/)
 - [ ] Tested: Unit and/or e2e where appropriate

.github/actions/deploy-conf/action.yml

@@ -28,6 +28,6 @@ runs:
     shell: bash
     working-directory: ${{ inputs.directory }}
   - name: run cht
-    run: npx cht --url=https://${{ inputs.username }}:${{ inputs.password }}@${{ inputs.hostname }} compile-app-settings convert-app-forms convert-collect-forms convert-contact-forms upload-app-settings upload-app-forms upload-collect-forms upload-contact-forms upload-resources upload-custom-translations --force
+    run: npx cht --url=https://${{ inputs.username }}:${{ inputs.password }}@${{ inputs.hostname }} compile-app-settings convert-app-forms convert-collect-forms convert-contact-forms convert-training-forms upload-app-settings upload-app-forms upload-collect-forms upload-contact-forms upload-training-forms upload-resources upload-custom-translations --force
     shell: bash
     working-directory: ${{ inputs.directory }}

README.md

@@ -57,7 +57,7 @@ Builds brought to you courtesy of GitHub Actions.
 
 ## Copyright
 
-Copyright 2013-2022 Medic Mobile, Inc. <[email protected]>
+Copyright 2013-2025 Medic Mobile, Inc. <[email protected]>
 
 ## License
 

admin/src/js/services/session.js

@@ -38,11 +38,14 @@ const _ = require('lodash/core');
         }
         ipCookie.remove(COOKIE_NAME, { path: '/' });
         userCtxCookieValue = undefined;
+        // Clear browser history to prevent loading page on browser's back button after logout.
+        $window.history.pushState(null, null, '/');
         $window.location.href = `/${Location.dbName}/login?${params.toString()}`;
       };
 
       const logout = function() {
-        return $http.delete('/_session')
+        return $http
+          .delete('/_session')
           .catch(function() {
             // Set cookie to force login before using app
             ipCookie('login', 'force', { path: '/' });

admin/tests/unit/services/session.spec.js

@@ -6,6 +6,7 @@ describe('Session service', function() {
   let ipCookie;
   let ipCookieRemove;
   let location;
+  let pushStateStub;
   let $httpBackend;
   let Location;
 
@@ -14,6 +15,7 @@ describe('Session service', function() {
     ipCookie = sinon.stub();
     ipCookieRemove = sinon.stub();
     ipCookie.remove = ipCookieRemove;
+    pushStateStub = sinon.stub();
     Location = {};
     location = {};
     module(function ($provide) {
@@ -24,6 +26,7 @@ describe('Session service', function() {
       $provide.factory('$window', function() {
         return {
           angular: { callbacks: [] },
+          history: { pushState: pushStateStub },
           location: location,
         };
       });
@@ -59,6 +62,8 @@ describe('Session service', function() {
     $httpBackend.flush();
     chai.expect(location.href).to.equal(`/DB_NAME/login?redirect=CURRENT_URL&username=${expected.name}`);
     chai.expect(ipCookieRemove.args[0][0]).to.equal('userCtx');
+    chai.expect(pushStateStub.calledOnce).to.be.true;
+    chai.expect(pushStateStub.args[0]).to.have.members([ null, null, '/' ]);
     done();
   });
 
@@ -73,6 +78,8 @@ describe('Session service', function() {
     $httpBackend.flush();
     chai.expect(location.href).to.equal('/DB_NAME/login?redirect=CURRENT_URL');
     chai.expect(ipCookieRemove.args[0][0]).to.equal('userCtx');
+    chai.expect(pushStateStub.calledOnce).to.be.true;
+    chai.expect(pushStateStub.args[0]).to.have.members([ null, null, '/' ]);
     done();
   });
 
@@ -96,6 +103,7 @@ describe('Session service', function() {
     service.checkCurrentSession();
     $httpBackend.flush();
     chai.expect(ipCookieRemove.callCount).to.equal(0);
+    chai.expect(pushStateStub.notCalled).to.be.true;
     done();
   });
 
@@ -114,6 +122,8 @@ describe('Session service', function() {
     $httpBackend.flush();
     chai.expect(location.href).to.equal(`/DB_NAME/login?redirect=CURRENT_URL&username=${expected.name}`);
     chai.expect(ipCookieRemove.args[0][0]).to.equal('userCtx');
+    chai.expect(pushStateStub.calledOnce).to.be.true;
+    chai.expect(pushStateStub.args[0]).to.have.members([ null, null, '/' ]);
     done();
   });
 
@@ -125,6 +135,7 @@ describe('Session service', function() {
     service.checkCurrentSession();
     $httpBackend.flush();
     chai.expect(ipCookieRemove.callCount).to.equal(0);
+    chai.expect(pushStateStub.notCalled).to.be.true;
     done();
   });