@evergis/api 3.0.81 → 3.0.82

package/dist/Api.d.ts

@@ -1,10 +1,10 @@
+import { EventEmitter } from '@evergis/event-emitter';
 import { HubConnection } from '@microsoft/signalr';
 import { Options as KyOptions } from 'ky';
-import { EventEmitter } from '@evergis/event-emitter';
-import { Account, External, ClientSettings, PortalSettings, FileUpload, General, Geocode, Import, Layers, Names, Namespace, Notification, Projects, ResourceCatalog, Resources, Scheduler, Security, Styles, Tables, Tools, AccountPreview, BulkOperations, IceRouter, Statistic, Feedback } from './services';
-import { Print } from './services/Print';
-import { HttpClient } from './__generated__/HttpClient';
 import { LoginDc } from './__generated__/data-contracts';
+import { HttpClient } from './__generated__/HttpClient';
+import { Account, AccountPreview, BulkOperations, ClientSettings, External, Feedback, FileUpload, General, Geocode, IceRouter, Import, Layers, Names, Namespace, Notification, PortalSettings, Projects, ResourceCatalog, Resources, Scheduler, Security, Statistic, Styles, Tables, Tools } from './services';
+import { Print } from './services/Print';
 export declare type ApiParams = {
     url: string;
     wsUrl?: string;
@@ -53,7 +53,7 @@ export declare class Api extends EventEmitter {
     readonly feedback: Feedback;
     readonly snappingHub: HubConnection | null;
     constructor({ url, wsUrl, snappingHubUrl, http, urlPath, httpOptions }: ApiParams);
-    init({ authParams, connectWs, connectSignalR, initScheduler, fetchSettings, fetchUser, }: {
+    init({ authParams, connectWs, initScheduler, fetchSettings, fetchUser, }: {
         authParams?: LoginDc;
         connectWs?: boolean;
         connectSignalR?: boolean;

package/dist/api.cjs.development.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
+var eventEmitter = require('@evergis/event-emitter');
 var signalr = require('@microsoft/signalr');
 var ky = require('ky');
 var ky__default = _interopDefault(ky);
-var eventEmitter = require('@evergis/event-emitter');
 var queryString = require('query-string');
 var nanoid = require('nanoid');
 var DomPainter = require('@evergis/sgis/es/painters/DomPainter/DomPainter');
@@ -180,6 +180,124 @@ function _get(target, property, receiver) {
   return _get(target, property, receiver || target);
 }
 
+let HttpClient = /*#__PURE__*/function () {
+  function HttpClient(options) {
+    var _options$prefixUrl;
+
+    if (options === void 0) {
+      options = {};
+    }
+
+    _classCallCheck(this, HttpClient);
+
+    this.ky = ky__default.extend(options);
+    this.prefixUrl = ((_options$prefixUrl = options.prefixUrl) == null ? void 0 : _options$prefixUrl.toString()) || '';
+  }
+
+  _createClass(HttpClient, [{
+    key: "extend",
+    value: function extend(options) {
+      var _options$prefixUrl2;
+
+      this.ky = ky__default.extend(options);
+      this.prefixUrl = ((_options$prefixUrl2 = options.prefixUrl) == null ? void 0 : _options$prefixUrl2.toString()) || '';
+    }
+  }, {
+    key: "get",
+    value: function get(url, params) {
+      return this.ky.get(this.stripSlashes(url), {
+        searchParams: qs(params)
+      });
+    }
+  }, {
+    key: "post",
+    value: function post(url, body, params) {
+      const options = kyOptions(params, body);
+      return this.ky.post(this.stripSlashes(url), options);
+    }
+  }, {
+    key: "put",
+    value: function put(url, body, params) {
+      const options = kyOptions(params, body);
+      return this.ky.put(this.stripSlashes(url), options);
+    }
+  }, {
+    key: "patch",
+    value: function patch(url, body, params) {
+      const options = kyOptions(params, body);
+      return this.ky.patch(this.stripSlashes(url), options);
+    }
+  }, {
+    key: "delete",
+    value: function _delete(url, body, params) {
+      const options = kyOptions(params, body);
+      return this.ky.delete(this.stripSlashes(url), options);
+    }
+  }, {
+    key: "createUrl",
+    value: function createUrl(url, params) {
+      const queryString = params ? "?" + qs(params) : '';
+      return this.prefixUrl + this.stripSlashes(url) + queryString;
+    }
+  }, {
+    key: "stripSlashes",
+    value: function stripSlashes(url) {
+      if (this.prefixUrl) {
+        return url.replace(/^\//g, '');
+      }
+
+      return url;
+    }
+  }]);
+
+  return HttpClient;
+}();
+
+function kyOptions(params, body) {
+  const options = {
+    searchParams: qs(params)
+  };
+
+  if (!isNotObject(body) || Array.isArray(body)) {
+    options.json = body;
+  } else {
+    options.body = body;
+  }
+
+  return options;
+}
+
+function isNotObject(value) {
+  return !(value !== void 0 && typeof value === 'object' && value !== null && value.constructor === Object);
+}
+
+function qs(params) {
+  if (params === void 0) {
+    params = {};
+  }
+
+  return queryString.stringify(params, {
+    arrayFormat: 'comma'
+  });
+}
+
+function toFormData(input) {
+  if (input instanceof FormData) {
+    return input;
+  }
+
+  return Object.keys(input).reduce((data, key) => {
+    data.append(key, input[key]);
+    return data;
+  }, new FormData());
+}
+
+(function (ApiEvent) {
+  ApiEvent["ConnectionLost"] = "ConnectionLost";
+  ApiEvent["Unauthorized"] = "Unauthorized";
+  ApiEvent["SessionClosed"] = "SessionClosed";
+})(exports.ApiEvent || (exports.ApiEvent = {}));
+
 /* eslint-disable */
 
 /* tslint:disable */
@@ -402,118 +520,6 @@ let Security = /*#__PURE__*/function (_SecurityService) {
   return Security;
 }(SecurityService);
 
-let HttpClient = /*#__PURE__*/function () {
-  function HttpClient(options) {
-    var _options$prefixUrl;
-
-    if (options === void 0) {
-      options = {};
-    }
-
-    _classCallCheck(this, HttpClient);
-
-    this.ky = ky__default.extend(options);
-    this.prefixUrl = ((_options$prefixUrl = options.prefixUrl) == null ? void 0 : _options$prefixUrl.toString()) || '';
-  }
-
-  _createClass(HttpClient, [{
-    key: "extend",
-    value: function extend(options) {
-      var _options$prefixUrl2;
-
-      this.ky = ky__default.extend(options);
-      this.prefixUrl = ((_options$prefixUrl2 = options.prefixUrl) == null ? void 0 : _options$prefixUrl2.toString()) || '';
-    }
-  }, {
-    key: "get",
-    value: function get(url, params) {
-      return this.ky.get(this.stripSlashes(url), {
-        searchParams: qs(params)
-      });
-    }
-  }, {
-    key: "post",
-    value: function post(url, body, params) {
-      const options = kyOptions(params, body);
-      return this.ky.post(this.stripSlashes(url), options);
-    }
-  }, {
-    key: "put",
-    value: function put(url, body, params) {
-      const options = kyOptions(params, body);
-      return this.ky.put(this.stripSlashes(url), options);
-    }
-  }, {
-    key: "patch",
-    value: function patch(url, body, params) {
-      const options = kyOptions(params, body);
-      return this.ky.patch(this.stripSlashes(url), options);
-    }
-  }, {
-    key: "delete",
-    value: function _delete(url, body, params) {
-      const options = kyOptions(params, body);
-      return this.ky.delete(this.stripSlashes(url), options);
-    }
-  }, {
-    key: "createUrl",
-    value: function createUrl(url, params) {
-      const queryString = params ? "?" + qs(params) : '';
-      return this.prefixUrl + this.stripSlashes(url) + queryString;
-    }
-  }, {
-    key: "stripSlashes",
-    value: function stripSlashes(url) {
-      if (this.prefixUrl) {
-        return url.replace(/^\//g, '');
-      }
-
-      return url;
-    }
-  }]);
-
-  return HttpClient;
-}();
-
-function kyOptions(params, body) {
-  const options = {
-    searchParams: qs(params)
-  };
-
-  if (!isNotObject(body) || Array.isArray(body)) {
-    options.json = body;
-  } else {
-    options.body = body;
-  }
-
-  return options;
-}
-
-function isNotObject(value) {
-  return !(value !== void 0 && typeof value === 'object' && value !== null && value.constructor === Object);
-}
-
-function qs(params) {
-  if (params === void 0) {
-    params = {};
-  }
-
-  return queryString.stringify(params, {
-    arrayFormat: 'comma'
-  });
-}
-
-function toFormData(input) {
-  if (input instanceof FormData) {
-    return input;
-  }
-
-  return Object.keys(input).reduce((data, key) => {
-    data.append(key, input[key]);
-    return data;
-  }, new FormData());
-}
-
 /**
  * @title Spatial Processing Core API
  * @version v0.6.0
@@ -5760,12 +5766,6 @@ let Print = /*#__PURE__*/function (_PrintService) {
   return _createClass(Print);
 }(PrintService);
 
-(function (ApiEvent) {
-  ApiEvent["ConnectionLost"] = "ConnectionLost";
-  ApiEvent["Unauthorized"] = "Unauthorized";
-  ApiEvent["SessionClosed"] = "SessionClosed";
-})(exports.ApiEvent || (exports.ApiEvent = {}));
-
 (function (UrlPath) {
   UrlPath["Base"] = "/map";
   UrlPath["Shared"] = "/shared";
@@ -5860,7 +5860,6 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
       let {
         authParams,
         connectWs,
-        connectSignalR,
         initScheduler,
         fetchSettings,
         fetchUser
@@ -5877,10 +5876,6 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
           await this.connectWs();
         }
 
-        if (connectSignalR) {
-          await this.connectSignalR();
-        }
-
         if (initScheduler) {
           await this.initScheduler();
         }
@@ -5931,7 +5926,7 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "connectSignalR",
     value: async function connectSignalR() {
-      if (this.account.isAuth && this.snappingHub) {
+      if (this.account.isAuth && this.snappingHub && this.snappingHub.state !== signalr.HubConnectionState.Connected) {
         await this.snappingHub.start();
       }
     }