(dnm) Enketo changes on 3.x architecture (#7821)

.github/actions/deploy-with-medic-conf/README.md

@@ -13,7 +13,7 @@ on: ['deployment']
 
 jobs:
   deployment:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-node@v1

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
 
   build:
     name: Compile the app
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Get Docker Hub username
@@ -57,7 +57,7 @@ jobs:
   config-tests:
     needs: build
     name: Config Tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         grunt-cmd: [ 'exec:test-config-standard', 'exec:test-config-default']
@@ -78,7 +78,7 @@ jobs:
   publish:
     needs: [tests,config-tests]
     name: Publish branch build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2
@@ -98,7 +98,7 @@ jobs:
   tests:
     needs: build
     name: ${{ matrix.grunt-cmd }} on node ${{ matrix.node-version }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     env:
       NODE: ${{ matrix.node-version }}
 

.github/workflows/cleanup.yml

@@ -10,7 +10,7 @@ env:
 jobs:
   cleanup:
     name: Deleting old published artefacts
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/scalability.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     name: Set up Medic on EC2 and Execute Jmeter on another EC2
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Set TAG_NAME var
         run: echo "TAG_NAME=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
@@ -25,4 +25,4 @@ jobs:
       - name: Execute Jmeter
         env: 
           SCALABILITY_ARN: ${{ secrets.SCALABILITY_ARN }}
-        run: cd tests/scalability && ./start_jmeter_ec2.sh 
+        run: cd tests/scalability && ./start_jmeter_ec2.sh

Gruntfile.js

@@ -129,6 +129,7 @@ module.exports = function(grunt) {
       test: {
         files: {
           ['http://admin:pass@localhost:4984/medic-test']: 'build/ddocs/medic.json',
+          ['http://admin:pass@localhost:4984/medic-test-logs']: 'build/ddocs/medic/_attachments/ddocs/logs.json',
         },
       },
       staging: {
@@ -540,11 +541,12 @@ module.exports = function(grunt) {
             'patch webapp/node_modules/moment/locale/hi.js < webapp/patches/moment-hindi-use-euro-numerals.patch',
 
             // patch enketo to always mark the /inputs group as relevant
-            'patch webapp/node_modules/enketo-core/src/js/Form.js < webapp/patches/enketo-inputs-always-relevant.patch',
+            'patch webapp/node_modules/enketo-core/src/js/form.js < webapp/patches/enketo-inputs-always-relevant_form.patch',
+            'patch webapp/node_modules/enketo-core/src/js/relevant.js < webapp/patches/enketo-inputs-always-relevant_relevant.patch',
 
-            // patch enketo so forms with no active pages are considered valid
-            // https://github.com/medic/medic/issues/5484
-            'patch webapp/node_modules/enketo-core/src/js/page.js < webapp/patches/enketo-handle-no-active-pages.patch',
+            // patch enketo to fix repeat name collision bug - this should be removed when upgrading to a new version of enketo-core
+            // https://github.com/enketo/enketo-core/issues/815
+            'patch webapp/node_modules/enketo-core/src/js/calculate.js < webapp/patches/enketo-repeat-name-collision.patch',
 
             // patch messageformat to add a default plural function for languages not yet supported by make-plural #5705
             'patch webapp/node_modules/messageformat/lib/plurals.js < webapp/patches/messageformat-default-plurals.patch',

TESTING.md

@@ -138,8 +138,7 @@ Github actions will artifact all files in tests/logs. This is the directory any
 
 ### Test Architecture
 
-Our github actions spin up an ubuntu-18.04 machine. Installs software and then launches Couchdb and Horticulturalist in a docker container. This is needed to run our applications in the specific node versions we support while allowing our test code to run in versions of node it they support. This creates a paradigm to keep in mind when writing tests. Tests run on the ubuntu machine. Any test code that starts a server or runs an executable is running outside of the horti container. The ports are exposed for all our services and horti has access to the cht-core root via a volume. Horti can also talk to the host by getting the gateway of the docker network. 
-
+Our GitHub actions spin up an ubuntu-22.04 machine. Installs software and then launches Couchdb and Horticulturalist in a docker container. This is needed to run our applications in the specific node versions we support while allowing our test code to run in versions of node it they support. This creates a paradigm to keep in mind when writing tests. Tests run on the ubuntu machine. Any test code that starts a server or runs an executable is running outside of the horti container. The ports are exposed for all our services and horti has access to the cht-core root via a volume. Horti can also talk to the host by getting the gateway of the docker network. 
 
 ### Glossary 
 

admin/package.json

@@ -19,7 +19,7 @@
     "bikram-sambat-bootstrap": "^1.5.0",
     "bootstrap": "^3.4.1",
     "font-awesome": "^4.7.0",
-    "google-libphonenumber": "^3.2.27",
+    "google-libphonenumber": "^3.2.30",
     "gsm": "^0.1.4",
     "jquery": "^3.5.1",
     "lodash": "^4.17.19",

admin/src/css/theme.less

@@ -185,3 +185,33 @@ ul {
 .people-section {
   margin-bottom: 30px;
 }
+
+.modal {
+  height: fit-content;
+  max-height: 70%;
+  top: 20%;
+  left: 25%;
+  width: 50%;
+  margin: 0px;
+  padding: 0px;
+}
+
+.modal-dialog {
+  width: auto;
+  margin: 0px;
+  padding: 0px;
+}
+
+.modal-content {
+  width: auto;
+}
+
+.summary-box {
+  border-bottom-width:0px !important;
+  padding-bottom:20px !important;
+}
+
+.summary-number {
+  font-size: 7rem;
+  margin-bottom: -15px;
+}

admin/src/js/controllers/edit-user.js

@@ -386,7 +386,7 @@ angular
             return UpdateUser($scope.editUserModel.username, updates);
           }
 
-          return CreateUser(updates);
+          return CreateUser.createSingleUser(updates);
         })
         .then(() => {
           $scope.setFinished();

admin/src/js/controllers/main.js

@@ -3,11 +3,12 @@ angular.module('controllers').controller('MainCtrl',
     $log,
     $scope,
     $state,
-    $translate,
     $window,
     Auth,
+    Language,
     Location,
-    Session
+    Session,
+    SetLanguage
   ) {
     'ngInject';
 
@@ -23,7 +24,7 @@ angular.module('controllers').controller('MainCtrl',
         });
     };   
 
-    $translate.use('en');
+    Language().then(locale => SetLanguage(locale));
     $scope.authorized = false;
     $scope.navbarCollapsed = true;
     Auth.any([['can_configure'], ['can_view_outgoing_messages'], ['can_export_all']])

admin/src/js/controllers/multiple-user.js

@@ -0,0 +1,150 @@
+angular.module('controllers').controller('MultipleUserCtrl', function(
+  $scope,
+  $uibModalInstance,
+  $window,
+  CreateUser,
+  DB
+) {
+
+  'use strict';
+  'ngInject';
+
+  $scope.status = { uploading: false };
+  $scope.displayAddMultipleModal = true;
+  $scope.displayUnavailableModal = false;
+  $scope.displayUploadConfirm = false;
+  $scope.displayProcessingStatus = false;
+  $scope.displayFinishSummary = false;
+  $scope.outputFileUrl = '';
+  $scope.processTotal = '';
+  const USER_LOG_DOC_ID = 'bulk-user-upload-';
+
+  $scope.onCancel = function () {
+    $scope.clearScreen();
+    $uibModalInstance.dismiss();
+  };
+
+  const getLogsByType = (docPrefix) => {
+    return DB({ logsDB: true })
+      .allDocs({
+        startkey: docPrefix,
+        endkey: docPrefix + '\ufff0',
+        include_docs: true
+      })
+      .then(result => {
+        if (!result || !result.rows || !result.rows.length) {
+          return;
+        }
+        return result.rows
+          .map(row => row.doc)
+          .sort((a, b) => new Date(b.bulk_uploaded_on) - new Date(a.bulk_uploaded_on));
+      });
+  };
+
+  const prepareStringForCSV = (str) => {
+    if (!str) {
+      return str;
+    }
+    return '"' + str.replace(/"/g, '""') + '"';
+  };
+
+  const convertToCSV = doc => {
+    if (!doc || !doc.data) {
+      return;
+    }
+    const eol = '\r\n';
+    const delimiter = ',';
+    const columns = ['import.status:excluded', 'import.message:excluded', 'import.username:excluded'];
+    let output = columns.join(delimiter) + eol;
+
+    doc.data.forEach(record => {
+      if (record.import) {
+        output += [
+          prepareStringForCSV(record.import.status),
+          prepareStringForCSV(record.import.message),
+          prepareStringForCSV(record.username),
+        ].join(delimiter) + eol;
+      }
+    });
+
+    const file = new Blob([output], { type: 'text/csv;charset=utf-8;' });
+    return URL.createObjectURL(file);
+  };
+
+  $scope.processUpload = function () {
+    $scope.clearScreen();
+    $scope.displayProcessingStatus = true;
+    return $scope.uploadedData
+      .text()
+      .then(data => CreateUser.createMultipleUsers(data))
+      .then(() => getLogsByType(USER_LOG_DOC_ID))
+      .then(docs => {
+        if (!docs || !docs.length) {
+          // eslint-disable-next-line no-console
+          console.error('CreateMultipleUser : Error getting logs by type');
+          $scope.setError('CreateMultipleUser : Error getting logs by type');
+        } else {
+          $scope.uploadProcessLog = docs[0];
+          $scope.processTotal = $scope.uploadProcessLog.progress.parsing.total;
+          $scope.successUsersNumber = $scope.uploadProcessLog.progress.saving.successful;
+          $scope.ignoredUsersNumber = $scope.uploadProcessLog.progress.saving.ignored;
+          $scope.failedUsersNumber = $scope.uploadProcessLog.progress.saving.failed;
+          $scope.$apply();
+          $scope.outputFileUrl = convertToCSV( $scope.uploadProcessLog);
+          $scope.showFinishSummary();
+        }
+      })
+      .catch(error => {
+        // eslint-disable-next-line no-console
+        console.error(error, 'CreateMultipleUser : Error processing data after upload');
+        $scope.setError(error, 'CreateMultipleUser : Error processing data after upload');
+      });
+  };
+
+  $scope.showFinishSummary = function () {
+    $scope.clearScreen();
+    $scope.displayFinishSummary = true;
+    $scope.$apply();
+  };
+
+  $scope.showDisplayUploadConfirm = function () {
+    $scope.clearScreen();
+    $scope.displayUploadConfirm = true;
+    $scope.$apply();
+  };
+
+  $scope.backToAppManagement = function () {
+    $window.location.href = '/admin/#/users';
+    $window.location.reload();
+    $scope.clearScreen();
+    $uibModalInstance.dismiss();
+    $scope.$apply();
+  };
+
+  $scope.clearScreen = function () {
+    $scope.displayAddMultipleModal = false;
+    $scope.displayUnavailableModal = false;
+    $scope.displayUploadConfirm = false;
+    $scope.displayProcessingStatus = false;
+    $scope.displayFinishSummary = false;
+  };
+
+  const upload = function() {
+    const files = $('#users-upload .uploader')[0].files;
+    if (!files || files.length === 0) {
+      return;
+    }
+    $scope.usersFilename = files[0].name;
+    $scope.uploadedData = files[0];
+    $scope.showDisplayUploadConfirm();
+  };
+
+  angular.element(function () {
+    $('#users-upload .uploader').on('change', upload);
+    $('#users-upload .choose').on('click', function(e) {
+      e.preventDefault();
+      $('#users-upload .uploader').click();
+    });
+  });
+}
+);

admin/src/js/controllers/upgrade.js

@@ -40,6 +40,9 @@ angular.module('controllers').controller('UpgradeCtrl',
       return DB().get('_design/medic')
         .then(function(ddoc) {
           $scope.currentDeploy = ddoc.deploy_info;
+
+          const currentVersion = Version.currentVersion($scope.currentDeploy);
+          $scope.isUsingFeatureRelease = !!currentVersion && typeof currentVersion.featureRelease !== 'undefined';
         });
     };
 
@@ -94,7 +97,21 @@ angular.module('controllers').controller('UpgradeCtrl',
             endkey: [ 'release', 'medic', 'medic', minVersion.major, minVersion.minor, minVersion.patch],
             descending: true,
             limit: 50
-          })
+          }),
+          featureReleases: !$scope.isUsingFeatureRelease ? builds({
+            startkey: [minVersion.featureRelease, 'medic', 'medic', {}],
+            endkey: [
+              minVersion.featureRelease,
+              'medic',
+              'medic',
+              minVersion.major,
+              minVersion.minor,
+              minVersion.patch,
+              minVersion.beta,
+            ],
+            descending: true,
+            limit: 50,
+          }) : [],
         }).then(function(results) {
           $scope.versions = results;
         });

admin/src/js/controllers/users.js

@@ -52,6 +52,14 @@ angular.module('controllers').controller('UsersCtrl',
       });
     };
 
+    $scope.showAddMultipleUsersModal = function() {
+      Modal({
+        templateUrl: 'templates/multiple_user_modal.html',
+        controller: 'MultipleUserCtrl',
+        model: {},
+      });
+    };
+
     $scope.$on('UsersUpdated', function() {
       $scope.updateList();
     });