cht-conf 3.21.4 → 3.22.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [3.22.0](https://github.com/medic/cht-conf/compare/v3.21.5...v3.22.0) (2024-04-29)
+
+
+### Features
+
+* **#615:** add support for `assetlinks.json` when compiling app settings ([#616](https://github.com/medic/cht-conf/issues/616)) ([f39d22a](https://github.com/medic/cht-conf/commit/f39d22a59816a18e9b2777067330193ce336b7a0)), closes [#615](https://github.com/medic/cht-conf/issues/615)
+
+## [3.21.5](https://github.com/medic/cht-conf/compare/v3.21.4...v3.21.5) (2024-02-05)
+
+
+### Bug Fixes
+
+* **#26:** add warning if jsonDir contains file when running csv-to-doc command ([#603](https://github.com/medic/cht-conf/issues/603)) ([e445c9b](https://github.com/medic/cht-conf/commit/e445c9b44be94b3a7492a471c5c709857509076e)), closes [#26](https://github.com/medic/cht-conf/issues/26)
+
 ## [3.21.4](https://github.com/medic/cht-conf/compare/v3.21.3...v3.21.4) (2024-01-31)
 
 

package/package.json

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

package/src/fn/compile-app-settings.js

@@ -95,6 +95,15 @@ const compileAppSettingsForProject = async (projectDir, options) => {
       }
       appSettings.schedules = scheduleSettings;
     }
+
+    const assetlinks = readOptionalJson(path.join(projectDir, 'app_settings/assetlinks.json'));
+    if (assetlinks) {
+      const validate = validateAppSettings.validateAssetlinks(assetlinks);
+      if (!validate.valid) {
+        throw new Error(`Invalid assetlinks: ${validate.error}`);
+      }
+      appSettings.assetlinks = assetlinks;
+    }
   } else {
     warn(`app_settings.json file should not be edited directly.
     Please create a base_settings.json file in app_settings folder and move any manually defined configurations there.`);

package/src/fn/csv-to-docs.js

@@ -29,6 +29,10 @@ const execute = () => {
   const jsonDir = `${environment.pathToProject}/json_docs`;
   fs.mkdir(jsonDir);
 
+  const warningMsg = `There are already docs in ${jsonDir}.
+     New json files will be created along side these existing docs.`;
+  fs.warnIfDirectoryIsNotEmpty(jsonDir, warningMsg);
+
   const saveJsonDoc = doc => fs.write(`${jsonDir}/${doc._id}.doc.json`, safeStringify(doc) + '\n');
 
   const model = {
@@ -262,5 +266,5 @@ module.exports = {
   int,
   setCol,
   parseColumn,
-  removeExcludedField
+  removeExcludedField,
 };

package/src/lib/sync-fs.js

@@ -4,6 +4,7 @@ const mkdirp = require('mkdirp').sync;
 const os = require('os');
 const path = require('path');
 const trace = require('../lib/log').trace;
+const userPrompt = require('../lib/user-prompt');
 const warn = require('../lib/log').warn;
 
 function read(path) {
@@ -80,12 +81,27 @@ function copy(from, to, { overwrite=true }={}) {
   }
 }
 
+function isDirectoryEmpty(dir) {
+  return !fs.readdirSync(dir).length;
+}
+
+function warnIfDirectoryIsNotEmpty(dir, warningMsg) {
+  if (!isDirectoryEmpty(dir)) {
+    warn(warningMsg);
+
+    if (!userPrompt.keyInYN('Are you sure you want to continue?')) {
+      throw new Error('User aborted execution.');
+    }
+  }
+}
+
 module.exports = {
   copy,
   dirs,
   exists: fs.existsSync,
   extension,
   fs,
+  isDirectoryEmpty,
   mkdir: path => { try { mkdirp(path); } catch(e) { warn(e); } },
   mkdtemp: () => fs.mkdtempSync(`${os.tmpdir()}/cht-conf`),
   path,
@@ -98,6 +114,7 @@ module.exports = {
   deleteFilesInFolder: folderPath => recurseFiles(folderPath).forEach(filePath => fs.unlinkSync(filePath)),
   readdir: fs.readdirSync,
   statSync: fs.statSync,
+  warnIfDirectoryIsNotEmpty,
   withoutExtension,
   write: (path, data, options = 'utf8') => fs.writeFileSync(path, data, options),
   writeBinary: (path, content) => fs.writeFileSync(path, content),

package/src/lib/validate-app-settings.js

@@ -64,6 +64,19 @@ const ScheduleSchema = joi.array().items(
   })
 );
 
+const AssetlinksSchema = joi.array().items(
+  joi.object({
+    relation: joi.array().items(
+      joi.string().valid('delegate_permission/common.handle_all_urls').required()
+    ).length(1).required(),
+    target: joi.object({
+      namespace: joi.string().valid('android_app').required(),
+      package_name: joi.string().required(),
+      sha256_cert_fingerprints: joi.array().items(joi.string().required()).min(1).required(),
+    }).required(),
+  }),
+).min(1);
+
 module.exports = {
   validateFormsSchema: (formsObject) => {
     const { error } = FormsSchema.validate(formsObject);
@@ -72,5 +85,9 @@ module.exports = {
   validateScheduleSchema: (scheduleObject) => {
     const { error } = ScheduleSchema.validate(scheduleObject);
     return error ? { valid: false, error } : { valid: true };
+  },
+  validateAssetlinks: (assetlinksObject) => {
+    const { error } = AssetlinksSchema.validate(assetlinksObject);
+    return error ? { valid: false, error } : { valid: true };
   }
 };