Skip to content

Commit 12da385

Browse files
Merge remote-tracking branch 'upstream/master'
2 parents 09fa074 + 88606a9 commit 12da385

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+166
-230
lines changed

dist/api/APIListProperties.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { API } from '../API';
22
import { APIList } from './APIList';
33
import { CollectionQueryParams } from './models/HTTP';
4-
import { AppBansQueryParams, Property, PropertyData } from './models/Property';
4+
import { Property, PropertyData } from './models/Property';
55
export declare class APIListProperties extends APIList<Property, CollectionQueryParams, PropertyData> {
66
constructor(parent: API);
7-
appBan(id: number): APIList<Property, AppBansQueryParams, AppBansQueryParams>;
87
maintenance(): APIList<any, CollectionQueryParams, any>;
98
}
109
export default APIListProperties;

dist/api/APIResourceAccount.d.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,17 @@ import { APIResource } from './APIResource';
33
import { Account } from './models/Account';
44
import { AccountConcurrencyStatusMap } from './models/AccountConcurrencyStatusMap';
55
import { AccountPreferences } from './models/AccountPreference';
6-
import { NoQueryParams, SimpleCollectionResponse } from './models/HTTP';
6+
import { CollectionBasicQueryParams, NoQueryParams, SimpleCollectionResponse } from './models/HTTP';
7+
import { User, UserData } from './models/User';
8+
import { APIList } from './APIList';
79
export declare class APIResourceAccount extends APIResource<Account> {
810
constructor(parent: API, id: number);
911
concurrencyStatus(): APIResource<AccountConcurrencyStatusMap, NoQueryParams, void>;
1012
preferences(): APIResource<AccountPreferences, NoQueryParams, SimpleCollectionResponse<AccountPreferences>>;
13+
users(): APIList<User, CollectionBasicQueryParams, UserData>;
14+
removeUser(id: number): APIResource<User, NoQueryParams, void>;
15+
disableUser(id: number): APIResource<User, NoQueryParams, void>;
16+
enableUser(id: number): APIResource<User, NoQueryParams, void>;
17+
resendActivation(id: number): APIResource<User, NoQueryParams, void>;
1118
}
1219
export default APIResourceAccount;

dist/api/APIResourceAdditionalUser.d.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

dist/api/APIResourceUser.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ export declare class APIResourceUser extends APIResource<User> {
4343
deviceGroup(id: number): APIResourceDeviceGroup;
4444
deviceSessions(): APIList<DeviceSession, DeviceSessionQueryParams, DeviceSessionData>;
4545
deviceSession(id: number): APIResourceDeviceSessionStandalone;
46+
markAccountOwner(): APIResource<User, NoQueryParams, void>;
4647
projects(): APIList<Project, UserProjectQueryParams, UserProjectData>;
4748
project(id: number): APIResourceProject;
4849
files(): APIListFiles;

dist/api/APIUserResourceAccount.d.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
import { APIList } from './APIList';
21
import { APIResource } from './APIResource';
3-
import { APIResourceAdditionalUser } from './APIResourceAdditionalUser';
42
import { APIResourceUser } from './APIResourceUser';
53
import { Account } from './models/Account';
64
import { AccountServicePayment } from './models/AccountServicePayment';
75
import { BillingPeriodQueryParams } from './models/BillingPeriod';
8-
import { CollectionBasicQueryParams, NoQueryParams } from './models/HTTP';
9-
import { User, UserData } from './models/User';
6+
import { NoQueryParams } from './models/HTTP';
107
import { VisualTestAccess } from './models/VisualTest';
118
export declare class APIUserResourceAccount extends APIResource<Account> {
129
constructor(parent: APIResourceUser);
13-
additionalUsers(): APIList<User, CollectionBasicQueryParams, UserData>;
14-
additionalUser(id: number): APIResourceAdditionalUser;
1510
serviceBillingPeriod(id: number): APIResource<AccountServicePayment, BillingPeriodQueryParams, void>;
1611
visualTestAccess(): APIResource<VisualTestAccess, NoQueryParams, VisualTestAccess>;
1712
}

dist/api/models/Account.d.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ export declare type Account = {
44
createTime: number;
55
dedicatedDevicesCount: number;
66
id: number;
7-
mainUserEmail: string;
8-
mainUserFirstName: string;
9-
mainUserLastName: string;
7+
name: string;
108
};
Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1+
declare type ConcurrencyDetails = {
2+
accountConcurrency: number;
3+
runningSessions: number;
4+
sessions: number;
5+
unlimitedConcurrency: boolean;
6+
usedBy: Array<string>;
7+
waitingSessions: number;
8+
};
19
export declare type AccountConcurrencyStatusMap = {
210
id: number;
3-
mainUserEmail: string;
11+
AUTOMATIC: ConcurrencyDetails;
12+
MANUAL: ConcurrencyDetails;
413
};
14+
export {};

dist/api/models/AccountService.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export declare type ServicePaymentStatus = {
3333
};
3434
export declare type AccountService = {
3535
accountId: number;
36+
accountName: string;
3637
activatedById: number;
3738
activatedByName: string;
3839
active: boolean;
@@ -57,7 +58,6 @@ export declare type AccountService = {
5758
total: number;
5859
unit: ServiceUnit;
5960
unitCount: number;
60-
userEmail: string;
6161
userId: number;
6262
vatRate: number;
6363
};

dist/api/models/AdminDevice.d.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export declare enum DeviceState {
1919
}
2020
export declare type AdminDevice = {
2121
accountId: number;
22+
accountName: string;
2223
cluster: unknown;
2324
comment: string;
2425
dedicationEndTime: number;
@@ -32,8 +33,6 @@ export declare type AdminDevice = {
3233
lastOnlineTime: number;
3334
location: string;
3435
locked: boolean;
35-
mainUserEmail: string;
36-
mainUserId: number;
3736
manufacturer: string;
3837
name: string;
3938
osType: OsType;

dist/api/models/BillingPeriod.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export declare type BillingPeriod = {
1616
endBillingPeriod: number;
1717
id: number;
1818
lastPaymentDate: number;
19-
mail: string;
2019
paid: boolean;
2120
paymentMethod: PaymentMethod;
2221
plan: string;
@@ -26,7 +25,6 @@ export declare type BillingPeriod = {
2625
subscriptionStart: number;
2726
totalPrice: number;
2827
usages: Array<BillingPeriodUsage>;
29-
userId: number;
3028
};
3129
export declare type BillingPeriodUsage = {
3230
billableSeconds: number;

0 commit comments

Comments
 (0)