@hahnpro/hpc-api 2025.3.9 → 2025.4.0

package/src/lib/services/organizations-administration.service.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrganizationsAdministrationService = void 0;
+const api_base_1 = require("../api-base");
+const utils_1 = require("../utils");
+/**
+ * Service for managing organizations with administrative privileges (superuser role required).
+ */
+class OrganizationsAdministrationService extends api_base_1.APIBase {
+    constructor(httpClient) {
+        super(httpClient, '/organizations-administration');
+    }
+    /**
+     * Gets one organization by id, combining data from Keycloak and MongoDB.
+     *
+     * @param {string} id - The ID of the organization to retrieve.
+     * @returns {Promise<Organization>} - An promise containing the combined organization data from Keycloak and MongoDB.
+     */
+    getOneCombined(id) {
+        return this.httpClient.get(`${this.basePath}/${id}`);
+    }
+    /**
+     * Get many organizations with pagination, filtering, and sorting options.
+     *
+     * @param {RequestParameter} params - The request parameters for pagination, filtering, and sorting.
+     * @returns {Promise<Paginated<Organization>>} - An observable containing the paginated list of organizations.
+     */
+    async getMany(params = {}) {
+        params.limit = params.limit || 0;
+        params.page = params.page || 1;
+        return this.httpClient.get(`${this.basePath}`, { params });
+    }
+    /**
+     * Get many organizations filtered by specific properties with pagination, filtering, and sorting options.
+     *
+     * @param {Filter} filter - The filter object containing properties to filter by.
+     * @param {RequestParameter} params - The request parameters for pagination, filtering, and sorting.
+     * @returns {Promise<Paginated<Organization>>} - An observable containing the paginated list of organizations.
+     */
+    async getManyFiltered(filter, params = {}) {
+        params.filter = (0, utils_1.getFilterString)(filter);
+        return this.getMany(params);
+    }
+    /**
+     * Searches for all organizations using the organization client.
+     *
+     * @param {OrganizationSearchQuery} query - The search query object containing optional filters.
+     * @param {string} query.name - The name of the organization to filter by (optional).
+     * @returns {Promise<Organization[]>} - An observable containing an array of organizations matching the query.
+     */
+    searchAllOrganizationWithOrganizationClient(query) {
+        const params = query.name ? { name: query.name } : {};
+        return this.httpClient.get(`${this.basePath}/search`, { params });
+    }
+    /**
+     * Creates an organization with a free subscription and invites a user to that organization
+     *
+     * @param {OrganizationCreateDto} organizationCreateDto - The data transfer object containing the organization details for creation
+     * @param {string} userEmail - The email address of the user to be invited to the organization
+     * @returns {Promise<Organization>} - An observable containing the created organization
+     */
+    createFreeOrgAndInviteUser(organizationCreateDto, userEmail) {
+        return this.httpClient.post(`${this.basePath}/create-free-org-invite-users`, {
+            organizationDto: organizationCreateDto,
+            userEmail,
+        });
+    }
+    async addOrganizationMembers(id, usersWithOrgRoles) {
+        return this.httpClient.post(`${this.basePath}/${id}/members`, { usersWithOrgRoles });
+    }
+    async addSubscriptionToOrganization(id, type) {
+        return this.httpClient.post(`${this.basePath}/${id}/subscription`, { type });
+    }
+    /**
+     * Deletes an organization.
+     *
+     * @param {string} id - organization id
+     * @returns {Promise<void>} - Promise resolving to void
+     */
+    deleteOne(id) {
+        return this.httpClient.delete(`${this.basePath}/${id}`);
+    }
+}
+exports.OrganizationsAdministrationService = OrganizationsAdministrationService;

package/src/lib/services/organizations-resources.service.d.ts

