OCLOMRS-923: Concept counts not displayed when using API2

openmrs · Mar 3, 2021 · 1347bb6 · 1347bb6
1 parent 686bf26
commit 1347bb6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/apps/containers/api.ts b/src/apps/containers/api.ts
@@ -2,7 +2,20 @@ import { authenticatedInstance } from "../../api";
 
 const api = {
   retrieve: (containerUrl: string) =>
-    authenticatedInstance.get(containerUrl, { params: { verbose: true } })
+    authenticatedInstance.get(containerUrl, {
+      params: { 
+        verbose: true,
+        includeReferences: true
+      } 
+    }),
+  versions: {
+    retrieve: (containerUrl: string) =>
+      authenticatedInstance.get(`${containerUrl}versions/`, {
+        params: { 
+          verbose: true
+        } 
+      })
+  }
 };
 
 export default api;
diff --git a/src/apps/dictionaries/api.ts b/src/apps/dictionaries/api.ts
@@ -56,8 +56,7 @@ const api = {
     }
   },
   versions: {
-    retrieve: (dictionaryUrl: string) =>
-      authenticatedInstance.get(`${dictionaryUrl}versions/?verbose=true`),
+    ...containerAPI.versions,
     create: (
       dictionaryUrl: string,
       data: DictionaryVersion
@@ -70,10 +69,10 @@ const api = {
         authenticatedInstance.put(`${dictionaryUrl}${data.id}/`, data)
   },
   retrieveMappings: (
-    sourceUrl: string,
+    dictionaryUrl: string,
     fromConceptIds: string[]
   ) =>
-    authenticatedInstance.get(`${sourceUrl}mappings/`, {
+    authenticatedInstance.get(`${dictionaryUrl}mappings/`, {
       params: {
         fromConcept: fromConceptIds.join(","),
         limit: 0 // bad, todo optimize this

diff --git a/src/apps/sources/api.ts b/src/apps/sources/api.ts
@@ -46,8 +46,7 @@ const api = {
             }),
     },
   },versions: {
-    retrieve: (sourceUrl: string) =>
-      authenticatedInstance.get(`${sourceUrl}versions/?verbose=true`),
+    ...containerAPI.versions,
     create: (
       sourceUrl: string,
       data: SourceVersion