@veritree/services 0.6.0 → 0.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veritree/services",
-  "version": "0.6.0",
+  "version": "0.8.1",
   "description": "A collection of javascript functions/services to talk to veritree API",
   "type": "module",
   "main": "index.js",

package/src/helpers/api.js

@@ -8,12 +8,12 @@ const Api = {
     return await this.unWrap(url);
   },
 
-  async post(url, data) {
-    return await this.unWrap(url, 'post', data);
+  async post(url, data, isMultipart = false) {
+    return await this.unWrap(url, 'post', data, isMultipart);
   },
 
-  async update(url, data) {
-    return await this.unWrap(url, 'put', data);
+  async update(url, data, isMultipart = false) {
+    return await this.unWrap(url, 'put', data, isMultipart);
   },
 
   /**
@@ -24,9 +24,9 @@ const Api = {
    * @param {object} data
    * @returns {object} envelope
    */
-  async unWrap(url, method = 'get', data) {
+  async unWrap(url, method = 'get', data, isMultipart) {
     if (this.forceEnvelopeResponse) url = this.addEvenlopeArgToUrl(url); // TODO: remove when API is fully migrated to envelopes
-    const config = this.getConfig(method, data);
+    const config = this.getConfig(method, data, isMultipart);
 
     try {
       const response = await fetch(url, config);
@@ -45,16 +45,23 @@ const Api = {
    * @param {object} body
    * @returns {object} data
    */
-  getConfig(method, data) {
+  getConfig(method, data, isMultipart) {
+    const contentType = isMultipart ? 'multipart/form-data' : 'application/json';
+    const token = `Bearer ${getCookie('access_token')}`;
+
     const config = {
       method,
       headers: {
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${getCookie('access_token')}`,
+        'Content-Type': contentType,
+        Authorization: token
       },
     };
 
-    if (method !== 'get') config.body = JSON.stringify(data);
+    if (method !== 'get' && !isMultipart) {
+      config.body = JSON.stringify(data);
+    } else {
+      config.body = data;
+    }
 
     return config;
   },

package/src/services/field-updates.js

@@ -18,6 +18,18 @@ export const createFieldUpdatesApiService = (orgId, orgType) => {
     },
   };
 
+  /**
+   * 
+   * @param {string} fieldUpdateId 
+   * @param {object} data 
+   * @returns 
+   */
+  const update = (fieldUpdateId, data, isMultipart = false) => {
+    const url = `${_getUrl()}/${fieldUpdateId}?${_getParams()}`;
+
+    return Api.update(url, data, isMultipart);
+  }
+
   const _getUrl = () => {
     return `${Api.baseUrl}/${resource}`;
   };
@@ -35,5 +47,6 @@ export const createFieldUpdatesApiService = (orgId, orgType) => {
 
   return {
     get,
+    update
   };
 };

package/src/services/forest-types.js

@@ -1,38 +1,38 @@
 import Api from '../helpers/api';
 
-// TODO: Add all possible parameters as in API
-export const createForestTypesApiService = () => {
+export const createForestTypesApiService = (orgId, orgType) => {
+  if (!orgId || !orgType) throw new Error('orgId and orgType are required');
+  const resource = 'forest-types';
+
   const get = {
     /**
-     * Gets all forest types of an organization
-     *
-     * @param {boolean} isPublic
      * @returns {object} envelope
      */
-    async all(isPublic = false) {
-      const url = `${_getUrl(isPublic)}`;
+     async all(page = 1, pageSize = 10) {
+      const url = `${_getUrl()}?${_getParams(page, pageSize)}`;
       return await Api.get(url);
     },
 
     /**
-     * Gets a speficific forest type of an organization
-     *
      * @param {number/string} id
-     * @param {boolean} isPublic
      * @returns {object} envelope
      */
-    async specific(id, isPublic = false) {
-      const url = `${_getUrl(isPublic)}/${id}`;
+    async specific(id) {
+      const url = `${_getUrl()}/${id}?${_getParams(page, pageSize)}`;
       return await Api.get(url);
     },
   };
 
-  const _getResource = (isPublic) => {
-    return isPublic ? 'forest-type-profiles' : `forest-types`;
+  const _getUrl = () => {
+    return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getUrl = (isPublic) => {
-    return `${Api.baseUrl}/${_getResource(isPublic)}`
+  const _getParams = (page, pageSize) => {
+    const pageParam = page ? `&page=${page}` : '';
+    const pageSizeParam = pageSize ? `&page_size=${pageSize}` : '';
+    const params = `${pageParam}${pageSizeParam}`;
+
+    return `org_id=${orgId}&org_type=${orgType}${params}`;
   };
 
   return {

package/src/services/images.js

@@ -7,7 +7,6 @@ export const createImagesApiService = (orgId, orgType) => {
   const get = {
     async all(
       purpose,
-      tagName,
       countryId,
       regionId,
       subsiteId,
@@ -16,7 +15,6 @@ export const createImagesApiService = (orgId, orgType) => {
     ) {
       const url = `${_getUrl()}?${_getParams(
         purpose,
-        tagName,
         countryId,
         regionId,
         subsiteId,
@@ -33,7 +31,6 @@ export const createImagesApiService = (orgId, orgType) => {
 
   const _getParams = (
     purpose,
-    tagName,
     countryId,
     regionId,
     subsiteId,
@@ -42,13 +39,12 @@ export const createImagesApiService = (orgId, orgType) => {
   ) => {
     const paramPageSize = pageSize ? `&page_size=${pageSize}` : "";
     const paramPurpose = purpose ? `&purpose=${purpose}` : "";
-    const paramTagName = tagName ? `&tag_name=${tagName}` : "";
     const paramCountryId = countryId ? `&country_id=${countryId}` : "";
     const paramRegionId = regionId ? `&region_id=${regionId}` : "";
     const paramSubsiteId = subsiteId ? `&subsite_id=${subsiteId}` : "";
     const paramPage = page ? `&page=${page}` : "";
 
-    const params = `${paramPurpose}${paramPageSize}${paramTagName}${paramCountryId}${paramRegionId}${paramSubsiteId}${paramPage}`;
+    const params = `${paramPurpose}${paramPageSize}${paramCountryId}${paramRegionId}${paramSubsiteId}${paramPage}`;
 
     return `org_id=${orgId}&org_type=${orgType}${params}`;
   };