From bd3ec70a5145f3e93762eabf827b9c456087f6e3 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 7 Mar 2023 12:01:15 +0100 Subject: [PATCH 01/16] Init --- .../src/components/Users/GroupsModal.vue | 0 .../src/generated/.openapi-generator/VERSION | 2 +- packages/web-client/src/generated/api.ts | 596 ++++++++++++------ packages/web-client/src/generated/base.ts | 2 +- packages/web-client/src/generated/common.ts | 2 +- .../web-client/src/generated/configuration.ts | 2 +- packages/web-client/src/generated/index.ts | 2 +- 7 files changed, 418 insertions(+), 188 deletions(-) create mode 100644 packages/web-app-admin-settings/src/components/Users/GroupsModal.vue diff --git a/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue b/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue new file mode 100644 index 00000000000..e69de29bb2d diff --git a/packages/web-client/src/generated/.openapi-generator/VERSION b/packages/web-client/src/generated/.openapi-generator/VERSION index d6b4ec4aa78..7f4d792ec2c 100644 --- a/packages/web-client/src/generated/.openapi-generator/VERSION +++ b/packages/web-client/src/generated/.openapi-generator/VERSION @@ -1 +1 @@ -6.3.0-SNAPSHOT \ No newline at end of file +6.5.0-SNAPSHOT \ No newline at end of file diff --git a/packages/web-client/src/generated/api.ts b/packages/web-client/src/generated/api.ts index 97a39656876..0728d362196 100644 --- a/packages/web-client/src/generated/api.ts +++ b/packages/web-client/src/generated/api.ts @@ -2,7 +2,7 @@ /* eslint-disable */ /** * Libre Graph API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * Libre Graph is a free API for cloud collaboration inspired by the MS Graph API. * * The version of the OpenAPI document: v1.0.1 * @@ -166,6 +166,19 @@ export interface ClassReference { */ '@odata.id'?: string; } +/** + * + * @export + * @interface ClassTeacherReference + */ +export interface ClassTeacherReference { + /** + * + * @type {string} + * @memberof ClassTeacherReference + */ + '@odata.id'?: string; +} /** * * @export @@ -689,13 +702,13 @@ export interface EducationClass { */ 'id'?: string; /** - * An optional description for the group. Returned by default. Supports $filter (eq, ne, not, ge, le, startsWith) and $search. + * An optional description for the group. Returned by default. * @type {string} * @memberof EducationClass */ 'description'?: string; /** - * The display name for the group. This property is required when a group is created and cannot be cleared during updates. Returned by default. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values), $search, and $orderBy. + * The display name for the group. This property is required when a group is created and cannot be cleared during updates. Returned by default. Supports $search and $orderBy. * @type {string} * @memberof EducationClass */ @@ -796,7 +809,7 @@ export interface EducationUser { */ 'accountEnabled'?: boolean; /** - * The name displayed in the address book for the user. This value is usually the combination of the user\'s first name, middle initial, and last name. This property is required when a user is created and it cannot be cleared during updates. Returned by default. Supports $filter and $orderby. + * The name displayed in the address book for the user. This value is usually the combination of the user\'s first name, middle initial, and last name. This property is required when a user is created and it cannot be cleared during updates. Returned by default. Supports $orderby. * @type {string} * @memberof EducationUser */ @@ -820,7 +833,7 @@ export interface EducationUser { */ 'identities'?: Array; /** - * The SMTP address for the user, for example, \'jeff@contoso.onowncloud.com\'. Returned by default. Supports $filter and endsWith. + * The SMTP address for the user, for example, \'jeff@contoso.onowncloud.com\'. Returned by default. * @type {string} * @memberof EducationUser */ @@ -844,13 +857,13 @@ export interface EducationUser { */ 'passwordProfile'?: PasswordProfile; /** - * The user\'s surname (family name or last name). Returned by default. Supports $filter. + * The user\'s surname (family name or last name). Returned by default. * @type {string} * @memberof EducationUser */ 'surname'?: string; /** - * The user\'s givenName. Returned by default. Supports $filter. + * The user\'s givenName. Returned by default. * @type {string} * @memberof EducationUser */ @@ -970,13 +983,13 @@ export interface Group { */ 'id'?: string; /** - * An optional description for the group. Returned by default. Supports $filter (eq, ne, not, ge, le, startsWith) and $search. + * An optional description for the group. Returned by default. * @type {string} * @memberof Group */ 'description'?: string; /** - * The display name for the group. This property is required when a group is created and cannot be cleared during updates. Returned by default. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values), $search, and $orderBy. + * The display name for the group. This property is required when a group is created and cannot be cleared during updates. Returned by default. Supports $search and $orderBy. * @type {string} * @memberof Group */ @@ -1313,6 +1326,12 @@ export interface PasswordProfile { * @interface Permission */ export interface Permission { + /** + * An optional expiration date which limits the permission in time. + * @type {string} + * @memberof Permission + */ + 'expirationDateTime'?: string; /** * * @type {Array} @@ -1604,7 +1623,7 @@ export interface User { */ 'appRoleAssignments'?: Array; /** - * The name displayed in the address book for the user. This value is usually the combination of the user\'s first name, middle initial, and last name. This property is required when a user is created and it cannot be cleared during updates. Returned by default. Supports $filter and $orderby. + * The name displayed in the address book for the user. This value is usually the combination of the user\'s first name, middle initial, and last name. This property is required when a user is created and it cannot be cleared during updates. Returned by default. Supports $orderby. * @type {string} * @memberof User */ @@ -1628,7 +1647,7 @@ export interface User { */ 'identities'?: Array; /** - * The SMTP address for the user, for example, \'jeff@contoso.onowncloud.com\'. Returned by default. Supports $filter and endsWith. + * The SMTP address for the user, for example, \'jeff@contoso.onowncloud.com\'. Returned by default. * @type {string} * @memberof User */ @@ -1652,13 +1671,13 @@ export interface User { */ 'passwordProfile'?: PasswordProfile; /** - * The user\'s surname (family name or last name). Returned by default. Supports $filter. + * The user\'s surname (family name or last name). Returned by default. * @type {string} * @memberof User */ 'surname'?: string; /** - * The user\'s givenName. Returned by default. Supports $filter. + * The user\'s givenName. Returned by default. * @type {string} * @memberof User */ @@ -2383,7 +2402,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Assign a user to a class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {ClassMemberReference} classMemberReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2467,7 +2486,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Delete education class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2505,8 +2524,8 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Unassign user from a class - * @param {string} classId key: id of class - * @param {string} userId key: id of the user to unassign from class + * @param {string} classId key: id or externalId of class + * @param {string} userId key: id or username of the user to unassign from class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2547,7 +2566,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Get class by key - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2585,7 +2604,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2657,7 +2676,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Update properties of a education class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {EducationClass} educationClass New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2711,7 +2730,7 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Assign a user to a class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {ClassMemberReference} classMemberReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2734,7 +2753,7 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Delete education class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2745,8 +2764,8 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Unassign user from a class - * @param {string} classId key: id of class - * @param {string} userId key: id of the user to unassign from class + * @param {string} classId key: id or externalId of class + * @param {string} userId key: id or username of the user to unassign from class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2757,7 +2776,7 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Get class by key - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2768,7 +2787,7 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2789,7 +2808,7 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Update properties of a education class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {EducationClass} educationClass New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2811,7 +2830,7 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Assign a user to a class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {ClassMemberReference} classMemberReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2832,7 +2851,7 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Delete education class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2842,8 +2861,8 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Unassign user from a class - * @param {string} classId key: id of class - * @param {string} userId key: id of the user to unassign from class + * @param {string} classId key: id or externalId of class + * @param {string} userId key: id or username of the user to unassign from class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2853,7 +2872,7 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Get class by key - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2863,7 +2882,7 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2882,7 +2901,7 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Update properties of a education class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {EducationClass} educationClass New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2903,7 +2922,7 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Assign a user to a class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {ClassMemberReference} classMemberReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2928,7 +2947,7 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Delete education class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationClassApi @@ -2940,8 +2959,8 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Unassign user from a class - * @param {string} classId key: id of class - * @param {string} userId key: id of the user to unassign from class + * @param {string} classId key: id or externalId of class + * @param {string} userId key: id or username of the user to unassign from class * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationClassApi @@ -2953,7 +2972,7 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Get class by key - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationClassApi @@ -2965,7 +2984,7 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationClassApi @@ -2988,7 +3007,7 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Update properties of a education class - * @param {string} classId key: id of class + * @param {string} classId key: id or externalId of class * @param {EducationClass} educationClass New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3000,6 +3019,273 @@ export class EducationClassApi extends BaseAPI { } +/** + * EducationClassTeachersApi - axios parameter creator + * @export + */ +export const EducationClassTeachersApiAxiosParamCreator = function (configuration?: Configuration) { + return { + /** + * + * @summary Assign a teacher to a class + * @param {string} classId key: id or externalId of class + * @param {ClassTeacherReference} classTeacherReference educationUser to be added as teacher + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + addTeacherToClass: async (classId: string, classTeacherReference: ClassTeacherReference, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'classId' is not null or undefined + assertParamExists('addTeacherToClass', 'classId', classId) + // verify required parameter 'classTeacherReference' is not null or undefined + assertParamExists('addTeacherToClass', 'classTeacherReference', classTeacherReference) + const localVarPath = `/education/classes/{class-id}/teachers/$ref` + .replace(`{${"class-id"}}`, encodeURIComponent(String(classId))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication bearerAuth required + // http bearer authentication required + await setBearerAuthToObject(localVarHeaderParameter, configuration) + + + + localVarHeaderParameter['Content-Type'] = 'application/json'; + + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + localVarRequestOptions.data = serializeDataIfNeeded(classTeacherReference, localVarRequestOptions, configuration) + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @summary Unassign user as teacher of a class + * @param {string} classId key: id or externalId of class + * @param {string} userId key: id or username of the user to unassign as teacher + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + deleteTeacherFromClass: async (classId: string, userId: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'classId' is not null or undefined + assertParamExists('deleteTeacherFromClass', 'classId', classId) + // verify required parameter 'userId' is not null or undefined + assertParamExists('deleteTeacherFromClass', 'userId', userId) + const localVarPath = `/education/classes/{class-id}/teachers/{user-id}/$ref` + .replace(`{${"class-id"}}`, encodeURIComponent(String(classId))) + .replace(`{${"user-id"}}`, encodeURIComponent(String(userId))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication bearerAuth required + // http bearer authentication required + await setBearerAuthToObject(localVarHeaderParameter, configuration) + + + + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + /** + * + * @summary Get the teachers for a class + * @param {string} classId key: id or externalId of class + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + getTeachers: async (classId: string, options: AxiosRequestConfig = {}): Promise => { + // verify required parameter 'classId' is not null or undefined + assertParamExists('getTeachers', 'classId', classId) + const localVarPath = `/education/classes/{class-id}/teachers` + .replace(`{${"class-id"}}`, encodeURIComponent(String(classId))); + // use dummy base URL string because the URL constructor only accepts absolute URLs. + const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); + let baseOptions; + if (configuration) { + baseOptions = configuration.baseOptions; + } + + const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; + const localVarHeaderParameter = {} as any; + const localVarQueryParameter = {} as any; + + // authentication bearerAuth required + // http bearer authentication required + await setBearerAuthToObject(localVarHeaderParameter, configuration) + + + + setSearchParams(localVarUrlObj, localVarQueryParameter); + let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; + localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; + + return { + url: toPathString(localVarUrlObj), + options: localVarRequestOptions, + }; + }, + } +}; + +/** + * EducationClassTeachersApi - functional programming interface + * @export + */ +export const EducationClassTeachersApiFp = function(configuration?: Configuration) { + const localVarAxiosParamCreator = EducationClassTeachersApiAxiosParamCreator(configuration) + return { + /** + * + * @summary Assign a teacher to a class + * @param {string} classId key: id or externalId of class + * @param {ClassTeacherReference} classTeacherReference educationUser to be added as teacher + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async addTeacherToClass(classId: string, classTeacherReference: ClassTeacherReference, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.addTeacherToClass(classId, classTeacherReference, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, + /** + * + * @summary Unassign user as teacher of a class + * @param {string} classId key: id or externalId of class + * @param {string} userId key: id or username of the user to unassign as teacher + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async deleteTeacherFromClass(classId: string, userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.deleteTeacherFromClass(classId, userId, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, + /** + * + * @summary Get the teachers for a class + * @param {string} classId key: id or externalId of class + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + async getTeachers(classId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.getTeachers(classId, options); + return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); + }, + } +}; + +/** + * EducationClassTeachersApi - factory interface + * @export + */ +export const EducationClassTeachersApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) { + const localVarFp = EducationClassTeachersApiFp(configuration) + return { + /** + * + * @summary Assign a teacher to a class + * @param {string} classId key: id or externalId of class + * @param {ClassTeacherReference} classTeacherReference educationUser to be added as teacher + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + addTeacherToClass(classId: string, classTeacherReference: ClassTeacherReference, options?: any): AxiosPromise { + return localVarFp.addTeacherToClass(classId, classTeacherReference, options).then((request) => request(axios, basePath)); + }, + /** + * + * @summary Unassign user as teacher of a class + * @param {string} classId key: id or externalId of class + * @param {string} userId key: id or username of the user to unassign as teacher + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + deleteTeacherFromClass(classId: string, userId: string, options?: any): AxiosPromise { + return localVarFp.deleteTeacherFromClass(classId, userId, options).then((request) => request(axios, basePath)); + }, + /** + * + * @summary Get the teachers for a class + * @param {string} classId key: id or externalId of class + * @param {*} [options] Override http request option. + * @throws {RequiredError} + */ + getTeachers(classId: string, options?: any): AxiosPromise { + return localVarFp.getTeachers(classId, options).then((request) => request(axios, basePath)); + }, + }; +}; + +/** + * EducationClassTeachersApi - object-oriented interface + * @export + * @class EducationClassTeachersApi + * @extends {BaseAPI} + */ +export class EducationClassTeachersApi extends BaseAPI { + /** + * + * @summary Assign a teacher to a class + * @param {string} classId key: id or externalId of class + * @param {ClassTeacherReference} classTeacherReference educationUser to be added as teacher + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof EducationClassTeachersApi + */ + public addTeacherToClass(classId: string, classTeacherReference: ClassTeacherReference, options?: AxiosRequestConfig) { + return EducationClassTeachersApiFp(this.configuration).addTeacherToClass(classId, classTeacherReference, options).then((request) => request(this.axios, this.basePath)); + } + + /** + * + * @summary Unassign user as teacher of a class + * @param {string} classId key: id or externalId of class + * @param {string} userId key: id or username of the user to unassign as teacher + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof EducationClassTeachersApi + */ + public deleteTeacherFromClass(classId: string, userId: string, options?: AxiosRequestConfig) { + return EducationClassTeachersApiFp(this.configuration).deleteTeacherFromClass(classId, userId, options).then((request) => request(this.axios, this.basePath)); + } + + /** + * + * @summary Get the teachers for a class + * @param {string} classId key: id or externalId of class + * @param {*} [options] Override http request option. + * @throws {RequiredError} + * @memberof EducationClassTeachersApi + */ + public getTeachers(classId: string, options?: AxiosRequestConfig) { + return EducationClassTeachersApiFp(this.configuration).getTeachers(classId, options).then((request) => request(this.axios, this.basePath)); + } +} + + /** * EducationSchoolApi - axios parameter creator * @export @@ -3009,7 +3295,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Assign a class to a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {ClassReference} classReference educationClass to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3053,7 +3339,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Assign a user to a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {EducationUserReference} educationUserReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3137,8 +3423,8 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Unassign class from a school - * @param {string} schoolId key: id of school - * @param {string} classId key: id of the class to unassign from school + * @param {string} schoolId key: id or schoolNumber of school + * @param {string} classId key: id or externalId of the class to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3179,7 +3465,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Delete school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3217,8 +3503,8 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Unassign user from a school - * @param {string} schoolId key: id of school - * @param {string} userId key: id of the user to unassign from school + * @param {string} schoolId key: id or schoolNumber of school + * @param {string} userId key: id or username of the user to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3259,7 +3545,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Get the properties of a specific school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3297,7 +3583,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3335,7 +3621,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Get the educationUser resources associated with an educationSchool - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3407,7 +3693,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Update properties of a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {EducationSchool} educationSchool New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3461,7 +3747,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Assign a class to a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {ClassReference} classReference educationClass to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3473,7 +3759,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Assign a user to a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {EducationUserReference} educationUserReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3496,8 +3782,8 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Unassign class from a school - * @param {string} schoolId key: id of school - * @param {string} classId key: id of the class to unassign from school + * @param {string} schoolId key: id or schoolNumber of school + * @param {string} classId key: id or externalId of the class to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3508,7 +3794,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Delete school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3519,8 +3805,8 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Unassign user from a school - * @param {string} schoolId key: id of school - * @param {string} userId key: id of the user to unassign from school + * @param {string} schoolId key: id or schoolNumber of school + * @param {string} userId key: id or username of the user to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3531,7 +3817,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Get the properties of a specific school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3542,7 +3828,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3553,7 +3839,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Get the educationUser resources associated with an educationSchool - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3574,7 +3860,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Update properties of a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {EducationSchool} educationSchool New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3596,7 +3882,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Assign a class to a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {ClassReference} classReference educationClass to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3607,7 +3893,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Assign a user to a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {EducationUserReference} educationUserReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3628,8 +3914,8 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Unassign class from a school - * @param {string} schoolId key: id of school - * @param {string} classId key: id of the class to unassign from school + * @param {string} schoolId key: id or schoolNumber of school + * @param {string} classId key: id or externalId of the class to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3639,7 +3925,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Delete school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3649,8 +3935,8 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Unassign user from a school - * @param {string} schoolId key: id of school - * @param {string} userId key: id of the user to unassign from school + * @param {string} schoolId key: id or schoolNumber of school + * @param {string} userId key: id or username of the user to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3660,7 +3946,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Get the properties of a specific school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3670,7 +3956,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3680,7 +3966,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Get the educationUser resources associated with an educationSchool - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3699,7 +3985,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Update properties of a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {EducationSchool} educationSchool New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3720,7 +4006,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Assign a class to a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {ClassReference} classReference educationClass to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3733,7 +4019,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Assign a user to a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {EducationUserReference} educationUserReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3758,8 +4044,8 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Unassign class from a school - * @param {string} schoolId key: id of school - * @param {string} classId key: id of the class to unassign from school + * @param {string} schoolId key: id or schoolNumber of school + * @param {string} classId key: id or externalId of the class to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -3771,7 +4057,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Delete school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -3783,8 +4069,8 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Unassign user from a school - * @param {string} schoolId key: id of school - * @param {string} userId key: id of the user to unassign from school + * @param {string} schoolId key: id or schoolNumber of school + * @param {string} userId key: id or username of the user to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -3796,7 +4082,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Get the properties of a specific school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -3808,7 +4094,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -3820,7 +4106,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Get the educationUser resources associated with an educationSchool - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -3843,7 +4129,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Update properties of a school - * @param {string} schoolId key: id of school + * @param {string} schoolId key: id or schoolNumber of school * @param {EducationSchool} educationSchool New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3904,7 +4190,7 @@ export const EducationUserApiAxiosParamCreator = function (configuration?: Confi /** * * @summary Delete educationUser - * @param {string} userId key: id of user + * @param {string} userId key: id or username of user * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4029,7 +4315,7 @@ export const EducationUserApiAxiosParamCreator = function (configuration?: Confi /** * * @summary Update properties of educationUser - * @param {string} userId key: id of user + * @param {string} userId key: id or username of user * @param {EducationUser} educationUser New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4094,7 +4380,7 @@ export const EducationUserApiFp = function(configuration?: Configuration) { /** * * @summary Delete educationUser - * @param {string} userId key: id of user + * @param {string} userId key: id or username of user * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4129,7 +4415,7 @@ export const EducationUserApiFp = function(configuration?: Configuration) { /** * * @summary Update properties of educationUser - * @param {string} userId key: id of user + * @param {string} userId key: id or username of user * @param {EducationUser} educationUser New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4161,7 +4447,7 @@ export const EducationUserApiFactory = function (configuration?: Configuration, /** * * @summary Delete educationUser - * @param {string} userId key: id of user + * @param {string} userId key: id or username of user * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4193,7 +4479,7 @@ export const EducationUserApiFactory = function (configuration?: Configuration, /** * * @summary Update properties of educationUser - * @param {string} userId key: id of user + * @param {string} userId key: id or username of user * @param {EducationUser} educationUser New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4226,7 +4512,7 @@ export class EducationUserApi extends BaseAPI { /** * * @summary Delete educationUser - * @param {string} userId key: id of user + * @param {string} userId key: id or username of user * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationUserApi @@ -4264,7 +4550,7 @@ export class EducationUserApi extends BaseAPI { /** * * @summary Update properties of educationUser - * @param {string} userId key: id of user + * @param {string} userId key: id or username of user * @param {EducationUser} educationUser New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4407,7 +4693,7 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration /** * * @summary Get entity from groups by key - * @param {string} groupId key: id of group + * @param {string} groupId key: id or name of group * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -4451,7 +4737,7 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration /** * * @summary Get a list of the group\'s direct members - * @param {string} groupId key: id of group + * @param {string} groupId key: id or name of group * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4572,7 +4858,7 @@ export const GroupApiFp = function(configuration?: Configuration) { /** * * @summary Get entity from groups by key - * @param {string} groupId key: id of group + * @param {string} groupId key: id or name of group * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -4585,7 +4871,7 @@ export const GroupApiFp = function(configuration?: Configuration) { /** * * @summary Get a list of the group\'s direct members - * @param {string} groupId key: id of group + * @param {string} groupId key: id or name of group * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4652,7 +4938,7 @@ export const GroupApiFactory = function (configuration?: Configuration, basePath /** * * @summary Get entity from groups by key - * @param {string} groupId key: id of group + * @param {string} groupId key: id or name of group * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -4664,7 +4950,7 @@ export const GroupApiFactory = function (configuration?: Configuration, basePath /** * * @summary Get a list of the group\'s direct members - * @param {string} groupId key: id of group + * @param {string} groupId key: id or name of group * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4735,7 +5021,7 @@ export class GroupApi extends BaseAPI { /** * * @summary Get entity from groups by key - * @param {string} groupId key: id of group + * @param {string} groupId key: id or name of group * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -4749,7 +5035,7 @@ export class GroupApi extends BaseAPI { /** * * @summary Get a list of the group\'s direct members - * @param {string} groupId key: id of group + * @param {string} groupId key: id or name of group * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof GroupApi @@ -4818,18 +5104,14 @@ export const GroupsApiAxiosParamCreator = function (configuration?: Configuratio /** * * @summary Get entities from groups - * @param {number} [$top] Show only the first n items - * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter items by property values - * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listGroups: async ($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options: AxiosRequestConfig = {}): Promise => { + listGroups: async ($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/groups`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -4842,26 +5124,10 @@ export const GroupsApiAxiosParamCreator = function (configuration?: Configuratio const localVarHeaderParameter = {} as any; const localVarQueryParameter = {} as any; - if ($top !== undefined) { - localVarQueryParameter['$top'] = $top; - } - - if ($skip !== undefined) { - localVarQueryParameter['$skip'] = $skip; - } - if ($search !== undefined) { localVarQueryParameter['$search'] = $search; } - if ($filter !== undefined) { - localVarQueryParameter['$filter'] = $filter; - } - - if ($count !== undefined) { - localVarQueryParameter['$count'] = $count; - } - if ($orderby) { localVarQueryParameter['$orderby'] = Array.from($orderby).join(COLLECTION_FORMATS.csv); } @@ -4909,19 +5175,15 @@ export const GroupsApiFp = function(configuration?: Configuration) { /** * * @summary Get entities from groups - * @param {number} [$top] Show only the first n items - * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter items by property values - * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.listGroups($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options); + async listGroups($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.listGroups($search, $orderby, $select, $expand, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, } @@ -4947,19 +5209,15 @@ export const GroupsApiFactory = function (configuration?: Configuration, basePat /** * * @summary Get entities from groups - * @param {number} [$top] Show only the first n items - * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter items by property values - * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: any): AxiosPromise { - return localVarFp.listGroups($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(axios, basePath)); + listGroups($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: any): AxiosPromise { + return localVarFp.listGroups($search, $orderby, $select, $expand, options).then((request) => request(axios, basePath)); }, }; }; @@ -4986,11 +5244,7 @@ export class GroupsApi extends BaseAPI { /** * * @summary Get entities from groups - * @param {number} [$top] Show only the first n items - * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter items by property values - * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities @@ -4998,8 +5252,8 @@ export class GroupsApi extends BaseAPI { * @throws {RequiredError} * @memberof GroupsApi */ - public listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig) { - return GroupsApiFp(this.configuration).listGroups($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath)); + public listGroups($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig) { + return GroupsApiFp(this.configuration).listGroups($search, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath)); } } @@ -5866,7 +6120,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) /** * * @summary Delete entity from users - * @param {string} userId key: id of user + * @param {string} userId key: id or name of user * @param {string} [ifMatch] ETag * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -5905,7 +6159,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) /** * * @summary Get entity from users by key - * @param {string} userId key: id of user + * @param {string} userId key: id or name of user * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -5999,7 +6253,7 @@ export const UserApiFp = function(configuration?: Configuration) { /** * * @summary Delete entity from users - * @param {string} userId key: id of user + * @param {string} userId key: id or name of user * @param {string} [ifMatch] ETag * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -6011,7 +6265,7 @@ export const UserApiFp = function(configuration?: Configuration) { /** * * @summary Get entity from users by key - * @param {string} userId key: id of user + * @param {string} userId key: id or name of user * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -6046,7 +6300,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath? /** * * @summary Delete entity from users - * @param {string} userId key: id of user + * @param {string} userId key: id or name of user * @param {string} [ifMatch] ETag * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -6057,7 +6311,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath? /** * * @summary Get entity from users by key - * @param {string} userId key: id of user + * @param {string} userId key: id or name of user * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -6090,7 +6344,7 @@ export class UserApi extends BaseAPI { /** * * @summary Delete entity from users - * @param {string} userId key: id of user + * @param {string} userId key: id or name of user * @param {string} [ifMatch] ETag * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -6103,7 +6357,7 @@ export class UserApi extends BaseAPI { /** * * @summary Get entity from users by key - * @param {string} userId key: id of user + * @param {string} userId key: id or name of user * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -6437,18 +6691,15 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration /** * * @summary Get entities from users - * @param {number} [$top] Show only the first n items - * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter items by property values - * @param {boolean} [$count] Include count of items + * @param {string} [$filter] Filter users by property values and relationship attributes * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listUsers: async ($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options: AxiosRequestConfig = {}): Promise => { + listUsers: async ($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/users`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -6461,14 +6712,6 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration const localVarHeaderParameter = {} as any; const localVarQueryParameter = {} as any; - if ($top !== undefined) { - localVarQueryParameter['$top'] = $top; - } - - if ($skip !== undefined) { - localVarQueryParameter['$skip'] = $skip; - } - if ($search !== undefined) { localVarQueryParameter['$search'] = $search; } @@ -6477,10 +6720,6 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['$filter'] = $filter; } - if ($count !== undefined) { - localVarQueryParameter['$count'] = $count; - } - if ($orderby) { localVarQueryParameter['$orderby'] = Array.from($orderby).join(COLLECTION_FORMATS.csv); } @@ -6528,19 +6767,16 @@ export const UsersApiFp = function(configuration?: Configuration) { /** * * @summary Get entities from users - * @param {number} [$top] Show only the first n items - * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter items by property values - * @param {boolean} [$count] Include count of items + * @param {string} [$filter] Filter users by property values and relationship attributes * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.listUsers($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options); + async listUsers($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.listUsers($search, $filter, $orderby, $select, $expand, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, } @@ -6566,19 +6802,16 @@ export const UsersApiFactory = function (configuration?: Configuration, basePath /** * * @summary Get entities from users - * @param {number} [$top] Show only the first n items - * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter items by property values - * @param {boolean} [$count] Include count of items + * @param {string} [$filter] Filter users by property values and relationship attributes * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: any): AxiosPromise { - return localVarFp.listUsers($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(axios, basePath)); + listUsers($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: any): AxiosPromise { + return localVarFp.listUsers($search, $filter, $orderby, $select, $expand, options).then((request) => request(axios, basePath)); }, }; }; @@ -6605,11 +6838,8 @@ export class UsersApi extends BaseAPI { /** * * @summary Get entities from users - * @param {number} [$top] Show only the first n items - * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter items by property values - * @param {boolean} [$count] Include count of items + * @param {string} [$filter] Filter users by property values and relationship attributes * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities @@ -6617,8 +6847,8 @@ export class UsersApi extends BaseAPI { * @throws {RequiredError} * @memberof UsersApi */ - public listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig) { - return UsersApiFp(this.configuration).listUsers($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath)); + public listUsers($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig) { + return UsersApiFp(this.configuration).listUsers($search, $filter, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath)); } } diff --git a/packages/web-client/src/generated/base.ts b/packages/web-client/src/generated/base.ts index 6828d4a6701..32f1ee9b078 100644 --- a/packages/web-client/src/generated/base.ts +++ b/packages/web-client/src/generated/base.ts @@ -2,7 +2,7 @@ /* eslint-disable */ /** * Libre Graph API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * Libre Graph is a free API for cloud collaboration inspired by the MS Graph API. * * The version of the OpenAPI document: v1.0.1 * diff --git a/packages/web-client/src/generated/common.ts b/packages/web-client/src/generated/common.ts index 6426e0f3f03..1b3858aaab9 100644 --- a/packages/web-client/src/generated/common.ts +++ b/packages/web-client/src/generated/common.ts @@ -2,7 +2,7 @@ /* eslint-disable */ /** * Libre Graph API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * Libre Graph is a free API for cloud collaboration inspired by the MS Graph API. * * The version of the OpenAPI document: v1.0.1 * diff --git a/packages/web-client/src/generated/configuration.ts b/packages/web-client/src/generated/configuration.ts index 592d03e1da6..558b025d902 100644 --- a/packages/web-client/src/generated/configuration.ts +++ b/packages/web-client/src/generated/configuration.ts @@ -2,7 +2,7 @@ /* eslint-disable */ /** * Libre Graph API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * Libre Graph is a free API for cloud collaboration inspired by the MS Graph API. * * The version of the OpenAPI document: v1.0.1 * diff --git a/packages/web-client/src/generated/index.ts b/packages/web-client/src/generated/index.ts index 2ea8cb510aa..226d69950ca 100644 --- a/packages/web-client/src/generated/index.ts +++ b/packages/web-client/src/generated/index.ts @@ -2,7 +2,7 @@ /* eslint-disable */ /** * Libre Graph API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * Libre Graph is a free API for cloud collaboration inspired by the MS Graph API. * * The version of the OpenAPI document: v1.0.1 * From 25a2d139117f26bb6535b129f6bae2d87a465070 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 7 Mar 2023 14:53:17 +0100 Subject: [PATCH 02/16] Enhancements --- .../src/components/Users/GroupsModal.vue | 57 ++ .../src/mixins/users/addToGroups.ts | 25 + .../src/mixins/users/removeFromGroups.ts | 25 + .../src/views/Users.vue | 161 ++- .../src/generated/.openapi-generator/VERSION | 2 +- packages/web-client/src/generated/api.ts | 596 ++++------- packages/web-client/src/generated/base.ts | 2 +- packages/web-client/src/generated/common.ts | 2 +- .../web-client/src/generated/configuration.ts | 2 +- packages/web-client/src/generated/index.ts | 2 +- pnpm-lock.yaml | 939 +++++++++++++++++- 11 files changed, 1348 insertions(+), 465 deletions(-) create mode 100644 packages/web-app-admin-settings/src/mixins/users/addToGroups.ts create mode 100644 packages/web-app-admin-settings/src/mixins/users/removeFromGroups.ts diff --git a/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue b/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue index e69de29bb2d..c99bf5edd35 100644 --- a/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue +++ b/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue @@ -0,0 +1,57 @@ + + + diff --git a/packages/web-app-admin-settings/src/mixins/users/addToGroups.ts b/packages/web-app-admin-settings/src/mixins/users/addToGroups.ts new file mode 100644 index 00000000000..09501eb908e --- /dev/null +++ b/packages/web-app-admin-settings/src/mixins/users/addToGroups.ts @@ -0,0 +1,25 @@ +import { eventBus } from 'web-pkg/src/services/eventBus' +import { computed, Ref } from 'vue' +import { useGettext } from 'vue3-gettext' + +export const useAddToGroups = (): { actions: Ref } => { + const { $gettext } = useGettext() + + const actions = computed((): unknown[] => [ + { + name: 'add-to-groups', + icon: 'add', + componentType: 'button', + class: 'oc-users-actions-add-to-groups-trigger', + label: () => $gettext('Add to groups'), + isEnabled: ({ resources }) => resources.length > 0, + handler() { + eventBus.publish('app.admin-settings.users.actions.add-to-groups') + } + } + ]) + + return { + actions + } +} diff --git a/packages/web-app-admin-settings/src/mixins/users/removeFromGroups.ts b/packages/web-app-admin-settings/src/mixins/users/removeFromGroups.ts new file mode 100644 index 00000000000..3a42ff16cbb --- /dev/null +++ b/packages/web-app-admin-settings/src/mixins/users/removeFromGroups.ts @@ -0,0 +1,25 @@ +import { eventBus } from 'web-pkg/src/services/eventBus' +import { computed, Ref } from 'vue' +import { useGettext } from 'vue3-gettext' + +export const useRemoveFromGroups = (): { actions: Ref } => { + const { $gettext } = useGettext() + + const actions = computed((): unknown[] => [ + { + name: 'remove-users-from-groups', + icon: 'subtract', + componentType: 'button', + class: 'oc-users-actions-remove-from-groups-trigger', + label: () => $gettext('Remove from groups'), + isEnabled: ({ resources }) => resources.length > 0, + handler() { + eventBus.publish('app.admin-settings.users.actions.remove-from-groups') + } + } + ]) + + return { + actions + } +} diff --git a/packages/web-app-admin-settings/src/views/Users.vue b/packages/web-app-admin-settings/src/views/Users.vue index 1228dc81942..2467c499dde 100644 --- a/packages/web-app-admin-settings/src/views/Users.vue +++ b/packages/web-app-admin-settings/src/views/Users.vue @@ -99,6 +99,30 @@ + + { - return [...instance.$_delete_items, ...instance.$_editQuota_items].filter((item) => - item.isEnabled({ resources: unref(selectedUsers) }) - ) + return [ + ...instance.$_delete_items, + ...instance.$_editQuota_items, + ...unref(addToGroupsActions), + ...unref(removeFromGroupsActions) + ].filter((item) => item.isEnabled({ resources: unref(selectedUsers) })) }) onMounted(async () => { @@ -322,6 +362,9 @@ export default defineComponent({ loadResourcesTask.perform() selectedUsers.value = [] }) + + calculateListHeaderPosition() + userUpdatedEventToken = eventBus.subscribe( 'app.admin-settings.users.user.updated', (updatedUser) => { @@ -329,13 +372,32 @@ export default defineComponent({ loadedUser.value = updatedUser } ) - calculateListHeaderPosition() + addToGroupsActionEventToken = eventBus.subscribe( + 'app.admin-settings.users.actions.add-to-groups', + () => { + addToGroupsModalIsOpen.value = true + } + ) + removeFromGroupsActionEventToken = eventBus.subscribe( + 'app.admin-settings.users.actions.remove-from-groups', + () => { + removeFromGroupsModalIsOpen.value = true + } + ) window.addEventListener('resize', calculateListHeaderPosition) }) onBeforeUnmount(() => { eventBus.unsubscribe('app.admin-settings.list.load', loadResourcesEventToken) eventBus.unsubscribe('app.admin-settings.users.user.updated', userUpdatedEventToken) + eventBus.unsubscribe( + 'app.admin-settings.users.actions.add-to-groups', + addToGroupsActionEventToken + ) + eventBus.unsubscribe( + 'app.admin-settings.users.actions.remove-from-groups', + removeFromGroupsActionEventToken + ) }) const quotaModalIsOpen = computed(() => instance.$data.$_editQuota_modalOpen) @@ -346,6 +408,84 @@ export default defineComponent({ instance.$data.$_editQuota_selectedSpace.spaceQuota = quota } + const addUsersToGroups = async ({ users, groups }) => { + try { + const usersToFetch = [] + const addUsersToGroupsRequests = [] + groups.reduce((acc, group) => { + for (const user of users) { + if (!user.memberOf.find((userGroup) => userGroup.id === group.id)) { + acc.push( + unref(graphClient).groups.addMember( + group.id, + user.id, + configurationManager.serverUrl + ) + ) + if (!usersToFetch.includes(user.id)) { + usersToFetch.push(user.id) + } + } + } + return acc + }, addUsersToGroupsRequests) + await Promise.all(addUsersToGroupsRequests) + const usersResponse = await Promise.all( + usersToFetch.map((userId) => unref(graphClient).users.getUser(userId)) + ) + for (const { data: updatedUser } of usersResponse) { + const userIndex = unref(users).findIndex((user) => user.id === updatedUser.id) + unref(users)[userIndex] = updatedUser + } + await store.dispatch('showMessage', { + title: $gettext('Users were added to groups successfully') + }) + addToGroupsModalIsOpen.value = false + } catch (e) { + console.error(e) + await store.dispatch('showMessage', { + title: $gettext('Failed add users to group'), + status: 'danger' + }) + } + } + + const removeUsersFromGroups = async ({ users, groups }) => { + try { + const usersToFetch = [] + const removeUsersToGroupsRequests = [] + groups.reduce((acc, group) => { + for (const user of users) { + if (user.memberOf.find((userGroup) => userGroup.id === group.id)) { + acc.push(unref(graphClient).groups.deleteMember(group.id, user.id)) + if (!usersToFetch.includes(user.id)) { + usersToFetch.push(user.id) + } + } + } + return acc + }, removeUsersToGroupsRequests) + await Promise.all(removeUsersToGroupsRequests) + const usersResponse = await Promise.all( + usersToFetch.map((userId) => unref(graphClient).users.getUser(userId)) + ) + for (const { data: updatedUser } of usersResponse) { + const userIndex = unref(users).findIndex((user) => user.id === updatedUser.id) + unref(users)[userIndex] = updatedUser + } + await store.dispatch('showMessage', { + title: $gettext('Users were removed from groups successfully') + }) + removeFromGroupsModalIsOpen.value = false + } catch (e) { + console.error(e) + await store.dispatch('showMessage', { + title: $gettext('Failed remove users from group'), + status: 'danger' + }) + } + } + return { ...useSideBar(), maxQuota: useCapabilitySpacesMaxQuota(), @@ -362,17 +502,20 @@ export default defineComponent({ accessToken, listHeaderPosition, createUserModalOpen, + addToGroupsModalIsOpen, + removeFromGroupsModalIsOpen, batchActions, filterGroups, filterRoles, quotaModalIsOpen, closeQuotaModal, spaceQuotaUpdated, - selectedPersonalDrives + selectedPersonalDrives, + addUsersToGroups, + removeUsersFromGroups } }, computed: { - ...mapGetters(['configuration']), ...mapState({ currentUser: 'user' }), selectedUsersText() { @@ -543,7 +686,7 @@ export default defineComponent({ for (const groupToAdd of groupsToAdd) { requests.push( - this.graphClient.groups.addMember(groupToAdd.id, user.id, this.configuration.server) + this.graphClient.groups.addMember(groupToAdd.id, user.id, configurationManager.serverUrl) ) } for (const groupToDelete of groupsToDelete) { diff --git a/packages/web-client/src/generated/.openapi-generator/VERSION b/packages/web-client/src/generated/.openapi-generator/VERSION index 7f4d792ec2c..d6b4ec4aa78 100644 --- a/packages/web-client/src/generated/.openapi-generator/VERSION +++ b/packages/web-client/src/generated/.openapi-generator/VERSION @@ -1 +1 @@ -6.5.0-SNAPSHOT \ No newline at end of file +6.3.0-SNAPSHOT \ No newline at end of file diff --git a/packages/web-client/src/generated/api.ts b/packages/web-client/src/generated/api.ts index 0728d362196..97a39656876 100644 --- a/packages/web-client/src/generated/api.ts +++ b/packages/web-client/src/generated/api.ts @@ -2,7 +2,7 @@ /* eslint-disable */ /** * Libre Graph API - * Libre Graph is a free API for cloud collaboration inspired by the MS Graph API. + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * * The version of the OpenAPI document: v1.0.1 * @@ -166,19 +166,6 @@ export interface ClassReference { */ '@odata.id'?: string; } -/** - * - * @export - * @interface ClassTeacherReference - */ -export interface ClassTeacherReference { - /** - * - * @type {string} - * @memberof ClassTeacherReference - */ - '@odata.id'?: string; -} /** * * @export @@ -702,13 +689,13 @@ export interface EducationClass { */ 'id'?: string; /** - * An optional description for the group. Returned by default. + * An optional description for the group. Returned by default. Supports $filter (eq, ne, not, ge, le, startsWith) and $search. * @type {string} * @memberof EducationClass */ 'description'?: string; /** - * The display name for the group. This property is required when a group is created and cannot be cleared during updates. Returned by default. Supports $search and $orderBy. + * The display name for the group. This property is required when a group is created and cannot be cleared during updates. Returned by default. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values), $search, and $orderBy. * @type {string} * @memberof EducationClass */ @@ -809,7 +796,7 @@ export interface EducationUser { */ 'accountEnabled'?: boolean; /** - * The name displayed in the address book for the user. This value is usually the combination of the user\'s first name, middle initial, and last name. This property is required when a user is created and it cannot be cleared during updates. Returned by default. Supports $orderby. + * The name displayed in the address book for the user. This value is usually the combination of the user\'s first name, middle initial, and last name. This property is required when a user is created and it cannot be cleared during updates. Returned by default. Supports $filter and $orderby. * @type {string} * @memberof EducationUser */ @@ -833,7 +820,7 @@ export interface EducationUser { */ 'identities'?: Array; /** - * The SMTP address for the user, for example, \'jeff@contoso.onowncloud.com\'. Returned by default. + * The SMTP address for the user, for example, \'jeff@contoso.onowncloud.com\'. Returned by default. Supports $filter and endsWith. * @type {string} * @memberof EducationUser */ @@ -857,13 +844,13 @@ export interface EducationUser { */ 'passwordProfile'?: PasswordProfile; /** - * The user\'s surname (family name or last name). Returned by default. + * The user\'s surname (family name or last name). Returned by default. Supports $filter. * @type {string} * @memberof EducationUser */ 'surname'?: string; /** - * The user\'s givenName. Returned by default. + * The user\'s givenName. Returned by default. Supports $filter. * @type {string} * @memberof EducationUser */ @@ -983,13 +970,13 @@ export interface Group { */ 'id'?: string; /** - * An optional description for the group. Returned by default. + * An optional description for the group. Returned by default. Supports $filter (eq, ne, not, ge, le, startsWith) and $search. * @type {string} * @memberof Group */ 'description'?: string; /** - * The display name for the group. This property is required when a group is created and cannot be cleared during updates. Returned by default. Supports $search and $orderBy. + * The display name for the group. This property is required when a group is created and cannot be cleared during updates. Returned by default. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values), $search, and $orderBy. * @type {string} * @memberof Group */ @@ -1326,12 +1313,6 @@ export interface PasswordProfile { * @interface Permission */ export interface Permission { - /** - * An optional expiration date which limits the permission in time. - * @type {string} - * @memberof Permission - */ - 'expirationDateTime'?: string; /** * * @type {Array} @@ -1623,7 +1604,7 @@ export interface User { */ 'appRoleAssignments'?: Array; /** - * The name displayed in the address book for the user. This value is usually the combination of the user\'s first name, middle initial, and last name. This property is required when a user is created and it cannot be cleared during updates. Returned by default. Supports $orderby. + * The name displayed in the address book for the user. This value is usually the combination of the user\'s first name, middle initial, and last name. This property is required when a user is created and it cannot be cleared during updates. Returned by default. Supports $filter and $orderby. * @type {string} * @memberof User */ @@ -1647,7 +1628,7 @@ export interface User { */ 'identities'?: Array; /** - * The SMTP address for the user, for example, \'jeff@contoso.onowncloud.com\'. Returned by default. + * The SMTP address for the user, for example, \'jeff@contoso.onowncloud.com\'. Returned by default. Supports $filter and endsWith. * @type {string} * @memberof User */ @@ -1671,13 +1652,13 @@ export interface User { */ 'passwordProfile'?: PasswordProfile; /** - * The user\'s surname (family name or last name). Returned by default. + * The user\'s surname (family name or last name). Returned by default. Supports $filter. * @type {string} * @memberof User */ 'surname'?: string; /** - * The user\'s givenName. Returned by default. + * The user\'s givenName. Returned by default. Supports $filter. * @type {string} * @memberof User */ @@ -2402,7 +2383,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Assign a user to a class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {ClassMemberReference} classMemberReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2486,7 +2467,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Delete education class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2524,8 +2505,8 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Unassign user from a class - * @param {string} classId key: id or externalId of class - * @param {string} userId key: id or username of the user to unassign from class + * @param {string} classId key: id of class + * @param {string} userId key: id of the user to unassign from class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2566,7 +2547,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Get class by key - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2604,7 +2585,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2676,7 +2657,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf /** * * @summary Update properties of a education class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {EducationClass} educationClass New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2730,7 +2711,7 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Assign a user to a class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {ClassMemberReference} classMemberReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2753,7 +2734,7 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Delete education class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2764,8 +2745,8 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Unassign user from a class - * @param {string} classId key: id or externalId of class - * @param {string} userId key: id or username of the user to unassign from class + * @param {string} classId key: id of class + * @param {string} userId key: id of the user to unassign from class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2776,7 +2757,7 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Get class by key - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2787,7 +2768,7 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2808,7 +2789,7 @@ export const EducationClassApiFp = function(configuration?: Configuration) { /** * * @summary Update properties of a education class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {EducationClass} educationClass New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2830,7 +2811,7 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Assign a user to a class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {ClassMemberReference} classMemberReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2851,7 +2832,7 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Delete education class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2861,8 +2842,8 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Unassign user from a class - * @param {string} classId key: id or externalId of class - * @param {string} userId key: id or username of the user to unassign from class + * @param {string} classId key: id of class + * @param {string} userId key: id of the user to unassign from class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2872,7 +2853,7 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Get class by key - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2882,7 +2863,7 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -2901,7 +2882,7 @@ export const EducationClassApiFactory = function (configuration?: Configuration, /** * * @summary Update properties of a education class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {EducationClass} educationClass New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2922,7 +2903,7 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Assign a user to a class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {ClassMemberReference} classMemberReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -2947,7 +2928,7 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Delete education class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationClassApi @@ -2959,8 +2940,8 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Unassign user from a class - * @param {string} classId key: id or externalId of class - * @param {string} userId key: id or username of the user to unassign from class + * @param {string} classId key: id of class + * @param {string} userId key: id of the user to unassign from class * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationClassApi @@ -2972,7 +2953,7 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Get class by key - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationClassApi @@ -2984,7 +2965,7 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationClassApi @@ -3007,7 +2988,7 @@ export class EducationClassApi extends BaseAPI { /** * * @summary Update properties of a education class - * @param {string} classId key: id or externalId of class + * @param {string} classId key: id of class * @param {EducationClass} educationClass New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3019,273 +3000,6 @@ export class EducationClassApi extends BaseAPI { } -/** - * EducationClassTeachersApi - axios parameter creator - * @export - */ -export const EducationClassTeachersApiAxiosParamCreator = function (configuration?: Configuration) { - return { - /** - * - * @summary Assign a teacher to a class - * @param {string} classId key: id or externalId of class - * @param {ClassTeacherReference} classTeacherReference educationUser to be added as teacher - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - addTeacherToClass: async (classId: string, classTeacherReference: ClassTeacherReference, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'classId' is not null or undefined - assertParamExists('addTeacherToClass', 'classId', classId) - // verify required parameter 'classTeacherReference' is not null or undefined - assertParamExists('addTeacherToClass', 'classTeacherReference', classTeacherReference) - const localVarPath = `/education/classes/{class-id}/teachers/$ref` - .replace(`{${"class-id"}}`, encodeURIComponent(String(classId))); - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - // authentication bearerAuth required - // http bearer authentication required - await setBearerAuthToObject(localVarHeaderParameter, configuration) - - - - localVarHeaderParameter['Content-Type'] = 'application/json'; - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - localVarRequestOptions.data = serializeDataIfNeeded(classTeacherReference, localVarRequestOptions, configuration) - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @summary Unassign user as teacher of a class - * @param {string} classId key: id or externalId of class - * @param {string} userId key: id or username of the user to unassign as teacher - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - deleteTeacherFromClass: async (classId: string, userId: string, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'classId' is not null or undefined - assertParamExists('deleteTeacherFromClass', 'classId', classId) - // verify required parameter 'userId' is not null or undefined - assertParamExists('deleteTeacherFromClass', 'userId', userId) - const localVarPath = `/education/classes/{class-id}/teachers/{user-id}/$ref` - .replace(`{${"class-id"}}`, encodeURIComponent(String(classId))) - .replace(`{${"user-id"}}`, encodeURIComponent(String(userId))); - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'DELETE', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - // authentication bearerAuth required - // http bearer authentication required - await setBearerAuthToObject(localVarHeaderParameter, configuration) - - - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - /** - * - * @summary Get the teachers for a class - * @param {string} classId key: id or externalId of class - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - getTeachers: async (classId: string, options: AxiosRequestConfig = {}): Promise => { - // verify required parameter 'classId' is not null or undefined - assertParamExists('getTeachers', 'classId', classId) - const localVarPath = `/education/classes/{class-id}/teachers` - .replace(`{${"class-id"}}`, encodeURIComponent(String(classId))); - // use dummy base URL string because the URL constructor only accepts absolute URLs. - const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); - let baseOptions; - if (configuration) { - baseOptions = configuration.baseOptions; - } - - const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options}; - const localVarHeaderParameter = {} as any; - const localVarQueryParameter = {} as any; - - // authentication bearerAuth required - // http bearer authentication required - await setBearerAuthToObject(localVarHeaderParameter, configuration) - - - - setSearchParams(localVarUrlObj, localVarQueryParameter); - let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {}; - localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers}; - - return { - url: toPathString(localVarUrlObj), - options: localVarRequestOptions, - }; - }, - } -}; - -/** - * EducationClassTeachersApi - functional programming interface - * @export - */ -export const EducationClassTeachersApiFp = function(configuration?: Configuration) { - const localVarAxiosParamCreator = EducationClassTeachersApiAxiosParamCreator(configuration) - return { - /** - * - * @summary Assign a teacher to a class - * @param {string} classId key: id or externalId of class - * @param {ClassTeacherReference} classTeacherReference educationUser to be added as teacher - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async addTeacherToClass(classId: string, classTeacherReference: ClassTeacherReference, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.addTeacherToClass(classId, classTeacherReference, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, - /** - * - * @summary Unassign user as teacher of a class - * @param {string} classId key: id or externalId of class - * @param {string} userId key: id or username of the user to unassign as teacher - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async deleteTeacherFromClass(classId: string, userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.deleteTeacherFromClass(classId, userId, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, - /** - * - * @summary Get the teachers for a class - * @param {string} classId key: id or externalId of class - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - async getTeachers(classId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.getTeachers(classId, options); - return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); - }, - } -}; - -/** - * EducationClassTeachersApi - factory interface - * @export - */ -export const EducationClassTeachersApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) { - const localVarFp = EducationClassTeachersApiFp(configuration) - return { - /** - * - * @summary Assign a teacher to a class - * @param {string} classId key: id or externalId of class - * @param {ClassTeacherReference} classTeacherReference educationUser to be added as teacher - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - addTeacherToClass(classId: string, classTeacherReference: ClassTeacherReference, options?: any): AxiosPromise { - return localVarFp.addTeacherToClass(classId, classTeacherReference, options).then((request) => request(axios, basePath)); - }, - /** - * - * @summary Unassign user as teacher of a class - * @param {string} classId key: id or externalId of class - * @param {string} userId key: id or username of the user to unassign as teacher - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - deleteTeacherFromClass(classId: string, userId: string, options?: any): AxiosPromise { - return localVarFp.deleteTeacherFromClass(classId, userId, options).then((request) => request(axios, basePath)); - }, - /** - * - * @summary Get the teachers for a class - * @param {string} classId key: id or externalId of class - * @param {*} [options] Override http request option. - * @throws {RequiredError} - */ - getTeachers(classId: string, options?: any): AxiosPromise { - return localVarFp.getTeachers(classId, options).then((request) => request(axios, basePath)); - }, - }; -}; - -/** - * EducationClassTeachersApi - object-oriented interface - * @export - * @class EducationClassTeachersApi - * @extends {BaseAPI} - */ -export class EducationClassTeachersApi extends BaseAPI { - /** - * - * @summary Assign a teacher to a class - * @param {string} classId key: id or externalId of class - * @param {ClassTeacherReference} classTeacherReference educationUser to be added as teacher - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof EducationClassTeachersApi - */ - public addTeacherToClass(classId: string, classTeacherReference: ClassTeacherReference, options?: AxiosRequestConfig) { - return EducationClassTeachersApiFp(this.configuration).addTeacherToClass(classId, classTeacherReference, options).then((request) => request(this.axios, this.basePath)); - } - - /** - * - * @summary Unassign user as teacher of a class - * @param {string} classId key: id or externalId of class - * @param {string} userId key: id or username of the user to unassign as teacher - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof EducationClassTeachersApi - */ - public deleteTeacherFromClass(classId: string, userId: string, options?: AxiosRequestConfig) { - return EducationClassTeachersApiFp(this.configuration).deleteTeacherFromClass(classId, userId, options).then((request) => request(this.axios, this.basePath)); - } - - /** - * - * @summary Get the teachers for a class - * @param {string} classId key: id or externalId of class - * @param {*} [options] Override http request option. - * @throws {RequiredError} - * @memberof EducationClassTeachersApi - */ - public getTeachers(classId: string, options?: AxiosRequestConfig) { - return EducationClassTeachersApiFp(this.configuration).getTeachers(classId, options).then((request) => request(this.axios, this.basePath)); - } -} - - /** * EducationSchoolApi - axios parameter creator * @export @@ -3295,7 +3009,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Assign a class to a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {ClassReference} classReference educationClass to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3339,7 +3053,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Assign a user to a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {EducationUserReference} educationUserReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3423,8 +3137,8 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Unassign class from a school - * @param {string} schoolId key: id or schoolNumber of school - * @param {string} classId key: id or externalId of the class to unassign from school + * @param {string} schoolId key: id of school + * @param {string} classId key: id of the class to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3465,7 +3179,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Delete school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3503,8 +3217,8 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Unassign user from a school - * @param {string} schoolId key: id or schoolNumber of school - * @param {string} userId key: id or username of the user to unassign from school + * @param {string} schoolId key: id of school + * @param {string} userId key: id of the user to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3545,7 +3259,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Get the properties of a specific school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3583,7 +3297,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3621,7 +3335,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Get the educationUser resources associated with an educationSchool - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3693,7 +3407,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con /** * * @summary Update properties of a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {EducationSchool} educationSchool New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3747,7 +3461,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Assign a class to a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {ClassReference} classReference educationClass to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3759,7 +3473,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Assign a user to a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {EducationUserReference} educationUserReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3782,8 +3496,8 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Unassign class from a school - * @param {string} schoolId key: id or schoolNumber of school - * @param {string} classId key: id or externalId of the class to unassign from school + * @param {string} schoolId key: id of school + * @param {string} classId key: id of the class to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3794,7 +3508,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Delete school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3805,8 +3519,8 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Unassign user from a school - * @param {string} schoolId key: id or schoolNumber of school - * @param {string} userId key: id or username of the user to unassign from school + * @param {string} schoolId key: id of school + * @param {string} userId key: id of the user to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3817,7 +3531,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Get the properties of a specific school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3828,7 +3542,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3839,7 +3553,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Get the educationUser resources associated with an educationSchool - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3860,7 +3574,7 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) { /** * * @summary Update properties of a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {EducationSchool} educationSchool New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3882,7 +3596,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Assign a class to a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {ClassReference} classReference educationClass to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3893,7 +3607,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Assign a user to a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {EducationUserReference} educationUserReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -3914,8 +3628,8 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Unassign class from a school - * @param {string} schoolId key: id or schoolNumber of school - * @param {string} classId key: id or externalId of the class to unassign from school + * @param {string} schoolId key: id of school + * @param {string} classId key: id of the class to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3925,7 +3639,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Delete school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3935,8 +3649,8 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Unassign user from a school - * @param {string} schoolId key: id or schoolNumber of school - * @param {string} userId key: id or username of the user to unassign from school + * @param {string} schoolId key: id of school + * @param {string} userId key: id of the user to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3946,7 +3660,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Get the properties of a specific school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3956,7 +3670,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3966,7 +3680,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Get the educationUser resources associated with an educationSchool - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -3985,7 +3699,7 @@ export const EducationSchoolApiFactory = function (configuration?: Configuration /** * * @summary Update properties of a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {EducationSchool} educationSchool New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4006,7 +3720,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Assign a class to a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {ClassReference} classReference educationClass to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4019,7 +3733,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Assign a user to a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {EducationUserReference} educationUserReference educationUser to be added as member * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4044,8 +3758,8 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Unassign class from a school - * @param {string} schoolId key: id or schoolNumber of school - * @param {string} classId key: id or externalId of the class to unassign from school + * @param {string} schoolId key: id of school + * @param {string} classId key: id of the class to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -4057,7 +3771,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Delete school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -4069,8 +3783,8 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Unassign user from a school - * @param {string} schoolId key: id or schoolNumber of school - * @param {string} userId key: id or username of the user to unassign from school + * @param {string} schoolId key: id of school + * @param {string} userId key: id of the user to unassign from school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -4082,7 +3796,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Get the properties of a specific school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -4094,7 +3808,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Get the educationClass resources owned by an educationSchool - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -4106,7 +3820,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Get the educationUser resources associated with an educationSchool - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationSchoolApi @@ -4129,7 +3843,7 @@ export class EducationSchoolApi extends BaseAPI { /** * * @summary Update properties of a school - * @param {string} schoolId key: id or schoolNumber of school + * @param {string} schoolId key: id of school * @param {EducationSchool} educationSchool New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4190,7 +3904,7 @@ export const EducationUserApiAxiosParamCreator = function (configuration?: Confi /** * * @summary Delete educationUser - * @param {string} userId key: id or username of user + * @param {string} userId key: id of user * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4315,7 +4029,7 @@ export const EducationUserApiAxiosParamCreator = function (configuration?: Confi /** * * @summary Update properties of educationUser - * @param {string} userId key: id or username of user + * @param {string} userId key: id of user * @param {EducationUser} educationUser New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4380,7 +4094,7 @@ export const EducationUserApiFp = function(configuration?: Configuration) { /** * * @summary Delete educationUser - * @param {string} userId key: id or username of user + * @param {string} userId key: id of user * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4415,7 +4129,7 @@ export const EducationUserApiFp = function(configuration?: Configuration) { /** * * @summary Update properties of educationUser - * @param {string} userId key: id or username of user + * @param {string} userId key: id of user * @param {EducationUser} educationUser New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4447,7 +4161,7 @@ export const EducationUserApiFactory = function (configuration?: Configuration, /** * * @summary Delete educationUser - * @param {string} userId key: id or username of user + * @param {string} userId key: id of user * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4479,7 +4193,7 @@ export const EducationUserApiFactory = function (configuration?: Configuration, /** * * @summary Update properties of educationUser - * @param {string} userId key: id or username of user + * @param {string} userId key: id of user * @param {EducationUser} educationUser New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4512,7 +4226,7 @@ export class EducationUserApi extends BaseAPI { /** * * @summary Delete educationUser - * @param {string} userId key: id or username of user + * @param {string} userId key: id of user * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof EducationUserApi @@ -4550,7 +4264,7 @@ export class EducationUserApi extends BaseAPI { /** * * @summary Update properties of educationUser - * @param {string} userId key: id or username of user + * @param {string} userId key: id of user * @param {EducationUser} educationUser New property values * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4693,7 +4407,7 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration /** * * @summary Get entity from groups by key - * @param {string} groupId key: id or name of group + * @param {string} groupId key: id of group * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -4737,7 +4451,7 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration /** * * @summary Get a list of the group\'s direct members - * @param {string} groupId key: id or name of group + * @param {string} groupId key: id of group * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4858,7 +4572,7 @@ export const GroupApiFp = function(configuration?: Configuration) { /** * * @summary Get entity from groups by key - * @param {string} groupId key: id or name of group + * @param {string} groupId key: id of group * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -4871,7 +4585,7 @@ export const GroupApiFp = function(configuration?: Configuration) { /** * * @summary Get a list of the group\'s direct members - * @param {string} groupId key: id or name of group + * @param {string} groupId key: id of group * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -4938,7 +4652,7 @@ export const GroupApiFactory = function (configuration?: Configuration, basePath /** * * @summary Get entity from groups by key - * @param {string} groupId key: id or name of group + * @param {string} groupId key: id of group * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -4950,7 +4664,7 @@ export const GroupApiFactory = function (configuration?: Configuration, basePath /** * * @summary Get a list of the group\'s direct members - * @param {string} groupId key: id or name of group + * @param {string} groupId key: id of group * @param {*} [options] Override http request option. * @throws {RequiredError} */ @@ -5021,7 +4735,7 @@ export class GroupApi extends BaseAPI { /** * * @summary Get entity from groups by key - * @param {string} groupId key: id or name of group + * @param {string} groupId key: id of group * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -5035,7 +4749,7 @@ export class GroupApi extends BaseAPI { /** * * @summary Get a list of the group\'s direct members - * @param {string} groupId key: id or name of group + * @param {string} groupId key: id of group * @param {*} [options] Override http request option. * @throws {RequiredError} * @memberof GroupApi @@ -5104,14 +4818,18 @@ export const GroupsApiAxiosParamCreator = function (configuration?: Configuratio /** * * @summary Get entities from groups + * @param {number} [$top] Show only the first n items + * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases + * @param {string} [$filter] Filter items by property values + * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listGroups: async ($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options: AxiosRequestConfig = {}): Promise => { + listGroups: async ($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/groups`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -5124,10 +4842,26 @@ export const GroupsApiAxiosParamCreator = function (configuration?: Configuratio const localVarHeaderParameter = {} as any; const localVarQueryParameter = {} as any; + if ($top !== undefined) { + localVarQueryParameter['$top'] = $top; + } + + if ($skip !== undefined) { + localVarQueryParameter['$skip'] = $skip; + } + if ($search !== undefined) { localVarQueryParameter['$search'] = $search; } + if ($filter !== undefined) { + localVarQueryParameter['$filter'] = $filter; + } + + if ($count !== undefined) { + localVarQueryParameter['$count'] = $count; + } + if ($orderby) { localVarQueryParameter['$orderby'] = Array.from($orderby).join(COLLECTION_FORMATS.csv); } @@ -5175,15 +4909,19 @@ export const GroupsApiFp = function(configuration?: Configuration) { /** * * @summary Get entities from groups + * @param {number} [$top] Show only the first n items + * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases + * @param {string} [$filter] Filter items by property values + * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async listGroups($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.listGroups($search, $orderby, $select, $expand, options); + async listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.listGroups($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, } @@ -5209,15 +4947,19 @@ export const GroupsApiFactory = function (configuration?: Configuration, basePat /** * * @summary Get entities from groups + * @param {number} [$top] Show only the first n items + * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases + * @param {string} [$filter] Filter items by property values + * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listGroups($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: any): AxiosPromise { - return localVarFp.listGroups($search, $orderby, $select, $expand, options).then((request) => request(axios, basePath)); + listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: any): AxiosPromise { + return localVarFp.listGroups($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(axios, basePath)); }, }; }; @@ -5244,7 +4986,11 @@ export class GroupsApi extends BaseAPI { /** * * @summary Get entities from groups + * @param {number} [$top] Show only the first n items + * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases + * @param {string} [$filter] Filter items by property values + * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned * @param {Set<'members'>} [$expand] Expand related entities @@ -5252,8 +4998,8 @@ export class GroupsApi extends BaseAPI { * @throws {RequiredError} * @memberof GroupsApi */ - public listGroups($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig) { - return GroupsApiFp(this.configuration).listGroups($search, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath)); + public listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig) { + return GroupsApiFp(this.configuration).listGroups($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath)); } } @@ -6120,7 +5866,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) /** * * @summary Delete entity from users - * @param {string} userId key: id or name of user + * @param {string} userId key: id of user * @param {string} [ifMatch] ETag * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -6159,7 +5905,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration) /** * * @summary Get entity from users by key - * @param {string} userId key: id or name of user + * @param {string} userId key: id of user * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -6253,7 +5999,7 @@ export const UserApiFp = function(configuration?: Configuration) { /** * * @summary Delete entity from users - * @param {string} userId key: id or name of user + * @param {string} userId key: id of user * @param {string} [ifMatch] ETag * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -6265,7 +6011,7 @@ export const UserApiFp = function(configuration?: Configuration) { /** * * @summary Get entity from users by key - * @param {string} userId key: id or name of user + * @param {string} userId key: id of user * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -6300,7 +6046,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath? /** * * @summary Delete entity from users - * @param {string} userId key: id or name of user + * @param {string} userId key: id of user * @param {string} [ifMatch] ETag * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -6311,7 +6057,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath? /** * * @summary Get entity from users by key - * @param {string} userId key: id or name of user + * @param {string} userId key: id of user * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -6344,7 +6090,7 @@ export class UserApi extends BaseAPI { /** * * @summary Delete entity from users - * @param {string} userId key: id or name of user + * @param {string} userId key: id of user * @param {string} [ifMatch] ETag * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -6357,7 +6103,7 @@ export class UserApi extends BaseAPI { /** * * @summary Get entity from users by key - * @param {string} userId key: id or name of user + * @param {string} userId key: id of user * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. @@ -6691,15 +6437,18 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration /** * * @summary Get entities from users + * @param {number} [$top] Show only the first n items + * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter users by property values and relationship attributes + * @param {string} [$filter] Filter items by property values + * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listUsers: async ($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options: AxiosRequestConfig = {}): Promise => { + listUsers: async ($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options: AxiosRequestConfig = {}): Promise => { const localVarPath = `/users`; // use dummy base URL string because the URL constructor only accepts absolute URLs. const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL); @@ -6712,6 +6461,14 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration const localVarHeaderParameter = {} as any; const localVarQueryParameter = {} as any; + if ($top !== undefined) { + localVarQueryParameter['$top'] = $top; + } + + if ($skip !== undefined) { + localVarQueryParameter['$skip'] = $skip; + } + if ($search !== undefined) { localVarQueryParameter['$search'] = $search; } @@ -6720,6 +6477,10 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration localVarQueryParameter['$filter'] = $filter; } + if ($count !== undefined) { + localVarQueryParameter['$count'] = $count; + } + if ($orderby) { localVarQueryParameter['$orderby'] = Array.from($orderby).join(COLLECTION_FORMATS.csv); } @@ -6767,16 +6528,19 @@ export const UsersApiFp = function(configuration?: Configuration) { /** * * @summary Get entities from users + * @param {number} [$top] Show only the first n items + * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter users by property values and relationship attributes + * @param {string} [$filter] Filter items by property values + * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async listUsers($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { - const localVarAxiosArgs = await localVarAxiosParamCreator.listUsers($search, $filter, $orderby, $select, $expand, options); + async listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise> { + const localVarAxiosArgs = await localVarAxiosParamCreator.listUsers($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options); return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration); }, } @@ -6802,16 +6566,19 @@ export const UsersApiFactory = function (configuration?: Configuration, basePath /** * * @summary Get entities from users + * @param {number} [$top] Show only the first n items + * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter users by property values and relationship attributes + * @param {string} [$filter] Filter items by property values + * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities * @param {*} [options] Override http request option. * @throws {RequiredError} */ - listUsers($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: any): AxiosPromise { - return localVarFp.listUsers($search, $filter, $orderby, $select, $expand, options).then((request) => request(axios, basePath)); + listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: any): AxiosPromise { + return localVarFp.listUsers($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(axios, basePath)); }, }; }; @@ -6838,8 +6605,11 @@ export class UsersApi extends BaseAPI { /** * * @summary Get entities from users + * @param {number} [$top] Show only the first n items + * @param {number} [$skip] Skip the first n items * @param {string} [$search] Search items by search phrases - * @param {string} [$filter] Filter users by property values and relationship attributes + * @param {string} [$filter] Filter items by property values + * @param {boolean} [$count] Include count of items * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities @@ -6847,8 +6617,8 @@ export class UsersApi extends BaseAPI { * @throws {RequiredError} * @memberof UsersApi */ - public listUsers($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig) { - return UsersApiFp(this.configuration).listUsers($search, $filter, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath)); + public listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig) { + return UsersApiFp(this.configuration).listUsers($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath)); } } diff --git a/packages/web-client/src/generated/base.ts b/packages/web-client/src/generated/base.ts index 32f1ee9b078..6828d4a6701 100644 --- a/packages/web-client/src/generated/base.ts +++ b/packages/web-client/src/generated/base.ts @@ -2,7 +2,7 @@ /* eslint-disable */ /** * Libre Graph API - * Libre Graph is a free API for cloud collaboration inspired by the MS Graph API. + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * * The version of the OpenAPI document: v1.0.1 * diff --git a/packages/web-client/src/generated/common.ts b/packages/web-client/src/generated/common.ts index 1b3858aaab9..6426e0f3f03 100644 --- a/packages/web-client/src/generated/common.ts +++ b/packages/web-client/src/generated/common.ts @@ -2,7 +2,7 @@ /* eslint-disable */ /** * Libre Graph API - * Libre Graph is a free API for cloud collaboration inspired by the MS Graph API. + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * * The version of the OpenAPI document: v1.0.1 * diff --git a/packages/web-client/src/generated/configuration.ts b/packages/web-client/src/generated/configuration.ts index 558b025d902..592d03e1da6 100644 --- a/packages/web-client/src/generated/configuration.ts +++ b/packages/web-client/src/generated/configuration.ts @@ -2,7 +2,7 @@ /* eslint-disable */ /** * Libre Graph API - * Libre Graph is a free API for cloud collaboration inspired by the MS Graph API. + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * * The version of the OpenAPI document: v1.0.1 * diff --git a/packages/web-client/src/generated/index.ts b/packages/web-client/src/generated/index.ts index 226d69950ca..2ea8cb510aa 100644 --- a/packages/web-client/src/generated/index.ts +++ b/packages/web-client/src/generated/index.ts @@ -2,7 +2,7 @@ /* eslint-disable */ /** * Libre Graph API - * Libre Graph is a free API for cloud collaboration inspired by the MS Graph API. + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) * * The version of the OpenAPI document: v1.0.1 * diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8594f743437..1acd71ef185 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -393,14 +393,14 @@ importers: '@vitejs/plugin-vue': 4.0.0 rollup-plugin-node-polyfills: ^0.2.1 rollup-plugin-serve: ^2.0.2 - sass: 1.58.3 + sass: 1.58.0 vite: ^4.1.1 dependencies: '@vitejs/plugin-vue': 4.0.0_vite@4.1.1+vue@3.2.45 rollup-plugin-node-polyfills: 0.2.1 rollup-plugin-serve: 2.0.2 - sass: 1.58.3 - vite: 4.1.1_sass@1.58.3 + sass: 1.58.0 + vite: 4.1.1_sass@1.58.0 packages/prettier-config: specifiers: @@ -552,11 +552,15 @@ importers: packages/web-app-skeleton: specifiers: - web-app-search: workspace:* - web-pkg: workspace:@ownclouders/web-pkg@* - dependencies: - web-app-search: link:../web-app-search - web-pkg: link:../web-pkg + rollup: 3.9.1 + rollup-plugin-serve: 1.1.0 + rollup-plugin-vue: 5.1.9 + vue: 2.7.14 + devDependencies: + rollup: 3.9.1 + rollup-plugin-serve: 1.1.0 + rollup-plugin-vue: 5.1.9_msb4omfpi5xaaav7gpce3lwjli + vue: 2.7.14 packages/web-app-text-editor: specifiers: @@ -661,7 +665,7 @@ importers: uuid: ^9.0.0 vue: 3.2.45 vue-concurrency: 4.0.0 - vue-inline-svg: 3.1.2 + vue-inline-svg: 3.1.0 vue-router: 4.1.6 vue-select: 4.0.0-beta.6 vue3-gettext: ^2.3.3 @@ -709,7 +713,7 @@ importers: uuid: 9.0.0 vue: 3.2.45 vue-concurrency: 4.0.0_vue@3.2.45 - vue-inline-svg: 3.1.2_vue@3.2.45 + vue-inline-svg: 3.1.0_agvlx64p3fh52dmj7mriww4tnm_vue@3.2.45 vue-router: 4.1.6_vue@3.2.45 vue-select: 4.0.0-beta.6_vue@3.2.45 vue3-gettext: 2.3.4_tfvhctuaqmmqnirfl65c47tqwu @@ -6329,7 +6333,7 @@ packages: vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 4.1.1_sass@1.58.3 + vite: 4.1.1_sass@1.58.0 vue: 3.2.45 dev: false @@ -6449,6 +6453,144 @@ packages: '@vue/compiler-dom': 3.2.45 '@vue/shared': 3.2.45 + /@vue/component-compiler-utils/3.2.2: + resolution: {integrity: sha512-rAYMLmgMuqJFWAOb3Awjqqv5X3Q3hVr4jH/kgrFJpiU0j3a90tnNBplqbj+snzrgZhC9W128z+dtgMifOiMfJg==} + dependencies: + consolidate: 0.15.1 + hash-sum: 1.0.2 + lru-cache: 4.1.5 + merge-source-map: 1.1.0 + postcss: 7.0.36 + postcss-selector-parser: 6.0.11 + source-map: 0.6.1 + vue-template-es2015-compiler: 1.9.1 + optionalDependencies: + prettier: 1.19.1 + transitivePeerDependencies: + - arc-templates + - atpl + - babel-core + - bracket-template + - coffee-script + - dot + - dust + - dustjs-helpers + - dustjs-linkedin + - eco + - ect + - ejs + - haml-coffee + - hamlet + - hamljs + - handlebars + - hogan.js + - htmling + - jade + - jazz + - jqtpl + - just + - liquid-node + - liquor + - lodash + - marko + - mote + - mustache + - nunjucks + - plates + - pug + - qejs + - ractive + - razor-tmpl + - react + - react-dom + - slm + - squirrelly + - swig + - swig-templates + - teacup + - templayed + - then-jade + - then-pug + - tinyliquid + - toffee + - twig + - twing + - underscore + - vash + - velocityjs + - walrus + - whiskers + dev: true + + /@vue/component-compiler-utils/3.2.2_pug@3.0.2: + resolution: {integrity: sha512-rAYMLmgMuqJFWAOb3Awjqqv5X3Q3hVr4jH/kgrFJpiU0j3a90tnNBplqbj+snzrgZhC9W128z+dtgMifOiMfJg==} + dependencies: + consolidate: 0.15.1_pug@3.0.2 + hash-sum: 1.0.2 + lru-cache: 4.1.5 + merge-source-map: 1.1.0 + postcss: 7.0.36 + postcss-selector-parser: 6.0.11 + source-map: 0.6.1 + vue-template-es2015-compiler: 1.9.1 + optionalDependencies: + prettier: 1.19.1 + transitivePeerDependencies: + - arc-templates + - atpl + - babel-core + - bracket-template + - coffee-script + - dot + - dust + - dustjs-helpers + - dustjs-linkedin + - eco + - ect + - ejs + - haml-coffee + - hamlet + - hamljs + - handlebars + - hogan.js + - htmling + - jade + - jazz + - jqtpl + - just + - liquid-node + - liquor + - lodash + - marko + - mote + - mustache + - nunjucks + - plates + - pug + - qejs + - ractive + - razor-tmpl + - react + - react-dom + - slm + - squirrelly + - swig + - swig-templates + - teacup + - templayed + - then-jade + - then-pug + - tinyliquid + - toffee + - twig + - twing + - underscore + - vash + - velocityjs + - walrus + - whiskers + dev: true + /@vue/component-compiler-utils/3.2.2_sfyobadhz7cuvf7tkzqfswrxrq: resolution: {integrity: sha512-rAYMLmgMuqJFWAOb3Awjqqv5X3Q3hVr4jH/kgrFJpiU0j3a90tnNBplqbj+snzrgZhC9W128z+dtgMifOiMfJg==} dependencies: @@ -6518,6 +6660,80 @@ packages: - whiskers dev: true + /@vue/component-compiler/4.2.4_msb4omfpi5xaaav7gpce3lwjli: + resolution: {integrity: sha512-tFGw3h3+nxiqnyborwWQ+rUgKAwSFl0Sdg+BCZkWTyFfkEF5fqunTNoklEUDdtRQMmVqsajn1pOZdm0zh4Uicw==} + peerDependencies: + postcss: '>=6.0' + vue-template-compiler: '*' + dependencies: + '@vue/component-compiler-utils': 3.2.2_pug@3.0.2 + clean-css: 4.2.3 + hash-sum: 1.0.2 + postcss: 8.4.21 + postcss-modules-sync: 1.0.0 + source-map: 0.6.1 + vue-template-compiler: 2.7.14 + optionalDependencies: + less: 3.13.1 + pug: 3.0.2 + sass: 1.58.0 + stylus: 0.54.8 + transitivePeerDependencies: + - arc-templates + - atpl + - babel-core + - bracket-template + - coffee-script + - dot + - dust + - dustjs-helpers + - dustjs-linkedin + - eco + - ect + - ejs + - haml-coffee + - hamlet + - hamljs + - handlebars + - hogan.js + - htmling + - jade + - jazz + - jqtpl + - just + - liquid-node + - liquor + - lodash + - marko + - mote + - mustache + - nunjucks + - plates + - qejs + - ractive + - razor-tmpl + - react + - react-dom + - slm + - squirrelly + - supports-color + - swig + - swig-templates + - teacup + - templayed + - then-jade + - then-pug + - tinyliquid + - toffee + - twig + - twing + - underscore + - vash + - velocityjs + - walrus + - whiskers + dev: true + /@vue/devtools-api/6.4.5: resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==} dev: false @@ -7051,6 +7267,11 @@ packages: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} + /ansi-styles/2.2.1: + resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==} + engines: {node: '>=0.10.0'} + dev: true + /ansi-styles/3.2.1: resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} engines: {node: '>=4'} @@ -7869,6 +8090,10 @@ packages: resolution: {integrity: sha512-FnWonOyaw7Vivg5nIkrUll9HSS5TjFbyuURAiDssuL6VxrBe3ERzudRxOcWRhZYlP89UArMDikz7SapRPQpmZQ==} dev: true + /big.js/3.2.0: + resolution: {integrity: sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==} + dev: true + /big.js/5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} dev: true @@ -8357,6 +8582,17 @@ packages: assertion-error: 1.1.0 dev: true + /chalk/1.1.3: + resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==} + engines: {node: '>=0.10.0'} + dependencies: + ansi-styles: 2.2.1 + escape-string-regexp: 1.0.5 + has-ansi: 2.0.0 + strip-ansi: 3.0.1 + supports-color: 2.0.0 + dev: true + /chalk/2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} engines: {node: '>=4'} @@ -8935,17 +9171,354 @@ packages: /config-chain/1.1.13: resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==} dependencies: - ini: 1.3.8 - proto-list: 1.2.4 - dev: true - - /connect-history-api-fallback/1.6.0: - resolution: {integrity: sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==} - engines: {node: '>=0.8'} - dev: true - - /console-browserify/1.2.0: - resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==} + ini: 1.3.8 + proto-list: 1.2.4 + dev: true + + /connect-history-api-fallback/1.6.0: + resolution: {integrity: sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==} + engines: {node: '>=0.8'} + dev: true + + /console-browserify/1.2.0: + resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==} + dev: true + + /consolidate/0.15.1: + resolution: {integrity: sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==} + engines: {node: '>= 0.10.0'} + peerDependencies: + arc-templates: ^0.5.3 + atpl: '>=0.7.6' + babel-core: ^6.26.3 + bracket-template: ^1.1.5 + coffee-script: ^1.12.7 + dot: ^1.1.3 + dust: ^0.3.0 + dustjs-helpers: ^1.7.4 + dustjs-linkedin: ^2.7.5 + eco: ^1.1.0-rc-3 + ect: ^0.5.9 + ejs: ^3.1.5 + haml-coffee: ^1.14.1 + hamlet: ^0.3.3 + hamljs: ^0.6.2 + handlebars: ^4.7.6 + hogan.js: ^3.0.2 + htmling: ^0.0.8 + jade: ^1.11.0 + jazz: ^0.0.18 + jqtpl: ~1.1.0 + just: ^0.1.8 + liquid-node: ^3.0.1 + liquor: ^0.0.5 + lodash: ^4.17.20 + marko: ^3.14.4 + mote: ^0.2.0 + mustache: ^3.0.0 + nunjucks: ^3.2.2 + plates: ~0.4.11 + pug: ^3.0.0 + qejs: ^3.0.5 + ractive: ^1.3.12 + razor-tmpl: ^1.3.1 + react: ^16.13.1 + react-dom: ^16.13.1 + slm: ^2.0.0 + squirrelly: ^5.1.0 + swig: ^1.4.2 + swig-templates: ^2.0.3 + teacup: ^2.0.0 + templayed: '>=0.2.3' + then-jade: '*' + then-pug: '*' + tinyliquid: ^0.2.34 + toffee: ^0.3.6 + twig: ^1.15.2 + twing: ^5.0.2 + underscore: ^1.11.0 + vash: ^0.13.0 + velocityjs: ^2.0.1 + walrus: ^0.10.1 + whiskers: ^0.4.0 + peerDependenciesMeta: + arc-templates: + optional: true + atpl: + optional: true + babel-core: + optional: true + bracket-template: + optional: true + coffee-script: + optional: true + dot: + optional: true + dust: + optional: true + dustjs-helpers: + optional: true + dustjs-linkedin: + optional: true + eco: + optional: true + ect: + optional: true + ejs: + optional: true + haml-coffee: + optional: true + hamlet: + optional: true + hamljs: + optional: true + handlebars: + optional: true + hogan.js: + optional: true + htmling: + optional: true + jade: + optional: true + jazz: + optional: true + jqtpl: + optional: true + just: + optional: true + liquid-node: + optional: true + liquor: + optional: true + lodash: + optional: true + marko: + optional: true + mote: + optional: true + mustache: + optional: true + nunjucks: + optional: true + plates: + optional: true + pug: + optional: true + qejs: + optional: true + ractive: + optional: true + razor-tmpl: + optional: true + react: + optional: true + react-dom: + optional: true + slm: + optional: true + squirrelly: + optional: true + swig: + optional: true + swig-templates: + optional: true + teacup: + optional: true + templayed: + optional: true + then-jade: + optional: true + then-pug: + optional: true + tinyliquid: + optional: true + toffee: + optional: true + twig: + optional: true + twing: + optional: true + underscore: + optional: true + vash: + optional: true + velocityjs: + optional: true + walrus: + optional: true + whiskers: + optional: true + dependencies: + bluebird: 3.7.2 + dev: true + + /consolidate/0.15.1_pug@3.0.2: + resolution: {integrity: sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==} + engines: {node: '>= 0.10.0'} + peerDependencies: + arc-templates: ^0.5.3 + atpl: '>=0.7.6' + babel-core: ^6.26.3 + bracket-template: ^1.1.5 + coffee-script: ^1.12.7 + dot: ^1.1.3 + dust: ^0.3.0 + dustjs-helpers: ^1.7.4 + dustjs-linkedin: ^2.7.5 + eco: ^1.1.0-rc-3 + ect: ^0.5.9 + ejs: ^3.1.5 + haml-coffee: ^1.14.1 + hamlet: ^0.3.3 + hamljs: ^0.6.2 + handlebars: ^4.7.6 + hogan.js: ^3.0.2 + htmling: ^0.0.8 + jade: ^1.11.0 + jazz: ^0.0.18 + jqtpl: ~1.1.0 + just: ^0.1.8 + liquid-node: ^3.0.1 + liquor: ^0.0.5 + lodash: ^4.17.20 + marko: ^3.14.4 + mote: ^0.2.0 + mustache: ^3.0.0 + nunjucks: ^3.2.2 + plates: ~0.4.11 + pug: ^3.0.0 + qejs: ^3.0.5 + ractive: ^1.3.12 + razor-tmpl: ^1.3.1 + react: ^16.13.1 + react-dom: ^16.13.1 + slm: ^2.0.0 + squirrelly: ^5.1.0 + swig: ^1.4.2 + swig-templates: ^2.0.3 + teacup: ^2.0.0 + templayed: '>=0.2.3' + then-jade: '*' + then-pug: '*' + tinyliquid: ^0.2.34 + toffee: ^0.3.6 + twig: ^1.15.2 + twing: ^5.0.2 + underscore: ^1.11.0 + vash: ^0.13.0 + velocityjs: ^2.0.1 + walrus: ^0.10.1 + whiskers: ^0.4.0 + peerDependenciesMeta: + arc-templates: + optional: true + atpl: + optional: true + babel-core: + optional: true + bracket-template: + optional: true + coffee-script: + optional: true + dot: + optional: true + dust: + optional: true + dustjs-helpers: + optional: true + dustjs-linkedin: + optional: true + eco: + optional: true + ect: + optional: true + ejs: + optional: true + haml-coffee: + optional: true + hamlet: + optional: true + hamljs: + optional: true + handlebars: + optional: true + hogan.js: + optional: true + htmling: + optional: true + jade: + optional: true + jazz: + optional: true + jqtpl: + optional: true + just: + optional: true + liquid-node: + optional: true + liquor: + optional: true + lodash: + optional: true + marko: + optional: true + mote: + optional: true + mustache: + optional: true + nunjucks: + optional: true + plates: + optional: true + pug: + optional: true + qejs: + optional: true + ractive: + optional: true + razor-tmpl: + optional: true + react: + optional: true + react-dom: + optional: true + slm: + optional: true + squirrelly: + optional: true + swig: + optional: true + swig-templates: + optional: true + teacup: + optional: true + templayed: + optional: true + then-jade: + optional: true + then-pug: + optional: true + tinyliquid: + optional: true + toffee: + optional: true + twig: + optional: true + twing: + optional: true + underscore: + optional: true + vash: + optional: true + velocityjs: + optional: true + walrus: + optional: true + whiskers: + optional: true + dependencies: + bluebird: 3.7.2 + pug: 3.0.2 dev: true /consolidate/0.15.1_sfyobadhz7cuvf7tkzqfswrxrq: @@ -9167,6 +9740,13 @@ packages: engines: {node: '>= 0.6'} dev: true + /copy-anything/2.0.3: + resolution: {integrity: sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==} + dependencies: + is-what: 3.14.1 + dev: true + optional: true + /copy-concurrently/1.0.5: resolution: {integrity: sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==} dependencies: @@ -9453,6 +10033,13 @@ packages: webpack: 4.46.0 dev: true + /css-parse/2.0.0: + resolution: {integrity: sha512-UNIFik2RgSbiTwIW1IsFwXWn6vs+bYdq83LKTSOsx7NJR7WII9dxewkHLltfTLVppoUApHV0118a4RZRI9FLwA==} + dependencies: + css: 2.2.4 + dev: true + optional: true + /css-select/4.1.3: resolution: {integrity: sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==} dependencies: @@ -9465,6 +10052,13 @@ packages: /css-selector-parser/1.4.1: resolution: {integrity: sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g==} + /css-selector-tokenizer/0.7.3: + resolution: {integrity: sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==} + dependencies: + cssesc: 3.0.0 + fastparse: 1.1.2 + dev: true + /css-tree/1.1.3: resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==} engines: {node: '>=8.0.0'} @@ -9485,6 +10079,16 @@ packages: resolution: {integrity: sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==} engines: {node: '>= 6'} + /css/2.2.4: + resolution: {integrity: sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==} + dependencies: + inherits: 2.0.4 + source-map: 0.6.1 + source-map-resolve: 0.5.3 + urix: 0.1.0 + dev: true + optional: true + /cssesc/3.0.0: resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==} engines: {node: '>=4'} @@ -9922,6 +10526,18 @@ packages: supports-color: 6.1.0 dev: true + /debug/3.1.0: + resolution: {integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.0.0 + dev: true + optional: true + /debug/3.2.6_supports-color@6.0.0: resolution: {integrity: sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==} deprecated: Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797) @@ -10501,6 +11117,11 @@ packages: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} dev: true + /emojis-list/2.1.0: + resolution: {integrity: sha512-knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng==} + engines: {node: '>= 0.10'} + dev: true + /emojis-list/3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} @@ -11518,6 +12139,10 @@ packages: engines: {node: '>= 4.9.1'} dev: true + /fastparse/1.1.2: + resolution: {integrity: sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==} + dev: true + /fastq/1.11.0: resolution: {integrity: sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==} dependencies: @@ -11981,6 +12606,12 @@ packages: resolution: {integrity: sha512-sA5etGE7yD/pOqivZRBvUBd/NaL2sjAu6QuSaFoe1H2BrJSkH/T/UXAJ8CdXdw7DvY3Hs8CXKYkDWX7RiP5KOg==} engines: {node: '>=10'} + /generic-names/1.0.3: + resolution: {integrity: sha512-b6OHfQuKasIKM9b6YPkX+KUj/TLBTx3B/1aT1T5F12FEuEqyFMdr59OMS53aoaSw8eVtapdqieX6lbg5opaOhA==} + dependencies: + loader-utils: 0.2.17 + dev: true + /gensync/1.0.0-beta.2: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} @@ -12245,6 +12876,13 @@ packages: engines: {node: '>=6'} dev: true + /has-ansi/2.0.0: + resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==} + engines: {node: '>=0.10.0'} + dependencies: + ansi-regex: 2.1.1 + dev: true + /has-bigints/1.0.1: resolution: {integrity: sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==} dev: false @@ -12253,6 +12891,11 @@ packages: resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} dev: true + /has-flag/1.0.0: + resolution: {integrity: sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==} + engines: {node: '>=0.10.0'} + dev: true + /has-flag/3.0.0: resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} engines: {node: '>=4'} @@ -12634,6 +13277,14 @@ packages: resolution: {integrity: sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==} engines: {node: '>= 4'} + /image-size/0.5.5: + resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==} + engines: {node: '>=0.10.0'} + hasBin: true + requiresBuild: true + dev: true + optional: true + /immer/9.0.16: resolution: {integrity: sha512-qenGE7CstVm1NrHQbMh8YaSzTZTFNP3zPqr3YU0S0UY441j4bJTg4A2Hh5KAhwgaiU6ZZ1Ar6y/2f4TblnMReQ==} dev: true @@ -13142,6 +13793,11 @@ packages: call-bind: 1.0.2 dev: true + /is-what/3.14.1: + resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==} + dev: true + optional: true + /is-whitespace/0.3.0: resolution: {integrity: sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==} engines: {node: '>=0.10.0'} @@ -15046,6 +15702,11 @@ packages: resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==} dev: true + /json5/0.5.1: + resolution: {integrity: sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==} + hasBin: true + dev: true + /json5/1.0.1: resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==} hasBin: true @@ -15260,6 +15921,25 @@ packages: verror: 1.10.0 dev: true + /less/3.13.1: + resolution: {integrity: sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==} + engines: {node: '>=6'} + hasBin: true + requiresBuild: true + dependencies: + copy-anything: 2.0.3 + tslib: 1.14.1 + optionalDependencies: + errno: 0.1.8 + graceful-fs: 4.2.10 + image-size: 0.5.5 + make-dir: 2.1.0 + mime: 1.6.0 + native-request: 1.0.8 + source-map: 0.6.1 + dev: true + optional: true + /leven/2.1.0: resolution: {integrity: sha512-nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA==} engines: {node: '>=0.10.0'} @@ -15333,6 +16013,15 @@ packages: engines: {node: '>=4.3.0 <5.0.0 || >=5.10'} dev: true + /loader-utils/0.2.17: + resolution: {integrity: sha512-tiv66G0SmiOx+pLWMtGEkfSEejxvb6N6uRrQjfWJIT79W9GMpgKeCAmm9aVBKtd4WEgntciI8CsGqjpDoCWJug==} + dependencies: + big.js: 3.2.0 + emojis-list: 2.1.0 + json5: 0.5.1 + object-assign: 4.1.1 + dev: true + /loader-utils/1.4.0: resolution: {integrity: sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==} engines: {node: '>=4.0.0'} @@ -15947,7 +16636,6 @@ packages: resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} engines: {node: '>=10.0.0'} hasBin: true - dev: false /mimic-fn/2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} @@ -16300,6 +16988,12 @@ packages: - supports-color dev: true + /native-request/1.0.8: + resolution: {integrity: sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==} + requiresBuild: true + dev: true + optional: true + /natural-compare/1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} @@ -17580,6 +18274,13 @@ packages: postcss: 8.4.20 dev: true + /postcss-modules-local-by-default/1.2.0: + resolution: {integrity: sha512-X4cquUPIaAd86raVrBwO8fwRfkIdbwFu7CTfEOjiZQHVQwlHRSkTgH5NLDmMm5+1hQO8u6dZ+TOOJDbay1hYpA==} + dependencies: + css-selector-tokenizer: 0.7.3 + postcss: 6.0.23 + dev: true + /postcss-modules-local-by-default/2.0.6: resolution: {integrity: sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==} engines: {node: '>= 6'} @@ -17601,6 +18302,13 @@ packages: postcss-value-parser: 4.2.0 dev: true + /postcss-modules-scope/1.1.0: + resolution: {integrity: sha512-LTYwnA4C1He1BKZXIx1CYiHixdSe9LWYVKadq9lK5aCCMkoOkFyZ7aigt+srfjlRplJY3gIol6KUNefdMQJdlw==} + dependencies: + css-selector-tokenizer: 0.7.3 + postcss: 6.0.23 + dev: true + /postcss-modules-scope/2.2.0: resolution: {integrity: sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==} engines: {node: '>= 6'} @@ -17619,6 +18327,17 @@ packages: postcss-selector-parser: 6.0.11 dev: true + /postcss-modules-sync/1.0.0: + resolution: {integrity: sha512-kIDk2NYmxHshqUbjtFf1WdBij08IsvRdgDT0nOGWhvwkr8/z1piLSzxVrPt56J4DU6ON986h2H+5xcBnFhT8UQ==} + dependencies: + generic-names: 1.0.3 + icss-replace-symbols: 1.1.0 + postcss: 5.2.18 + postcss-modules-local-by-default: 1.2.0 + postcss-modules-scope: 1.1.0 + string-hash: 1.1.3 + dev: true + /postcss-modules-values/2.0.0: resolution: {integrity: sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==} dependencies: @@ -17850,6 +18569,25 @@ packages: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} dev: true + /postcss/5.2.18: + resolution: {integrity: sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==} + engines: {node: '>=0.12'} + dependencies: + chalk: 1.1.3 + js-base64: 2.6.4 + source-map: 0.5.7 + supports-color: 3.2.3 + dev: true + + /postcss/6.0.23: + resolution: {integrity: sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==} + engines: {node: '>=4.0.0'} + dependencies: + chalk: 2.4.2 + source-map: 0.6.1 + supports-color: 5.5.0 + dev: true + /postcss/7.0.2: resolution: {integrity: sha512-fmaUY5370keLUTx+CnwRxtGiuFTcNBLQBqr1oE3WZ/euIYmGAo0OAgOhVJ3ByDnVmOR3PK+0V9VebzfjRIUcqw==} engines: {node: '>=6.0.0'} @@ -18273,6 +19011,12 @@ packages: deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead. dev: true + /querystring/0.2.1: + resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==} + engines: {node: '>=0.4.x'} + deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead. + dev: true + /querystringify/2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} @@ -19141,6 +19885,13 @@ packages: dependencies: rollup-plugin-inject: 3.0.2 + /rollup-plugin-serve/1.1.0: + resolution: {integrity: sha512-pYkSsuA0/psKqhhictkJw1c2klya5b+LlCvipWqI9OE1aG2M97mRumZCbBlry5CMEOzYBBgSDgd1694sNbmyIw==} + dependencies: + mime: 3.0.0 + opener: 1.5.2 + dev: true + /rollup-plugin-serve/2.0.2: resolution: {integrity: sha512-ALqyTbPhlf7FZ5RzlbDvMYvbKuCHWginJkTo6dMsbgji/a78IbsXox+pC83HENdkTRz8OXrTj+aShp3+3ratpg==} dependencies: @@ -19165,6 +19916,79 @@ packages: yargs: 17.6.0 dev: true + /rollup-plugin-vue/5.1.9_msb4omfpi5xaaav7gpce3lwjli: + resolution: {integrity: sha512-DXzrBUD2j68Y6nls4MmuJsFL1SrQDpdgjxvhk/oy04LzJmXJoX1x31yLEBFkkmvpbon6Q885WJLvEMiMyT+3rA==} + peerDependencies: + vue-template-compiler: '*' + dependencies: + '@vue/component-compiler': 4.2.4_msb4omfpi5xaaav7gpce3lwjli + '@vue/component-compiler-utils': 3.2.2 + debug: 4.3.4 + hash-sum: 1.0.2 + magic-string: 0.25.7 + querystring: 0.2.1 + rollup-pluginutils: 2.8.2 + source-map: 0.7.3 + vue-runtime-helpers: 1.1.2 + vue-template-compiler: 2.7.14 + transitivePeerDependencies: + - arc-templates + - atpl + - babel-core + - bracket-template + - coffee-script + - dot + - dust + - dustjs-helpers + - dustjs-linkedin + - eco + - ect + - ejs + - haml-coffee + - hamlet + - hamljs + - handlebars + - hogan.js + - htmling + - jade + - jazz + - jqtpl + - just + - liquid-node + - liquor + - lodash + - marko + - mote + - mustache + - nunjucks + - plates + - postcss + - pug + - qejs + - ractive + - razor-tmpl + - react + - react-dom + - slm + - squirrelly + - supports-color + - swig + - swig-templates + - teacup + - templayed + - then-jade + - then-pug + - tinyliquid + - toffee + - twig + - twing + - underscore + - vash + - velocityjs + - walrus + - whiskers + dev: true + /rollup-pluginutils/2.8.2: resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==} dependencies: @@ -19294,15 +20118,14 @@ packages: source-map-js: 1.0.2 dev: true - /sass/1.58.3: - resolution: {integrity: sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==} + /sass/1.58.0: + resolution: {integrity: sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==} engines: {node: '>=12.0.0'} hasBin: true dependencies: chokidar: 3.5.3 immutable: 4.1.0 source-map-js: 1.0.2 - dev: false /sax/1.2.4: resolution: {integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==} @@ -19785,6 +20608,11 @@ packages: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} + /source-map/0.7.3: + resolution: {integrity: sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==} + engines: {node: '>= 8'} + dev: true + /source-map/0.7.4: resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==} engines: {node: '>= 8'} @@ -20009,6 +20837,10 @@ packages: engines: {node: '>=0.6.19'} dev: true + /string-hash/1.1.3: + resolution: {integrity: sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==} + dev: true + /string-length/4.0.2: resolution: {integrity: sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==} engines: {node: '>=10'} @@ -20334,6 +21166,36 @@ packages: - supports-color dev: true + /stylus/0.54.8: + resolution: {integrity: sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==} + hasBin: true + requiresBuild: true + dependencies: + css-parse: 2.0.0 + debug: 3.1.0 + glob: 7.2.0 + mkdirp: 1.0.4 + safer-buffer: 2.1.2 + sax: 1.2.4 + semver: 6.3.0 + source-map: 0.7.4 + transitivePeerDependencies: + - supports-color + dev: true + optional: true + + /supports-color/2.0.0: + resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==} + engines: {node: '>=0.8.0'} + dev: true + + /supports-color/3.2.3: + resolution: {integrity: sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==} + engines: {node: '>=0.8.0'} + dependencies: + has-flag: 1.0.0 + dev: true + /supports-color/5.5.0: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} @@ -20828,7 +21690,6 @@ packages: /tslib/1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} - dev: false /tslib/2.4.0: resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} @@ -21383,7 +22244,7 @@ packages: optionalDependencies: fsevents: 2.3.2 - /vite/4.1.1_sass@1.58.3: + /vite/4.1.1_sass@1.58.0: resolution: {integrity: sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -21412,7 +22273,7 @@ packages: postcss: 8.4.21 resolve: 1.22.1 rollup: 3.14.0 - sass: 1.58.3 + sass: 1.58.0 optionalDependencies: fsevents: 2.3.2 dev: false @@ -21564,17 +22425,8 @@ packages: vue: ^3 dependencies: vue: 3.2.45 - dev: true patched: true - /vue-inline-svg/3.1.2_vue@3.2.45: - resolution: {integrity: sha512-K01sLANBnjosObee4JrBu/igXpYIFhQfy4EcEyVWxEWf6nmrxp7Isz6pmeRCsWx6XGrGWfrQH3uNwt4nOmrFdA==} - peerDependencies: - vue: ^3 - dependencies: - vue: 3.2.45 - dev: false - /vue-loader/15.10.1_y4p7kvorzgilxnlq3klfoybme4: resolution: {integrity: sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==} peerDependencies: @@ -21664,6 +22516,10 @@ packages: vue: 3.2.45 dev: false + /vue-runtime-helpers/1.1.2: + resolution: {integrity: sha512-pZfGp+PW/IXEOyETE09xQHR1CKkR9HfHZdnMD/FVLUNI+HxYTa82evx5WrF6Kz4s82qtqHvMZ8MZpbk2zT2E1Q==} + dev: true + /vue-select/4.0.0-beta.6_vue@3.2.45: resolution: {integrity: sha512-K+zrNBSpwMPhAxYLTCl56gaMrWZGgayoWCLqe5rWwkB8aUbAUh7u6sXjIR7v4ckp2WKC7zEEUY27g6h1MRsIHw==} peerDependencies: @@ -21790,6 +22646,13 @@ packages: typescript: 4.9.4 dev: true + /vue/2.7.14: + resolution: {integrity: sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==} + dependencies: + '@vue/compiler-sfc': 2.7.14 + csstype: 3.1.1 + dev: true + /vue/3.2.45: resolution: {integrity: sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==} dependencies: From 36fd56b67434e7677138ea7f10ec6340fbe5e38a Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 7 Mar 2023 15:04:03 +0100 Subject: [PATCH 03/16] Enhancements --- packages/design-system/src/components/OcModal/OcModal.vue | 1 + .../web-app-admin-settings/src/components/Users/GroupsModal.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/design-system/src/components/OcModal/OcModal.vue b/packages/design-system/src/components/OcModal/OcModal.vue index 9c0816f1d47..08ee7e9dbef 100644 --- a/packages/design-system/src/components/OcModal/OcModal.vue +++ b/packages/design-system/src/components/OcModal/OcModal.vue @@ -343,6 +343,7 @@ export default defineComponent({ }, computed: { initialFocusRef() { + console.log(this.focusTrapInitial) if (this.focusTrapInitial) { return this.focusTrapInitial } diff --git a/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue b/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue index c99bf5edd35..ea2ee9fd9c8 100644 --- a/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue +++ b/packages/web-app-admin-settings/src/components/Users/GroupsModal.vue @@ -5,12 +5,12 @@ :button-cancel-text="$gettext('Cancel')" :button-confirm-text="$gettext('Confirm')" :button-confirm-disabled="!selectedOptions.length" - focus-trap-initial="#create-user-input-display-name" @cancel="$emit('cancel')" @confirm="$emit('confirm', { users, groups: selectedOptions })" >