@evergis/api 5.0.29 → 5.0.30

package/dist/customDataContracts.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Layer reference configuration. Isn't used by server.
+ */
+export interface LayerReferenceConfigurationDc {
+    /** Name of the layer. */
+    layerName?: string;
+    /** Condition to apply. */
+    condition?: string;
+    /** Attribute name in base layer. */
+    referenceAttribute?: string;
+    /** Attribute name in target layer. */
+    targetAttribute?: string;
+    /** Id of the reference. */
+    referenceId?: string;
+}

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export * from './services';
 export * from './utils';
 export * from './__generated__/HttpClient';
 export * from './__generated__/data-contracts';
+export * from './customDataContracts';
 export * from './Api';
 export * from './ApiEvent';
 export { STORAGE_TOKEN_KEY, STORAGE_REFRESH_TOKEN_KEY } from './constants';

package/dist/index.js

@@ -2,7 +2,6 @@
 
 var ky = require('ky');
 var queryString = require('query-string');
-var signalr = require('@microsoft/signalr');
 var nanoid = require('nanoid');
 
 const API_USER_INFO_KEY = "@evergis/user-info";
@@ -2330,13 +2329,27 @@ function isString(v) {
  * @baseUrl /sp
  */
 class DataSourceService extends Service {
+    /**
+     * No description
+     *
+     * @tags DataSource
+     * @name TestConnection
+     * @operationId DataSourceController_TestConnection
+     * @summary Test ArcGIS data source connection.
+     * @request POST:/ds/arcgis/test-connection
+     * @secure
+     * @response `200` OK
+     */
+    testConnection(data) {
+        return this.http.post(`/ds/arcgis/test-connection`, data).then(() => { });
+    }
     /**
      * No description
      *
      * @tags DataSource
      * @name CreateArcGisDataSource
      * @operationId DataSourceController_CreateArcGisDataSource
-     * @summary Create S3 data source.
+     * @summary Create ArcGIS data source.
      * @request POST:/ds/arcgis
      * @secure
      * @response `200` OK
@@ -2350,7 +2363,7 @@ class DataSourceService extends Service {
      * @tags DataSource
      * @name UpdateArcGisDataSource
      * @operationId DataSourceController_UpdateArcGisDataSource
-     * @summary Update arcgis data source.
+     * @summary Update ArcGIS data source.
      * @request PATCH:/ds/arcgis
      * @secure
      * @response `200` OK
@@ -2434,15 +2447,15 @@ class DataSourceService extends Service {
      * No description
      *
      * @tags DataSource
-     * @name TestConnection
-     * @operationId DataSourceController_TestConnection
-     * @summary Test ds connection.
-     * @request POST:/ds/testConnection
+     * @name TestConnection1
+     * @operationId DataSourceController_TestConnection_1
+     * @summary Test data.mos.ru data source connection.
+     * @request POST:/ds/dataMosRu/test-connection
      * @secure
      * @response `200` OK
      */
-    testConnection(data) {
-        return this.http.post(`/ds/testConnection`, data).json();
+    testConnection1(data) {
+        return this.http.post(`/ds/dataMosRu/test-connection`, data).then(() => { });
     }
     /**
      * No description
@@ -2472,6 +2485,34 @@ class DataSourceService extends Service {
     updateMosRuDataSource(data) {
         return this.http.patch(`/ds/dataMosRu`, data).then(() => { });
     }
+    /**
+     * No description
+     *
+     * @tags DataSource
+     * @name TestConnection2
+     * @operationId DataSourceController_TestConnection_2
+     * @summary Test PostgreSQL data source connection.
+     * @request POST:/ds/test-connection
+     * @secure
+     * @response `200` OK
+     */
+    testConnection2(data) {
+        return this.http.post(`/ds/test-connection`, data).then(() => { });
+    }
+    /**
+     * No description
+     *
+     * @tags DataSource
+     * @name TestConnection3
+     * @operationId DataSourceController_TestConnection_3
+     * @summary Test S3 data source connection.
+     * @request POST:/ds/s3/test-connection
+     * @secure
+     * @response `200` OK
+     */
+    testConnection3(data) {
+        return this.http.post(`/ds/s3/test-connection`, data).then(() => { });
+    }
     /**
      * No description
      *
@@ -2492,7 +2533,7 @@ class DataSourceService extends Service {
      * @tags DataSource
      * @name UpdateS3DataSource
      * @operationId DataSourceController_UpdateS3DataSource
-     * @summary Create S3 data source.
+     * @summary Update S3 data source.
      * @request PATCH:/ds/s3
      * @secure
      * @response `200` OK
@@ -2760,7 +2801,6 @@ class Api extends EventEmitter {
     tables;
     projects;
     security;
-    notification;
     file;
     filters;
     import;
@@ -2776,7 +2816,6 @@ class Api extends EventEmitter {
     bulk;
     statistic;
     feedback;
-    snappingHub;
     vectorTiles;
     spatialReference;
     eql;
@@ -2785,10 +2824,9 @@ class Api extends EventEmitter {
     dataSource;
     remoteTaskManager;
     http;
-    wsUrl;
     urlPath;
     refreshingToken = false;
-    constructor({ url, wsUrl, wsKeepAlive, snappingHubUrl, http, urlPath, httpOptions, }) {
+    constructor({ url, http, urlPath, httpOptions, }) {
         super();
         const { hooks } = httpOptions || {};
         this.http =
@@ -2855,7 +2893,6 @@ class Api extends EventEmitter {
                     },
                 });
         this.url = url;
-        this.wsUrl = wsUrl || url;
         this.urlPath = urlPath || this.defineUrlPath();
         this.layers = new Layers(this.http);
         this.tables = new Tables(this.http);
@@ -2866,7 +2903,6 @@ class Api extends EventEmitter {
         this.accountPreview = new AccountPreview(this.http);
         this.bulk = new BulkOperations(this.http);
         this.security = new Security(this.http, this.account);
-        this.notification = new Notification(this.http, this, wsKeepAlive);
         this.file = new FileUpload(this.http);
         this.filters = new Filters(this.http);
         this.import = new Import(this.http);
@@ -2886,19 +2922,6 @@ class Api extends EventEmitter {
         this.names = new Names({
             account: this.account,
         });
-        this.snappingHub = snappingHubUrl
-            ? new signalr.HubConnectionBuilder()
-                .withUrl(snappingHubUrl, {
-                withCredentials: true,
-                skipNegotiation: true,
-                transport: signalr.HttpTransportType.WebSockets,
-                accessTokenFactory: () => {
-                    return window.localStorage.getItem(STORAGE_TOKEN_KEY) || "";
-                },
-            })
-                .withAutomaticReconnect()
-                .build()
-            : null;
     }
     get isShared() {
         return this.urlPath === exports.UrlPath.Shared;
@@ -2906,21 +2929,17 @@ class Api extends EventEmitter {
     get isPresentation() {
         return this.urlPath === exports.UrlPath.Presentation || window.location.port === SHARED_PORT;
     }
-    async init({ authParams, authQueryParams, connectWs, fetchSettings, fetchUser, useJwt, }) {
+    async init({ authParams, authQueryParams, fetchSettings, fetchUser, useJwt, }) {
         try {
             await this.account.login(authParams, authQueryParams, useJwt);
             if (fetchUser) {
                 await this.account.fetchCurrentUser();
             }
-            if (connectWs) {
-                await this.connectWs();
-            }
             if (fetchSettings) {
                 await this.clientSettings.fetchClientSettings({
                     urlPath: getFetchingUrlPath(this.urlPath),
                 });
             }
-            await this.notification.subscribe("service_update" /* SubscriptionTag.ServiceUpdate */);
         }
         catch (e) {
             throw errorHandler(e);
@@ -2939,26 +2958,6 @@ class Api extends EventEmitter {
             throw errorHandler(e);
         }
     }
-    async connectWs() {
-        if (this.account.isAuth) {
-            this.notification.connectWs(this.wsUrl);
-            this.notification.on("ConnectionStatus" /* NotificationTag.ConnectionStatus */, connection => {
-                if (connection.data === exports.ConnectionStatus.Lost) {
-                    this.emit(exports.ApiEvent.ConnectionLost, connection.data);
-                }
-                else if (connection.data === exports.ConnectionStatus.SessionClosed) {
-                    this.emit(exports.ApiEvent.SessionClosed, connection.data);
-                }
-            });
-        }
-    }
-    async connectSignalR() {
-        if (this.account.isAuth &&
-            this.snappingHub &&
-            this.snappingHub.state !== signalr.HubConnectionState.Connected) {
-            await this.snappingHub.start();
-        }
-    }
     async logout() {
         await this.account.logout();
         await this.security.reset();
@@ -3910,230 +3909,6 @@ class Names {
     }
 }
 
-/* eslint-disable */
-/* tslint:disable */
-/*
- * ---------------------------------------------------------------
- * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
- * ##                                                           ##
- * ## AUTHOR: acacode                                           ##
- * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
- * ---------------------------------------------------------------
- */
-// @ts-nocheck
-/**
- * @title Spatial Processing Gateway API
- * @version 1.5.1.0
- * @baseUrl /sp
- */
-class NotificationService extends Service {
-    /**
-     * No description
-     *
-     * @tags NotificationService
-     * @name GetSubscriptionList
-     * @operationId NotificationServiceController_GetSubscriptionList
-     * @summary Returns a list of notification tags that the current session is subscribed to.
-     * @request GET:/notifications/subscribes
-     * @secure
-     * @response `200` OK
-     */
-    getSubscriptionList() {
-        return this.http.get(`/notifications/subscribes`).json();
-    }
-    /**
-     * No description
-     *
-     * @tags NotificationService
-     * @name SubscribeOperation
-     * @operationId NotificationServiceController_SubscribeOperation
-     * @summary Subscribe current session by subscribe tag. A subscribed session will receive all notifications added for the specified tag.
-     * @request POST:/notifications/subscribes
-     * @secure
-     * @response `200` OK
-     */
-    subscribeOperation(query) {
-        return this.http.post(`/notifications/subscribes`, null, query).then(() => { });
-    }
-    /**
-     * No description
-     *
-     * @tags NotificationService
-     * @name UnsubscribeOperation
-     * @operationId NotificationServiceController_UnsubscribeOperation
-     * @summary Unsubscribe from receiving notifications that come for the specified tag.
-     * @request DELETE:/notifications/subscribes
-     * @secure
-     * @response `200` OK
-     */
-    unsubscribeOperation(query) {
-        return this.http.delete(`/notifications/subscribes`, null, query).then(() => { });
-    }
-    /**
-     * No description
-     *
-     * @tags NotificationService
-     * @name SubscribeListOperation
-     * @operationId NotificationServiceController_SubscribeListOperation
-     * @summary Subscribe current session by subscribe tags. A subscribed session will receive all notifications added for the specified tags.
-     * @request POST:/notifications/subscribe-list
-     * @secure
-     * @response `200` OK
-     */
-    subscribeListOperation(data) {
-        return this.http.post(`/notifications/subscribe-list`, data).then(() => { });
-    }
-    /**
-     * No description
-     *
-     * @tags NotificationService
-     * @name UnsubscribeListOperation
-     * @operationId NotificationServiceController_UnsubscribeListOperation
-     * @summary Unsubscribe from receiving notifications that come for the specified tags.
-     * @request POST:/notifications/unsubscribe-list
-     * @secure
-     * @response `200` OK
-     */
-    unsubscribeListOperation(data) {
-        return this.http.post(`/notifications/unsubscribe-list`, data).then(() => { });
-    }
-}
-
-exports.ConnectionStatus = void 0;
-(function (ConnectionStatus) {
-    ConnectionStatus["Initialized"] = "Initialized";
-    ConnectionStatus["Connected"] = "Connected";
-    ConnectionStatus["Break"] = "Break";
-    ConnectionStatus["Lost"] = "Lost";
-    ConnectionStatus["SessionClosed"] = "SessionClosed";
-})(exports.ConnectionStatus || (exports.ConnectionStatus = {}));
-const SUBSCRIPTION_DELAY = 500;
-const KEEP_ALIVE_INTERVAL = 5 * 1000;
-class Notification extends NotificationService {
-    api;
-    MAX_WS_RECONNECT_TRIES = 10;
-    emitter;
-    keepAlive = false;
-    ws;
-    wsUrl;
-    reconnectTries = 0;
-    subscriptions = [];
-    keepAliveTimeout;
-    _connectStatus = exports.ConnectionStatus.Initialized;
-    // @ts-ignore
-    get connectStatus() {
-        return this._connectStatus;
-    }
-    // @ts-ignore
-    set connectStatus(connectStatus) {
-        this.emitter.emit("ConnectionStatus" /* NotificationTag.ConnectionStatus */, new NotificationEvent(connectStatus));
-        this._connectStatus = connectStatus;
-    }
-    get currentWs() {
-        return this.ws;
-    }
-    constructor(http, api, keepAlive = false) {
-        super(http);
-        this.api = api;
-        this.emitter = new EventEmitter();
-        this.keepAlive = keepAlive;
-    }
-    on(tag, handler) {
-        this.emitter.on(tag, handler);
-    }
-    off(tag, handler) {
-        this.emitter.off(tag, handler);
-    }
-    async subscribe(tag) {
-        this.subscriptions.push(tag);
-        setTimeout(() => {
-            if (!this.api.isShared && !this.api.isPresentation && this.subscriptions.length) {
-                this.subscribeListOperation(this.subscriptions);
-            }
-            this.subscriptions = [];
-        }, SUBSCRIPTION_DELAY);
-    }
-    async unsubscribe(tag) {
-        const subscriptions = await this.getSubscriptionList();
-        if (subscriptions.includes(tag)) {
-            return this.unsubscribeOperation({ tag });
-        }
-    }
-    connectWs(url) {
-        const urlWithWsScheme = url
-            .replace("http://", "ws://")
-            .replace("https://", "wss://");
-        this.wsUrl = urlWithWsScheme;
-        this.connect();
-    }
-    connect() {
-        if (this.wsUrl) {
-            this.ws = new WebSocket(this.wsUrl);
-            this.ws.onopen = this.onWsConnected;
-            this.ws.onclose = this.onWsClosed;
-            this.ws.onmessage = this.onWsMessage;
-        }
-        else {
-            console.warn("Connection to WebSocket not allowed. wsUrl not provided");
-        }
-    }
-    onWsConnected = () => {
-        this.connectStatus = exports.ConnectionStatus.Connected;
-        if (this.keepAlive) {
-            this.keepAliveTimeout = setInterval(() => {
-                if (this.ws) {
-                    this.ws.send(JSON.stringify({ keepAlive: true }));
-                }
-            }, KEEP_ALIVE_INTERVAL);
-        }
-        // TODO: comment for now. it launch endless flow of reconnections
-        // this.reconnectTries = 0;
-    };
-    onWsClosed = (event) => {
-        if (event.code === 4001 /* WsCloseStatusCode.SessionClosed */ ||
-            event.code === 4002 /* WsCloseStatusCode.InvalidSession */) {
-            this.connectStatus = exports.ConnectionStatus.SessionClosed;
-        }
-        else if (this.reconnectTries < this.MAX_WS_RECONNECT_TRIES) {
-            this.connectStatus = exports.ConnectionStatus.Break;
-            this.reconnectTries++;
-            if (this.ws) {
-                this.ws.onopen = null;
-                this.ws.onclose = null;
-                this.ws.onmessage = null;
-                this.ws = void 0;
-            }
-            this.keepAliveTimeout && clearInterval(this.keepAliveTimeout);
-            setTimeout(() => {
-                this.connect();
-            }, 0);
-        }
-        else {
-            this.connectStatus = exports.ConnectionStatus.Lost;
-        }
-    };
-    onWsMessage = (event) => {
-        let message = {};
-        try {
-            message = JSON.parse(event.data);
-        }
-        catch (e) {
-            console.debug("Failed to parse ws message from sp.");
-            // ignore
-        }
-        if (message.type === "notification" && message.data) {
-            const { tag, data } = message.data;
-            tag && this.emitter.emit(tag, new NotificationEvent(data));
-        }
-    };
-}
-class NotificationEvent {
-    data;
-    constructor(data) {
-        this.data = data;
-    }
-}
-
 class PortalSettings extends ClientSettingsService {
     config = null;
     async fetchPortalSettings(query) {
@@ -5307,8 +5082,6 @@ exports.HttpClient = HttpClient;
 exports.Import = Import;
 exports.Layers = Layers;
 exports.Names = Names;
-exports.Notification = Notification;
-exports.NotificationEvent = NotificationEvent;
 exports.PortalSettings = PortalSettings;
 exports.Projects = Projects;
 exports.RemoteTaskManager = RemoteTaskManager;