Merge branch 'develop' of github.com:opencrvs/opencrvs-core into develop

opencrvs · Jun 27, 2022 · e415bc9 · e415bc9
2 parents 4c9520c + 4cb8f86
commit e415bc9
Show file tree

Hide file tree

Showing 12 changed files with 395 additions and 264 deletions.
diff --git a/packages/client/graphql.schema.json b/packages/client/graphql.schema.json
diff --git a/packages/client/src/forms/configuration/formConfig/utils/index.ts b/packages/client/src/forms/configuration/formConfig/utils/index.ts
@@ -317,7 +317,7 @@ export function generateConfigFields(
   defaultForm: ISerializedForm,
   questions: IQuestionConfig[]
 ) {
-  questions = questions.filter((question) => question.fieldId.includes(event))
+  questions = questions.filter((question) => question.fieldId.startsWith(event))
   /*
    * We get a list of all the fields, configured & default,
    * transformed into questionConfigs

diff --git a/packages/client/src/forms/configuration/index.ts b/packages/client/src/forms/configuration/index.ts
@@ -82,7 +82,7 @@ function mergeIdentifiers(
   return [
     ...mergedIdentifiers.filter(
       ({ sectionIndex, groupIndex }) =>
-        sectionIndex !== questionIdentifiers.sectionIndex &&
+        sectionIndex !== questionIdentifiers.sectionIndex ||
         groupIndex !== questionIdentifiers.groupIndex
     ),
     currentFieldIdentifier
@@ -292,7 +292,7 @@ export function getConfiguredOrDefaultForm(
     ? getConfiguredForm(
         formWithAddresses,
         formConfig.questionConfig.filter(({ fieldId }) =>
-          fieldId.includes(event)
+          fieldId.startsWith(event)
         )
       )
     : formWithAddresses

diff --git a/packages/client/src/forms/questionConfig/index.ts b/packages/client/src/forms/questionConfig/index.ts
@@ -180,7 +180,7 @@ export function getConfiguredQuestions(
       ...orderedQuestions,
       ...orderByPosition([
         ...customizedQuestions.filter(({ fieldId }) =>
-          fieldId.includes(section)
+          fieldId.startsWith(`${event}.${section}`)
         ),
         ...nonCustomizedQuestions
       ])

diff --git a/packages/client/src/search/queries.ts b/packages/client/src/search/queries.ts
@@ -18,7 +18,7 @@ export const SEARCH_EVENTS = gql`
     $contactNumber: String
     $registrationNumber: String
     $name: String
-    $locationIds: [String]
+    $locationIds: [String!]
   ) {
     searchEvents(
       sort: $sort
@@ -72,7 +72,7 @@ export const SEARCH_DECLARATIONS_USER_WISE = gql`
   query searchDeclarationsUserWise(
     $status: [String]
     $userId: String
-    $locationIds: [String]
+    $locationIds: [String!]
     $sort: String
     $count: Int
     $skip: Int
@@ -122,7 +122,7 @@ export const COUNT_USER_WISE_DECLARATIONS = gql`
   query countUserWiseDeclarations(
     $status: [String]
     $userId: String
-    $locationIds: [String]
+    $locationIds: [String!]
   ) {
     searchEvents(status: $status, userId: $userId, locationIds: $locationIds) {
       totalItems