@@ -0,0 +1,35 @@
+import { Observable } from 'rxjs';
+import { APIBase } from '../api-base';
+import { OrganizationResourcesProgressDto } from '../interfaces';
+import { HttpClientService } from './';
+export declare class OrganizationsResourcesService extends APIBase {
+    constructor(httpClient: HttpClientService);
+    /**
+     * Fetches the names of all available resource sets.
+     * @returns {Promise<string[]>} A promise that resolves to an array of resource set names.
+     */
+    getResourceSetNames(): Promise<string[]>;
+    /**
+     * Starts the creation of resources for a specific organization based on the provided resource set name.
+     *
+     * The progress status update messages can be received by subscribing to the `getResourceCreationProgress` method with the same organization ID.
+     *
+     * @param {string} organizationId - The ID of the organization for which resources are to be created.
+     * @param {string} resourceSetName - The name of the resource set to be used for resource creation from the S3 bucket.
+     * @returns {Promise<string[]>} A promise that resolves to an array of resource set names.
+     */
+    createResourcesForOrganization(organizationId: string, resourceSetName: string): Promise<string>;
+    /**
+     * Subscribes to server-sent events to receive real-time progress updates on the resource tasks for a specific organization.
+     * @param {string} organizationId - The ID of the organization to monitor the resources progress updates for.
+     * @param {string} path - The API path segment for the SSE endpoint
+     * @returns {Observable<OrganizationResourcesProgress>} An observable that emits progress updates.
+     */
+    getSseObservable(organizationId: string, path: 'creationTask'): Observable<OrganizationResourcesProgressDto>;
+    /**
+     * Subscribes to server-sent events to receive real-time progress updates on the resource creation task for a specific organization.
+     * @param {string} organizationId - The ID of the organization to monitor the resource creation progress for.
+     * @returns {Observable<OrganizationResourcesProgress>} An observable that emits progress updates.
+     */
+    getResourceCreationProgress(organizationId: string): Observable<OrganizationResourcesProgressDto>;
+}

package/src/lib/services/organizations-resources.service.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrganizationsResourcesService = void 0;
+const api_base_1 = require("../api-base");
+class OrganizationsResourcesService extends api_base_1.APIBase {
+    constructor(httpClient) {
+        super(httpClient, '/organizations-resources');
+    }
+    /**
+     * Fetches the names of all available resource sets.
+     * @returns {Promise<string[]>} A promise that resolves to an array of resource set names.
+     */
+    getResourceSetNames() {
+        return this.httpClient.get(`${this.basePath}/set-names`);
+    }
+    /**
+     * Starts the creation of resources for a specific organization based on the provided resource set name.
+     *
+     * The progress status update messages can be received by subscribing to the `getResourceCreationProgress` method with the same organization ID.
+     *
+     * @param {string} organizationId - The ID of the organization for which resources are to be created.
+     * @param {string} resourceSetName - The name of the resource set to be used for resource creation from the S3 bucket.
+     * @returns {Promise<string[]>} A promise that resolves to an array of resource set names.
+     */
+    createResourcesForOrganization(organizationId, resourceSetName) {
+        return this.httpClient.post(`${this.basePath}/${organizationId}`, { resourceSetName });
+    }
+    /**
+     * Subscribes to server-sent events to receive real-time progress updates on the resource tasks for a specific organization.
+     * @param {string} organizationId - The ID of the organization to monitor the resources progress updates for.
+     * @param {string} path - The API path segment for the SSE endpoint
+     * @returns {Observable<OrganizationResourcesProgress>} An observable that emits progress updates.
+     */
+    getSseObservable(organizationId, path) {
+        return this.httpClient.getSseObservable(`${this.basePath}/${path}/${organizationId}`, (subject, event) => {
+            if (event.data) {
+                try {
+                    const data = JSON.parse(event.data);
+                    if ('message' in data) {
+                        subject.error(data);
+                    }
+                    else {
+                        subject.next(data);
+                    }
+                }
+                catch (err) {
+                    subject.next(event.data);
+                }
+            }
+        });
+    }
+    /**
+     * Subscribes to server-sent events to receive real-time progress updates on the resource creation task for a specific organization.
+     * @param {string} organizationId - The ID of the organization to monitor the resource creation progress for.
+     * @returns {Observable<OrganizationResourcesProgress>} An observable that emits progress updates.
+     */
+    getResourceCreationProgress(organizationId) {
+        return this.getSseObservable(organizationId, 'creationTask');
+    }
+}
+exports.OrganizationsResourcesService = OrganizationsResourcesService;

