Put attendeeGroups under reportPeople setting in the dictionary

NCI-Agency · Dec 6, 2023 · 662a77f · 662a77f
1 parent 29324e7
commit 662a77f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 28 deletions.
diff --git a/anet-dictionary.yml b/anet-dictionary.yml
@@ -383,6 +383,10 @@ fields:
       minAttendingAuthors: 1
       optionalPrimaryAdvisor: false
       optionalPrimaryPrincipal: true
+      attendeeGroups:
+        - label: Linguists
+          filter:
+            orgUuid: 70193ee9-05b4-4aac-80b5-75609825db9f
     customFields:
       relatedReport:
         type: anet_object
@@ -512,10 +516,6 @@ fields:
             typeError: Qty must be a number
             label: Qty
         visibleWhen: $[?(@ && @.multipleButtons && (@.multipleButtons.indexOf('assist') != -1 || @.multipleButtons.indexOf('other') != -1))]
-    attendeeGroups:
-      - label: Linguists
-        filter:
-          orgUuid: 70193ee9-05b4-4aac-80b5-75609825db9f
 
   person:
     status:

diff --git a/client/src/pages/reports/Form.js b/client/src/pages/reports/Form.js
@@ -366,7 +366,8 @@ const ReportForm = ({
         }
 
         // Add attendee groups defined in the dictionary
-        const attendeeGroups = Settings.fields.report.attendeeGroups ?? []
+        const attendeeGroups =
+          Settings.fields.report.reportPeople?.attendeeGroups ?? []
         attendeeGroups.forEach(({ label, filter: queryVars }) => {
           reportPeopleFilters[label] = { label, queryVars }
         })

diff --git a/src/main/resources/anet-schema.yml b/src/main/resources/anet-schema.yml
@@ -652,29 +652,29 @@ properties:
               optionalPrimaryPrincipal:
                 type: boolean
                 default: false
+              attendeeGroups:
+                type: array
+                uniqueItems: true
+                items:
+                  type: object
+                  additionalProperties: false
+                  title: Attendee-group
+                  required: [label, filter]
+                  properties:
+                    label:
+                      type: string
+                      title: The label of the attendee group
+                    filter:
+                      type: object
+                      title: Attendee group filters
+                      properties:
+                        orgUuid:
+                          type: string
+                          title: UUID of organisation membership to form
           customFields:
             type: object
             additionalProperties:
               "$ref": "#/$defs/customField"
-          attendeeGroups:
-            type: array
-            uniqueItems: true
-            items:
-              type: object
-              additionalProperties: false
-              title: Attendee-group
-              required: [label, filter]
-              properties:
-                label:
-                  type: string
-                  title: The label of the attendee group
-                filter:
-                  type: object
-                  title: Attendee group filters
-                  properties:
-                    orgUuid:
-                      type: string
-                      title: UUID of organisation membership to form
 
       person:
         type: object

diff --git a/testDictionaries/no-custom-fields.yml b/testDictionaries/no-custom-fields.yml
@@ -367,10 +367,10 @@ fields:
       minAttendingAuthors: 1
       optionalPrimaryAdvisor: false
       optionalPrimaryPrincipal: true
-    attendeeGroups:
-      - label: Linguists
-        filter:
-          orgUuid: 70193ee9-05b4-4aac-80b5-75609825db9f
+      attendeeGroups:
+        - label: Linguists
+          filter:
+            orgUuid: 70193ee9-05b4-4aac-80b5-75609825db9f
 
   person:
     status: