Merge branch 'main' into anji/dev-1194-clear-button

Author: duvld

jsapp/js/api/models/hook.ts

@@ -29,8 +29,8 @@ export interface Hook {
   /** @nullable */
   payload_template?: string | null
   readonly pending_count: number
-  settings: HookSettings
-  subset_fields: string[]
+  settings?: HookSettings
+  subset_fields?: string[]
   readonly success_count: number
   readonly uid: string
   readonly url: string

jsapp/js/components/processing/analysis/editors/analysisQuestionEditor.component.tsx

@@ -201,7 +201,8 @@ export default function AnalysisQuestionEditor(props: AnalysisQuestionEditorProp
 
       {qaDefinition.additionalFieldNames && (
         // Hard coded left padding to account for the 32px icon size + 8px gap
-        <Stack pl={'40px'}>
+        // 0px gap because the children still did not get a mantine refactor so we must respect existing styles
+        <Stack pl={'40px'} gap={'0px'}>
           {question.type === 'qual_auto_keyword_count' && (
             <KeywordSearchFieldsEditor
               questionUuid={question.uuid}

jsapp/js/components/processing/analysis/responseForms/responseWrapper.component.tsx

@@ -111,7 +111,7 @@ export default function ResponseWrapper(props: ResponseWrapperProps) {
               </ButtonNew>
 
               <ButtonNew size='md' onClick={deleteQuestion} variant='danger'>
-                {t('Delete account')}
+                {t('Delete')}
               </ButtonNew>
             </Group>
           </Stack>

kobo/apps/hook/serializers/v2/hook.py

@@ -23,11 +23,12 @@
 
 class HookSerializer(serializers.ModelSerializer):
 
-    payload_template = serializers.CharField(required=False, allow_blank=True,
-                                             allow_null=True)
+    payload_template = serializers.CharField(
+        required=False, allow_blank=True, allow_null=True
+    )
 
-    settings = JSONFieldWithSchemaField(SettingsField)
-    subset_fields = ListFieldWithSchemaField(SubsetFieldsField)
+    settings = JSONFieldWithSchemaField(SettingsField, required=False)
+    subset_fields = ListFieldWithSchemaField(SubsetFieldsField, required=False)
 
     class Meta:
         model = Hook

kobo/apps/hook/tests/test_api_hook.py

@@ -63,6 +63,9 @@ def test_anonymous_access(self):
     def test_create_hook(self):
         self._create_hook()
 
+    def test_create_minimal_hook(self):
+        self._create_hook(minimal=True)
+
     def test_editor_access(self):
         hook = self._create_hook()
 

kobo/apps/hook/utils/tests/mixins.py

@@ -28,18 +28,23 @@ def _create_hook(self, return_response_only=False, **kwargs):
         self._add_submissions()
 
         url = reverse('hook-list', args=(self.asset.uid,))
+
         data = {
             'name': kwargs.get('name', 'some external service with token'),
             'endpoint': kwargs.get('endpoint', 'http://external.service.local/'),
-            'settings': kwargs.get(
-                'settings', {'custom_headers': {'X-Token': '1234abcd'}}
-            ),
-            'export_type': format_type,
-            'active': kwargs.get('active', True),
-            'subset_fields': kwargs.get('subset_fields', []),
-            'payload_template': kwargs.get('payload_template', None),
         }
 
+        if not kwargs.get('minimal', False):
+            data.update({
+                'settings': kwargs.get(
+                    'settings', {'custom_headers': {'X-Token': '1234abcd'}}
+                ),
+                'active': kwargs.get('active', True),
+                'export_type': format_type,
+                'subset_fields': kwargs.get('subset_fields', []),
+                'payload_template': kwargs.get('payload_template', None),
+            })
+
         response = self.client.post(url, data, format='json')
         if return_response_only:
             return response

static/openapi/schema_v2.json

@@ -15368,8 +15368,6 @@
                     "logs_url",
                     "name",
                     "pending_count",
-                    "settings",
-                    "subset_fields",
                     "success_count",
                     "uid",
                     "url"

static/openapi/schema_v2.yaml

@@ -11082,8 +11082,6 @@ components:
       - logs_url
       - name
       - pending_count
-      - settings
-      - subset_fields
       - success_count
       - uid
       - url