@c8y/client 1018.506.0 → 1018.509.6

package/lib/cjs/src/smart-groups/SmartGroupsService.d.ts

@@ -1,21 +1,14 @@
 import { IFetchClient, IResult } from '../core';
 import { Service } from '../core/Service';
-import { IdReference, IManagedObject } from '../inventory';
+import { IManagedObject, IdReference } from '../inventory';
 export declare class SmartGroupsService extends Service<IManagedObject> {
     protected baseUrl: string;
     protected listUrl: string;
-    private applicationService;
     private readonly SMART_GROUP_TYPE;
     private readonly SMART_GROUP_FRAGMENT_TYPE;
-    private readonly DEVICE_GROUP_FRAGMENT_TYPE;
-    private readonly DEVICE_GROUP_TYPE;
-    private readonly DEVICE_SUBGROUP_TYPE;
     private readonly COLUMNS_CONFIG_FRAGMENT;
     private readonly FILTER_CONFIG_FRAGMENT;
     private readonly QUERY_STRING_FRAGMENT;
-    private readonly SMART_GROUPS_V2_MICROSERVICE_APP_NAME;
-    private readonly SMART_GROUPS_V2_MICROSERVICE_BASE_PATH;
-    private readonly SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH;
     constructor(client: IFetchClient);
     /**
      * Gets the details of managed object
@@ -73,7 +66,6 @@ export declare class SmartGroupsService extends Service<IManagedObject> {
      * Updates smart group managed object with given id.
      *
      * @param {Partial<IManagedObject>} mo Partial managed object of the smart group.
-     * @param {object} filter Filter object.
      *
      * @returns Response wrapped in [[IResult]]
      *
@@ -87,26 +79,7 @@ export declare class SmartGroupsService extends Service<IManagedObject> {
      *   })();
      * ```
      */
-    update(mo: Partial<IManagedObject>, filter?: object): Promise<IResult<IManagedObject>>;
-    /**
-     * Updates smart group v2 managed object with given id.
-     *
-     * @param {Partial<IManagedObject>} mo Partial managed object of the smart group v2.
-     * @param {object} filter Filter object.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    const smartGroupV2 = { id: '1', name: 'newName' };
-     *
-     *    (async () => {
-     *      await smartGroupsService.updateSmartGroupV2(smartGroupV2);
-     *   })();
-     * ```
-     */
-    updateSmartGroupV2(mo: Partial<IManagedObject>, filter?: object): Promise<IResult<IManagedObject>>;
+    update(mo: Partial<IManagedObject>): Promise<IResult<IManagedObject>>;
     /**
      * Removes managed object with given id.
      *
@@ -129,20 +102,6 @@ export declare class SmartGroupsService extends Service<IManagedObject> {
      * ```
      */
     delete(entityOrId: IdReference, params?: any): Promise<IResult<null>>;
-    /**
-     * Checks if the smart groups v2 microservice is installed.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    (async () => {
-     *      const {data, res} = await smartGroupsService.isSmartGroupsV2MicroserviceInstalled();
-     *   })();
-     * ```
-     */
-    isSmartGroupsV2MicroserviceInstalled(): Promise<IResult<boolean>>;
     /**
      * Checks whether a given managed object is a smart group
      *
@@ -161,43 +120,6 @@ export declare class SmartGroupsService extends Service<IManagedObject> {
      * ```
      */
     isSmartGroup(mo: Partial<IManagedObject>): boolean;
-    /**
-     * Checks whether a given managed object is a smart group v2
-     *
-     * @param {IManagedObject} mo Managed object to check.
-     *
-     * @returns boolean
-     *
-     * @example
-     * ```typescript
-     *
-     *    const mo: IManagedObject = {id: 1, type: "c8y_DeviceGroup", c8y_IsDeviceGroup: {}} as IManagedObject;
-     *
-     *    (() => {
-     *      const isSmartGroup = smartGroupsService.isSmartGroupV2(mo);
-     *   })();
-     * ```
-     */
-    isSmartGroupV2(mo: Partial<IManagedObject>): boolean;
-    /**
-     * Removes smart group v2 managed object with given id.
-     *
-     * @param {IdReference} entityOrId entity or Id of the ManagedObject.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    const id: string = '1';
-     *
-     *    (async () => {
-     *      await smartGroupsService.removeSmartGroupV2(id);
-     *   })();
-     * ```
-     */
-    removeSmartGroupV2(entityOrId: IdReference): Promise<IResult<null>>;
     protected getUrl(url?: string): string;
-    private createSmartGroupV2;
 }
 //# sourceMappingURL=SmartGroupsService.d.ts.map

