@solidstarters/solid-core 1.2.39 → 1.2.41

package/dist/seeders/seed-data/solid-core-metadata.json

@@ -1369,9 +1369,9 @@
                 ]
             },
             {
-                "singularName": "solidMediaModel",
+                "singularName": "media",
                 "tableName": "ss_media_model",
-                "pluralName": "solidMediaModels",
+                "pluralName": "medias",
                 "displayName": "solid Media Model",
                 "description": "Model to capture all Media in the system",
                 "dataSource": "default",
@@ -1390,6 +1390,7 @@
                         "index": true,
                         "private": false,
                         "encrypt": false,
+                        "columnName": "entity_id",
                         "isSystem": true
                     },
                     {
@@ -1403,18 +1404,21 @@
                         "index": false,
                         "private": false,
                         "encrypt": false,
+                        "columnName": "relative_uri",
                         "isSystem": true
                     },
                     {
-                        "name": "size",
-                        "displayName": "Size",
+                        "name": "fileSize",
+                        "displayName": "File Size",
                         "type": "int",
                         "ormType": "integer",
                         "required": false,
+                        "defaultValue": 0,
                         "unique": false,
                         "index": false,
                         "private": false,
                         "encrypt": false,
+                        "columnName": "file_size",
                         "isSystem": true
                     },
                     {
@@ -1424,10 +1428,12 @@
                         "ormType": "varchar",
                         "length": 512,
                         "required": false,
+                        "defaultValue": "",
                         "unique": false,
                         "index": false,
                         "private": false,
                         "encrypt": false,
+                        "columnName": "mime_type",
                         "isSystem": true
                     },
                     {
@@ -1441,6 +1447,7 @@
                         "index": false,
                         "private": false,
                         "encrypt": false,
+                        "columnName": "original_file_name",
                         "isSystem": true
                     },
                     {
@@ -1454,6 +1461,7 @@
                         "encrypt": false,
                         "relationType": "many-to-one",
                         "relationCoModelSingularName": "modelMetadata",
+                        "relationCoModelColumnName": "model_metadata_id",
                         "relationCreateInverse": false,
                         "relationCascade": "set null",
                         "relationModelModuleName": "solid-core",
@@ -1470,6 +1478,7 @@
                         "encrypt": false,
                         "relationType": "many-to-one",
                         "relationCoModelSingularName": "mediaStorageProviderMetadata",
+                        "relationCoModelColumnName": "media_storage_provider_metadata_id",
                         "relationCreateInverse": false,
                         "relationCascade": "set null",
                         "relationModelModuleName": "solid-core",
@@ -1486,6 +1495,7 @@
                         "encrypt": false,
                         "relationType": "many-to-one",
                         "relationCoModelSingularName": "fieldMetadata",
+                        "relationCoModelColumnName": "field_metadata_id",
                         "relationCreateInverse": false,
                         "relationCascade": "set null",
                         "relationModelModuleName": "solid-core",
@@ -2532,22 +2542,22 @@
             "modelUserKey": "menuItemMetadata"
         },
         {
-            "displayName": "Solid Media Model list action",
-            "name": "solidMediaModel-list-action",
-            "type": "custom",
+            "displayName": "Media list action",
+            "name": "media-list-action",
+            "type": "solid",
             "domain": "",
             "context": "",
             "customComponent": "/admin/app-builder/media/all",
             "customIsModal": true,
             "serverEndpoint": "",
-            "viewUserKey": "solidMediaModel-list-view",
+            "viewUserKey": "media-list-view",
             "moduleUserKey": "solid-core",
-            "modelUserKey": "solidMediaModel"
+            "modelUserKey": "media"
         },
         {
             "displayName": "Solid Media Storage Provider Model list action",
             "name": "mediaStorageProviderMetadata-list-action",
-            "type": "custom",
+            "type": "solid",
             "domain": "",
             "context": "",
             "customComponent": "/admin/app-builder/media-storage-provider/all",
@@ -2728,7 +2738,7 @@
             "parentMenuItemUserKey": "layout-builder-menu-item"
         },
         {
-            "displayName": "Media",
+            "displayName": "Media & other",
             "name": "media-menu-item",
             "sequenceNumber": 3,
             "actionUserKey": "media-root",
@@ -2736,18 +2746,18 @@
             "parentMenuItemUserKey": ""
         },
         {
-            "displayName": "Media Storage Provider",
-            "name": "media-storage-provider",
-            "sequenceNumber": 7,
-            "actionUserKey": "mediaStorageProviderMetadata-list-action",
+            "displayName": "Media",
+            "name": "media-metadata-menu-item",
+            "sequenceNumber": 3,
+            "actionUserKey": "media-list-action",
             "moduleUserKey": "solid-core",
             "parentMenuItemUserKey": "media-menu-item"
         },
         {
-            "displayName": "Media",
-            "name": "media",
-            "sequenceNumber": 8,
-            "actionUserKey": "solidMediaModel-list-action",
+            "displayName": "Media Storage Provider",
+            "name": "media-storage-provider",
+            "sequenceNumber": 7,
+            "actionUserKey": "mediaStorageProviderMetadata-list-action",
             "moduleUserKey": "solid-core",
             "parentMenuItemUserKey": "media-menu-item"
         },