package/src/lib/services/organizations.service.d.ts

@@ -0,0 +1,167 @@
+import { OrganizationRoleRepresentation } from '@p2-inc/js-sdk';
+import { APIBase } from '../api-base';
+import { KeycloakProfile, Organization, OrganizationCreateDto, OrganizationData, OrganizationDataKind, OrganizationName, OrganizationRolesAdjustment } from '../interfaces';
+import { HttpClientService } from './';
+export declare class OrganizationsService extends APIBase {
+    constructor(httpClientClient: HttpClientService);
+    /**
+     * Create an organization.
+     *
+     * @param dto organization information
+     * @returns newly created organization
+     */
+    addOne(dto: OrganizationCreateDto): Promise<Organization>;
+    /**
+     * Invite a user to an organization.
+     *
+     * @param id organization id
+     * @param email email address of user
+     * @param roles roles (names) which the user should get in the organization
+     * @returns newly created invitation
+     */
+    addOrganizationInvitation(id: string, email: string, roles: string[]): Promise<void>;
+    /**
+     * Add organization role to an organization.
+     *
+     * @param id organization id
+     * @param roleDto organization role information
+     * @returns all organization roles
+     */
+    addOrganizationRole(id: string, roleDto: OrganizationRoleRepresentation): Promise<OrganizationRoleRepresentation[]>;
+    /**
+     * Grants or revoke roles which the selected user should have in the provided organization.
+     *
+     * @param id organization id
+     * @param roles information about which roles should be revoked or added
+     * @param userId id of a user whose organization roles are adjusted
+     */
+    grantOrRevokeRolesOfUser(id: string, roles: OrganizationRolesAdjustment, userId: string): Promise<void>;
+    /**
+     * Resend an invitation to an organization.
+     *
+     * @param id organization id
+     * @param invitationId
+     */
+    resendOrganizationInvitation(id: string, invitationId: string): Promise<Response>;
+    /**
+     * Requests the deletion of an organization.
+     *
+     * @param id organization id
+     */
+    requestDeletion(id: string): Promise<void>;
+    /**
+     * Set a (new) active organization for the current user.
+     *
+     * @param id organization id
+     */
+    setActiveOrganizationOfUser(id: string): Promise<void>;
+    /**
+     * Updates an organization.
+     *
+     * @param id organization id
+     * @param dto organization information
+     * @returns updated organization
+     */
+    updateOne(id: string, dto: any): Promise<Organization>;
+    /**
+     * Updates an organization role.
+     *
+     * @param id organization id
+     * @param roleName name of the role which shall be updated
+     * @param dto organization role information
+     * @returns organization roles (array of all roles belonging to the organization)
+     */
+    updateOrganizationRole(id: string, roleName: string, dto: OrganizationRoleRepresentation): Promise<OrganizationRoleRepresentation[]>;
+    /**
+     * Checks whether the organization name is already used (throws Exception).
+     *
+     * @param {string}  name - Organization name
+     */
+    checkForOrganizationUniqueness(name: string): Promise<void>;
+    /**
+     * Get active organization for the current user
+     */
+    getActiveOrganizationOfUser(): Promise<Organization>;
+    /**
+     * Retrieves a single organization of the user by its ID.
+     *
+     * @param {string} id - The unique identifier of the organization to retrieve.
+     * @returns {Promise<Organization>} - The organization
+     */
+    getOneCombined(id: string): Promise<Organization>;
+    /**
+     * Returns data belonging to the organization identified by the provided id.
+     * A subset of all data is selected defined by the 'kinds' parameter.
+     *
+     * @param {string} id - organization id
+     * @param {string} kinds - array of requested data types ( selection of: ['members', 'invitations', 'roles', 'domains', 'userRoles'])
+     * @returns{Promise<OrganizationData>} organizationData (only selected kinds are returned)
+     */
+    getOrganizationData(id: string, kinds?: OrganizationDataKind[]): Promise<OrganizationData>;
+    /**
+     * Returns the member with the provided id
+     *
+     * @param {string} id - organization id
+     * @param {string} userId - user id of requested member
+     * @returns {Promise<KeycloakProfile>} member
+     */
+    getOrganizationMemberById(id: string, userId: string): Promise<KeycloakProfile>;
+    /**
+     * Returns the names of organizations with the provided ids.
+     *
+     * @param {string[]} ids - Ids of the organizations
+     * @returns array of organization name objects
+     */
+    getOrganizationNamesByIds(ids: string[]): Promise<OrganizationName[]>;
+    /**
+     * Returns the id of an organization with the provided name.
+     *
+     * @param {string} name - name of the organization
+     * @returns id of the organization, if it exists
+     */
+    getOrganizationIdByName(name: string): Promise<OrganizationName>;
+    /**
+     * Returns an array of organizations where the current user is a member.
+     *
+     * @returns {Promise<Organization[]>} - Organizations (array of organizations)
+     */
+    getMyOrganizations(): Promise<Organization[]>;
+    /**
+     * Returns an array of organizations where the user is a member.
+     *
+     * @returns organizations (array of organizations)
+     */
+    getUserOrganizations(userId: string): Promise<Organization[]>;
+    /**
+     * Returns an array of roles which the selected user has in the provided organizations.
+     *
+     * @param ids organization ids
+     * @param userId id of a user whose organization roles are requested
+     * @returns records with organization id and array user roles of that organization
+     */
+    getUserOrganizationRoles(ids: string[], userId: string): Promise<Record<string, OrganizationRoleRepresentation[]>>;
+    /**
+     * Returns whether the subscription is actively used by an organization.
+     *
+     * @param {string} subscriptionId - Subscription ID from an azure marketplace subscription
+     * @returns boolean (whether subscription is active)
+     */
+    hasActiveSubscription(subscriptionId: string): Promise<boolean>;
+    /**
+     * Deletes organization data.
+     *
+     * @comment Domains are deleted using the updateOne method
+     * @param {string} id - Organization id
+     * @param {string} elementId - ID belonging to an element of the provided kind
+     * @param {OrganizationDataKind} kind - Requested data type (one of: ['members', 'invitations', 'roles', 'userRoles'])
+     * @returns {Promise<OrganizationData>}
+     */
+    deleteOrganizationData(id: string, elementId: string, kind: OrganizationDataKind): Promise<OrganizationData>;
+    /**
+     * Removes the current user from the members of the provided organization.
+     *
+     * @param {string} id - organization id
+     * @returns {Promise<void>}
+     */
+    leaveOrganization(id: string): Promise<void>;
+}

