Merge pull request #161 from folio-org/revert-159-UIOR-97-change-api-…

…endpoints Revert "UIOR-97 change API enpoints"
folio-org · Jan 15, 2019 · a171e6c · a171e6c
2 parents 8e4fe27 + 3723863
commit a171e6c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 27 deletions.
diff --git a/src/components/POLine/POLine.js b/src/components/POLine/POLine.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { get } from 'lodash';
-
 import { IfPermission } from '@folio/stripes/core';
 import {
   Accordion,
@@ -14,12 +13,7 @@ import {
   PaneMenu,
   Row,
 } from '@folio/stripes/components';
-
 import transitionToParams from '../Utils/transitionToParams';
-import {
-  LINES_API,
-  ORDER_DETAIL_API,
-} from '../Utils/api';
 import { POLineDetails } from './POLineDetails';
 import CostView from './Cost/CostView';
 import TagView from './Tags/TagView';
@@ -42,12 +36,12 @@ class POLine extends Component {
   static manifest = Object.freeze({
     order: {
       type: 'okapi',
-      path: ORDER_DETAIL_API,
+      path: 'orders/:{id}',
       throwErrors: false,
     },
     poLine: {
       type: 'okapi',
-      path: LINES_API,
+      path: 'orders/:{id}/lines',
       fetch: false,
     },
   });

diff --git a/src/components/PurchaseOrder/PO.js b/src/components/PurchaseOrder/PO.js
@@ -21,10 +21,6 @@ import {
   LayerPO,
   LayerPOLine,
 } from '../LayerCollection';
-import {
-  LINES_API,
-  ORDER_DETAIL_API,
-} from '../Utils/api';
 import transitionToParams from '../Utils/transitionToParams';
 import { updateOrderResource } from '../Utils/orderResource';
 import { MODULE_ORDERS } from '../Utils/const';
@@ -38,11 +34,11 @@ class PO extends Component {
   static manifest = Object.freeze({
     order: {
       type: 'okapi',
-      path: ORDER_DETAIL_API,
+      path: 'orders/:{id}',
     },
     poLine: {
       type: 'okapi',
-      path: LINES_API,
+      path: 'orders/:{id}/lines',
       fetch: false,
       throwErrors: false,
     },

diff --git a/src/components/Utils/api.js b/src/components/Utils/api.js
diff --git a/src/routes/Main.js b/src/routes/Main.js
@@ -16,7 +16,6 @@ import { POForm } from '../components/PurchaseOrder';
 import { Filters, SearchableIndexes } from '../components/Utils/FilterConfig';
 import FolioFormattedTime from '../components/FolioFormattedTime';
 import { createOrderResource } from '../components/Utils/orderResource';
-import { ORDERS_API } from '../components/Utils/api';
 
 const INITIAL_RESULT_COUNT = 30;
 const RESULT_COUNT_INCREMENT = 30;
@@ -36,7 +35,7 @@ class Main extends Component {
     resultCount: { initialValue: INITIAL_RESULT_COUNT },
     records: {
       type: 'okapi',
-      path: ORDERS_API,
+      path: 'orders',
       records: 'purchase_orders',
       recordsRequired: '%{resultCount}',
       perRequest: RESULT_COUNT_INCREMENT,

diff --git a/test/bigtest/network/config.js b/test/bigtest/network/config.js
@@ -1,15 +1,9 @@
 // typical mirage config export
 // http://www.ember-cli-mirage.com/docs/v0.4.x/configuration/
-import {
-  ORDERS_API,
-} from '../../../src/components/Utils/api';
-
 export default function config() {
-  this.get(ORDERS_API, (schema, request) => {
-    return schema.orders.all();
-  });
+  this.get('/orders');
 
-  this.get(`${ORDERS_API}/:id`, (schema, request) => {
+  this.get('/orders/:id', (schema, request) => {
     return schema.orders.find(request.params.id).attrs;
   });