diff --git a/.bingo/go-xgettext.mod b/.bingo/go-xgettext.mod index b14946a0b8..8e3c6210b5 100644 --- a/.bingo/go-xgettext.mod +++ b/.bingo/go-xgettext.mod @@ -3,5 +3,3 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT go 1.23.4 require github.com/gosexy/gettext v0.0.0-20160830220431-74466a0a0c4a // go-xgettext - -require github.com/jessevdk/go-flags v1.6.1 // indirect diff --git a/.woodpecker.env b/.woodpecker.env index e5e3878dd4..522038ac71 100644 --- a/.woodpecker.env +++ b/.woodpecker.env @@ -1,4 +1,4 @@ # The test runner source for UI tests -WEB_COMMITID=2cee98bb27fab223fc4ce2455f5483ce7767ff1a +WEB_COMMITID=44a7201d440d39f756c0d071e3b3e9a99688054d WEB_BRANCH=main diff --git a/services/web/Makefile b/services/web/Makefile index ad48f3d5e6..7835ac6bbe 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v7.1.0 +WEB_ASSETS_VERSION = v7.2.0-beta.1 WEB_ASSETS_BRANCH = main ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI diff --git a/services/web/pkg/config/defaults/defaultconfig.go b/services/web/pkg/config/defaults/defaultconfig.go index 8120394aa6..4c18aae0bd 100644 --- a/services/web/pkg/config/defaults/defaultconfig.go +++ b/services/web/pkg/config/defaults/defaultconfig.go @@ -111,6 +111,7 @@ func DefaultConfig() *config.Config { Upload: &config.Upload{}, TokenStorageLocal: true, UserListRequiresFilter: false, + OxAppSuite: &config.OxAppSuite{}, }, }, }, diff --git a/services/web/pkg/config/options.go b/services/web/pkg/config/options.go index d943d60cf4..c68595d312 100644 --- a/services/web/pkg/config/options.go +++ b/services/web/pkg/config/options.go @@ -19,6 +19,7 @@ type Options struct { UserListRequiresFilter bool `json:"userListRequiresFilter,omitempty" yaml:"userListRequiresFilter" env:"WEB_OPTION_USER_LIST_REQUIRES_FILTER" desc:"Defines whether one or more filters must be set in order to list users in the Web admin settings. Set this option to 'true' if running in an environment with a lot of users and listing all users could slow down performance. Defaults to 'false'." introductionVersion:"1.0.0"` ConcurrentRequests *ConcurrentRequests `json:"concurrentRequests,omitempty" yaml:"concurrentRequests"` DefaultAppID string `json:"defaultAppId,omitempty" yaml:"defaultAppId" env:"WEB_OPTION_DEFAULT_APP_ID" desc:"Defines the entrypoint for the web ui." introductionVersion:"4.0.0"` + OxAppSuite *OxAppSuite `json:"oxAppSuite,omitempty" yaml:"oxAppSuite"` } // AccountEditLink are the AccountEditLink options @@ -65,3 +66,8 @@ type ConcurrentRequestsShares struct { Create int `json:"create,omitempty" yaml:"create" env:"WEB_OPTION_CONCURRENT_REQUESTS_SHARES_CREATE" desc:"Defines the maximum number of concurrent requests per sharing invite batch. Defaults to 4." introductionVersion:"1.0.0"` List int `json:"list,omitempty" yaml:"list" env:"WEB_OPTION_CONCURRENT_REQUESTS_SHARES_LIST" desc:"Defines the maximum number of concurrent requests when loading individual share information inside listings. Defaults to 2." introductionVersion:"1.0.0"` } + +type OxAppSuite struct { + Enabled bool `json:"enabled,omitempty" yaml:"enabled" env:"WEB_OPTION_OX_APP_SUITE_ENABLED" desc:"Enables the OX App Suite. Defaults to false." introductionVersion:"%%NEXT%%"` + ApiUrl string `json:"apiUrl,omitempty" yaml:"apiUrl" env:"WEB_OPTION_OX_APP_SUITE_API_URL" desc:"The API URL for the OX App Suite. Defaults to an empty string." introductionVersion:"%%NEXT%%"` +}