package/src/lib/services/organizations.service.js

@@ -0,0 +1,216 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrganizationsService = void 0;
+const api_base_1 = require("../api-base");
+class OrganizationsService extends api_base_1.APIBase {
+    constructor(httpClientClient) {
+        super(httpClientClient, '/organizations');
+    }
+    /**
+     * Create an organization.
+     *
+     * @param dto organization information
+     * @returns newly created organization
+     */
+    addOne(dto) {
+        return this.httpClient.post(this.basePath, dto);
+    }
+    /**
+     * Invite a user to an organization.
+     *
+     * @param id organization id
+     * @param email email address of user
+     * @param roles roles (names) which the user should get in the organization
+     * @returns newly created invitation
+     */
+    addOrganizationInvitation(id, email, roles) {
+        return this.httpClient.post(`${this.basePath}/${id}/data/invitations`, { roles, email });
+    }
+    /**
+     * Add organization role to an organization.
+     *
+     * @param id organization id
+     * @param roleDto organization role information
+     * @returns all organization roles
+     */
+    addOrganizationRole(id, roleDto) {
+        return this.httpClient.post(`${this.basePath}/${id}/data/roles`, roleDto);
+    }
+    /**
+     * Grants or revoke roles which the selected user should have in the provided organization.
+     *
+     * @param id organization id
+     * @param roles information about which roles should be revoked or added
+     * @param userId id of a user whose organization roles are adjusted
+     */
+    grantOrRevokeRolesOfUser(id, roles, userId) {
+        return this.httpClient.put(`${this.basePath}/${id}/data/roles/users/${userId}`, roles);
+    }
+    /**
+     * Resend an invitation to an organization.
+     *
+     * @param id organization id
+     * @param invitationId
+     */
+    resendOrganizationInvitation(id, invitationId) {
+        return this.httpClient.put(`${this.basePath}/${id}/data/invitations/${invitationId}/resend`, {});
+    }
+    /**
+     * Requests the deletion of an organization.
+     *
+     * @param id organization id
+     */
+    requestDeletion(id) {
+        return this.httpClient.put(`${this.basePath}/${id}/request-deletion`, {});
+    }
+    /**
+     * Set a (new) active organization for the current user.
+     *
+     * @param id organization id
+     */
+    setActiveOrganizationOfUser(id) {
+        return this.httpClient.put(`${this.basePath}/${id}/active`, {});
+    }
+    /**
+     * Updates an organization.
+     *
+     * @param id organization id
+     * @param dto organization information
+     * @returns updated organization
+     */
+    updateOne(id, dto) {
+        return this.httpClient.put(`${this.basePath}/${id}`, dto);
+    }
+    /**
+     * Updates an organization role.
+     *
+     * @param id organization id
+     * @param roleName name of the role which shall be updated
+     * @param dto organization role information
+     * @returns organization roles (array of all roles belonging to the organization)
+     */
+    updateOrganizationRole(id, roleName, dto) {
+        return this.httpClient.put(`${this.basePath}/${id}/data/roles/${roleName}`, dto);
+    }
+    /**
+     * Checks whether the organization name is already used (throws Exception).
+     *
+     * @param {string}  name - Organization name
+     */
+    checkForOrganizationUniqueness(name) {
+        return this.httpClient.get(`${this.basePath}/unique/${name}`);
+    }
+    /**
+     * Get active organization for the current user
+     */
+    getActiveOrganizationOfUser() {
+        return this.httpClient.get(`${this.basePath}/active`);
+    }
+    /**
+     * Retrieves a single organization of the user by its ID.
+     *
+     * @param {string} id - The unique identifier of the organization to retrieve.
+     * @returns {Promise<Organization>} - The organization
+     */
+    getOneCombined(id) {
+        return this.httpClient.get(`${this.basePath}/${id}/`);
+    }
+    /**
+     * Returns data belonging to the organization identified by the provided id.
+     * A subset of all data is selected defined by the 'kinds' parameter.
+     *
+     * @param {string} id - organization id
+     * @param {string} kinds - array of requested data types ( selection of: ['members', 'invitations', 'roles', 'domains', 'userRoles'])
+     * @returns{Promise<OrganizationData>} organizationData (only selected kinds are returned)
+     */
+    getOrganizationData(id, kinds = []) {
+        const params = kinds.length > 0 ? { kinds: kinds.join(',') } : {};
+        return this.httpClient.get(`${this.basePath}/${id}/data`, { params });
+    }
+    /**
+     * Returns the member with the provided id
+     *
+     * @param {string} id - organization id
+     * @param {string} userId - user id of requested member
+     * @returns {Promise<KeycloakProfile>} member
+     */
+    getOrganizationMemberById(id, userId) {
+        return this.httpClient.get(`${this.basePath}/${id}/data/employees/${userId}`);
+    }
+    /**
+     * Returns the names of organizations with the provided ids.
+     *
+     * @param {string[]} ids - Ids of the organizations
+     * @returns array of organization name objects
+     */
+    getOrganizationNamesByIds(ids) {
+        return this.httpClient.post(`${this.basePath}/names`, { ids });
+    }
+    /**
+     * Returns the id of an organization with the provided name.
+     *
+     * @param {string} name - name of the organization
+     * @returns id of the organization, if it exists
+     */
+    getOrganizationIdByName(name) {
+        return this.httpClient.get(`${this.basePath}/names/${name}`);
+    }
+    /**
+     * Returns an array of organizations where the current user is a member.
+     *
+     * @returns {Promise<Organization[]>} - Organizations (array of organizations)
+     */
+    getMyOrganizations() {
+        return this.httpClient.get(`${this.basePath}/mine`);
+    }
+    /**
+     * Returns an array of organizations where the user is a member.
+     *
+     * @returns organizations (array of organizations)
+     */
+    getUserOrganizations(userId) {
+        return this.httpClient.get(`${this.basePath}/users/${userId}`);
+    }
+    /**
+     * Returns an array of roles which the selected user has in the provided organizations.
+     *
+     * @param ids organization ids
+     * @param userId id of a user whose organization roles are requested
+     * @returns records with organization id and array user roles of that organization
+     */
+    getUserOrganizationRoles(ids, userId) {
+        return this.httpClient.post(`${this.basePath}/users/${userId}/roles`, { ids });
+    }
+    /**
+     * Returns whether the subscription is actively used by an organization.
+     *
+     * @param {string} subscriptionId - Subscription ID from an azure marketplace subscription
+     * @returns boolean (whether subscription is active)
+     */
+    hasActiveSubscription(subscriptionId) {
+        return this.httpClient.get(`${this.basePath}/activeSubscription/${subscriptionId}`);
+    }
+    /**
+     * Deletes organization data.
+     *
+     * @comment Domains are deleted using the updateOne method
+     * @param {string} id - Organization id
+     * @param {string} elementId - ID belonging to an element of the provided kind
+     * @param {OrganizationDataKind} kind - Requested data type (one of: ['members', 'invitations', 'roles', 'userRoles'])
+     * @returns {Promise<OrganizationData>}
+     */
+    deleteOrganizationData(id, elementId, kind) {
+        const params = kind ? { kind } : {};
+        return this.httpClient.delete(`${this.basePath}/${id}/data/${elementId}`, { params });
+    }
+    /**
+     * Removes the current user from the members of the provided organization.
+     *
+     * @param {string} id - organization id
+     * @returns {Promise<void>}
+     */
+    leaveOrganization(id) {
+        return this.httpClient.delete(`${this.basePath}/${id}/leave`);
+    }
+}
+exports.OrganizationsService = OrganizationsService;

