pages and partners services renamed. App and env params added

amsnyder · Jul 19, 2019 · 46e0d84 · 46e0d84
1 parent f438ebb
commit 46e0d84
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 16 deletions.
diff --git a/components/admin/pages/form/PagesForm.js b/components/admin/pages/form/PagesForm.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Serializer } from 'jsonapi-serializer';
 
 // Services
-import PagesService from 'services/PagesService';
+import PagesService from 'services/pages';
 import { toastr } from 'react-redux-toastr';
 
 import { STATE_DEFAULT, FORM_ELEMENTS } from 'components/admin/pages/form/constants';

diff --git a/components/admin/pages/table/actions/DeleteAction.js b/components/admin/pages/table/actions/DeleteAction.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 // Services
-import PagesService from 'services/PagesService';
+import PagesService from 'services/pages';
 import { toastr } from 'react-redux-toastr';
 
 class DeleteAction extends React.Component {

diff --git a/components/admin/partners/form/PartnersForm.js b/components/admin/partners/form/PartnersForm.js
@@ -4,7 +4,7 @@ import { Serializer } from 'jsonapi-serializer';
 import { toastr } from 'react-redux-toastr';
 
 // Services
-import PartnersService from 'services/PartnersService';
+import PartnersService from 'services/partners';
 
 import { STATE_DEFAULT, FORM_ELEMENTS } from 'components/admin/partners/form/constants';
 

diff --git a/components/admin/partners/table/actions/DeleteAction.js b/components/admin/partners/table/actions/DeleteAction.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 // Services
-import PartnersService from 'services/PartnersService';
+import PartnersService from 'services/partners';
 import { toastr } from 'react-redux-toastr';
 
 class DeleteAction extends React.Component {

diff --git a/layout/admin/partners-detail/component.js b/layout/admin/partners-detail/component.js
@@ -11,7 +11,7 @@ import Breadcrumbs from 'components/ui/Breadcrumbs';
 import Title from 'components/ui/Title';
 
 // services
-import { fetchPartner } from 'services/PartnersService';
+import { fetchPartner } from 'services/partners';
 
 // utils
 import { capitalizeFirstLetter } from 'utils/utils';

diff --git a/modules/partners/actions.js b/modules/partners/actions.js
@@ -5,7 +5,7 @@ import WRISerializer from 'wri-json-api-serializer';
 import {
   fetchPartners,
   fetchPartner
-} from 'services/PartnersService';
+} from 'services/partners';
 // TO-DO: get rid of this at some point
 import DatasetService from 'services/DatasetService';
 

diff --git a/redactions/admin/pages.js b/redactions/admin/pages.js
@@ -1,5 +1,5 @@
 import 'isomorphic-fetch';
-import PagesService from 'services/PagesService';
+import PagesService from 'services/pages';
 
 /**
  * CONSTANTS

diff --git a/redactions/admin/partners.js b/redactions/admin/partners.js
@@ -1,6 +1,6 @@
 
 // services
-import { fetchPartners } from 'services/PartnersService';
+import { fetchPartners } from 'services/partners';
 
 /**
  * CONSTANTS

diff --git a/services/PagesService.js → services/pages.js b/services/PagesService.js → services/pages.js
@@ -13,7 +13,7 @@ export default class PagesService {
   fetchAllData() {
     return new Promise((resolve, reject) => {
       get({
-        url: `${process.env.WRI_API_URL}/static_page/?published=all`,
+        url: `${process.env.WRI_API_URL}/static_page/?published=all&application=${process.env.APPLICATIONS}&env=${process.env.API_ENV}`,
         headers: [{
           key: 'Content-Type',
           value: 'application/json'
@@ -40,7 +40,7 @@ export default class PagesService {
   fetchData(id) {
     return new Promise((resolve, reject) => {
       get({
-        url: `${process.env.WRI_API_URL}/static_page/${id}`,
+        url: `${process.env.WRI_API_URL}/static_page/${id}?application=${process.env.APPLICATIONS}&env=${process.env.API_ENV}`,
         headers: [{
           key: 'Content-Type',
           value: 'application/json'
@@ -69,7 +69,11 @@ export default class PagesService {
       post({
         url: `${process.env.WRI_API_URL}/static_page/${id}`,
         type,
-        body,
+        body: {
+          ...body,
+          application: [process.env.APPLICATIONS],
+          env: process.env.API_ENV
+        },
         headers: [{
           key: 'Content-Type',
           value: 'application/json'

diff --git a/services/PartnersService.js → services/partners.js b/services/PartnersService.js → services/partners.js
@@ -18,7 +18,7 @@ export default class PartnersService {
   fetchData(id) {
     return new Promise((resolve, reject) => {
       get({
-        url: `${process.env.WRI_API_URL}/partner/${id}`,
+        url: `${process.env.WRI_API_URL}/partner/${id}?application=${process.env.APPLICATIONS}&env=${process.env.API_ENV}`,
         headers: [{
           key: 'Content-Type',
           value: 'application/json'
@@ -31,7 +31,7 @@ export default class PartnersService {
           value: 1
         }],
         onSuccess: (response) => {
-          new Deserializer({keyForAttribute: 'underscore_case'}).deserialize(response, (err, partner) => {
+          new Deserializer({ keyForAttribute: 'underscore_case' }).deserialize(response, (err, partner) => {
             resolve(partner);
           });
         },
@@ -47,7 +47,11 @@ export default class PartnersService {
       post({
         url: `${process.env.WRI_API_URL}/partner/${id}`,
         type,
-        body,
+        body: {
+          ...body,
+          env: process.env.API_ENV,
+          application: [process.env.APPLICATIONS]
+        },
         headers: [{
           key: 'Content-Type',
           value: 'application/json'
@@ -93,7 +97,13 @@ export default class PartnersService {
  * @returns {Object[]} array of serialized partners.
  */
 export const fetchPartners = (params = {}) =>
-  WRIAPI.get('/partner', { params })
+  WRIAPI.get('/partner', {
+    params: {
+      ...params,
+      env: process.env.API_ENV,
+      application: [process.env.APPLICATIONS]
+    }
+  })
     .then((response) => {
       const { status, statusText, data } = response;
       if (status > 200) throw new Error(statusText);
@@ -107,7 +117,7 @@ export const fetchPartners = (params = {}) =>
  * @returns {Object} serialized specified partnet.
  */
 export const fetchPartner = id =>
-  WRIAPI.get(`/partner/${id}`, {
+  WRIAPI.get(`/partner/${id}?application=${process.env.APPLICATIONS}&env=${process.env.API_ENV}`, {
     headers: {
       ...WRIAPI.defaults.headers,
       // TO-DO: forces the API to not cache, this should be removed at some point