Merge pull request #103 from anyproto/go-1539-error-object-is-not-an-object-type

fix objectShow with objects of removed types

Author: requilence

core/block/editor/smartblock/smartblock.go

@@ -445,6 +445,7 @@ func (sb *smartBlock) fetchMeta() (details []*model.ObjectViewDetailsSet, object
 	objectTypes, err = sb.objectStore.GetObjectTypes(uniqueObjTypes)
 	if err != nil {
 		log.With("objectID", sb.Id()).Errorf("error while fetching meta: get object types: %s", err)
+		err = nil
 	}
 	go sb.metaListener(recordsCh)
 	return

pkg/lib/localstore/objectstore/objects.go

@@ -492,6 +492,8 @@ func (s *dsObjectStore) GetInboundLinksByID(id string) ([]string, error) {
 	return findInboundLinks(txn, id)
 }
 
+// GetDetails returns empty struct without errors in case details are not found
+// todo: get rid of this or change the name method!
 func (s *dsObjectStore) GetDetails(id string) (*model.ObjectDetails, error) {
 	txn, err := s.ds.NewTransaction(true)
 	if err != nil {
@@ -774,20 +776,25 @@ func (s *dsObjectStore) GetObjectType(url string) (*model.ObjectType, error) {
 	if strings.HasPrefix(url, addr.BundledObjectTypeURLPrefix) {
 		return bundle.GetTypeByUrl(url)
 	}
-	objectInfos, err := s.GetByIDs(url)
+
+	details, err := s.GetDetails(url)
 	if err != nil {
 		return nil, err
 	}
-	if len(objectInfos) == 0 {
-		return nil, fmt.Errorf("object type not found in the index")
+
+	if pbtypes.IsStructEmpty(details.GetDetails()) {
+		return nil, ErrObjectNotFound
+	}
+
+	if pbtypes.GetBool(details.GetDetails(), bundle.RelationKeyIsDeleted.String()) {
+		return nil, fmt.Errorf("type was removed")
 	}
-	details := objectInfos[0].Details
 
-	if pbtypes.GetString(details, bundle.RelationKeyType.String()) != bundle.TypeKeyObjectType.URL() {
+	if pbtypes.GetString(details.Details, bundle.RelationKeyType.String()) != bundle.TypeKeyObjectType.URL() {
 		return nil, fmt.Errorf("object %s is not an object type", url)
 	}
 
-	return s.extractObjectTypeFromDetails(details, url), nil
+	return s.extractObjectTypeFromDetails(details.Details, url), nil
 }
 
 func (s *dsObjectStore) extractObjectTypeFromDetails(details *types.Struct, url string) *model.ObjectType {

util/pbtypes/pbtypes.go

@@ -545,3 +545,14 @@ func ValidateValue(t *types.Value) error {
 	}
 	return nil
 }
+
+func IsStructEmpty(s *types.Struct) bool {
+	if s == nil {
+		return true
+	} else if s.GetFields() == nil {
+		return true
+	} else if len(s.GetFields()) == 0 {
+		return true
+	}
+	return false
+}