fix: could not define custom components for entry field types

Author: felixroos

packages/data/src/model-config/model-config.service.ts

@@ -103,8 +103,8 @@ export class ModelConfigService extends Config {
             readOnly: schema.properties[property].readOnly,
             // required: schema.required.indexOf(property) !== -1,
             display: ((value) => value)
-          }, fieldConfig[property] ? fieldConfig[property] : {},
-          this.typeConfig.get(type.name));
+          }, this.typeConfig.get(type.name),
+          fieldConfig[property] ? fieldConfig[property] : {});
       });
       return fieldConfig;
     });

packages/data/src/model-config/type-config.service.ts

@@ -143,22 +143,4 @@ export class TypeConfigService {
     }
     Object.assign(this.types[type], config);
   }
-
-  /** Resolves entry/entries from nested resource or id inside (single and array).
-   * Gives back standardizes "light" entries {id, _entryTitle} */
-  /*static resolveEntries(entry, item, property, value = entry[property]) {
-    if (Array.isArray(value)) {
-      return value ? value.map((e) => TypeConfigService.resolveEntries(entry, item, property, e)) : [];
-    }
-    if (typeof value === 'string') {
-      //TODO use getLevels when ready
-      //TODO is it possible to get the model title field of the nested entry? (and useful)
-      return { id: value, _entryTitle: entry.getTitle(property) };
-    }
-    if (value && value.getTitle) {
-      // return { id: value.id, _entryTitle: value.getTitle('') }
-      return { id: value.id, _entryTitle: value.getTitle() }
-      //TODO use modelTitleField when it is possible to get it with lvl1
-    }
-  }*/
 }