Merge branch 'beta' of github.com:kobotoolbox/kpi into beta

Author: magicznyleszek

dependencies/pip/dev_requirements.in

@@ -3,6 +3,7 @@
 Fabric
 coverage
 coveralls
+ddt
 ipython==8.12.3 # Max supported version by Python 3.8
 mock
 model-bakery

dependencies/pip/dev_requirements.txt

@@ -114,6 +114,8 @@ cryptography==42.0.5
     #   pyopenssl
 cssselect==1.2.0
     # via pyquery
+ddt==1.7.2
+    # via -r dependencies/pip/dev_requirements.in
 decorator==5.1.1
     # via
     #   fabric
@@ -598,6 +600,8 @@ tzdata==2024.1
     #   celery
     #   django-celery-beat
     #   pandas
+ua-parser==0.18.0
+    # via -r dependencies/pip/requirements.in
 uritemplate==4.1.1
     # via google-api-python-client
 urllib3==1.26.18

dependencies/pip/requirements.in

@@ -84,6 +84,7 @@ shortuuid
 sqlparse
 static3
 tabulate
+ua-parser
 uWSGI
 Werkzeug
 xlrd

dependencies/pip/requirements.txt

@@ -495,6 +495,8 @@ tzdata==2024.1
     #   celery
     #   django-celery-beat
     #   pandas
+ua-parser==0.18.0
+    # via -r dependencies/pip/requirements.in
 uritemplate==4.1.1
     # via google-api-python-client
 urllib3==1.26.18

jsapp/js/account/security/email/emailSection.component.tsx

@@ -11,6 +11,7 @@ import Button from 'jsapp/js/components/common/button';
 import TextBox from 'jsapp/js/components/common/textBox';
 import Icon from 'jsapp/js/components/common/icon';
 import {formatTime} from 'jsapp/js/utils';
+import {notify} from 'js/utils';
 
 interface EmailState {
   emails: EmailResponse[];
@@ -87,6 +88,15 @@ export default function EmailSection() {
     });
   }
 
