@veritree/services 0.8.1 → 0.9.1

package/package.json

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

package/src/helpers/api.js

@@ -1,4 +1,4 @@
-import { getCookie } from './cookies';
+import { getCookie } from "./cookies";
 
 const Api = {
   baseUrl: `${process.env.API_VERITREE_URL}/api`,
@@ -8,12 +8,12 @@ const Api = {
     return await this.unWrap(url);
   },
 
-  async post(url, data, isMultipart = false) {
-    return await this.unWrap(url, 'post', data, isMultipart);
+  async post(url, data) {
+    return await this.unWrap(url, "post", data);
   },
 
-  async update(url, data, isMultipart = false) {
-    return await this.unWrap(url, 'put', data, isMultipart);
+  async update(url, data) {
+    return await this.unWrap(url, "put", data);
   },
 
   /**
@@ -24,9 +24,9 @@ const Api = {
    * @param {object} data
    * @returns {object} envelope
    */
-  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, isMultipart);
+  async unWrap(url, method = "get", data) {
+    if (this.forceEnvelopeResponse) url = this.handleEnvelopParam(url, data); // TODO: remove when API is fully migrated to envelopes
+    const config = this.getConfig(method, data);
 
     try {
       const response = await fetch(url, config);
@@ -45,22 +45,24 @@ const Api = {
    * @param {object} body
    * @returns {object} data
    */
-  getConfig(method, data, isMultipart) {
-    const contentType = isMultipart ? 'multipart/form-data' : 'application/json';
-    const token = `Bearer ${getCookie('access_token')}`;
+  getConfig(method, data) {
+    const isGet = method === "get";
+    const isFormData = this._isFormData(data);
+    const accessToken = `Bearer ${getCookie('access_token')}`;
 
     const config = {
       method,
       headers: {
-        'Content-Type': contentType,
-        Authorization: token
+        Authorization: accessToken,
       },
     };
 
-    if (method !== 'get' && !isMultipart) {
-      config.body = JSON.stringify(data);
-    } else {
-      config.body = data;
+    if(!isFormData) {
+      config.headers['Content-Type'] = 'application/json';
+    }
+
+    if (!isGet) {
+      isFormData ? (config.body = data) : (config.body = JSON.stringify(data));
     }
 
     return config;
@@ -72,13 +74,18 @@ const Api = {
    * @param {string} url
    * @returns {string} url
    */
-  addEvenlopeArgToUrl(url) {
-    if (!url || url.includes('_result=1')) return;
-    const urlHasArgs = url.includes('?');
-    const urlEvenlopeArg = urlHasArgs ? '&_result=1' : '?_result=1';
+  handleEnvelopParam(url) {
+    if (!url || url.includes("_result=1")) return url;
+
+    const urlHasArgs = url.includes("?");
+    const urlEvenlopeArg = urlHasArgs ? "&_result=1" : "?_result=1";
 
     return `${url}${urlEvenlopeArg}`;
   },
+
+  _isFormData(data) {
+    return data instanceof FormData;
+  },
 };
 
 export default Api;

package/src/helpers/session.js

@@ -0,0 +1,7 @@
+export const getSessionOrgId = () => {
+  return getSession().orgId;
+};
+
+export const getSession = () => {
+  return JSON.parse(localStorage.getItem('session'));
+};

package/src/services/field-updates.js

@@ -1,15 +1,18 @@
-import Api from '../helpers/api';
+import Api from "../helpers/api";
+import { getSession } from "../helpers/session";
 
-export const createFieldUpdatesApiService = (orgId, orgType) => {
+export const createFieldUpdatesApiService = () => {
   const resource = `field-updates`;
+  const { orgId, orgType } = getSession();
 
   const get = {
-    async all(countryId, regionId, subsiteId, page = 1, pageSize = 10) {
+    async all(countryId, regionId, subsiteId, page = 1, orderBy = 'date_planted-desc', pageSize = 10) {
       const params = `${_getParams(
         countryId,
         regionId,
         subsiteId,
         page,
+        orderBy,
         pageSize
       )}`;
       const url = `${_getUrl()}?${params}`;
@@ -19,34 +22,35 @@ export const createFieldUpdatesApiService = (orgId, orgType) => {
   };
 
   /**
-   * 
-   * @param {string} fieldUpdateId 
-   * @param {object} data 
-   * @returns 
+   *
+   * @param {string} fieldUpdateId
+   * @param {object} data
+   * @returns
    */
-  const update = (fieldUpdateId, data, isMultipart = false) => {
+  const update = (fieldUpdateId, data) => {
     const url = `${_getUrl()}/${fieldUpdateId}?${_getParams()}`;
 
-    return Api.update(url, data, isMultipart);
-  }
+    return Api.post(url, data);
+  };
 
   const _getUrl = () => {
     return `${Api.baseUrl}/${resource}`;
   };
 
-  const _getParams = (countryId, regionId, subsiteId, page, pageSize) => {
-    const countryIdParam = countryId ? `&country_id=${countryId}` : '';
-    const regionIdParam = regionId ? `&region_id=${regionId}` : '';
-    const subsiteIdParam = subsiteId ? `&subsite_id=${subsiteId}` : '';
-    const pageParam = page ? `&page=${page}` : '';
-    const pageSizeParam = pageSize ? `&page_size=${pageSize}` : '';
-    const params = `${countryIdParam}${regionIdParam}${subsiteIdParam}${pageParam}${pageSizeParam}`;
+  const _getParams = (countryId, regionId, subsiteId, page, orderBy, pageSize) => {
+    const countryIdParam = countryId ? `&country_id=${countryId}` : "";
+    const regionIdParam = regionId ? `&region_id=${regionId}` : "";
+    const subsiteIdParam = subsiteId ? `&subsite_id=${subsiteId}` : "";
+    const pageParam = page ? `&page=${page}` : "";
+    const orderByParam = orderBy ? `&orderBy=${orderBy}` : "";
+    const pageSizeParam = pageSize ? `&page_size=${pageSize}` : "";
+    const params = `${countryIdParam}${regionIdParam}${subsiteIdParam}${pageParam}${pageSizeParam}${orderByParam}`;
 
     return `org_id=${orgId}&org_type=${orgType}${params}`;
   };
 
   return {
     get,
-    update
+    update,
   };
 };