package/lib/cjs/src/smart-groups/SmartGroupsService.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SmartGroupsService = void 0;
-const application_1 = require("../application");
 const Service_1 = require("../core/Service");
 class SmartGroupsService extends Service_1.Service {
     constructor(client) {
@@ -10,16 +9,9 @@ class SmartGroupsService extends Service_1.Service {
         this.listUrl = 'managedObjects';
         this.SMART_GROUP_TYPE = 'c8y_DynamicGroup';
         this.SMART_GROUP_FRAGMENT_TYPE = 'c8y_IsDynamicGroup';
-        this.DEVICE_GROUP_FRAGMENT_TYPE = 'c8y_IsDeviceGroup';
-        this.DEVICE_GROUP_TYPE = 'c8y_DeviceGroup';
-        this.DEVICE_SUBGROUP_TYPE = 'c8y_DeviceSubgroup';
         this.COLUMNS_CONFIG_FRAGMENT = 'c8y_DeviceColumnsConfig';
         this.FILTER_CONFIG_FRAGMENT = 'c8y_DeviceFilterConfig';
         this.QUERY_STRING_FRAGMENT = 'c8y_DeviceQueryString';
-        this.SMART_GROUPS_V2_MICROSERVICE_APP_NAME = 'smartgroup';
-        this.SMART_GROUPS_V2_MICROSERVICE_BASE_PATH = 'service/smartgroup';
-        this.SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH = `${this.SMART_GROUPS_V2_MICROSERVICE_BASE_PATH}/smartgroups`;
-        this.applicationService = new application_1.ApplicationService(client);
     }
     /**
      * Gets the details of managed object
@@ -75,20 +67,18 @@ class SmartGroupsService extends Service_1.Service {
      * ```
      */
     async create(obj) {
-        const { data: isInstalled } = await this.isSmartGroupsV2MicroserviceInstalled();
         const entity = {
             ...obj.smartGroup,
             [this.QUERY_STRING_FRAGMENT]: obj.deviceQueryString,
             [this.COLUMNS_CONFIG_FRAGMENT]: obj.configurableColumns,
             ...(obj.filterConfig && { [this.FILTER_CONFIG_FRAGMENT]: obj.filterConfig })
         };
-        return isInstalled ? this.createSmartGroupV2(entity) : super.create(entity);
+        return super.create(entity);
     }
     /**
      * Updates smart group managed object with given id.
      *
      * @param {Partial<IManagedObject>} mo Partial managed object of the smart group.
-     * @param {object} filter Filter object.
      *
      * @returns Response wrapped in [[IResult]]
      *
@@ -102,41 +92,8 @@ class SmartGroupsService extends Service_1.Service {
      *   })();
      * ```
      */
-    async update(mo, filter = {}) {
-        const { id } = mo;
-        const { data: isInstalled } = await this.isSmartGroupsV2MicroserviceInstalled();
-        const { data: groupMo } = await this.detail(id, { withChildren: false });
-        return isInstalled && this.isSmartGroupV2(groupMo)
-            ? this.updateSmartGroupV2(mo, filter)
-            : super.update(mo);
-    }
-    /**
-     * Updates smart group v2 managed object with given id.
-     *
-     * @param {Partial<IManagedObject>} mo Partial managed object of the smart group v2.
-     * @param {object} filter Filter object.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    const smartGroupV2 = { id: '1', name: 'newName' };
-     *
-     *    (async () => {
-     *      await smartGroupsService.updateSmartGroupV2(smartGroupV2);
-     *   })();
-     * ```
-     */
-    async updateSmartGroupV2(mo, filter = {}) {
-        const { id, ...partialMo } = mo;
-        const method = 'PUT';
-        const body = JSON.stringify(this.onBeforeUpdate(partialMo));
-        const headers = { 'content-type': 'application/json', accept: 'application/json' };
-        const url = `${this.SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH}/${id}`;
-        const res = await this.fetch(url, { method, body, headers, params: { ...filter } });
-        const data = await res.json();
-        return { res, data };
+    async update(mo) {
+        return super.update(mo);
     }
     /**
      * Removes managed object with given id.
@@ -160,29 +117,8 @@ class SmartGroupsService extends Service_1.Service {
      * ```
      */
     async delete(entityOrId, params = {}) {
-        const { data: isInstalled } = await this.isSmartGroupsV2MicroserviceInstalled();
         const data = (await this.detail(entityOrId, { withChildren: false })).data;
-        return isInstalled && this.isSmartGroupV2(data)
-            ? await this.removeSmartGroupV2(data)
-            : await super.delete(data, params);
-    }
-    /**
-     * Checks if the smart groups v2 microservice is installed.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    (async () => {
-     *      const {data, res} = await smartGroupsService.isSmartGroupsV2MicroserviceInstalled();
-     *   })();
-     * ```
-     */
-    isSmartGroupsV2MicroserviceInstalled() {
-        return this.applicationService.isAvailable({
-            name: this.SMART_GROUPS_V2_MICROSERVICE_APP_NAME
-        });
+        return await super.delete(data, params);
     }
     /**
      * Checks whether a given managed object is a smart group
@@ -206,77 +142,10 @@ class SmartGroupsService extends Service_1.Service {
         const isSmartGroupType = mo && mo.type === this.SMART_GROUP_TYPE;
         return hasSmartGroupFragmentType || isSmartGroupType;
     }
-    /**
-     * Checks whether a given managed object is a smart group v2
-     *
-     * @param {IManagedObject} mo Managed object to check.
-     *
-     * @returns boolean
-     *
-     * @example
-     * ```typescript
-     *
-     *    const mo: IManagedObject = {id: 1, type: "c8y_DeviceGroup", c8y_IsDeviceGroup: {}} as IManagedObject;
-     *
-     *    (() => {
-     *      const isSmartGroup = smartGroupsService.isSmartGroupV2(mo);
-     *   })();
-     * ```
-     */
-    isSmartGroupV2(mo) {
-        const hasSmartGroupFragmentType = mo.hasOwnProperty(this.SMART_GROUP_FRAGMENT_TYPE);
-        const hasDeviceGroupFragmentType = mo.hasOwnProperty(this.DEVICE_GROUP_FRAGMENT_TYPE);
-        const isGroupOrSubgroup = (mo && mo.type === this.DEVICE_GROUP_TYPE) || mo.type === this.DEVICE_SUBGROUP_TYPE;
-        return hasSmartGroupFragmentType && hasDeviceGroupFragmentType && isGroupOrSubgroup;
-    }
-    /**
-     * Removes smart group v2 managed object with given id.
-     *
-     * @param {IdReference} entityOrId entity or Id of the ManagedObject.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    const id: string = '1';
-     *
-     *    (async () => {
-     *      await smartGroupsService.removeSmartGroupV2(id);
-     *   })();
-     * ```
-     */
-    async removeSmartGroupV2(entityOrId) {
-        let id;
-        if (typeof entityOrId === 'object' && entityOrId.id) {
-            id = entityOrId.id;
-        }
-        else {
-            id = entityOrId;
-        }
-        const method = 'DELETE';
-        const url = `${this.SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH}/${id}`;
-        const res = await this.client.fetch(url, { method });
-        return { res, data: null };
-    }
     getUrl(url = '') {
         const partialUrl = url.replace(/^\/+/, '');
         const baseUrl = this.baseUrl.replace(/\/+$/, '');
-        if (url.includes(this.SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH)) {
-            return partialUrl;
-        }
-        else {
-            return `${baseUrl}/${partialUrl}`;
-        }
-    }
-    async createSmartGroupV2(entity) {
-        const method = 'POST';
-        const body = JSON.stringify(entity);
-        const headers = { 'content-type': 'application/json', accept: 'application/json' };
-        const url = this.SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH;
-        const res = await this.fetch(url, { method, body, headers });
-        const data = await res.json();
-        return { res, data };
+        return `${baseUrl}/${partialUrl}`;
     }
 }
 exports.SmartGroupsService = SmartGroupsService;

package/lib/cjs/src/smart-groups/SmartGroupsService.js.map

@@ -1 +1 @@
-{"version":3,"file":"SmartGroupsService.js","sourceRoot":"","sources":["../../../../src/smart-groups/SmartGroupsService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SmartGroupsService.js","sourceRoot":"","sources":["../../../../src/smart-groups/SmartGroupsService.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAE1C,MAAa,kBAAmB,SAAQ,iBAAuB;IAS7D,YAAY,MAAoB;QAC9B,KAAK,CAAC,MAAM,CAAC,CAAC;QATN,YAAO,GAAG,WAAW,CAAC;QACtB,YAAO,GAAG,gBAAgB,CAAC;QACpB,qBAAgB,GAAG,kBAAkB,CAAC;QACtC,8BAAyB,GAAG,oBAAoB,CAAC;QACjD,4BAAuB,GAAG,yBAAyB,CAAC;QACpD,2BAAsB,GAAG,wBAAwB,CAAC;QAClD,0BAAqB,GAAG,uBAAuB,CAAC;IAIjE,CAAC;IAED;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CAAC,MAAM,CAAC,UAAuB,EAAE,SAAiB,EAAE;QACvD,OAAO,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACH,KAAK,CAAC,MAAM,CAAC,GAA4B;QACvC,MAAM,MAAM,GAAG;YACb,GAAG,GAAG,CAAC,UAAU;YACjB,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,GAAG,CAAC,iBAAiB;YACnD,CAAC,IAAI,CAAC,uBAAuB,CAAC,EAAE,GAAG,CAAC,mBAAmB;YACvD,GAAG,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC;SAC7E,CAAC;QAEF,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,KAAK,CAAC,MAAM,CAAC,EAA2B;QACtC,OAAO,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,KAAK,CAAC,MAAM,CAAC,UAAuB,EAAE,SAAc,EAAE;QACpD,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAE3E,OAAO,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;;;;;;;;;;;;OAgBG;IACH,YAAY,CAAC,EAA2B;QACtC,MAAM,yBAAyB,GAAG,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACpF,MAAM,gBAAgB,GAAG,EAAE,IAAI,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,gBAAgB,CAAC;QAEjE,OAAO,yBAAyB,IAAI,gBAAgB,CAAC;IACvD,CAAC;IAES,MAAM,CAAC,GAAG,GAAG,EAAE;QACvB,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAEjD,OAAO,GAAG,OAAO,IAAI,UAAU,EAAE,CAAC;IACpC,CAAC;CACF;AA5JD,gDA4JC"}

package/lib/esm2015/src/smart-groups/SmartGroupsService.d.ts

@@ -1,21 +1,14 @@
 import { IFetchClient, IResult } from '../core';
 import { Service } from '../core/Service';
-import { IdReference, IManagedObject } from '../inventory';
+import { IManagedObject, IdReference } from '../inventory';
 export declare class SmartGroupsService extends Service<IManagedObject> {
     protected baseUrl: string;
     protected listUrl: string;
-    private applicationService;
     private readonly SMART_GROUP_TYPE;
     private readonly SMART_GROUP_FRAGMENT_TYPE;
-    private readonly DEVICE_GROUP_FRAGMENT_TYPE;
-    private readonly DEVICE_GROUP_TYPE;
-    private readonly DEVICE_SUBGROUP_TYPE;
     private readonly COLUMNS_CONFIG_FRAGMENT;
     private readonly FILTER_CONFIG_FRAGMENT;
     private readonly QUERY_STRING_FRAGMENT;
-    private readonly SMART_GROUPS_V2_MICROSERVICE_APP_NAME;
-    private readonly SMART_GROUPS_V2_MICROSERVICE_BASE_PATH;
-    private readonly SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH;
     constructor(client: IFetchClient);
     /**
      * Gets the details of managed object
@@ -73,7 +66,6 @@ export declare class SmartGroupsService extends Service<IManagedObject> {
      * Updates smart group managed object with given id.
      *
      * @param {Partial<IManagedObject>} mo Partial managed object of the smart group.
-     * @param {object} filter Filter object.
      *
      * @returns Response wrapped in [[IResult]]
      *
@@ -87,26 +79,7 @@ export declare class SmartGroupsService extends Service<IManagedObject> {
      *   })();
      * ```
      */
-    update(mo: Partial<IManagedObject>, filter?: object): Promise<IResult<IManagedObject>>;
-    /**
-     * Updates smart group v2 managed object with given id.
-     *
-     * @param {Partial<IManagedObject>} mo Partial managed object of the smart group v2.
-     * @param {object} filter Filter object.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    const smartGroupV2 = { id: '1', name: 'newName' };
-     *
-     *    (async () => {
-     *      await smartGroupsService.updateSmartGroupV2(smartGroupV2);
-     *   })();
-     * ```
-     */
-    updateSmartGroupV2(mo: Partial<IManagedObject>, filter?: object): Promise<IResult<IManagedObject>>;
+    update(mo: Partial<IManagedObject>): Promise<IResult<IManagedObject>>;
     /**
      * Removes managed object with given id.
      *
@@ -129,20 +102,6 @@ export declare class SmartGroupsService extends Service<IManagedObject> {
      * ```
      */
     delete(entityOrId: IdReference, params?: any): Promise<IResult<null>>;
-    /**
-     * Checks if the smart groups v2 microservice is installed.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    (async () => {
-     *      const {data, res} = await smartGroupsService.isSmartGroupsV2MicroserviceInstalled();
-     *   })();
-     * ```
-     */
-    isSmartGroupsV2MicroserviceInstalled(): Promise<IResult<boolean>>;
     /**
      * Checks whether a given managed object is a smart group
      *
@@ -161,43 +120,6 @@ export declare class SmartGroupsService extends Service<IManagedObject> {
      * ```
      */
     isSmartGroup(mo: Partial<IManagedObject>): boolean;
-    /**
-     * Checks whether a given managed object is a smart group v2
-     *
-     * @param {IManagedObject} mo Managed object to check.
-     *
-     * @returns boolean
-     *
-     * @example
-     * ```typescript
-     *
-     *    const mo: IManagedObject = {id: 1, type: "c8y_DeviceGroup", c8y_IsDeviceGroup: {}} as IManagedObject;
-     *
-     *    (() => {
-     *      const isSmartGroup = smartGroupsService.isSmartGroupV2(mo);
-     *   })();
-     * ```
-     */
-    isSmartGroupV2(mo: Partial<IManagedObject>): boolean;
-    /**
-     * Removes smart group v2 managed object with given id.
-     *
-     * @param {IdReference} entityOrId entity or Id of the ManagedObject.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    const id: string = '1';
-     *
-     *    (async () => {
-     *      await smartGroupsService.removeSmartGroupV2(id);
-     *   })();
-     * ```
-     */
-    removeSmartGroupV2(entityOrId: IdReference): Promise<IResult<null>>;
     protected getUrl(url?: string): string;
-    private createSmartGroupV2;
 }
 //# sourceMappingURL=SmartGroupsService.d.ts.map

package/lib/esm2015/src/smart-groups/SmartGroupsService.js

@@ -7,18 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import { ApplicationService } from '../application';
 import { Service } from '../core/Service';
 export class SmartGroupsService extends Service {
     constructor(client) {
@@ -27,16 +15,9 @@ export class SmartGroupsService extends Service {
         this.listUrl = 'managedObjects';
         this.SMART_GROUP_TYPE = 'c8y_DynamicGroup';
         this.SMART_GROUP_FRAGMENT_TYPE = 'c8y_IsDynamicGroup';
-        this.DEVICE_GROUP_FRAGMENT_TYPE = 'c8y_IsDeviceGroup';
-        this.DEVICE_GROUP_TYPE = 'c8y_DeviceGroup';
-        this.DEVICE_SUBGROUP_TYPE = 'c8y_DeviceSubgroup';
         this.COLUMNS_CONFIG_FRAGMENT = 'c8y_DeviceColumnsConfig';
         this.FILTER_CONFIG_FRAGMENT = 'c8y_DeviceFilterConfig';
         this.QUERY_STRING_FRAGMENT = 'c8y_DeviceQueryString';
-        this.SMART_GROUPS_V2_MICROSERVICE_APP_NAME = 'smartgroup';
-        this.SMART_GROUPS_V2_MICROSERVICE_BASE_PATH = 'service/smartgroup';
-        this.SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH = `${this.SMART_GROUPS_V2_MICROSERVICE_BASE_PATH}/smartgroups`;
-        this.applicationService = new ApplicationService(client);
     }
     /**
      * Gets the details of managed object
@@ -101,16 +82,14 @@ export class SmartGroupsService extends Service {
             create: { get: () => super.create }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            const { data: isInstalled } = yield this.isSmartGroupsV2MicroserviceInstalled();
             const entity = Object.assign(Object.assign(Object.assign({}, obj.smartGroup), { [this.QUERY_STRING_FRAGMENT]: obj.deviceQueryString, [this.COLUMNS_CONFIG_FRAGMENT]: obj.configurableColumns }), (obj.filterConfig && { [this.FILTER_CONFIG_FRAGMENT]: obj.filterConfig }));
-            return isInstalled ? this.createSmartGroupV2(entity) : _super.create.call(this, entity);
+            return _super.create.call(this, entity);
         });
     }
     /**
      * Updates smart group managed object with given id.
      *
      * @param {Partial<IManagedObject>} mo Partial managed object of the smart group.
-     * @param {object} filter Filter object.
      *
      * @returns Response wrapped in [[IResult]]
      *
@@ -124,47 +103,12 @@ export class SmartGroupsService extends Service {
      *   })();
      * ```
      */
-    update(mo, filter = {}) {
+    update(mo) {
         const _super = Object.create(null, {
             update: { get: () => super.update }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            const { id } = mo;
-            const { data: isInstalled } = yield this.isSmartGroupsV2MicroserviceInstalled();
-            const { data: groupMo } = yield this.detail(id, { withChildren: false });
-            return isInstalled && this.isSmartGroupV2(groupMo)
-                ? this.updateSmartGroupV2(mo, filter)
-                : _super.update.call(this, mo);
-        });
-    }
-    /**
-     * Updates smart group v2 managed object with given id.
-     *
-     * @param {Partial<IManagedObject>} mo Partial managed object of the smart group v2.
-     * @param {object} filter Filter object.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    const smartGroupV2 = { id: '1', name: 'newName' };
-     *
-     *    (async () => {
-     *      await smartGroupsService.updateSmartGroupV2(smartGroupV2);
-     *   })();
-     * ```
-     */
-    updateSmartGroupV2(mo, filter = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { id } = mo, partialMo = __rest(mo, ["id"]);
-            const method = 'PUT';
-            const body = JSON.stringify(this.onBeforeUpdate(partialMo));
-            const headers = { 'content-type': 'application/json', accept: 'application/json' };
-            const url = `${this.SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH}/${id}`;
-            const res = yield this.fetch(url, { method, body, headers, params: Object.assign({}, filter) });
-            const data = yield res.json();
-            return { res, data };
+            return _super.update.call(this, mo);
         });
     }
     /**
@@ -193,29 +137,8 @@ export class SmartGroupsService extends Service {
             delete: { get: () => super.delete }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            const { data: isInstalled } = yield this.isSmartGroupsV2MicroserviceInstalled();
             const data = (yield this.detail(entityOrId, { withChildren: false })).data;
-            return isInstalled && this.isSmartGroupV2(data)
-                ? yield this.removeSmartGroupV2(data)
-                : yield _super.delete.call(this, data, params);
-        });
-    }
-    /**
-     * Checks if the smart groups v2 microservice is installed.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    (async () => {
-     *      const {data, res} = await smartGroupsService.isSmartGroupsV2MicroserviceInstalled();
-     *   })();
-     * ```
-     */
-    isSmartGroupsV2MicroserviceInstalled() {
-        return this.applicationService.isAvailable({
-            name: this.SMART_GROUPS_V2_MICROSERVICE_APP_NAME
+            return yield _super.delete.call(this, data, params);
         });
     }
     /**
@@ -240,81 +163,10 @@ export class SmartGroupsService extends Service {
         const isSmartGroupType = mo && mo.type === this.SMART_GROUP_TYPE;
         return hasSmartGroupFragmentType || isSmartGroupType;
     }
-    /**
-     * Checks whether a given managed object is a smart group v2
-     *
-     * @param {IManagedObject} mo Managed object to check.
-     *
-     * @returns boolean
-     *
-     * @example
-     * ```typescript
-     *
-     *    const mo: IManagedObject = {id: 1, type: "c8y_DeviceGroup", c8y_IsDeviceGroup: {}} as IManagedObject;
-     *
-     *    (() => {
-     *      const isSmartGroup = smartGroupsService.isSmartGroupV2(mo);
-     *   })();
-     * ```
-     */
-    isSmartGroupV2(mo) {
-        const hasSmartGroupFragmentType = mo.hasOwnProperty(this.SMART_GROUP_FRAGMENT_TYPE);
-        const hasDeviceGroupFragmentType = mo.hasOwnProperty(this.DEVICE_GROUP_FRAGMENT_TYPE);
-        const isGroupOrSubgroup = (mo && mo.type === this.DEVICE_GROUP_TYPE) || mo.type === this.DEVICE_SUBGROUP_TYPE;
-        return hasSmartGroupFragmentType && hasDeviceGroupFragmentType && isGroupOrSubgroup;
-    }
-    /**
-     * Removes smart group v2 managed object with given id.
-     *
-     * @param {IdReference} entityOrId entity or Id of the ManagedObject.
-     *
-     * @returns Response wrapped in [[IResult]]
-     *
-     * @example
-     * ```typescript
-     *
-     *    const id: string = '1';
-     *
-     *    (async () => {
-     *      await smartGroupsService.removeSmartGroupV2(id);
-     *   })();
-     * ```
-     */
-    removeSmartGroupV2(entityOrId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let id;
-            if (typeof entityOrId === 'object' && entityOrId.id) {
-                id = entityOrId.id;
-            }
-            else {
-                id = entityOrId;
-            }
-            const method = 'DELETE';
-            const url = `${this.SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH}/${id}`;
-            const res = yield this.client.fetch(url, { method });
-            return { res, data: null };
-        });
-    }
     getUrl(url = '') {
         const partialUrl = url.replace(/^\/+/, '');
         const baseUrl = this.baseUrl.replace(/\/+$/, '');
-        if (url.includes(this.SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH)) {
-            return partialUrl;
-        }
-        else {
-            return `${baseUrl}/${partialUrl}`;
-        }
-    }
-    createSmartGroupV2(entity) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const method = 'POST';
-            const body = JSON.stringify(entity);
-            const headers = { 'content-type': 'application/json', accept: 'application/json' };
-            const url = this.SMART_GROUPS_V2_MICROSERVICE_ENDPOINT_PATH;
-            const res = yield this.fetch(url, { method, body, headers });
-            const data = yield res.json();
-            return { res, data };
-        });
+        return `${baseUrl}/${partialUrl}`;
     }
 }
 //# sourceMappingURL=SmartGroupsService.js.map