diff --git a/frontend/Makefile b/frontend/Makefile index 8a66601dd..a9e40925f 100644 --- a/frontend/Makefile +++ b/frontend/Makefile @@ -26,7 +26,7 @@ openapi: -v $$(pwd)/openapi_templates:/tmp/openapi_templates \ -v /tmp/openapi:/tmp/output \ -u $$(id -u $${USER}):$$(id -g $${USER}) \ - openapitools/openapi-generator-cli:v7.5.0 generate \ + openapitools/openapi-generator-cli:v7.7.0 generate \ -i /tmp/openapi.json \ -t /tmp/openapi_templates \ --global-property models,apis,supportingFiles="index.ts:api.ts:models.ts:variables.ts:configuration.ts:api.module.ts:param.ts:encoder.ts" \ diff --git a/frontend/src/app/openapi/.openapi-generator/VERSION b/frontend/src/app/openapi/.openapi-generator/VERSION index 18bb4182d..1985849fb 100644 --- a/frontend/src/app/openapi/.openapi-generator/VERSION +++ b/frontend/src/app/openapi/.openapi-generator/VERSION @@ -1 +1 @@ -7.5.0 +7.7.0 diff --git a/frontend/src/app/openapi/api/default.service.ts b/frontend/src/app/openapi/api/default.service.ts index 7028d4952..71dd268df 100644 --- a/frontend/src/app/openapi/api/default.service.ts +++ b/frontend/src/app/openapi/api/default.service.ts @@ -50,8 +50,9 @@ export class DefaultService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/events.service.ts b/frontend/src/app/openapi/api/events.service.ts index 788d8cf1f..874664fdc 100644 --- a/frontend/src/app/openapi/api/events.service.ts +++ b/frontend/src/app/openapi/api/events.service.ts @@ -42,8 +42,9 @@ export class EventsService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/health.service.ts b/frontend/src/app/openapi/api/health.service.ts index 6176b8eb8..60a64ea4c 100644 --- a/frontend/src/app/openapi/api/health.service.ts +++ b/frontend/src/app/openapi/api/health.service.ts @@ -46,8 +46,9 @@ export class HealthService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/metadata.service.ts b/frontend/src/app/openapi/api/metadata.service.ts index 6e3b9bfe1..cddbd1e27 100644 --- a/frontend/src/app/openapi/api/metadata.service.ts +++ b/frontend/src/app/openapi/api/metadata.service.ts @@ -42,8 +42,9 @@ export class MetadataService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/notices.service.ts b/frontend/src/app/openapi/api/notices.service.ts index 61d330b99..de2975dfc 100644 --- a/frontend/src/app/openapi/api/notices.service.ts +++ b/frontend/src/app/openapi/api/notices.service.ts @@ -46,8 +46,9 @@ export class NoticesService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/oauth.service.ts b/frontend/src/app/openapi/api/oauth.service.ts index 8958e4fdd..96a9b4d0d 100644 --- a/frontend/src/app/openapi/api/oauth.service.ts +++ b/frontend/src/app/openapi/api/oauth.service.ts @@ -48,8 +48,9 @@ export class OauthService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/projects-events.service.ts b/frontend/src/app/openapi/api/projects-events.service.ts index adfd2f59b..1cbd7537d 100644 --- a/frontend/src/app/openapi/api/projects-events.service.ts +++ b/frontend/src/app/openapi/api/projects-events.service.ts @@ -44,8 +44,9 @@ export class ProjectsEventsService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/projects-models-backups.service.ts b/frontend/src/app/openapi/api/projects-models-backups.service.ts index 4f9c97eff..81a2f8d05 100644 --- a/frontend/src/app/openapi/api/projects-models-backups.service.ts +++ b/frontend/src/app/openapi/api/projects-models-backups.service.ts @@ -52,8 +52,9 @@ export class ProjectsModelsBackupsService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/projects-models-diagrams.service.ts b/frontend/src/app/openapi/api/projects-models-diagrams.service.ts index 810b11e49..b95c96566 100644 --- a/frontend/src/app/openapi/api/projects-models-diagrams.service.ts +++ b/frontend/src/app/openapi/api/projects-models-diagrams.service.ts @@ -44,8 +44,9 @@ export class ProjectsModelsDiagramsService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/projects-models-git.service.ts b/frontend/src/app/openapi/api/projects-models-git.service.ts index 02b6170f4..cb2a807cd 100644 --- a/frontend/src/app/openapi/api/projects-models-git.service.ts +++ b/frontend/src/app/openapi/api/projects-models-git.service.ts @@ -50,8 +50,9 @@ export class ProjectsModelsGitService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/projects-models-model-complexity-badge.service.ts b/frontend/src/app/openapi/api/projects-models-model-complexity-badge.service.ts index b1e1dca37..a6d4d4545 100644 --- a/frontend/src/app/openapi/api/projects-models-model-complexity-badge.service.ts +++ b/frontend/src/app/openapi/api/projects-models-model-complexity-badge.service.ts @@ -42,8 +42,9 @@ export class ProjectsModelsModelComplexityBadgeService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/projects-models-restrictions.service.ts b/frontend/src/app/openapi/api/projects-models-restrictions.service.ts index 632c54c70..562293777 100644 --- a/frontend/src/app/openapi/api/projects-models-restrictions.service.ts +++ b/frontend/src/app/openapi/api/projects-models-restrictions.service.ts @@ -44,8 +44,9 @@ export class ProjectsModelsRestrictionsService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/projects-models-t4-c.service.ts b/frontend/src/app/openapi/api/projects-models-t4-c.service.ts index 6c3ec76b3..4afdab418 100644 --- a/frontend/src/app/openapi/api/projects-models-t4-c.service.ts +++ b/frontend/src/app/openapi/api/projects-models-t4-c.service.ts @@ -46,8 +46,9 @@ export class ProjectsModelsT4CService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/projects-models.service.ts b/frontend/src/app/openapi/api/projects-models.service.ts index e3d34cd46..0efcf2587 100644 --- a/frontend/src/app/openapi/api/projects-models.service.ts +++ b/frontend/src/app/openapi/api/projects-models.service.ts @@ -74,8 +74,9 @@ export class ProjectsModelsService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/projects.service.ts b/frontend/src/app/openapi/api/projects.service.ts index a4bfa5d4e..be7ade9f3 100644 --- a/frontend/src/app/openapi/api/projects.service.ts +++ b/frontend/src/app/openapi/api/projects.service.ts @@ -56,8 +56,9 @@ export class ProjectsService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/sessions.service.ts b/frontend/src/app/openapi/api/sessions.service.ts index b0d21ba7c..54aaed68f 100644 --- a/frontend/src/app/openapi/api/sessions.service.ts +++ b/frontend/src/app/openapi/api/sessions.service.ts @@ -54,8 +54,9 @@ export class SessionsService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/settings-modelsources-git.service.ts b/frontend/src/app/openapi/api/settings-modelsources-git.service.ts index 0e3c28862..9137d0584 100644 --- a/frontend/src/app/openapi/api/settings-modelsources-git.service.ts +++ b/frontend/src/app/openapi/api/settings-modelsources-git.service.ts @@ -52,8 +52,9 @@ export class SettingsModelsourcesGitService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/settings-modelsources-t4-c.service.ts b/frontend/src/app/openapi/api/settings-modelsources-t4-c.service.ts index d0a1fc010..98a18d74c 100644 --- a/frontend/src/app/openapi/api/settings-modelsources-t4-c.service.ts +++ b/frontend/src/app/openapi/api/settings-modelsources-t4-c.service.ts @@ -58,8 +58,9 @@ export class SettingsModelsourcesT4CService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/tools.service.ts b/frontend/src/app/openapi/api/tools.service.ts index b55ca1af8..f18e6c687 100644 --- a/frontend/src/app/openapi/api/tools.service.ts +++ b/frontend/src/app/openapi/api/tools.service.ts @@ -62,8 +62,9 @@ export class ToolsService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/users-sessions.service.ts b/frontend/src/app/openapi/api/users-sessions.service.ts index da509d4ca..bb5050bad 100644 --- a/frontend/src/app/openapi/api/users-sessions.service.ts +++ b/frontend/src/app/openapi/api/users-sessions.service.ts @@ -44,8 +44,9 @@ export class UsersSessionsService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/users-token.service.ts b/frontend/src/app/openapi/api/users-token.service.ts index a96cd83cf..02f3bd6cb 100644 --- a/frontend/src/app/openapi/api/users-token.service.ts +++ b/frontend/src/app/openapi/api/users-token.service.ts @@ -48,8 +48,9 @@ export class UsersTokenService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/api/users.service.ts b/frontend/src/app/openapi/api/users.service.ts index 4036aefa1..7cc914838 100644 --- a/frontend/src/app/openapi/api/users.service.ts +++ b/frontend/src/app/openapi/api/users.service.ts @@ -60,8 +60,9 @@ export class UsersService { this.configuration = configuration; } if (typeof this.configuration.basePath !== 'string') { - if (Array.isArray(basePath) && basePath.length > 0) { - basePath = basePath[0]; + const firstBasePath = Array.isArray(basePath) ? basePath[0] : undefined; + if (firstBasePath != undefined) { + basePath = firstBasePath; } if (typeof basePath !== 'string') { diff --git a/frontend/src/app/openapi/model/guacamole-connection-method-input.ts b/frontend/src/app/openapi/model/guacamole-connection-method-input.ts index 5e85b13be..a4bd2297b 100644 --- a/frontend/src/app/openapi/model/guacamole-connection-method-input.ts +++ b/frontend/src/app/openapi/model/guacamole-connection-method-input.ts @@ -23,7 +23,7 @@ export interface GuacamoleConnectionMethodInput { /** * Connection method specific environment variables. Check the global environment field for more information. */ - environment?: object; + environment?: { [key: string]: Environment; }; sharing?: ToolSessionSharingConfigurationInput; } export namespace GuacamoleConnectionMethodInput { diff --git a/frontend/src/app/openapi/model/guacamole-connection-method-output.ts b/frontend/src/app/openapi/model/guacamole-connection-method-output.ts index 00bff79e0..70dbad4ad 100644 --- a/frontend/src/app/openapi/model/guacamole-connection-method-output.ts +++ b/frontend/src/app/openapi/model/guacamole-connection-method-output.ts @@ -23,7 +23,7 @@ export interface GuacamoleConnectionMethodOutput { /** * Connection method specific environment variables. Check the global environment field for more information. */ - environment: object; + environment: { [key: string]: Environment1; }; sharing: ToolSessionSharingConfigurationOutput; } export namespace GuacamoleConnectionMethodOutput { diff --git a/frontend/src/app/openapi/model/http-connection-method-input.ts b/frontend/src/app/openapi/model/http-connection-method-input.ts index 29604c02b..b1aab8ce2 100644 --- a/frontend/src/app/openapi/model/http-connection-method-input.ts +++ b/frontend/src/app/openapi/model/http-connection-method-input.ts @@ -23,7 +23,7 @@ export interface HTTPConnectionMethodInput { /** * Connection method specific environment variables. Check the global environment field for more information. */ - environment?: object; + environment?: { [key: string]: Environment; }; sharing?: ToolSessionSharingConfigurationInput; redirect_url?: string; /** diff --git a/frontend/src/app/openapi/model/http-connection-method-output.ts b/frontend/src/app/openapi/model/http-connection-method-output.ts index cead73c4d..574882202 100644 --- a/frontend/src/app/openapi/model/http-connection-method-output.ts +++ b/frontend/src/app/openapi/model/http-connection-method-output.ts @@ -23,7 +23,7 @@ export interface HTTPConnectionMethodOutput { /** * Connection method specific environment variables. Check the global environment field for more information. */ - environment: object; + environment: { [key: string]: Environment1; }; sharing: ToolSessionSharingConfigurationOutput; redirect_url: string; /** diff --git a/frontend/src/app/openapi/model/tool-session-configuration-input.ts b/frontend/src/app/openapi/model/tool-session-configuration-input.ts index 833261608..d47f87b45 100644 --- a/frontend/src/app/openapi/model/tool-session-configuration-input.ts +++ b/frontend/src/app/openapi/model/tool-session-configuration-input.ts @@ -22,7 +22,7 @@ export interface ToolSessionConfigurationInput { /** * Environment variables, which are mounted into session containers. You can use f-strings to reference other environment variables in the value. */ - environment?: object; + environment?: { [key: string]: Environment; }; connection?: ToolSessionConnectionInput; monitoring?: SessionMonitoringInput; /** diff --git a/frontend/src/app/openapi/model/tool-session-configuration-output.ts b/frontend/src/app/openapi/model/tool-session-configuration-output.ts index b56a48410..abd856875 100644 --- a/frontend/src/app/openapi/model/tool-session-configuration-output.ts +++ b/frontend/src/app/openapi/model/tool-session-configuration-output.ts @@ -22,7 +22,7 @@ export interface ToolSessionConfigurationOutput { /** * Environment variables, which are mounted into session containers. You can use f-strings to reference other environment variables in the value. */ - environment: object; + environment: { [key: string]: Environment1; }; connection: ToolSessionConnectionOutput; monitoring: SessionMonitoringOutput; /** diff --git a/frontend/src/app/openapi/model/tool-session-connection-input-methods-inner.ts b/frontend/src/app/openapi/model/tool-session-connection-input-methods-inner.ts index d11ba4365..6bd5663f9 100644 --- a/frontend/src/app/openapi/model/tool-session-connection-input-methods-inner.ts +++ b/frontend/src/app/openapi/model/tool-session-connection-input-methods-inner.ts @@ -31,7 +31,7 @@ export interface ToolSessionConnectionInputMethodsInner { /** * Cookies, which are required to connect to the session. */ - cookies?: { [key: string]: any; }; + cookies?: { [key: string]: string; }; } export namespace ToolSessionConnectionInputMethodsInner { export type TypeEnum = 'guacamole' | 'http'; diff --git a/frontend/src/app/openapi/model/tool-session-connection-method.ts b/frontend/src/app/openapi/model/tool-session-connection-method.ts index 6482f3ed9..e7107d5b3 100644 --- a/frontend/src/app/openapi/model/tool-session-connection-method.ts +++ b/frontend/src/app/openapi/model/tool-session-connection-method.ts @@ -23,7 +23,7 @@ export interface ToolSessionConnectionMethod { /** * Connection method specific environment variables. Check the global environment field for more information. */ - environment: object; + environment: { [key: string]: Environment1; }; sharing: ToolSessionSharingConfigurationOutput; } diff --git a/frontend/src/app/openapi/model/tool-session-connection-output-methods-inner.ts b/frontend/src/app/openapi/model/tool-session-connection-output-methods-inner.ts index 3d3f06102..f67578caf 100644 --- a/frontend/src/app/openapi/model/tool-session-connection-output-methods-inner.ts +++ b/frontend/src/app/openapi/model/tool-session-connection-output-methods-inner.ts @@ -31,7 +31,7 @@ export interface ToolSessionConnectionOutputMethodsInner { /** * Cookies, which are required to connect to the session. */ - cookies: { [key: string]: any; }; + cookies: { [key: string]: string; }; } export namespace ToolSessionConnectionOutputMethodsInner { export type TypeEnum = 'guacamole' | 'http';