@solidstarters/solid-core 1.2.39 → 1.2.41

package/src/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,167 @@
           "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": {
@@ -5206,7 +5324,7 @@
                             "type": "field",
                             "attrs": {
                               "name": "name",
-                              "showLabel":false
+                              "showLabel": false
                             }
                           }
                         ]
@@ -5233,7 +5351,7 @@
                             "attrs": {
                               "name": "permissions",
                               "renderMode": "autocomplete",
-                              "showLabel":false
+                              "showLabel": false
                             }
                           }
                         ]
@@ -5259,7 +5377,7 @@
                             "type": "field",
                             "attrs": {
                               "name": "users",
-                              "showLabel":false
+                              "showLabel": false
                             }
                           }
                         ]
@@ -5285,7 +5403,7 @@
                             "type": "field",
                             "attrs": {
                               "name": "menuItems",
-                              "showLabel":false
+                              "showLabel": false
                             }
                           }
                         ]

package/src/services/action-metadata.service.ts

@@ -1,13 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';
-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";
 
@@ -19,18 +17,18 @@ export class ActionMetadataService extends CRUDService<ActionMetadata> {
   constructor(
     readonly modelMetadataService: ModelMetadataService,
     readonly moduleMetadataService: ModuleMetadataService,
-    readonly mediaStorageProviderService: MediaStorageProviderMetadataService,
     readonly configService: ConfigService,
     readonly fileService: FileService,
-    readonly mediaService: MediaService,
     readonly discoveryService: DiscoveryService,
     readonly crudHelperService: CrudHelperService,
     @InjectEntityManager()
     readonly entityManager: EntityManager,
     @InjectRepository(ActionMetadata, 'default')
     readonly repo: Repository<ActionMetadata>,
+    readonly moduleRef: ModuleRef
+
   ) {
-    super(modelMetadataService, moduleMetadataService, mediaStorageProviderService, configService, fileService, mediaService, discoveryService, crudHelperService, entityManager, repo, 'actionMetadata', 'app-builder');
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'actionMetadata', 'app-builder', moduleRef);
   }
 
   async findOneByUserKey(name: string, relations = {}) {

package/src/services/crud.service.ts

@@ -1,6 +1,6 @@
 import { BadRequestException } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
-import { DiscoveryService } from "@nestjs/core";
+import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { EntityManager, In, IsNull, Not, QueryFailedError, SelectQueryBuilder } from "typeorm";
 import { Repository } from "typeorm/repository/Repository";
 import { BasicFilterDto } from "../dtos/basic-filters.dto";
@@ -31,12 +31,9 @@ import { UUIDFieldCrudManager } from "../helpers/field-crud-managers/UUIDFieldCr
 import { FieldCrudManager } from "../interfaces";
 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 { getMediaStorageProvider } from "./mediaStorageProviders";
 import { ModelMetadataService } from "./model-metadata.service";
 import { ModuleMetadataService } from "./module-metadata.service";
-import { SolidRequestContextDto } from "src/dtos/solid-request-context.dto";
 
 const DEFAULT_LIMIT = 10;
 const DEFAULT_OFFSET = 0;
@@ -45,16 +42,15 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
     constructor(
         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,
+        readonly moduleRef: ModuleRef
         //We can just have the Model Entity here
     ) { }
 
@@ -160,7 +156,7 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
                 const storageProviderType = storageProviderMetadata.type as MediaStorageProviderType;
 
                 // Get the storage provider implementation
-                const storageProvider = getMediaStorageProvider(this.configService, this.fileService, this.mediaService, storageProviderType);
+                const storageProvider = await getMediaStorageProvider(this.moduleRef, storageProviderType);
 
                 //Commented the below code since we will be direclty images from server on call from ui 
                 // await storageProvider.delete(savedEntity, mediaField);
@@ -585,7 +581,7 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
                 const media = await Promise.all(mediaFields.map(async (mediaField) => {
                     const storageProviderMetadata = mediaField.mediaStorageProvider;
                     const storageProviderType = storageProviderMetadata.type as MediaStorageProviderType;
-                    const storageProvider = getMediaStorageProvider(this.configService, this.fileService, this.mediaService, storageProviderType);
+                    const storageProvider = await getMediaStorageProvider(this.moduleRef, storageProviderType);
                     const mediaResult = await storageProvider.retrieve(entity, mediaField);
                     mediaObj[mediaField.name] = mediaResult;
                 }));
@@ -637,7 +633,7 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
                 }
                 const storageProviderMetadata = mediaField.mediaStorageProvider;
                 const storageProviderType = storageProviderMetadata.type as MediaStorageProviderType;
-                const storageProvider = getMediaStorageProvider(this.configService, this.fileService, this.mediaService, storageProviderType);
+                const storageProvider = await getMediaStorageProvider(this.moduleRef, storageProviderType);
                 const mediaResult = await storageProvider.retrieve(entity, mediaField);
                 let obj = { [mediaField.name]: mediaResult }
                 mediaObj[mediaField.name] = mediaResult;

package/src/services/field-metadata.service.ts

@@ -853,7 +853,9 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "isUserKey"
+
                 ];
 
             case SolidFieldType.selectionDynamic:
@@ -874,7 +876,9 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "isUserKey"
+
                 ];
             case SolidFieldType.computed:
                 return [
@@ -894,7 +898,8 @@ export class FieldMetadataService {
                     "encrypt",
                     "encryptionType",
                     "decryptWhen",
-                    "columnName"
+                    "columnName",
+                    "isUserKey"
                 ];
 
             case SolidFieldType.uuid: