Skip to content

Commit 4d60852

Browse files
authored
fix(server): fix bug that visibility become empty when project import (#1777)
1 parent b3b4e9a commit 4d60852

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

server/internal/app/file_uploader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func serveUploadFiles(
126126

127127
func CreateProcessingProject(ctx context.Context, usecases *interfaces.Container, op *usecase.Operator, wsId string) (*project.Project, error) {
128128

129-
visibility := "private"
129+
visibility := string(project.VisibilityPrivate)
130130
coreSupport := true
131131
unknown := "It's importing now..."
132132
workspaceID, err := accountdomain.WorkspaceIDFrom(wsId)

server/internal/usecase/interactor/project.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,12 @@ func (i *Project) Create(ctx context.Context, input interfaces.CreateProjectPara
343343
visibility = project.Visibility(*input.Visibility)
344344
}
345345

346-
if i.policyChecker != nil {
346+
// override visibility to public if it's an import
347+
if isImport {
348+
visibility = project.VisibilityPublic
349+
}
347350

351+
if i.policyChecker != nil {
348352
if isImport {
349353
// Try checking if user can create private project
350354
errPrivate := i.checkGeneralPolicy(ctx, input.WorkspaceID, project.VisibilityPrivate)
@@ -362,7 +366,6 @@ func (i *Project) Create(ctx context.Context, input interfaces.CreateProjectPara
362366

363367
}
364368

365-
// project.Visibility(input.Visibility),
366369
return i.createProject(ctx, createProjectInput{
367370
WorkspaceID: input.WorkspaceID,
368371
Visualizer: input.Visualizer,
@@ -1095,6 +1098,12 @@ func (i *Project) ImportProjectData(ctx context.Context, workspace string, proje
10951098
topics = &ret
10961099
}
10971100

1101+
visibility := project.VisibilityPublic
1102+
if ret, ok := projectData["visibility"].(string); ok {
1103+
vis := project.Visibility(ret)
1104+
visibility = vis
1105+
}
1106+
10981107
result, err := i.createProject(ctx, createProjectInput{
10991108
WorkspaceID: workspaceId,
11001109
ProjectID: projectId,
@@ -1109,7 +1118,7 @@ func (i *Project) ImportProjectData(ctx context.Context, workspace string, proje
11091118
Readme: readme,
11101119
License: license,
11111120
Topics: topics,
1112-
// skip Visibility
1121+
Visibility: &visibility,
11131122
}, op)
11141123
if err != nil {
11151124
return nil, err

0 commit comments

Comments
 (0)