fix pipe/map bug in react version

lib/react/react-builders.js

@@ -250,6 +250,8 @@ exports.buildServiceImports = (model, loadAccessToken, isIo, models) => {
     { module: 'JSONSearchParams', from: '../core/search.params' },
     { module: 'ErrorHandler', from: '../core/error.service' },
     { module: 'Observable, Subject', from: 'rxjs' },
+        { module: 'catchError, map', from: 'rxjs/operators' },
+
     { module: modelName, from: `../../models/${modelName}` },
   ];
   if (isIo === 'enabled') {
@@ -283,4 +285,4 @@ exports.buildServiceImports = (model, loadAccessToken, isIo, models) => {
   });
 
   return helpers.buildImports(imports);
-}
+}

lib/templates/shared/index.ejs

@@ -43,10 +43,12 @@ export class Component extends ReactComponent {
   models = {};
   constructor(config) {
     super();
-    config.services.forEach((service) => {
-      if ( typeof this.services === 'object') this.services = {};
-      this[service] = new Services[service]();
-    });
+    if(config.services){
+      config.services.forEach((service) => {
+        if ( typeof this.services === 'object') this.services = {};
+        this[service] = new Services[service]();
+      });
+    }
   }
 }
 <% } %>

lib/templates/shared/services/core/base.ejs

@@ -38,9 +38,10 @@ export abstract class BaseLoopBackApi {
     this.models = new SDKModels();
     this.model = this.models.get(this.getModelName());
     this.auth = new LoopBackAuth();
-    if (instance) {
+   /* if (instance) {
       return instance;
     }
+    */
     instance = this;
 <% } %>
 <% if (framework === 'angular') { -%>
@@ -169,14 +170,16 @@ let headers = {
           headers ,
           method  : method,
           url     : `${url}${filter}`,
-          search  : Object.keys(urlParams).length > 0
-                  ? searchParams.getURLSearchParams() : null,
+          params  : Object.keys(urlParams).length > 0
+                  ? urlParams : null,
           data    : body ? JSON.stringify(body) : undefined
         }
       );
-      return from(request)
-        .map((res) => res.data)
-        .catch((e) => errorHandler.handleError(e));
+     return from(request)
+                .pipe(
+                    map((res) => res.data),
+                    catchError((e) => errorHandler.handleError(e)),
+                )
 <% } %>
     }
   }
@@ -845,9 +848,11 @@ let headers = {
           data    : body ? JSON.stringify(body) : undefined
         }
       );
-      return from(request)
-        .map((res) => res.data)
-        .catch((e) => errorHandler.handleError(e));
+   return from(request)
+                .pipe(
+                    map((res) => res.data),
+                    catchError((e) => errorHandler.handleError(e)),
+                )
 <% } %>
     }
   }
@@ -906,7 +911,7 @@ let headers = {
       LoopBackConfig.getApiVersion(),
       this.model.getModelDefinition().path
     ].join('/'), undefined, undefined, { data }, true)
-    .map((datum) => datum.map((data) => this.model.factory(data)));
+    .pipe(map((datum) => datum.map((data) => this.model.factory(data))))
   }
 <% } -%>
   /**
@@ -924,7 +929,7 @@ let headers = {
       LoopBackConfig.getApiVersion(),
       this.model.getModelDefinition().path
     ].join('/'), undefined, undefined, { data }, null, customHeaders)
-    .map((datum) => datum.map((data) => this.model.factory(data)));
+    .pipe(map((datum) => datum.map((data) => this.model.factory(data))))
   }
 <% if ( isIo === 'enabled' ){ -%>
   /**
@@ -942,7 +947,7 @@ let headers = {
       LoopBackConfig.getApiVersion(),
       this.model.getModelDefinition().path
     ].join('/'), undefined, undefined, { data }, true)
-    .map((datum) => datum.map((data) => this.model.factory(data)));
+    .pipe(map((datum) => datum.map((data) => this.model.factory(data))))
   }
 <% } -%>
   /**
@@ -979,7 +984,7 @@ let headers = {
       LoopBackConfig.getApiVersion(),
       this.model.getModelDefinition().path
     ].join('/'), undefined, { filter }, undefined, null, customHeaders)
-    .map((datum) => datum.map((data) => this.model.factory(data)));
+    .pipe(map((datum) => datum.map((data) => this.model.factory(data))))
   }
   /**
    * @method exists

lib/templates/shared/services/core/error.ejs

@@ -34,7 +34,11 @@ import { Observable, throwError } from 'rxjs';
 export class ErrorHandler {
   handleError(error): Observable<never> {
 <% if (framework === 'react') { -%>
-    return throwError(error.response.data.error || 'Server error');
+    if (error.response && error.response.data && error.response.data.error) {
+      return throwError(error.response.data.error);
+    } else {
+      return throwError("Server error");
+    }
 <% } else { -%>
     return throwError(error.json().error || 'Server error');
 <% } %>

lib/templates/shared/services/custom/service.ejs

@@ -70,14 +70,15 @@ export class <%-: modelName %>Api extends BaseLoopBackApi {
 
     let result = this.request(_method, _url, _routeParams, _urlParams, _postBody, null, customHeaders)<%
 if (model.isUser && methodName === 'login') { %>
-      .map(
+.pipe(
+      map(
         (response<% if(isTyped) { %>: any<% } %>) => {
           response.ttl = parseInt(response.ttl);
           response.rememberMe = rememberMe;
           this.auth.setToken(response);
           return response;
         }
-      );
+      ));
       return result;
       <%
 } else if (methodName.match(/(^create$|upsert|^findBy|^findOne$)/g)) { %>;