fix: include attribute options in completion post [DHIS2-15032] (#311)

dhis2 · Apr 5, 2023 · 8df1dc0 · 8df1dc0 · dhis2-bot · Apr 5, 2023
1 parent 293d33f
commit 8df1dc0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/shared/completion/use-set-form-completion-mutation.js b/src/shared/completion/use-set-form-completion-mutation.js
@@ -13,14 +13,17 @@ const MUTATION_SET_FORM_COMPLETION = {
  pe: periodId,
  ou: orgUnitId,
  cc: categoryComboId,
- co: categoryOptionIds,
+ cp: categoryOptionIds,
  completed,
  }) => {
  return {
  dataSet: dataSetId,
  period: periodId,
  orgUnit: orgUnitId,
- attribute: { combo: categoryComboId, options: categoryOptionIds },
+ attribute: {
+ combo: categoryComboId,
+ options: categoryOptionIds?.split(';'),
+ },
  completed,
  }
  },

diff --git a/src/shared/use-data-value-set/query-key-factory.js b/src/shared/use-data-value-set/query-key-factory.js
@@ -5,14 +5,14 @@ export const dataValueSets = {
  periodId,
  orgUnitId,
  categoryComboId,
- categoryOptionIds = [],
+ categoryOptionIds,
  }) => {
  const params = {
  ds: dataSetId,
  pe: periodId,
  ou: orgUnitId,
  cc: categoryComboId,
- cp: categoryOptionIds.join(';'),
+ cp: categoryOptionIds && categoryOptionIds.join(';'),
  }
 
  return [...dataValueSets.all, { params }]