cht-conf 5.1.0 → 5.2.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [5.2.1](https://github.com/medic/cht-conf/compare/v5.2.0...v5.2.1) (2025-08-27)
+
+
+### Bug Fixes
+
+* **#390:** notify user of new cht-conf versions ([#730](https://github.com/medic/cht-conf/issues/730)) ([9d36c21](https://github.com/medic/cht-conf/commit/9d36c215f5b6406233b856b6348fe949757ab0b8)), closes [#390](https://github.com/medic/cht-conf/issues/390)
+
+# [5.2.0](https://github.com/medic/cht-conf/compare/v5.1.0...v5.2.0) (2025-08-07)
+
+
+### Features
+
+* refactor requests from freetexts views to other similar views ([#660](https://github.com/medic/cht-conf/issues/660)) ([292565d](https://github.com/medic/cht-conf/commit/292565de488e05e630a21d5046215fa19910a1fb))
+
 # [5.1.0](https://github.com/medic/cht-conf/compare/v5.0.0...v5.1.0) (2025-07-02)
 
 

package/README.md

@@ -293,24 +293,6 @@ To achieve this, create a file called `settings.inherit.json` in your project's
 		}
 	}
 
-# Fetching logs
-
-Fetch logs from a CHT v2.x production server.
-
-This is a standalone command installed alongside `cht-conf`.  For usage information, run `cht-logs --help`.
-
-## Usage
-
-	cht-logs <instance-name> <log-types...>
-
-Accepted log types:
-
-	api
-	couchdb
-	gardener
-	nginx
-	sentinel
-
 # Development
 
 To develop a new action or improve an existing one, check the ["Actions" doc](src/fn/README.md).

package/commitlint.config.js

@@ -1 +1 @@
-module.exports = {extends: ['@commitlint/config-conventional']}
+module.exports = {extends: ['@commitlint/config-conventional']};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cht-conf",
-  "version": "5.1.0",
+  "version": "5.2.1",
   "description": "Configure CHT deployments",
   "main": "./src/lib/main.js",
   "engines": {
@@ -16,8 +16,6 @@
   "bin": {
     "medic-conf": "src/bin/index.js",
     "cht": "src/bin/index.js",
-    "medic-logs": "src/bin/cht-logs.bash",
-    "cht-logs": "src/bin/cht-logs.bash",
     "shell-completion-for-medic-conf": "src/bin/shell-completion.js",
     "shell-completion-for-cht": "src/bin/shell-completion.js",
     "pngout-medic": "bin/pngout",

package/src/cli/usage.js

@@ -8,9 +8,13 @@ ${bold('NAME')}
 
 ${bold('SYNOPSIS')}
   cht <--local|--instance=instance-name|--url=url>
-Or:
+
+  Or
+
   cht <--local|--instance=instance-name|--url=url|--archive> <actions> <options> -- <params>
 
+  ${underscore('Note')}: If <actions>,<options> or <params> are ${bold('not')} passed but one of --local or --instance or --url ${bold('is')} passed, ${bold('all')} supported actions are called.
+
 ${bold('DESCRIPTION')}
   This script updates and uploads a project's configuration.
 
@@ -58,6 +62,9 @@ ${bold('OPTIONS')}
   --skip-dependency-check
     Skips checking the version running is set to the same version in the package.json
 
+  --skip-version-check       
+    Skips the automatic check for new cht-conf versions
+    
   --skip-git-check
     Skips checking the status of the current repository that holds the configuration
 
@@ -65,12 +72,13 @@ ${bold('OPTIONS')}
     Skips checking message translations
 
   --skip-validate
-    Skips form validation  
+    Skips form validation
 
   --force
-    CAN BE DANGEROUS! Passes yes to all commands and any where that would prompt to overwrite changes will overwrite automatically. 
+    CAN BE DANGEROUS! Passes yes to all commands and any where that would prompt to overwrite changes will overwrite automatically.
 `);
   /* eslint-enable max-len */
 };
 
 const bold = text => `\x1b[1m${text}\x1b[0m`;
+const underscore = text => `\x1b[4m${text}\x1b[0m`;

package/src/lib/api.js

@@ -254,6 +254,22 @@ const api = {
       }
       return [];
     }
+  },
+
+  async getReportsByCreatedByIds (createdByIds, limit, skip) {
+    const queryString = createdByIds.map(id => `exact_match:"contact:${id}"`).join(' OR ');
+    const res = await request.get(`${environment.apiUrl}/_design/medic/_nouveau/reports_by_freetext`, {
+      qs: {
+        // sorting by this field ensures that the output are same with the clouseau views
+        // https://github.com/medic/cht-core/pull/9541
+        sort: '"reported_date"',
+        q: queryString,
+        include_docs: true,
+        limit,
+        skip
+      }, json: true
+    });
+    return res.hits.map(item => item.doc);
   }
 };
 

package/src/lib/check-for-updates.js

@@ -1,39 +1,35 @@
-const info = require('../lib/log').info;
 const request = require('request-promise-native');
-const warn = require('../lib/log').warn;
-
-module.exports = (options) => {
-  const current = require('../../package').version;
-  info(`Current version: ${current}.  Checking NPM for updates…`);
-
-  if (!options) {
-    options = {};
-  }
+const log = require('../lib/log'); 
+const current = require('../../package.json').version;
 
+module.exports = (options = {}) => {
   return request
     .get('https://registry.npmjs.org/cht-conf')
     .then(res => {
       const json = JSON.parse(res);
-      const latest = json['dist-tags'].latest;
-
-      if (latest === current) {
-        info('You are already on the latest version :¬)');
-      } else {
-        warn(`New version available!
+      return json['dist-tags'].latest;
+    })
+    .catch(err => {
+      log.warn(`Could not check NPM for updates: ${err.message}`); 
+      if (!options.nonFatal) {
+        throw err;
+      }
+    })
+    .then(latest => {
+      if (latest && latest !== current) {
+        log.warn(`New version available!
 
-        ${current} -> ${latest}
+      ${current} -> ${latest}
 
-     To install:
+   To install:
 
-       npm install -g cht-conf
-  `);
-      }
-    })
-    .catch(err => {
-      if (options.nonFatal && err.cause && err.cause.code === 'ENOTFOUND') {
-        warn('Could not check NPM for updates.  You may be offline.');
-      } else {
-        warn(`Could not check NPM for updates. Error: ${err.message}`);
+     npm install -g cht-conf
+    `); 
+        if (!options.nonFatal) {
+          throw new Error('You are not running the latest version of cht-conf!');
+        }
+      } else if (!options.nonFatal) {
+        log.info('You are already on the latest version :¬)'); 
       }
     });
 };

package/src/lib/hierarchy-operations/hierarchy-data-source.js

@@ -1,7 +1,11 @@
 const lineageManipulation = require('./lineage-manipulation');
+const {getValidApiVersion} = require('../get-api-version');
+const semver = require('semver');
+const api = require('../api');
 
 const HIERARCHY_ROOT = 'root';
 const BATCH_SIZE = 10000;
+const NOUVEAU_MIN_VERSION = '5.0.0';
 
 /*
 Fetches all of the documents associated with the "contactIds" and confirms they exist.
@@ -56,28 +60,48 @@ async function getContactWithDescendants(db, contactId) {
     .filter(doc => doc && doc.type !== 'tombstone');
 }
 
-async function getReportsForContacts(db, createdByIds, createdAtId, skip) {
-  const createdByKeys = createdByIds.map(id => [`contact:${id}`]);
-  const createdAtKeys = createdAtId ? [
-    [`patient_id:${createdAtId}`],
-    [`patient_uuid:${createdAtId}`],
-    [`place_id:${createdAtId}`],
-    [`place_uuid:${createdAtId}`]
-  ] : [];
-
-  const reports = await db.query('medic-client/reports_by_freetext', {
-    keys: [
-      ...createdByKeys,
-      ...createdAtKeys,
-    ],
+const getFromDbView = async (db, view, keys, skip) => {
+  const res = await db.query(view, {
+    keys,
     include_docs: true,
     limit: BATCH_SIZE,
-    skip,
+    skip
   });
+  return res.rows.map(row => row.doc);
+};
+
+const fetchReportsByCreator = async (db, createdByIds, skip) => {
+  if (createdByIds.length === 0) {
+    return [];
+  }
+
+  const coreVersion = await getValidApiVersion();
+  if (coreVersion && semver.gte(coreVersion, NOUVEAU_MIN_VERSION)) {
+    return await api().getReportsByCreatedByIds(createdByIds, BATCH_SIZE, skip);
+  }
+
+  const createdByKeys = createdByIds.map(id => [`contact:${id}`]);
+  return await getFromDbView(db, 'medic-client/reports_by_freetext', createdByKeys, skip);
+};
+
+const fetchReportsBySubject = async (db, createdAtId, skip) => {
+  if (!createdAtId) {
+    return [];
+  }
+  return await getFromDbView(db, 'medic-client/reports_by_subject', [createdAtId], skip);
+};
 
-  const docsWithId = reports.rows.map(({ doc }) => [doc._id, doc]);
+const getReportsForContacts = async (db, createdByIds, createdAtId, skip) => {
+  const [creatorReports, subjectReports] = await Promise.all([
+    fetchReportsByCreator(db, createdByIds, skip),
+    fetchReportsBySubject(db, createdAtId, skip)
+  ]);
+
+  const allRows = [...creatorReports, ...subjectReports];
+
+  const docsWithId = allRows.map(( doc ) => [doc._id, doc]);
   return Array.from(new Map(docsWithId).values());
-}
+};
 
 async function getAncestorsOf(db, contactDoc) {
   const ancestorIds = lineageManipulation.pluckIdsFromLineage(contactDoc.parent);

package/src/lib/main.js

@@ -187,11 +187,6 @@ module.exports = async (argv, env) => {
   info(`Processing config in ${projectName}.`);
   info('Actions:\n     -', actions.map(({name}) => name).join('\n     - '));
 
-  const skipCheckForUpdates = cmdArgs.check === false;
-  if (actions.some(action => action.name === 'check-for-updates') && !skipCheckForUpdates) {
-    await checkForUpdates({ nonFatal: true });
-  }
-
   for (const action of actions) {
     info(`Starting action: ${action.name}…`);
     await executeAction(action);
@@ -201,6 +196,9 @@ module.exports = async (argv, env) => {
   if (actions.length > 1) {
     await info('All actions completed.');
   }
+  if (!actions.some(action => action.name === 'check-for-updates') && !cmdArgs['skip-version-check']) {
+    await checkForUpdates({ nonFatal: true });
+  }
 };
 
 function buildActions(cmdArgs, skipValidate) {

package/src/bin/cht-logs.bash

@@ -1,62 +0,0 @@
-#!/bin/bash -eu
-
-usage() {
-	cat <<EOF
-cht-logs
-==========
-
-Fetch logs from production CHT servers.
-
-USAGE
-	$0 <instance-name> <log-types...>
-
-Accepted log types:
-
-	api
-	couchdb
-	gardener
-	nginx
-	sentinel
-EOF
-}
-
-if [[ $# = 0 ]]; then usage; exit 1; fi
-if [[ "$1" = "--help" ]]; then usage; exit; fi
-if [[ $# < 2 ]]; then usage; exit 1; fi
-
-instanceName="$1"
-shift
-
-domain="${instanceName}.medicmobile.org"
-
-localRoot="fetched-logs/${instanceName}"
-
-while [[ $# > 0 ]]; do
-	logType="$1"
-	shift
-
-	case "$logType" in
-		nginx)     logPath="/var/log/medic-core/nginx";  realLogType=nginx    ;;
-
-		gardener)  logPath="/var/log/gardener";          realLogType=gardener ;;
-		api)       logPath="/var/log/gardener";          realLogType=gardener ;;
-		medic-api) logPath="/var/log/gardener";          realLogType=gardener ;;
-		sentinel)  logPath="/var/log/gardener";          realLogType=gardener ;;
-
-		couch)     logPath="/var/log/medic-core/couchdb";realLogType=couchdb  ;;
-		couchdb)   logPath="/var/log/medic-core/couchdb";realLogType=couchdb  ;;
-
-		*) echo "ERROR: Cannot fetch logs of type: $logType"; exit 1 ;;
-	esac
-
-	localDir="${localRoot}/${realLogType}"
-	mkdir -p "$localDir"
-
-	echo "[logs:$logType] Fetching logs to ${localDir}..."
-	rsync -az --progress -e 'ssh -p 33696' "vm@${domain}:${logPath}/*" "$localDir"
-
-	echo "[logs:$logType] Decompressing logs..."
-	(cd "$localDir" && find . -name \*.bz2 | xargs bzip2 -dk)
-
-	echo "[logs:$logType] Completed.  Logs saved in: ${localDir}"
-done