Merge branch 'develop' into CU-8685dcrr6_Expand-graphchart-visuals-wh…

…en-only-two-graph-types-are-selected
caktus · Aug 29, 2023 · 5d903a4 · 5d903a4
2 parents 2887711 + a9bef73
commit 5d903a4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/frontend/src/Components/Elements/Table/TableModal.js b/frontend/src/Components/Elements/Table/TableModal.js
@@ -135,7 +135,10 @@ function TableModal({ chartState, dataSet, columns, isOpen, closeModal }) {
  const getEndpoint = mapDatasetKeyToEndpoint(tableDS);
  const _from = `${rangeValue.from.year}-${rangeValue.from.month.toString().padStart(2, 0)}-01`;
  const _to = `${rangeValue.to.year}-${rangeValue.to.month.toString().padStart(2, 0)}-01`;
- const url = `${getEndpoint(agencyId)}?from=${_from}&to=${_to}`;
+ let url = `${getEndpoint(agencyId)}?from=${_from}&to=${_to}`;
+ if (officerId) {
+ url = `${url}&officer=${officerId}`;
+ }
  yearRange = range(rangeValue.from.year, rangeValue.to.year + 1, 1);
  try {
  const { data } = await axios.get(url);