merged-master

.github/ISSUE_TEMPLATE/z_release_major.md

@@ -37,17 +37,18 @@ Please let me know if there’s any final update we need to make.
 If all is good, then in 24h, I will start the release. Thanks!
 ```
 - [ ] The beta tag will automatically trigger the scalability build. Once it passes, download the scalability results on S3 at medic-e2e/scalability/$TAG_NAME. If you do not have access to the scalability results ask someone in the #product-team who has access. Add the release `.json` file to `cht-core/tests/scalability/previous_results`. More info in the  [scalability documentation](https://github.com/medic/cht-core/blob/master/tests/scalability/README.md).
+- [ ] Go to the [Issues tab](https://github.com/medic/cht-core/issues) and filter the issues with `is:issue label:"Affects: 4.x.x" ` , replace `4.x.x` with the previous version number. Add any open "known issues" from the prior release that were not fixed in this release. Done by adding the correct `Affects: 4.x.x` label.  
 - [ ] Add release notes to the [Core Framework Releases](https://docs.communityhealthtoolkit.org/core/releases/) page:
   - [ ] Create a new document for the release in the [releases folder](https://github.com/medic/cht-docs/tree/main/content/en/core/releases).
   - [ ] Ensure all issues are in the GH Milestone, they have human readable descriptions, and that they're correctly labelled. In particular: they have one "Type" label, "UI/UX" if they change the UI, and "Breaking change" if appropriate.
   - [ ] Use [this script](https://github.com/medic/cht-core/blob/master/scripts/release-notes/index.js) to export the issues into our release note format.
   - [ ] Collect known migration steps, descriptions, screenshots, videos, data, and anything else to help communicate particularly important changes. This information should already be on the issue, but if not, prompt the change author to provide it.
   - [ ] Document any required or recommended upgrades to our other products (eg: cht-conf, cht-gateway, cht-android).
   - [ ] Add the release to the [Supported versions](https://docs.communityhealthtoolkit.org/core/releases/#supported-versions) and update the EOL date of the previous release. Update the status of any releases that are past their End Of Life date. Also add a link in the `Release Notes` section to the new release page.
-- [ ] Create a release in GitHub from the release branch so it shows up under the [Releases tab](https://github.com/medic/cht-core/releases) with the naming convention `<major>.<minor>.<patch>`. In the releases tab, you select the "Choose a tag", type tag in the search box, then create a tag for the release `<major>.<minor>.<patch>`. Next, change the Target dropdown to the release branch (eg: `4.4.x`). Ensure the release notes PR above is merged. Add a link to the release notes in the description of the release.
+- [ ] Create a [new release](https://github.com/medic/cht-core/releases/new) in GitHub, with the naming convention `<major>.<minor>.<patch>`, from the release branch created above as the target branch. Click on the "Choose a tag" dropdown and create a tag for the release with the naming convention `<major>.<minor>.<patch>`. Ensure the release notes PR from above are merged. Add a link to the release notes in the description of the release.
 - [ ] Once you publish the release, confirm the release build completes successfully and the new release is available on the [market](https://staging.dev.medicmobile.org/_couch/builds_4/_design/builds/_view/releases). Make sure that the document has new entry with `id: medic:medic:<major>.<minor>.<patch>`
 - [ ] Upgrade the [demo](https://demo-cht.dev.medicmobile.org/) instance to the newly released version.
-- [ ] Use cht-conf to upload the configuration from the `/config/demo` folder to the `demo-cht.dev` server.
+- [ ] Use cht-conf to upload the configuration from the `cht-core/config/demo` folder to the `demo-cht.dev` server.
 - [ ] Announce the release on the [CHT forum](https://forum.communityhealthtoolkit.org/c/product/releases/26), under the "Product - Releases" category using this template:
 ```
 *We're excited to announce the release of {{version}} of {{product}}*
@@ -74,5 +75,4 @@ We’ve also implemented loads of other improvements and fixed a heap of bugs.
 
 ```
 - [ ] Add one last update to the #product-team Slack channel and use the thread to lead an internal release retrospective covering what went well and areas to improve for next time.
-- [ ] Go to the [Issues tab](https://github.com/medic/cht-core/issues) and filter the issues with `is:issue label:"Affects: 4.x.x" ` , replace `4.x.x` with the previous version number. Add any open "known issues" from the prior release that were not fixed in this release. Done by adding the correct `Affects: 4.x.x` label.  
 - [ ] Mark this issue "done" and close the Milestone.

.github/dependabot.yml

@@ -13,15 +13,15 @@ updates:
     commit-message:
       prefix: "chore"
     groups:
-      angular:
-        patterns:
-        - "@angular*"
       wdio:
         patterns:
         - "@wdio/*"
       pouchdb:
         patterns:
         - "pouchdb-*"
+      karma:
+        patterns:
+        - "karma*"
   - package-ecosystem: "npm"
     directory: "/admin"
     schedule:
@@ -33,28 +33,6 @@ updates:
       angular:
         patterns:
         - "angular*"
-  - package-ecosystem: "npm"
-    directory: "/api"
-    schedule:
-      interval: "weekly"
-      day: "saturday"
-    commit-message:
-      prefix: "chore"
-    groups:
-      pouchdb:
-        patterns:
-        - "pouchdb-*"
-  - package-ecosystem: "npm"
-    directory: "/sentinel"
-    schedule:
-      interval: "weekly"
-      day: "saturday"
-    commit-message:
-      prefix: "chore"
-    groups:
-      pouchdb:
-        patterns:
-        - "pouchdb-*"
   - package-ecosystem: "npm"
     directory: "/webapp"
     schedule:
@@ -66,6 +44,6 @@ updates:
       angular:
         patterns:
         - "@angular*"
-      pouchdb:
-        patterns:
-        - "pouchdb-*"
+        - "@ngrx/*"
+        - "rxjs"
+        - "zone.js"

.github/workflows/build.yml

@@ -163,6 +163,17 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
       - uses: actions/checkout@v4
 
+      - name: Download docker images artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: cht-images
+          path: images/
+        if: ${{ !env.INTERNAL_CONTRIBUTOR }}
+      - name: Load docker images
+        run: ls -1 *.tar | xargs --no-run-if-empty -L 1 docker load -i
+        working-directory: images/
+        if: ${{ !env.INTERNAL_CONTRIBUTOR }}
+
       - run: mkdir tests/logs
       - run: python -m pip install git+https://github.com/medic/[email protected]#egg=pyxform-medic
       - run: npm install -g cht-conf
@@ -419,9 +430,7 @@ jobs:
     name: Publish generated docs
     runs-on: ubuntu-22.04
     timeout-minutes: 5
-
     if: ${{ github.event_name != 'pull_request' }}
-
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ env.NODE_VERSION }}
@@ -432,7 +441,8 @@ jobs:
       - name: Generate TypeDoc
         run: npm run --prefix shared-libs/cht-datasource gen-docs
       - name: Main Branch Only - Deploy to GH pages
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
+        if: github.ref == 'refs/heads/master'
         with:
           personal_token: ${{ secrets.DEPLOY_TO_GITHUB_PAGES }}
           external_repository: medic/cht-datasource

.gitignore

@@ -53,6 +53,7 @@ couchdb/srv*
 tests/scalability/jmeter/
 webapp/analyzer.report.html
 /webapp/.angular/
+/webapp/.nx/
 .nyc_output
 user-password-change.txt
 user-password-change.csv