+  function handleSubmit() {
+    const emailPattern = /[^@]+@[^@]+\.[^@]+/;
+    if (!emailPattern.test(email.newEmail)) {
+      notify.error('Invalid email address');
+    } else {
+      setNewUserEmail(email.newEmail);
+    }
+  }
+
   const currentAccount = session.currentAccount;
   const unverifiedEmail = email.emails.find(
     (userEmail) => !userEmail.verified && !userEmail.primary
@@ -162,7 +172,7 @@ export default function EmailSection() {
         className={style.optionsSection}
         onSubmit={(e) => {
           e.preventDefault();
-          setNewUserEmail(email.newEmail);
+          handleSubmit();
         }}
       >
         {/*TODO: Move TextBox into a modal--it messes up the flow of the row right now*/}
@@ -178,10 +188,7 @@ export default function EmailSection() {
           size='m'
           color='blue'
           type='frame'
-          onClick={setNewUserEmail.bind(setNewUserEmail, email.newEmail)}
-          // quick simple subtle email validation to avoid complete accidents
-          // a toast showing any API error feedback would be nicer
-          isDisabled={!/[^@]+@[^@]+\.[^@]+/.test(email.newEmail)}
+          onClick={handleSubmit}
         />
       </form>
     </div>

jsapp/js/i18nMissingStrings.es6

@@ -8,8 +8,8 @@
 // misc strings
 test = t('Add another condition');
 
-test = t('Question should match all of these criteria');
-test = t('Question should match any of these criteria');
+test = t('Previous responses should match all of these conditions');
+test = t('Previous responses should match any of these conditions');
 test = t('Click to add another response...');
 test = t('AUTOMATIC');
 test = t('Skip Logic');

jsapp/xlform/src/view.rowDetail.SkipLogic.coffee

@@ -29,8 +29,8 @@ module.exports = do ->
           <button class="skiplogic__addcriterion kobo-button kobo-button--storm">+ #{t("Add another condition")}</button>
         </p>
         <select class="skiplogic__delimselect">
-          <option value="and">#{t("Question should match all of these criteria")}</option>
-          <option value="or">#{t("Question should match any of these criteria")}</option>
+          <option value="and">#{t("Previous responses should match all of these conditions")}</option>
+          <option value="or">#{t("Previous responses should match any of these conditions")}</option>
         </select>
       """)
 

kobo/apps/audit_log/migrations/0007_alter_auditlog_action_and_more.py

@@ -0,0 +1,69 @@
+# Generated by Django 4.2.11 on 2024-07-31 20:00
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+def manually_create_indexes_instructions(apps, schema_editor):
+    print(
+        """
+        !!! ATTENTION !!!
+        If you have existing projects you need to run the SQL queries below in PostgreSQL directly:
+
+           > CREATE INDEX CONCURRENTLY audit_log_asset_action_idx ON public.audit_log_auditlog
+           USING btree (((metadata -> 'asset_uid'::text)), action);
+           > CREATE INDEX CONCURRENTLY audit_log_asset_uid_idx ON public.audit_log_auditlog
+            USING btree (((metadata -> 'asset_uid'::text)))
+
+        Otherwise, the audit log table may be unusable.
+        """
+    )
+
+
+def manually_drop_indexes_instructions(apps, schema_editor):
+    print(
+        """
+        !!! ATTENTION !!!
+        Run the SQL queries below in PostgreSQL directly:
+
+           > DROP INDEX IF EXISTS "audit_log_asset_action_idx";
+           > DROP INDEX IF EXISTS "audit_log_asset_uid_idx";
+
+        """
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('audit_log', '0001_squashed_0006_remove_index_together'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='auditlog',
+            name='action',
+            field=models.CharField(choices=[('create', 'CREATE'), ('delete', 'DELETE'), ('in-trash', 'IN TRASH'), ('put-back', 'PUT BACK'), ('remove', 'REMOVE'), ('update', 'UPDATE'), ('auth', 'AUTH')], db_index=True, default='delete', max_length=10),
+        ),
+    ]
+    if not settings.SKIP_HEAVY_MIGRATIONS:
+        operations.extend(
+            [
+                migrations.AddIndex(
+                    model_name='auditlog',
+                    index=models.Index(models.F('metadata__asset_uid'), models.F('action'),
+                                       name='audit_log_asset_action_idx'),
+                ),
+                migrations.AddIndex(
+                    model_name='auditlog',
+                    index=models.Index(models.F('metadata__asset_uid'), name='audit_log_asset_uid_idx'),
+                ),
+            ]
+        )
+    else:
+        operations.extend([
+            migrations.RunPython(
+                manually_create_indexes_instructions,
+                manually_drop_indexes_instructions,
+            )
+        ])

kobo/apps/audit_log/models.py

@@ -14,6 +14,7 @@ class AuditAction(models.TextChoices):
     PUT_BACK = 'put-back', 'PUT BACK'
     REMOVE = 'remove', 'REMOVE'
     UPDATE = 'update', 'UPDATE'
+    AUTH = 'auth', 'AUTH'
 
 
 class AuditLog(models.Model):
@@ -39,6 +40,8 @@ class Meta:
         indexes = [
             models.Index(fields=['app_label', 'model_name', 'action']),
             models.Index(fields=['app_label', 'model_name']),
+            models.Index(models.F('metadata__asset_uid'), 'action', name='audit_log_asset_action_idx'),
+            models.Index(models.F('metadata__asset_uid'), name='audit_log_asset_uid_idx')
         ]
 
     def save(

kobo/apps/openrosa/apps/viewer/tests/test_viewer_tools.py

@@ -1,21 +1,67 @@
 # coding: utf-8
+from ddt import data, ddt, unpack
 from django.test.client import RequestFactory
 
 from kobo.apps.openrosa.apps.main.tests.test_base import TestBase
-from kobo.apps.openrosa.libs.utils.viewer_tools import export_def_from_filename,\
-    get_client_ip
+from kobo.apps.openrosa.libs.utils.viewer_tools import (
+    export_def_from_filename,
+    get_client_ip,
+    get_human_readable_client_user_agent,
+)
 
 
+@ddt
 class TestViewerTools(TestBase):
     def test_export_def_from_filename(self):
-        filename = "path/filename.xlsx"
+        filename = 'path/filename.xlsx'
         ext, mime_type = export_def_from_filename(filename)
         self.assertEqual(ext, 'xlsx')
         self.assertEqual(mime_type, 'vnd.openxmlformats')
 
     def test_get_client_ip(self):
-        request = RequestFactory().get("/")
+        request = RequestFactory().get('/')
         client_ip = get_client_ip(request)
         self.assertIsNotNone(client_ip)
         # will this always be 127.0.0.1
-        self.assertEqual(client_ip, "127.0.0.1")
+        self.assertEqual(client_ip, '127.0.0.1')
+
+    @data(
+        # chrome on android phone
+        (
+            'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36'
+            ' (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36',
+            'Chrome Mobile (Android)',
+        ),
+        # chrome on Windows
+        (
+            'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko)'
+            ' Chrome/47.0.2526.111 Safari/537.36',
+            'Chrome (Windows)',
+        ),
+        # firefox on linux
+        (
+            'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:15.0) Gecko/20100101 Firefox/15.0.1',
+            'Firefox (Ubuntu)',
+        ),
+        # curl
+        ('curl/7.88.1', 'curl (Other)'),
+        # system browser on iPhone
+        (
+            'Mozilla/5.0 (Apple-iPhone7C2/1202.466; U; CPU like Mac OS X; en) AppleWebKit/420+'
+            ' (KHTML, like Gecko) Version/3.0 Mobile/1A543 Safari/419.3',
+            'Mobile Safari (iOS)',
+        ),
+        # nonsense
+        ('Lizards!', 'Other (Other)'),
+        # empty
+        ('', 'No information available'),
+        # missing
+        (None, 'No information available'),
+    )
+    @unpack
+    def test_client_user_agent(self, ua_string, expected_result):
+        factory = RequestFactory()
+        header = {'HTTP_USER_AGENT': ua_string}
+        request = factory.get('/', **header)
+        result = get_human_readable_client_user_agent(request)
+        self.assertEqual(result, expected_result)