CatalogAPI refactoring

Author: ssarkisy

src/api/catalogApi.js

@@ -3,36 +3,63 @@ import { server } from "./config";
 
 class CatalogApi {
 
+  // get list of all available catalogs
   static getAllCatalogs() {
-    return axios(
-      {
-        method: 'get',
-        url: `${server}/form/info`,
-        params: {
-          size: 5000
-        }
+    return axios({
+      method: 'get',
+      url: `${server}/form/info`,
+      params: {
+        size: 5000
       }
-    );
+    });
   }
 
+  // get full metadata of specified catalog
   static getCatalogInfo(catalogClass) {
-    return axios.get(`${server}/form/info/${catalogClass}`);
+    return axios({
+      method: 'get',
+      url: `${server}/form/info/${catalogClass}`
+    });
   }
 
+  // get <size> objects of specified catalog
   static getCatalogExtent(catalogClass) {
-    return axios.get(`${server}/form/objects/${catalogClass}/info?size=500`);
+    return axios({
+      method: 'get',
+      url: `${server}/form/objects/${catalogClass}/info`,
+      params: {
+        size: 5000
+      }
+    });
   }
 
+  // get <size> objects of specified catalog with _class property
   static getCatalogExtendWithClass(catalogClass) {
-    return axios.get(`${server}/form/objects/${catalogClass}/infoclass?size=500&orderby=name`);
+    return axios({
+      method: 'get',
+      url: `${server}/form/objects/${catalogClass}/infoclass`,
+      params: {
+        size: 5000,
+        orderby: 'name'
+      }
+    });
   }
 
+  // get object by catalog and id
   static getFormObjectById(catalogClass, id) {
-    return axios.get(`${server}/form/object/${catalogClass}/${id}`);
+    return axios({
+      method: 'get',
+      url: `${server}/form/object/${catalogClass}/${id}`
+    });
   }
 
+
   static saveCatalog(catalogClass, id, catalog) {
-    return axios.put(`${server}/form/object/${catalogClass}/${id}`, catalog);
+    return axios({
+      method: 'put',
+      url: `${server}/form/object/${catalogClass}/${id}`,
+      data: catalog
+    });
   }
 }
 

src/api/config.js

@@ -1 +1,2 @@
+// should be changed to actual rest application
 export const server = 'http://localhost:57773/sah/rest';

src/components/catalog/ManageCatalogPage.js

@@ -133,7 +133,7 @@ export class ManageCatalogPage extends React.Component {
           <Breadcrumb.Item>
             <a onClick={this.goPathOnClick(`/catalog/${this.props.match.params.name}`)}>{this.state.catalog.name}</a>
           </Breadcrumb.Item>
-          <Breadcrumb.Item>{this.state.form.name || 'Создание объекта'}</Breadcrumb.Item>
+          <Breadcrumb.Item>{this.state.form.name || 'Object creating'}</Breadcrumb.Item>
         </Breadcrumb>
 
         <div style={{background: '#fff', padding: 24, minHeight: 280}}>
@@ -145,7 +145,7 @@ export class ManageCatalogPage extends React.Component {
 
           {!this.state.loading &&
           <div>
-            {!this.props.match.params.id && <h1>Создание объекта справочника '{this.state.catalog.name}'</h1>}
+            {!this.props.match.params.id && <h1>'{this.state.catalog.name}: creating new object'</h1>}
 
             {this.props.match.params.id &&
             (this.state.catalog.objpermissions.indexOf('U') !== -1) &&