@@ -4038,12 +4048,12 @@
             }
         },
         {
-            "name": "solidMediaModel-list-view",
+            "name": "media-list-view",
             "displayName": "Solid Media Model",
             "type": "list",
             "context": "{}",
             "moduleUserKey": "solid-core",
-            "modelUserKey": "solidMediaModel",
+            "modelUserKey": "media",
             "layout": {
                 "type": "list",
                 "attrs": {
@@ -4056,59 +4066,165 @@
                     "enableGlobalSearch": true,
                     "create": true,
                     "edit": true,
-                    "delete": true
+                    "delete": true,
+                    "allowedViews": [
+                        "list",
+                        "kanban"
+                    ]
                 },
                 "children": [
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "entityId",
-                            "sortable": true,
-                            "filterable": true
+                            "name": "entityId"
                         }
                     },
                     {
                         "type": "field",
                         "attrs": {
                             "name": "relativeUri",
-                            "sortable": true,
-                            "filterable": true
+                            "renderMode": "image"
                         }
                     },
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "modelMetadata",
-                            "sortable": true,
-                            "filterable": true
+                            "name": "modelMetadata"
                         }
                     },
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "mediaStorageProviderMetadata",
-                            "sortable": true,
-                            "filterable": true
+                            "name": "mediaStorageProviderMetadata"
                         }
                     },
                     {
                         "type": "field",
                         "attrs": {
-                            "name": "fieldMetadata",
-                            "sortable": true,
-                            "filterable": true
+                            "name": "fieldMetadata"
                         }
                     }
                 ]
             }
         },
         {
-            "name": "solidMediaModel-form-view",
+            "name": "media-kanban-view",
+            "displayName": "Media Kanban",
+            "type": "kanban",
+            "context": "{}",
+            "moduleUserKey": "solid-core",
+            "modelUserKey": "media",
+            "layout": {
+                "type": "kanban",
+                "attrs": {
+                    "swimlanesCount": 10,
+                    "recordsInSwimlane": 5,
+                    "enableGlobalSearch": true,
+                    "create": true,
+                    "edit": true,
+                    "delete": true,
+                    "groupBy": "mimeType",
+                    "draggable": true,
+                    "allowedViews": [
+                        "list",
+                        "kanban"
+                    ]
+                },
+                "children": [
+                    {
+                        "type": "card",
+                        "attrs": {
+                            "name": "Card"
+                        },
+                        "children": [
+                            {
+                                "type": "row",
+                                "attrs": {
+                                    "name": "row-1",
+                                    "label": "",
+                                    "className": "row"
+                                },
+                                "children": [
+                                    {
+                                        "type": "column",
+                                        "attrs": {
+                                            "name": "col-1",
+                                            "label": "",
+                                            "className": "col-6"
+                                        },
+                                        "children": [
+                                            {
+                                                "type": "field",
+                                                "attrs": {
+                                                    "name": "mimeType",
+                                                    "label": "mimeType"
+                                                }
+                                            },
+                                            {
+                                                "type": "field",
+                                                "attrs": {
+                                                    "name": "relativeUri",
+                                                    "label": "relativeUri",
+                                                    "renderMode": "image"
+                                                }
+                                            },
+                                            {
+                                                "type": "field",
+                                                "attrs": {
+                                                    "name": "originalFileName",
+                                                    "label": "originalFileName"
+                                                }
+                                            }
+                                        ]
+                                    }
+                                ]
+                            },
+                            {
+                                "type": "row",
+                                "attrs": {
+                                    "name": "row-2",
+                                    "label": "",
+                                    "className": "row"
+                                },
+                                "children": [
+                                    {
+                                        "type": "column",
+                                        "attrs": {
+                                            "name": "col-1",
+                                            "label": "",
+                                            "className": "col-12"
+                                        },
+                                        "children": [
+                                            {
+                                                "type": "field",
+                                                "attrs": {
+                                                    "name": "fileSize",
+                                                    "label": "fileSize"
+                                                }
+                                            },
+                                            {
+                                                "type": "field",
+                                                "attrs": {
+                                                    "name": "mediaStorageProviderMetadata",
+                                                    "label": "mediaStorageProviderMetadata"
+                                                }
+                                            }
+                                        ]
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        },
+        {
+            "name": "media-form-view",
             "displayName": "Solid Media Model",
             "type": "form",
             "context": "{}",
             "moduleUserKey": "solid-core",
-            "modelUserKey": "solidMediaModel",
+            "modelUserKey": "media",
             "layout": {
                 "type": "form",
                 "attrs": {

package/dist/services/action-metadata.service.d.ts

@@ -1,26 +1,23 @@
-import { DiscoveryService } from "@nestjs/core";
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { EntityManager, Repository } from 'typeorm';
 import { CRUDService } from 'src/services/crud.service';
 import { ModelMetadataService } from 'src/services/model-metadata.service';
 import { ModuleMetadataService } from 'src/services/module-metadata.service';
-import { MediaStorageProviderMetadataService } from 'src/services/media-storage-provider-metadata.service';
 import { ConfigService } from '@nestjs/config';
-import { MediaService } from "src/services/media.service";
 import { FileService } from "src/services/file.service";
 import { CrudHelperService } from "src/services/crud-helper.service";
 import { ActionMetadata } from '../entities/action-metadata.entity';
 export declare class ActionMetadataService extends CRUDService<ActionMetadata> {
     readonly modelMetadataService: ModelMetadataService;
     readonly moduleMetadataService: ModuleMetadataService;
-    readonly mediaStorageProviderService: MediaStorageProviderMetadataService;
     readonly configService: ConfigService;
     readonly fileService: FileService;
-    readonly mediaService: MediaService;
     readonly discoveryService: DiscoveryService;
     readonly crudHelperService: CrudHelperService;
     readonly entityManager: EntityManager;
     readonly repo: Repository<ActionMetadata>;
-    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, mediaStorageProviderService: MediaStorageProviderMetadataService, configService: ConfigService, fileService: FileService, mediaService: MediaService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<ActionMetadata>);
+    readonly moduleRef: ModuleRef;
+    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<ActionMetadata>, moduleRef: ModuleRef);
     findOneByUserKey(name: string, relations?: {}): Promise<ActionMetadata>;
     upsert(updateSolidActionDto: any): Promise<any>;
 }

package/dist/services/action-metadata.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"action-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/action-metadata.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,mCAAmC,EAAE,MAAM,sDAAsD,CAAC;AAC3G,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAGrE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,qBACa,qBAAsB,SAAQ,WAAW,CAAC,cAAc,CAAC;IAElE,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,2BAA2B,EAAE,mCAAmC;IACzE,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,YAAY,EAAE,YAAY;IACnC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC;gBAXhC,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,2BAA2B,EAAE,mCAAmC,EAChE,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC;IAKrC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,KAAK;IAU7C,MAAM,CAAC,oBAAoB,EAAE,GAAG;CAoBvC"}
+{"version":3,"file":"action-metadata.service.d.ts","sourceRoot":"","sources":["../../src/services/action-metadata.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAGrE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,qBACa,qBAAsB,SAAQ,WAAW,CAAC,cAAc,CAAC;IAElE,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC;IACzC,QAAQ,CAAC,SAAS,EAAE,SAAS;gBAVpB,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,EAChC,SAAS,EAAE,SAAS;IAMzB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,KAAK;IAU7C,MAAM,CAAC,oBAAoB,EAAE,GAAG;CAoBvC"}

package/dist/services/action-metadata.service.js

@@ -20,25 +20,22 @@ const typeorm_2 = require("typeorm");
 const crud_service_1 = require("./crud.service");
 const model_metadata_service_1 = require("./model-metadata.service");
 const module_metadata_service_1 = require("./module-metadata.service");
-const media_storage_provider_metadata_service_1 = require("./media-storage-provider-metadata.service");
 const config_1 = require("@nestjs/config");
-const media_service_1 = require("./media.service");
 const file_service_1 = require("./file.service");
 const crud_helper_service_1 = require("./crud-helper.service");
 const action_metadata_entity_1 = require("../entities/action-metadata.entity");
 let ActionMetadataService = class ActionMetadataService extends crud_service_1.CRUDService {
-    constructor(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, entityManager, repo) {
-        super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, entityManager, repo, 'actionMetadata', 'app-builder');
+    constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, moduleRef) {
+        super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'actionMetadata', 'app-builder', moduleRef);
         this.modelMetadataService = modelMetadataService;
         this.moduleMetadataService = moduleMetadataService;
-        this.mediaStorageProviderService = mediaStorageProviderService;
         this.configService = configService;
         this.fileService = fileService;
-        this.mediaService = mediaService;
         this.discoveryService = discoveryService;
         this.crudHelperService = crudHelperService;
         this.entityManager = entityManager;
         this.repo = repo;
+        this.moduleRef = moduleRef;
     }
     async findOneByUserKey(name, relations = {}) {
         const entity = await this.repo.findOne({
@@ -68,17 +65,16 @@ let ActionMetadataService = class ActionMetadataService extends crud_service_1.C
 exports.ActionMetadataService = ActionMetadataService;
 exports.ActionMetadataService = ActionMetadataService = __decorate([
     (0, common_1.Injectable)(),
-    __param(8, (0, typeorm_1.InjectEntityManager)()),
-    __param(9, (0, typeorm_1.InjectRepository)(action_metadata_entity_1.ActionMetadata, 'default')),
+    __param(6, (0, typeorm_1.InjectEntityManager)()),
+    __param(7, (0, typeorm_1.InjectRepository)(action_metadata_entity_1.ActionMetadata, 'default')),
     __metadata("design:paramtypes", [model_metadata_service_1.ModelMetadataService,
         module_metadata_service_1.ModuleMetadataService,
-        media_storage_provider_metadata_service_1.MediaStorageProviderMetadataService,
         config_1.ConfigService,
         file_service_1.FileService,
-        media_service_1.MediaService,
         core_1.DiscoveryService,
         crud_helper_service_1.CrudHelperService,
         typeorm_2.EntityManager,
-        typeorm_2.Repository])
+        typeorm_2.Repository,
+        core_1.ModuleRef])
 ], ActionMetadataService);
 //# sourceMappingURL=action-metadata.service.js.map

package/dist/services/action-metadata.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"action-metadata.service.js","sourceRoot":"","sources":["../../src/services/action-metadata.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAwE;AACxE,uCAAgD;AAChD,qCAAoD;AACpD,iDAAwD;AACxD,qEAA2E;AAC3E,uEAA6E;AAC7E,uGAA2G;AAC3G,2CAA+C;AAC/C,mDAA0D;AAC1D,iDAAwD;AACxD,+DAAqE;AAGrE,+EAAoE;AAG7D,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,0BAA2B;IACpE,YACW,oBAA0C,EAC1C,qBAA4C,EAC5C,2BAAgE,EAChE,aAA4B,EAC5B,WAAwB,EACxB,YAA0B,EAC1B,gBAAkC,EAClC,iBAAoC,EAEpC,aAA4B,EAE5B,IAAgC;QAEzC,KAAK,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC;QAb5M,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,gCAA2B,GAA3B,2BAA2B,CAAqC;QAChE,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,kBAAa,GAAb,aAAa,CAAe;QAE5B,SAAI,GAAJ,IAAI,CAA4B;IAG3C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY,EAAE,SAAS,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACrC,KAAK,EAAE;gBACL,IAAI,EAAE,IAAI;aACX;YACD,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,oBAAyB;QAEpC,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YAClD,KAAK,EAAE;gBACL,IAAI,EAAE,oBAAoB,CAAC,IAAI;aAChC;SACF,CAAC,CAAA;QAGF,IAAI,mBAAmB,EAAE,CAAC;YACxB,MAAM,qBAAqB,GAAG,EAAE,GAAG,mBAAmB,EAAE,GAAG,oBAAoB,EAAE,CAAC;YAClF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC/C,CAAC;aAEI,CAAC;YACJ,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;CAEF,CAAA;AAhDY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAWR,WAAA,IAAA,6BAAmB,GAAE,CAAA;IAErB,WAAA,IAAA,0BAAgB,EAAC,uCAAc,EAAE,SAAS,CAAC,CAAA;qCAVb,6CAAoB;QACnB,+CAAqB;QACf,6EAAmC;QACjD,sBAAa;QACf,0BAAW;QACV,4BAAY;QACR,uBAAgB;QACf,uCAAiB;QAErB,uBAAa;QAEtB,oBAAU;GAbhB,qBAAqB,CAgDjC"}
+{"version":3,"file":"action-metadata.service.js","sourceRoot":"","sources":["../../src/services/action-metadata.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAwE;AACxE,uCAA2D;AAC3D,qCAAoD;AACpD,iDAAwD;AACxD,qEAA2E;AAC3E,uEAA6E;AAC7E,2CAA+C;AAC/C,iDAAwD;AACxD,+DAAqE;AAGrE,+EAAoE;AAG7D,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,0BAA2B;IACpE,YACW,oBAA0C,EAC1C,qBAA4C,EAC5C,aAA4B,EAC5B,WAAwB,EACxB,gBAAkC,EAClC,iBAAoC,EAEpC,aAA4B,EAE5B,IAAgC,EAChC,SAAoB;QAG7B,KAAK,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,IAAI,EAAE,gBAAgB,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;QAb5K,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,kBAAa,GAAb,aAAa,CAAe;QAE5B,SAAI,GAAJ,IAAI,CAA4B;QAChC,cAAS,GAAT,SAAS,CAAW;IAI/B,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY,EAAE,SAAS,GAAG,EAAE;QACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YACrC,KAAK,EAAE;gBACL,IAAI,EAAE,IAAI;aACX;YACD,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,oBAAyB;QAEpC,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YAClD,KAAK,EAAE;gBACL,IAAI,EAAE,oBAAoB,CAAC,IAAI;aAChC;SACF,CAAC,CAAA;QAGF,IAAI,mBAAmB,EAAE,CAAC;YACxB,MAAM,qBAAqB,GAAG,EAAE,GAAG,mBAAmB,EAAE,GAAG,oBAAoB,EAAE,CAAC;YAClF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC/C,CAAC;aAEI,CAAC;YACJ,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;CAEF,CAAA;AAhDY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IASR,WAAA,IAAA,6BAAmB,GAAE,CAAA;IAErB,WAAA,IAAA,0BAAgB,EAAC,uCAAc,EAAE,SAAS,CAAC,CAAA;qCARb,6CAAoB;QACnB,+CAAqB;QAC7B,sBAAa;QACf,0BAAW;QACN,uBAAgB;QACf,uCAAiB;QAErB,uBAAa;QAEtB,oBAAU;QACL,gBAAS;GAZpB,qBAAqB,CAgDjC"}

package/dist/services/crud.service.d.ts

@@ -1,28 +1,25 @@
 import { ConfigService } from "@nestjs/config";
-import { DiscoveryService } from "@nestjs/core";
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { EntityManager } from "typeorm";
 import { Repository } from "typeorm/repository/Repository";
 import { BasicFilterDto } from "../dtos/basic-filters.dto";
 import { CrudHelperService } from "./crud-helper.service";
 import { FileService } from "./file.service";
-import { MediaStorageProviderMetadataService } from "./media-storage-provider-metadata.service";
-import { MediaService } from "./media.service";
 import { ModelMetadataService } from "./model-metadata.service";
 import { ModuleMetadataService } from "./module-metadata.service";
 export declare class CRUDService<T> {
     readonly modelMetadataService: ModelMetadataService;
     readonly moduleMetadataService: ModuleMetadataService;
-    readonly mediaStorageProviderService: MediaStorageProviderMetadataService;
     readonly configService: ConfigService;
     readonly fileService: FileService;
-    readonly mediaService: MediaService;
     readonly discoveryService: DiscoveryService;
     readonly crudHelperService: CrudHelperService;
     readonly entityManager: EntityManager;
     readonly repo: Repository<T>;
     readonly modelName: string;
     readonly moduleName: string;
-    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, mediaStorageProviderService: MediaStorageProviderMetadataService, configService: ConfigService, fileService: FileService, mediaService: MediaService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<T>, modelName: string, moduleName: string);
+    readonly moduleRef: ModuleRef;
+    constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<T>, modelName: string, moduleName: string, moduleRef: ModuleRef);
     create(createDto: any, files?: Express.Multer.File[], solidRequestContext?: any): Promise<T>;
     private loadInverseRelationFields;
     private loadModel;

package/dist/services/crud.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crud.service.d.ts","sourceRoot":"","sources":["../../src/services/crud.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"crud.service.d.ts","sourceRoot":"","sources":["../../src/services/crud.service.ts"],"names":[],"mappings":"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"}

package/dist/services/crud.service.js

@@ -29,19 +29,18 @@ const mediaStorageProviders_1 = require("./mediaStorageProviders");
 const DEFAULT_LIMIT = 10;
 const DEFAULT_OFFSET = 0;
 class CRUDService {
-    constructor(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, entityManager, repo, modelName, moduleName) {
+    constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, modelName, moduleName, moduleRef) {
         this.modelMetadataService = modelMetadataService;
         this.moduleMetadataService = moduleMetadataService;
-        this.mediaStorageProviderService = mediaStorageProviderService;
         this.configService = configService;
         this.fileService = fileService;
-        this.mediaService = mediaService;
         this.discoveryService = discoveryService;
         this.crudHelperService = crudHelperService;
         this.entityManager = entityManager;
         this.repo = repo;
         this.modelName = modelName;
         this.moduleName = moduleName;
+        this.moduleRef = moduleRef;
     }
     async create(createDto, files = [], solidRequestContext = {}) {
         let hasMediaFields = false;
@@ -116,7 +115,7 @@ class CRUDService {
             if (media.length > 0) {
                 const storageProviderMetadata = mediaField.mediaStorageProvider;
                 const storageProviderType = storageProviderMetadata.type;
-                const storageProvider = (0, mediaStorageProviders_1.getMediaStorageProvider)(this.configService, this.fileService, this.mediaService, storageProviderType);
+                const storageProvider = await (0, mediaStorageProviders_1.getMediaStorageProvider)(this.moduleRef, storageProviderType);
                 await storageProvider.store(media, savedEntity, mediaField);
             }
         });
@@ -440,7 +439,7 @@ class CRUDService {
                 const media = await Promise.all(mediaFields.map(async (mediaField) => {
                     const storageProviderMetadata = mediaField.mediaStorageProvider;
                     const storageProviderType = storageProviderMetadata.type;
-                    const storageProvider = (0, mediaStorageProviders_1.getMediaStorageProvider)(this.configService, this.fileService, this.mediaService, storageProviderType);
+                    const storageProvider = await (0, mediaStorageProviders_1.getMediaStorageProvider)(this.moduleRef, storageProviderType);
                     const mediaResult = await storageProvider.retrieve(entity, mediaField);
                     mediaObj[mediaField.name] = mediaResult;
                 }));
@@ -484,7 +483,7 @@ class CRUDService {
                 }
                 const storageProviderMetadata = mediaField.mediaStorageProvider;
                 const storageProviderType = storageProviderMetadata.type;
-                const storageProvider = (0, mediaStorageProviders_1.getMediaStorageProvider)(this.configService, this.fileService, this.mediaService, storageProviderType);
+                const storageProvider = await (0, mediaStorageProviders_1.getMediaStorageProvider)(this.moduleRef, storageProviderType);
                 const mediaResult = await storageProvider.retrieve(entity, mediaField);
                 let obj = { [mediaField.name]: mediaResult };
                 mediaObj[mediaField.name] = mediaResult;