From a572e9d4d6c0d3ce7cabdef51833c4740bc59e16 Mon Sep 17 00:00:00 2001
From: Alena Petraki <alena.petraki@gmail.com>
Date: Tue, 31 Oct 2023 13:48:32 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0,=20?=
=?UTF-8?q?=D0=B8=D0=B7-=D0=B7=D0=B0=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80?=
=?UTF-8?q?=D0=BE=D0=B9=20=D1=81=D1=85=D0=B5=D0=BC=D1=8B=20=D0=BA=D0=BE?=
=?UTF-8?q?=D0=BB=D0=BB=D0=B5=D0=BA=D1=86=D0=B8=D0=B9=20"=D0=9D=D0=B0?=
=?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8/=D0=94=D0=B5=D0=B9?=
=?UTF-8?q?=D1=81=D1=82=D0=B2=D0=B8=D1=8F","=D0=9D=D0=B0=D1=81=D1=82=D1=80?=
=?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8/=D0=A0=D0=B0=D1=81=D1=88=D0=B8=D1=80?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F"=20=D0=BF=D1=80=D0=B8=20=D0=BE=D0=B1?=
=?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=81=D1=87?=
=?UTF-8?q?=D0=B8=D1=82=D0=B0=D0=BB=D0=B8=D1=81=D1=8C=20=D0=B8=D0=B7=D0=BC?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/extension/extension.go | 2 +-
pkg/extension/schema.go | 12 ++++++------
pkg/extension/storage.go | 8 +++++---
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/pkg/extension/extension.go b/pkg/extension/extension.go
index 0e13061b..ae7878d5 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 c2ad5dfd..6b1ff266 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 0d8479c1..07355eee 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())
--
GitLab