From c17717d7c9e39ea2a9936414ef891e9c5fd34af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 22 Apr 2022 10:47:34 +0000 Subject: [PATCH] enable search in web ui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- extensions/storage/pkg/command/frontend.go | 4 +++- extensions/web/pkg/config/defaults/defaultconfig.go | 3 +++ extensions/web/pkg/service/v0/service.go | 6 ------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/extensions/storage/pkg/command/frontend.go b/extensions/storage/pkg/command/frontend.go index 26dba9add..69dd8b1a2 100644 --- a/extensions/storage/pkg/command/frontend.go +++ b/extensions/storage/pkg/command/frontend.go @@ -236,7 +236,9 @@ func frontendConfigFromStruct(c *cli.Context, cfg *config.Config, filesCfg map[s "preferred_upload_type": cfg.Reva.ChecksumPreferredUploadType, }, "files": filesCfg, - "dav": map[string]interface{}{}, + "dav": map[string]interface{}{ + "reports": []string{"search-files"}, + }, "files_sharing": map[string]interface{}{ "api_enabled": true, "resharing": false, diff --git a/extensions/web/pkg/config/defaults/defaultconfig.go b/extensions/web/pkg/config/defaults/defaultconfig.go index bbfad9bdf..cb5488b08 100644 --- a/extensions/web/pkg/config/defaults/defaultconfig.go +++ b/extensions/web/pkg/config/defaults/defaultconfig.go @@ -51,6 +51,9 @@ func DefaultConfig() *config.Config { Scope: "openid profile email", }, Apps: []string{"files", "search", "preview", "text-editor", "pdf-viewer", "external"}, + Options: map[string]interface{}{ + "hideSearchBar": false, + }, }, }, } diff --git a/extensions/web/pkg/service/v0/service.go b/extensions/web/pkg/service/v0/service.go index 3f762fded..dd6a9aa1a 100644 --- a/extensions/web/pkg/service/v0/service.go +++ b/extensions/web/pkg/service/v0/service.go @@ -66,12 +66,6 @@ func (p Web) getPayload() (payload []byte, err error) { if p.config.Web.Path == "" { // render dynamically using config - // provide default ocis-web options - if p.config.Web.Config.Options == nil { - p.config.Web.Config.Options = make(map[string]interface{}) - p.config.Web.Config.Options["hideSearchBar"] = true - } - // build theme url if themeServer, err := url.Parse(p.config.Web.ThemeServer); err == nil { p.config.Web.Config.Theme = themeServer.String() + p.config.Web.ThemePath