cht-conf 6.0.1 → 6.0.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [6.0.2](https://github.com/medic/cht-conf/compare/v6.0.1...v6.0.2) (2026-01-16)
+
+
+### Bug Fixes
+
+* **#787:** upload forms with correct `internalId` property ([#788](https://github.com/medic/cht-conf/issues/788)) ([3a28dce](https://github.com/medic/cht-conf/commit/3a28dce3499c7cc2aac7ad5c8a7327303288986f)), closes [#787](https://github.com/medic/cht-conf/issues/787)
+
 ## [6.0.1](https://github.com/medic/cht-conf/compare/v6.0.0...v6.0.1) (2026-01-14)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cht-conf",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Configure CHT deployments",
   "main": "./src/lib/main.js",
   "engines": {

package/src/lib/forms-utils.js

@@ -127,6 +127,13 @@ module.exports = {
   readTitleFrom: xml =>
     xml.substring(xml.indexOf('<h:title>') + 9, xml.indexOf('</h:title>')),
 
+  /**
+   * Get the ID of the form
+   * @param {string} xml the XML string
+   * @returns {string}
+   */
+  readIdFrom: xml => /<model.*?>[^]*?<instance>[^]*?id="([^"]*)"[^]*?<\/instance>[^]*?<\/model>/.exec(xml)?.[1],
+
   /**
    * Escape whitespaces in a path.
    * @param {string} path the path string

package/src/lib/upload-forms.js

@@ -10,7 +10,7 @@ const warnUploadOverwrite = require('./warn-upload-overwrite');
 const {
   getFormDir,
   getFormFilePaths,
-  readTitleFrom,
+  readTitleFrom, readIdFrom,
 } = require('./forms-utils');
 
 const SUPPORTED_PROPERTIES = ['context', 'icon', 'title', 'xml2sms', 'subject_key', 'hidden_fields'];
@@ -59,7 +59,7 @@ const execute = async (projectDir, subDirectory, options) => {
     log.info(`Preparing form for upload: ${fileName}…`);
 
     const { baseFileName, mediaDir, xformPath, filePath } = getFormFilePaths(formsDir, fileName);
-    const internalId = (options.id_prefix || '') + baseFileName.replaceAll('-', ':');
+    const baseDocId = (options.id_prefix || '') + baseFileName.replaceAll('-', ':');
 
     const mediaDirExists = fs.exists(mediaDir);
     if (!mediaDirExists) {
@@ -74,7 +74,14 @@ const execute = async (projectDir, subDirectory, options) => {
       sha256: hashSum.digest('hex'),
     };
 
-    const docId = `form:${internalId}`;
+    const internalId = readIdFrom(xml);
+    if (internalId.replaceAll('-', ':') !== baseDocId) {
+      throw new Error(`The file name for the form [${baseFileName}] does not match the id in the xml [${
+        internalId
+      }]. Rename the form xlsx/xml files to match the id.`);
+    }
+
+    const docId = `form:${baseDocId}`;
     const doc = {
       _id: docId,
       type: 'form',