diff --git a/pkg/extension/extension.go b/pkg/extension/extension.go index 0e13061bd5a0256c073576c45ab8f41f40c8cd55..ae7878d56de53f423ea86c28fa2f263cef6cbd03 100644 --- a/pkg/extension/extension.go +++ b/pkg/extension/extension.go @@ -68,7 +68,7 @@ type Extension interface { } func CheckInstalled(ctx context.Context, content *content.Content, spaceID, envID, extension string) (bool, error) { - status, err := NewStorage(content).GetExtension(ctx, spaceID, envID, extension) + status, err := NewStorage(content, nil).GetExtension(ctx, spaceID, envID, extension) if err != nil { return false, err } diff --git a/pkg/extension/schema.go b/pkg/extension/schema.go index c2ad5dfd3efb87008167089c97d68b06b1d3d402..6b1ff266422d0d80605fb4460a0041f42f7769ff 100644 --- a/pkg/extension/schema.go +++ b/pkg/extension/schema.go @@ -74,9 +74,9 @@ func NewActionsCollection(spaceID, envID string) *collections.Collection { // UI sch.Field.UI.ListView = &field.View{Options: map[string]interface{}{ - "fields": []string{"name", "action", "kind", "target", "updated_at", "updated_by"}, - "sort": []string{"name"}, - "page_size": 50, + "fields": []interface{}{"name", "action", "kind", "target", "updated_at", "updated_by"}, + "sort": []interface{}{"name"}, + "page_size": float64(50), }} sch.Field.UI.Options["title"] = "name" @@ -130,9 +130,9 @@ func NewExtensionsCollection(spaceID, envID string) *collections.Collection { //UI sch.Field.UI.ListView = &field.View{Options: map[string]interface{}{ - "fields": []string{"id", "title", "updated_at", "updated_by"}, - "sort": []string{"title"}, - "page_size": 50, + "fields": []interface{}{"id", "title", "updated_at", "updated_by"}, + "sort": []interface{}{"title"}, + "page_size": float64(50), }} sch.Field.UI.Options["title"] = "title" diff --git a/pkg/extension/storage.go b/pkg/extension/storage.go index 0d8479c1b39ddc508c79280222b4e22df0d79ee7..07355eee4954b4c00cdae65def04ac124f3ca58b 100644 --- a/pkg/extension/storage.go +++ b/pkg/extension/storage.go @@ -10,6 +10,7 @@ import ( "git.perx.ru/perxis/perxis-go/pkg/errors" "git.perx.ru/perxis/perxis-go/pkg/setup" pb "git.perx.ru/perxis/perxis-go/proto/extensions" + "go.uber.org/zap" "git.perx.ru/perxis/perxis-go/pkg/content" "git.perx.ru/perxis/perxis-go/pkg/items" @@ -29,10 +30,11 @@ type Storage interface { type storage struct { content *content.Content + logger *zap.Logger } -func NewStorage(content *content.Content) Storage { - return &storage{content: content} +func NewStorage(content *content.Content, logger *zap.Logger) Storage { + return &storage{content: content, logger: logger} } func infoFromItem(extension string, item *items.Item) *Info { @@ -137,7 +139,7 @@ func (s *storage) DeleteExtension(ctx context.Context, spaceID, envID string, ex func (s *storage) init(ctx context.Context, spaceID, envID string) error { // миграция окружения не должна запуститься, поскольку окружение может быть сломано // расширениями - нужно дать возможность восстановиться - stp := setup.NewSetup(s.content, spaceID, envID, nil).AddCollections([]*collections.Collection{ + stp := setup.NewSetup(s.content, spaceID, envID, s.logger).AddCollections([]*collections.Collection{ NewExtensionsCollection(spaceID, envID), NewActionsCollection(spaceID, envID), }, setup.SkipMigration())