package/src/lib/{proxy.service.d.ts → services/proxy.service.d.ts}

@@ -1,8 +1,9 @@
 import { AxiosRequestConfig } from 'axios';
-import { HttpClient, TokenOption } from './http.service';
+import { HttpClientService } from '.';
+import { TokenOption } from '../interfaces';
 export declare class ProxyService {
     private readonly httpClient;
-    constructor(httpClient: HttpClient);
+    constructor(httpClient: HttpClientService);
     delete: <T>(proxyId: string, path: string, config?: TokenOption & AxiosRequestConfig) => Promise<T>;
     get: <T>(proxyId: string, path: string, config?: TokenOption & AxiosRequestConfig) => Promise<T>;
     post: <T>(proxyId: string, path: string, data: any, config?: TokenOption & AxiosRequestConfig) => Promise<T>;

package/src/lib/services/search.service.d.ts

@@ -1,8 +1,8 @@
+import { HttpClientService } from '.';
 import { APIBase } from '../api-base';
-import { HttpClient, TokenOption } from '../http.service';
-import type { SearchOptions, SearchResult } from '../interfaces';
+import type { SearchOptions, SearchResult, TokenOption } from '../interfaces';
 export declare class SearchService extends APIBase {
-    constructor(httpClient: HttpClient);
+    constructor(httpClient: HttpClientService);
     search<T extends {
         id?: string;
     }, K extends keyof T & string = keyof T & string>(query: SearchOptions<T, K>, tokenOption?: TokenOption): Promise<SearchResult<T, K>>;

package/src/lib/services/secret.service.d.ts

@@ -0,0 +1,11 @@
+import { DataService, HttpClientService, TrashService } from '.';
+import { APIBase } from '../api-base';
+import { Secret } from '../interfaces';
+interface BaseService extends DataService<Secret>, TrashService<Secret> {
+}
+declare class BaseService extends APIBase {
+}
+export declare class SecretService extends BaseService {
+    constructor(httpClient: HttpClientService);
+}
+export {};

package/src/lib/{secret.service.js → services/secret.service.js}

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecretService = void 0;
 const tslib_1 = require("tslib");
 const ts_mixer_1 = require("ts-mixer");
-const api_base_1 = require("./api-base");
-const data_service_1 = require("./data.service");
-const trash_service_1 = require("./trash.service");
+const _1 = require(".");
+const api_base_1 = require("../api-base");
 let BaseService = class BaseService extends api_base_1.APIBase {
 };
 BaseService = tslib_1.__decorate([
-    (0, ts_mixer_1.mix)(data_service_1.DataService, trash_service_1.TrashService)
+    (0, ts_mixer_1.mix)(_1.DataService, _1.TrashService)
 ], BaseService);
 class SecretService extends BaseService {
     constructor(httpClient) {

package/src/lib/{task.service.d.ts → services/task.service.d.ts}

@@ -1,24 +1,21 @@
-import { APIBase } from './api-base';
-import { Paginated } from './data.interface';
-import { DataService } from './data.service';
-import { HttpClient, TokenOption } from './http.service';
-import { LogbookEntry, LogbookEntryDto, Task } from './task.interface';
-import { TrashService } from './trash.service';
+import { DataService, HttpClientService, TrashService } from '.';
+import { APIBase } from '../api-base';
+import { LogbookEntry, LogbookEntryDto, Paginated, Task, TokenOption } from '../interfaces';
 interface BaseService extends DataService<Task>, TrashService<Task> {
 }
 declare class BaseService extends APIBase {
 }
 export declare class TaskService extends BaseService {
-    constructor(httpClient: HttpClient);
+    constructor(httpClient: HttpClientService);
     createTaskAttachedToAsset(dto: any, options?: TokenOption): Promise<Task>;
-    findByName(name: string, options?: TokenOption): Promise<Paginated<Task[]>>;
-    findByAsset(assetId: string, options?: TokenOption): Promise<Paginated<Task[]>>;
-    getLogbookEntries(taskId: string, limit?: number, offset?: number, options?: TokenOption): Promise<Paginated<LogbookEntry[]>>;
+    findByName(name: string, options?: TokenOption): Promise<Paginated<Task>>;
+    findByAsset(assetId: string, options?: TokenOption): Promise<Paginated<Task>>;
+    getLogbookEntries(taskId: string, limit?: number, offset?: number, options?: TokenOption): Promise<Paginated<LogbookEntry>>;
     addLogbookEntry(taskId: string, entry: LogbookEntryDto, options?: TokenOption): Promise<LogbookEntry>;
     updateLogbookEntry(taskId: string, entryId: string, entry: Partial<LogbookEntryDto>, options?: TokenOption): Promise<LogbookEntry>;
     deleteLogbookEntry(taskId: string, entryId: string, options?: TokenOption): Promise<{
         deleted: boolean;
     }>;
-    getUserLogbookEntries(limit?: number, offset?: number, options?: TokenOption): Promise<Paginated<LogbookEntry[]>>;
+    getUserLogbookEntries(limit?: number, offset?: number, options?: TokenOption): Promise<Paginated<LogbookEntry>>;
 }
 export {};

package/src/lib/{task.service.js → services/task.service.js}

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskService = void 0;
 const tslib_1 = require("tslib");
 const ts_mixer_1 = require("ts-mixer");
-const api_base_1 = require("./api-base");
-const data_service_1 = require("./data.service");
-const trash_service_1 = require("./trash.service");
+const _1 = require(".");
+const api_base_1 = require("../api-base");
 let BaseService = class BaseService extends api_base_1.APIBase {
 };
 BaseService = tslib_1.__decorate([
-    (0, ts_mixer_1.mix)(data_service_1.DataService, trash_service_1.TrashService)
+    (0, ts_mixer_1.mix)(_1.DataService, _1.TrashService)
 ], BaseService);
 class TaskService extends BaseService {
     constructor(httpClient) {