Merge branch 'master' into 8816-fix-couchdb-admin-search

Author: sh1vam31

.github/workflows/build.yml

@@ -242,7 +242,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cmd: ['ci-integration-all', 'ci-integration-sentinel', 'ci-webdriver-default-mobile']
+        cmd: ['ci-integration-all', 'ci-integration-sentinel', 'ci-webdriver-default-mobile', 'wdio-performance']
         chrome-version: ['107', 'latest']
         suite: [all]
         include:
@@ -271,6 +271,8 @@ jobs:
             chrome-version: 107
           - cmd: ci-webdriver-default-mobile
             chrome-version: 107
+          - cmd: wdio-performance
+            chrome-version: 107
     steps:
     - name: Login to Docker Hub
       uses: docker/login-action@v3

admin/package-lock.json

@@ -1,6 +1,7 @@
 const _ = require('lodash/core');
 const constants = require('@medic/constants');
 const DOC_TYPES = constants.DOC_TYPES;
+const PREFIXES = constants.PREFIXES;
 
 angular.module('controllers').controller('EditLanguageCtrl',
   function (
@@ -43,7 +44,7 @@ angular.module('controllers').controller('EditLanguageCtrl',
       if (!$scope.errors) {
         $scope.setProcessing();
         if (!$scope.language._id) {
-          $scope.language._id = 'messages-' + $scope.language.code;
+          $scope.language._id = PREFIXES.TRANSLATIONS + $scope.language.code;
         }
         DB().put($scope.language)
           .then(function() {

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

@@ -2,12 +2,14 @@ const moment = require('moment');
 const passwordTester = require('simple-password-tester');
 const phoneNumber = require('@medic/phone-number');
 const CHT = require('@medic/cht-datasource');
+const constants = require('@medic/constants');
+const USER_ROLES = constants.USER_ROLES;
 const PASSWORD_MINIMUM_LENGTH = 8;
 const PASSWORD_MINIMUM_SCORE = 50;
 const SHOW_PASSWORD_ICON = '/login/images/show-password.svg';
 const HIDE_PASSWORD_ICON = '/login/images/hide-password.svg';
 const USERNAME_ALLOWED_CHARS = /^[a-z0-9_-]+$/;
-const ADMIN_ROLE = '_admin';
+const ADMIN_ROLE = USER_ROLES.COUCHDB_ADMIN;
 const FIELDS_TO_IGNORE = [
   'currentPassword',
   'passwordConfirm',

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

@@ -1,3 +1,6 @@
+const constants = require('@medic/constants');
+const DOC_IDS = constants.DOC_IDS;
+
 angular.module('controllers').controller('ImagesBrandingCtrl',
   function(
     $log,
@@ -11,7 +14,7 @@ angular.module('controllers').controller('ImagesBrandingCtrl',
     'ngInject';
     'use strict';
 
-    const DOC_ID = 'branding';
+    const DOC_ID = DOC_IDS.BRANDING;
     const MAX_FILE_SIZE = 100000; // 100KB
 
     $('#images-branding .choose').on('click', ev => {

admin/src/js/controllers/images-branding.js

@@ -21,7 +21,7 @@ angular.module('inboxFilters').filter('headerLogo',
     'use strict';
     'ngInject';
     return function(name) {
-      return $sce.trustAsHtml(ResourceIcons.getImg(name, 'branding'));
+      return $sce.trustAsHtml(ResourceIcons.getImg(name, DOC_IDS.BRANDING));
     };
   });
 

admin/src/js/filters/resource-icon.js

@@ -1,6 +1,9 @@
 /*
  * Get all enabled languages
  */
+const constants = require('@medic/constants');
+const PREFIXES = constants.PREFIXES;
+
 angular.module('inboxServices').factory('Languages',
   function(
     DB
@@ -9,7 +12,7 @@ angular.module('inboxServices').factory('Languages',
     'ngInject';
     return function() {
       return DB()
-        .allDocs({ start_key: 'messages-', end_key: 'messages-\ufff0', include_docs: true })
+        .allDocs({ start_key: PREFIXES.TRANSLATIONS, end_key: PREFIXES.TRANSLATIONS + '\ufff0', include_docs: true })
         .then(function(result) {
           return result.rows.map(row => ({ code: row.doc.code, name: row.doc.name }));
         });

admin/src/js/services/languages.js

@@ -12,7 +12,7 @@ angular.module('inboxServices').factory('ResourceIcons',
     'ngInject';
 
     const CSS_CLASS = ['resource-icon', 'header-logo', 'partner-image'];
-    const ICON_DOC_IDS = [DOC_IDS.RESOURCES, 'branding', DOC_IDS.PARTNERS];
+    const ICON_DOC_IDS = [DOC_IDS.RESOURCES, DOC_IDS.BRANDING, DOC_IDS.PARTNERS];
 
     const cache = {
       resources: {

admin/src/js/services/resource-icons.js

@@ -1,7 +1,8 @@
 const _ = require('lodash/core');
 const constants = require('@medic/constants');
+const USER_ROLES = constants.USER_ROLES;
 const COOKIE_NAME = 'userCtx';
-const ONLINE_ROLE = constants.USER_ROLES.ONLINE;
+const ONLINE_ROLE = USER_ROLES.ONLINE;
 
 (function () {
 
@@ -96,7 +97,7 @@ const ONLINE_ROLE = constants.USER_ROLES.ONLINE;
 
       const isAdmin = function(userCtx) {
         userCtx = userCtx || getUserCtx();
-        return hasRole(userCtx, '_admin');
+        return hasRole(userCtx, USER_ROLES.COUCHDB_ADMIN);
       };
 
       return {

admin/src/js/services/session.js

@@ -1,7 +1,9 @@
 const translationUtils = require('@medic/translation-utils');
 
 const DEFAULT_LOCALE = 'en';
-const DOC_ID_PREFIX = 'messages-';
+const constants = require('@medic/constants');
+const PREFIXES = constants.PREFIXES;
+const DOC_ID_PREFIX = PREFIXES.TRANSLATIONS;
 
 angular.module('inboxServices').factory('TranslationLoader',
   function(