Commit e16546f8 authored by steven's avatar steven

chore: handle legacy workspace setting

parent a73f979f
......@@ -73,7 +73,7 @@ func (s *APIV1Service) ListMemoResources(ctx context.Context, request *v1pb.List
MemoID: &id,
})
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to list resources")
return nil, status.Errorf(codes.Internal, "failed to list resources: %v", err)
}
response := &v1pb.ListMemoResourcesResponse{
......
......@@ -69,6 +69,9 @@ func (s *Store) ListWorkspaceSettings(ctx context.Context, find *FindWorkspaceSe
if err != nil {
return nil, errors.Wrap(err, "Failed to convert workspace setting")
}
if workspaceSetting == nil {
continue
}
s.workspaceSettingCache.Store(workspaceSetting.Key.String(), workspaceSetting)
workspaceSettings = append(workspaceSettings, workspaceSetting)
}
......@@ -206,7 +209,8 @@ func convertWorkspaceSettingFromRaw(workspaceSettingRaw *WorkspaceSetting) (*sto
}
workspaceSetting.Value = &storepb.WorkspaceSetting_MemoRelatedSetting{MemoRelatedSetting: memoRelatedSetting}
default:
return nil, errors.Errorf("unsupported workspace setting key: %v", workspaceSettingRaw.Name)
// Skip unsupported workspace setting key.
return nil, nil
}
return workspaceSetting, nil
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment