fix: COM-313

Author: felixroos

package.json

@@ -56,7 +56,7 @@
     "@ec.components/ui": "*",
     "ace-builds": "^1.4.3",
     "core-js": "^2.6.5",
-    "ec.sdk": "^0.21.13",
+    "ec.sdk": "^0.21.16",
     "googlemaps": "^1.12.0",
     "lerna": "^3.13.1",
     "medium-editor": "^5.23.2",

packages/data/src/lib/crud/crud.component.ts

@@ -14,6 +14,7 @@ import { EntryPopComponent } from '../entry-pop/entry-pop.component';
 import { WithLoader } from '@ec.components/ui';
 import { Notification, WithNotifications, SymbolService } from '@ec.components/ui';
 import { ModelConfigService } from '../model-config/model-config.service';
+import EntryResource from 'ec.sdk/lib/resources/publicAPI/EntryResource';
 
 /** The CrudComponent takes at least a model name to render an entry list with create/edit/delete functionality out of the box.
  * ```html
@@ -25,13 +26,13 @@ import { ModelConfigService } from '../model-config/model-config.service';
   selector: 'ec-crud',
   templateUrl: './crud.component.html',
 })
-export class CrudComponent<T> implements OnInit, WithLoader, WithNotifications {
+export class CrudComponent implements OnInit, WithLoader, WithNotifications {
   /** The model that should be crud'ed. */
   @Input() model: string;
   /** CrudConfig for customization of the crud's UI.*/
-  @Input() config: CrudConfig<T> = {};
+  @Input() config: CrudConfig<EntryResource> = {};
   /** The selection that should be used */
-  @Input() selection: Selection<T>;
+  @Input() selection: Selection<EntryResource>;
   /** The EntryList inside the template. */
   @ViewChild(EntryListComponent, { static: false }) list: EntryListComponent;
   /** The Pop inside the template. */
@@ -71,6 +72,12 @@ export class CrudComponent<T> implements OnInit, WithLoader, WithNotifications {
       this.config.methods = methods;
       this.cdr.markForCheck();
     });
+    this.modelConfig.generateConfig(this.model).then(config => {
+      this.config = {
+        ...config,
+        ...this.config
+      };
+    });
   }
 
   /** Returns true if the given method is part of the methods array (or if there is no methods array) */

packages/data/src/lib/entry-list/entry-list.component.ts

@@ -10,6 +10,7 @@ import { ResourceService } from '../resource-config/resource.service';
 import { ResourceListComponent } from '../resource-list/resource-list.component';
 import { SdkService } from '../sdk/sdk.service';
 import { EntryList } from './entry-list';
+import { CrudConfig } from '../crud/crud-config.interface';
 
 /** The EntryListComponent is a thin holder of an EntryList instance. It extends the ListComponent
  * <example-url>https://components.entrecode.de/entries/entry-list?e=1</example-url>
@@ -72,7 +73,7 @@ export class EntryListComponent extends ResourceListComponent implements OnDestr
       });
     return this.modelConfig
       .generateConfig(this.model, (this.config || {}).fields)
-      .then((config: ListConfig<EntryResource>) => {
+      .then((config: CrudConfig<EntryResource>) => {
         this.config = Object.assign(this.config || {}, config);
         this.initFilter();
         return new EntryList(this.model, this.config, this.sdk);

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

@@ -216,8 +216,10 @@ export class ModelConfigService extends Config {
    * or just specific components. */
   async generateConfig(model: string, customFieldConfig?: FieldConfig): Promise<CrudConfig<EntryResource>> {
     const lightModel = await this.getLightModel(model);
+    const { singularLabel } = lightModel.config;
     // first step: merge global model config with default entry config
     const modelConfig = Object.assign(this.get(model) || {}, {
+      singularLabel,
       identifier: 'id',
       identifierPattern: /^[0-9A-Za-z-_]{7,14}$/, // shortID pattern
       label: '_entryTitle',

src/app/crud/crud-demo.component.ts

@@ -12,7 +12,7 @@ export class CrudDemoComponent {
     defaultFilter: 'name',
     disableHeader: false,
     develop: true,
-    singularLabel: 'Muffin',
+    /* singularLabel: 'Muffin', */ // now handled by publicConfig
     createLabel: 'Neuer Muffin',
     size: 15,
     levels: 2,