@hahnpro/hpc-api 2025.12.1 → 2026.1.1

package/src/lib/services/notification-rule.service.d.ts

@@ -1,6 +1,12 @@
-import { HttpClientService } from '.';
+import { DataService, HttpClientService } from '.';
+import { APIBase } from '../api-base';
 import { NotificationRule } from '../interfaces';
 import { ShareService } from './share.service';
-export declare class NotificationRuleService extends ShareService<NotificationRule> {
+interface BaseService extends DataService<NotificationRule>, ShareService {
+}
+declare class BaseService extends APIBase {
+}
+export declare class NotificationRuleService extends BaseService {
     constructor(httpClient: HttpClientService);
 }
+export {};

package/src/lib/services/notification-rule.service.js

@@ -1,8 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationRuleService = void 0;
+const tslib_1 = require("tslib");
+const ts_mixer_1 = require("ts-mixer");
+const _1 = require(".");
+const api_base_1 = require("../api-base");
 const share_service_1 = require("./share.service");
-class NotificationRuleService extends share_service_1.ShareService {
+let BaseService = class BaseService extends api_base_1.APIBase {
+};
+BaseService = tslib_1.__decorate([
+    (0, ts_mixer_1.mix)(_1.DataService, share_service_1.ShareService)
+], BaseService);
+/* eslint-enable @typescript-eslint/no-unsafe-declaration-merging */
+class NotificationRuleService extends BaseService {
     constructor(httpClient) {
         super(httpClient, '/notification/rules');
     }

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

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { APIBase } from '../api-base';
-import { Filter, Organization, OrganizationCreateDto, OrganizationResourcesProgress, OrganizationSearchQuery, Paginated, RequestParameter, ServerSentEvent, SubscriptionType, UserWithOrgRoles } from '../interfaces';
+import { CreateOrganizationDto, Filter, Organization, OrganizationResourcesProgress, OrganizationSearchQuery, Paginated, RequestParameter, ServerSentEvent, SubscriptionType, UserWithOrgRoles } from '../interfaces';
 import { HttpClientService } from './';
 /**
  * Service for managing organizations with administrative privileges (superuser role required).
@@ -41,13 +41,13 @@ export declare class OrganizationsAdministrationService extends APIBase {
      * Creates an organization with a free subscription and invites or adds a user to it.
      * The owner of the organization can be either the user or the service account 'organization-client', depending on the 'createOrgAsOwner' flag in the OrganizationCreateFlowDto.
      *
-     * @param {OrganizationCreateDto} organizationCreateDto - The data transfer object containing the organization details for creation
-     * @param {string[]} emailsToInvite - The email addresses of the users to be invited to the organization
-     * @param {string[]} emailsToAdd - The email addresses of the users to be added without an invitation to the organization
+     * @param {CreateOrganizationDto} createOrganizationDto - The data transfer object containing the organization details for creation
+     * @param {UserWithOrgRoles[]} usersWithOrgRolesToInvite - The email addresses with the individual org roles of the users to be invited to the organization
+     * @param {UserWithOrgRoles[]} usersWithOrgRolesToAdd - The email addresses with the individual org roles of the users to be added without an invitation to the organization
      * @param {boolean} createOrgAsOwner - Whether to create the organization with the user as the owner
      * @returns {Promise<Organization>} - An promise of the created organization
      */
-    createOrganization(organizationCreateDto: OrganizationCreateDto, emailsToInvite: string[], emailsToAdd: string[], createOrgAsOwner?: boolean): Promise<Organization>;
+    createOrganization(createOrganizationDto: CreateOrganizationDto, usersWithOrgRolesToInvite: UserWithOrgRoles[], usersWithOrgRolesToAdd: UserWithOrgRoles[], createOrgAsOwner?: boolean): Promise<Organization>;
     addOrganizationMembers(id: string, usersWithOrgRoles: UserWithOrgRoles[]): Promise<void>;
     addSubscriptionToOrganization(id: string, type: SubscriptionType): Promise<Organization>;
     /**

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

@@ -56,17 +56,17 @@ class OrganizationsAdministrationService extends api_base_1.APIBase {
      * Creates an organization with a free subscription and invites or adds a user to it.
      * The owner of the organization can be either the user or the service account 'organization-client', depending on the 'createOrgAsOwner' flag in the OrganizationCreateFlowDto.
      *
-     * @param {OrganizationCreateDto} organizationCreateDto - The data transfer object containing the organization details for creation
-     * @param {string[]} emailsToInvite - The email addresses of the users to be invited to the organization
-     * @param {string[]} emailsToAdd - The email addresses of the users to be added without an invitation to the organization
+     * @param {CreateOrganizationDto} createOrganizationDto - The data transfer object containing the organization details for creation
+     * @param {UserWithOrgRoles[]} usersWithOrgRolesToInvite - The email addresses with the individual org roles of the users to be invited to the organization
+     * @param {UserWithOrgRoles[]} usersWithOrgRolesToAdd - The email addresses with the individual org roles of the users to be added without an invitation to the organization
      * @param {boolean} createOrgAsOwner - Whether to create the organization with the user as the owner
      * @returns {Promise<Organization>} - An promise of the created organization
      */
-    createOrganization(organizationCreateDto, emailsToInvite, emailsToAdd, createOrgAsOwner = false) {
+    createOrganization(createOrganizationDto, usersWithOrgRolesToInvite, usersWithOrgRolesToAdd, createOrgAsOwner = false) {
         return this.httpClient.post(`${this.basePath}/create-org`, {
-            organizationDto: organizationCreateDto,
-            emailsToInvite,
-            emailsToAdd,
+            createOrganizationDto,
+            usersWithOrgRolesToInvite,
+            usersWithOrgRolesToAdd,
             createOrgAsOwner,
         });
     }

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

@@ -1,5 +1,5 @@
 import { APIBase } from '../api-base';
-import { KeycloakProfile, Organization, OrganizationCreateDto, OrganizationData, OrganizationDataKind, OrganizationName, OrganizationRolesAdjustment } from '../interfaces';
+import { CreateOrganizationDto, KeycloakProfile, Organization, OrganizationData, OrganizationDataKind, OrganizationName, OrganizationRolesAdjustment } from '../interfaces';
 import { HttpClientService } from './';
 export declare class OrganizationsService extends APIBase {
     constructor(httpClientClient: HttpClientService);
@@ -9,7 +9,7 @@ export declare class OrganizationsService extends APIBase {
      * @param dto organization information
      * @returns newly created organization
      */
-    addOne(dto: OrganizationCreateDto): Promise<Organization>;
+    addOne(dto: CreateOrganizationDto): Promise<Organization>;
     /**
      * Invite a user to an organization.
      *
@@ -18,7 +18,7 @@ export declare class OrganizationsService extends APIBase {
      * @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>;
+    inviteUser(id: string, email: string, roles: string[]): Promise<void>;
     /**
      * Add organization role to an organization.
      *

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

@@ -23,7 +23,7 @@ class OrganizationsService extends api_base_1.APIBase {
      * @param roles roles (names) which the user should get in the organization
      * @returns newly created invitation
      */
-    addOrganizationInvitation(id, email, roles) {
+    inviteUser(id, email, roles) {
         return this.httpClient.post(`${this.basePath}/${id}/data/invitations`, { roles, email });
     }
     /**

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

@@ -1,6 +1,6 @@
+import { APIBase } from '../api-base';
 import { OrgResourcePermission, SharedResources, TokenOption } from '../interfaces';
-import { DataService } from './data.service';
-export declare class ShareService<T> extends DataService<T> {
+export declare class ShareService extends APIBase {
     getBasePath(): string;
     cancelAccess(id: string, options?: TokenOption): Promise<void>;
     share(ids: string[], orgResourcePermissions: OrgResourcePermission[], connectedResourcesToShare?: SharedResources, sourceIds?: string[], sourceType?: string, options?: TokenOption): Promise<void>;

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShareService = void 0;
-const data_service_1 = require("./data.service");
-class ShareService extends data_service_1.DataService {
+const api_base_1 = require("../api-base");
+class ShareService extends api_base_1.APIBase {
     getBasePath() {
         return this.basePath;
     }

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

@@ -1,8 +1,8 @@
-import { HttpClientService, TrashService } from '.';
+import { DataService, HttpClientService, TrashService } from '.';
 import { APIBase } from '../api-base';
 import { LogbookEntry, LogbookEntryDto, Paginated, Task, TokenOption } from '../interfaces';
 import { ShareService } from './share.service';
-interface BaseService extends ShareService<Task>, TrashService<Task> {
+interface BaseService extends DataService<Task>, ShareService, TrashService<Task> {
 }
 declare class BaseService extends APIBase {
 }

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

@@ -9,8 +9,9 @@ const share_service_1 = require("./share.service");
 let BaseService = class BaseService extends api_base_1.APIBase {
 };
 BaseService = tslib_1.__decorate([
-    (0, ts_mixer_1.mix)(share_service_1.ShareService, _1.TrashService)
+    (0, ts_mixer_1.mix)(_1.DataService, share_service_1.ShareService, _1.TrashService)
 ], BaseService);
+/* eslint-enable @typescript-eslint/no-unsafe-declaration-merging */
 class TaskService extends BaseService {
     constructor(httpClient) {
         super(httpClient, '/tasks');

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

@@ -1,8 +1,8 @@
-import { HttpClientService, TrashService } from '.';
+import { DataService, HttpClientService, TrashService } from '.';
 import { APIBase } from '../api-base';
 import { Paginated, TimeSeries, TimeSeriesValue, TokenOption, TS_GROUPS } from '../interfaces';
 import { ShareService } from './share.service';
-interface BaseService extends ShareService<TimeSeries>, TrashService<TimeSeries> {
+interface BaseService extends DataService<TimeSeries>, ShareService, TrashService<TimeSeries> {
 }
 declare class BaseService extends APIBase {
 }

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

@@ -9,8 +9,9 @@ const share_service_1 = require("./share.service");
 let BaseService = class BaseService extends api_base_1.APIBase {
 };
 BaseService = tslib_1.__decorate([
-    (0, ts_mixer_1.mix)(share_service_1.ShareService, _1.TrashService)
+    (0, ts_mixer_1.mix)(_1.DataService, share_service_1.ShareService, _1.TrashService)
 ], BaseService);
+/* eslint-enable @typescript-eslint/no-unsafe-declaration-merging */
 class TimeSeriesService extends BaseService {
     constructor(httpClient) {
         super(httpClient, '/tsm');