Revert "Merge pull request #4 from akhilkala/api_service_extended"

This reverts commit dc0a525, reversing changes made to f97a083.
OpenConceptLab · Aug 21, 2021 · a4815d6 · a4815d6
1 parent aa000ba
commit a4815d6
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 29 deletions.
diff --git a/src/common/utils.js b/src/common/utils.js
@@ -218,36 +218,36 @@ const handleLookupValuesResponse = (data, callback, attr) => {
 }
 
 export const fetchLocales = callback => {
-  APIService.orgs('OCL').sources('Locales').concepts().get(null, null, {limit: 1000}).then(response => {
+  APIService.orgs('OCL').sources('Locales').appendToUrl('concepts/').get(null, null, {limit: 1000}).then(response => {
     callback(orderBy(map(reject(response.data, {locale: null}), l => ({id: l.locale, name: `${l.display_name} [${l.locale}]`})), 'name'));});
 }
 
 export const fetchConceptClasses = callback => {
-  APIService.orgs('OCL').sources('Classes').concepts()
+  APIService.orgs('OCL').sources('Classes').appendToUrl('concepts/')
     .get(null, null, {limit: 1000, brief: true})
     .then(response => handleLookupValuesResponse(response.data, callback));
 }
 
 export const fetchMapTypes = callback => {
-  APIService.orgs('OCL').sources('MapTypes').concepts()
+  APIService.orgs('OCL').sources('MapTypes').appendToUrl('concepts/')
     .get(null, null, {limit: 1000, brief: true})
     .then(response => handleLookupValuesResponse(response.data, callback));
 }
 
 export const fetchDatatypes = callback => {
-  APIService.orgs('OCL').sources('Datatypes').concepts()
+  APIService.orgs('OCL').sources('Datatypes').appendToUrl('concepts/')
     .get(null, null, {limit: 1000, brief: true})
     .then(response => handleLookupValuesResponse(response.data, callback));
 }
 
 export const fetchNameTypes = callback => {
-  APIService.orgs('OCL').sources('NameTypes').concepts()
+  APIService.orgs('OCL').sources('NameTypes').appendToUrl('concepts/')
     .get(null, null, {limit: 1000, brief: true})
     .then(response => handleLookupValuesResponse(response.data, callback));
 }
 
 export const fetchDescriptionTypes = callback => {
-  APIService.orgs('OCL').sources('DescriptionTypes').concepts()
+  APIService.orgs('OCL').sources('DescriptionTypes').appendToUrl('concepts/')
     .get(null, null, {limit: 1000, brief: true})
     .then(response => handleLookupValuesResponse(response.data, callback));
 }
@@ -340,7 +340,7 @@ export const getCurrentUserCollections = callback => {
               .then(response => isArray(response.data) ? callback(response.data) : false);
     APIService.users(username)
               .orgs()
-              .collections()
+              .appendToUrl('collections/')
               .get(null, null, {limit: 1000})
               .then(response => isArray(response.data) ? callback(response.data) : false);
   }

diff --git a/src/components/common/ConceptClassAutoComplete.jsx b/src/components/common/ConceptClassAutoComplete.jsx
@@ -25,7 +25,7 @@ const ConceptClassAutoComplete = ({ id, selected, multiple, minCharactersForSear
     APIService
       .orgs('OCL')
       .sources('Classes')
-      .concepts()
+      .appendToUrl('concepts/')
       .get(null, null, {limit: 25, q: searchStr, brief: true})
       .then(response => {
         setItems(orderBy(uniqBy(map(response.data, cc => ({id: cc.id, name: cc.id})), 'name'), 'name'))

diff --git a/src/components/common/LocaleAutoComplete.jsx b/src/components/common/LocaleAutoComplete.jsx
@@ -25,7 +25,7 @@ const LocaleAutoComplete = ({ id, selected, multiple, minCharactersForSearch, re
     APIService
       .orgs('OCL')
       .sources('Locales')
-      .concepts()
+      .appendToUrl('concepts/')
       .get(null, null, {limit: 25, q: searchStr})
       .then(response => {
         const _locales = orderBy(map(response.data, l => ({id: l.locale || l.display_locale, name: `${l.display_name} [${l.locale || l.display_locale}]`, uuid: l.uuid})), 'name');

diff --git a/src/components/concepts/ConceptForm.jsx b/src/components/concepts/ConceptForm.jsx
@@ -194,7 +194,7 @@ class ConceptForm extends React.Component {
       if(edit) {
         service.put(fields).then(response => this.handleSubmitResponse(response))
       } else {
-        service.concepts().post(fields).then(response => this.handleSubmitResponse(response))
+        service.appendToUrl('concepts/').post(fields).then(response => this.handleSubmitResponse(response))
       }
     }
   }

diff --git a/src/services/APIService.js b/src/services/APIService.js
@@ -24,7 +24,7 @@ const getAPIURL = () => {
 }
 
 class APIService {
-  constructor(name, id, relations, url) {
+  constructor(name, id, relations) {
     const apiURL = getAPIURL();
     if (name === 'empty') this.URL = `${apiURL}/`;
     else this.URL = `${apiURL}/${name}/`;
@@ -33,24 +33,16 @@ class APIService {
       Accept: 'application/json'
     };
 
-    if(url) this.URL=url
-
-    if (id) this.URL += `${id}/`;
-
+    if (id) {
+      this.URL += `${id}/`;
+    }
     if (relations) {
-      relations.forEach((relation) => {
-        const resource = RESOURCES.find(res=>res.name === relation)
-        if(!resource) return
-        if(resource.relations.length === 0) {
-          this[relation] = relationId => {
-                this.URL += `${relation}/${relationId ? `${relationId}/` : ''}`
-                return this
-             };
-        }
-        else {
-          this[relation] = (id, query) => new APIService(resource.name, id, resource.relations, query,this.URL);
-        }
-      })
+      relations.forEach(relation => {
+        this[relation] = relationId => {
+          this.URL += `${relation}/${relationId ? `${relationId}/` : ''}`;
+          return this;
+        };
+      });
     }
   }
 
@@ -126,7 +118,9 @@ class APIService {
   }
 
   getQueryParams(query) {
-    if (isPlainObject(query)) return query;
+    if (isPlainObject(query)) {
+      return query;
+    }
     if (isString(query)) {
       const questionMarkSplit = query.split('?');
       if (questionMarkSplit.length === 2) {