@solidstarters/solid-core 1.2.125 → 1.2.128

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

@@ -1043,6 +1043,19 @@
             "encrypt": false,
             "columnName": "local_path",
             "isSystem": true
+          },
+          {
+            "name": "signedUrlExpiry",
+            "displayName": "Signed Url Expiry Time",
+            "type": "int",
+            "ormType": "integer",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "columnName": "signed_url_expiry",
+            "isSystem": true
           }
         ]
       },
@@ -2524,6 +2537,270 @@
           }
         ]
       },
+      {
+        "singularName": "scheduledJob",
+        "pluralName": "scheduledJobs",
+        "displayName": "Scheduled Job",
+        "description": "This table allows us to store schedule job configuration records.",
+        "dataSource": "default",
+        "dataSourceType": "postgres",
+        "tableName": "ss_scheduled_jobs",
+        "userKeyFieldUserKey": "scheduleName",
+        "isChild": false,
+        "enableAuditTracking": true,
+        "enableSoftDelete": true,
+        "draftPublishWorkflow": false,
+        "internationalisation": false,
+        "fields": [
+          {
+            "name": "scheduleName",
+            "displayName": "Schedule Name",
+            "description": null,
+            "type": "shortText",
+            "ormType": "varchar",
+            "isSystem": false,
+            "defaultValue": null,
+            "min": null,
+            "max": null,
+            "required": true,
+            "unique": true,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "isUserKey": true,
+            "enableAuditTracking": false
+          },
+          {
+            "name": "isActive",
+            "displayName": "Is Active",
+            "description": null,
+            "type": "boolean",
+            "ormType": "boolean",
+            "isSystem": false,
+            "defaultValue": null,
+            "required": true,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "enableAuditTracking": false
+          },
+          {
+            "name": "frequency",
+            "displayName": "Frequency",
+            "description": null,
+            "type": "selectionStatic",
+            "ormType": "varchar",
+            "isSystem": false,
+            "defaultValue": null,
+            "selectionStaticValues": [
+              "Once:Once",
+              "Hourly:Hourly",
+              "Daily:Daily",
+              "Weekly:Weekly",
+              "Monthly:Monthly",
+              "Custom:Custom"
+            ],
+            "selectionValueType": "string",
+            "required": true,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "enableAuditTracking": false,
+            "isMultiSelect": false
+          },
+          {
+            "name": "startTime",
+            "displayName": "Start Time",
+            "description": null,
+            "type": "time",
+            "ormType": "time",
+            "isSystem": false,
+            "defaultValue": null,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "enableAuditTracking": false
+          },
+          {
+            "name": "endTime",
+            "displayName": "End Time",
+            "description": null,
+            "type": "time",
+            "ormType": "time",
+            "isSystem": false,
+            "defaultValue": null,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "enableAuditTracking": false
+          },
+          {
+            "name": "startDate",
+            "displayName": "Start Date",
+            "description": null,
+            "type": "date",
+            "ormType": "date",
+            "isSystem": false,
+            "defaultValue": null,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "enableAuditTracking": false
+          },
+          {
+            "name": "endDate",
+            "displayName": "End Date",
+            "description": null,
+            "type": "date",
+            "ormType": "date",
+            "isSystem": false,
+            "defaultValue": null,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "enableAuditTracking": false
+          },
+          {
+            "name": "dayOfMonth",
+            "displayName": "Day Of Month",
+            "description": null,
+            "type": "int",
+            "ormType": "integer",
+            "isSystem": false,
+            "defaultValue": null,
+            "min": null,
+            "max": null,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "enableAuditTracking": false
+          },
+          {
+            "name": "lastRunAt",
+            "displayName": "Last Run At",
+            "description": null,
+            "type": "datetime",
+            "ormType": "timestamp",
+            "isSystem": false,
+            "defaultValue": null,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "enableAuditTracking": false
+          },
+          {
+            "name": "nextRunAt",
+            "displayName": "Next Run At",
+            "description": null,
+            "type": "datetime",
+            "ormType": "timestamp",
+            "isSystem": false,
+            "defaultValue": null,
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "enableAuditTracking": false
+          },
+          {
+            "name": "dayOfWeek",
+            "displayName": "Day Of Week",
+            "description": null,
+            "type": "selectionStatic",
+            "ormType": "varchar",
+            "isSystem": false,
+            "defaultValue": null,
+            "selectionStaticValues": [
+              "Monday:Monday",
+              "Tuesday:Tuesday",
+              "Wednesday:Wednesday",
+              "Thursday:Thursday",
+              "Friday:Friday",
+              "Saturday:Saturday",
+              "Sunday:Sunday"
+            ],
+            "selectionValueType": "string",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "enableAuditTracking": false,
+            "isMultiSelect": true
+          },
+          {
+            "name": "job",
+            "displayName": "Job",
+            "description": null,
+            "type": "selectionDynamic",
+            "ormType": "varchar",
+            "isSystem": false,
+            "defaultValue": null,
+            "min": null,
+            "max": null,
+            "required": true,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "encryptionType": null,
+            "decryptWhen": null,
+            "columnName": null,
+            "isUserKey": false,
+            "enableAuditTracking": false,
+            "selectionValueType": "string",
+            "selectionDynamicProvider": "ListOfScheduledJobsSelectionProvider",
+            "selectionDynamicProviderCtxt": "{}"
+          }
+        ]
+      },
       {
         "singularName": "setting",
         "tableName": "ss_setting",
@@ -4294,6 +4571,19 @@
       "moduleUserKey": "solid-core",
       "modelUserKey": "mqMessageQueue"
     },
+    {
+      "displayName": "Scheduled Jobs list action",
+      "name": "scheduledJob-list-action",
+      "type": "solid",
+      "domain": "",
+      "context": "",
+      "customComponent": "",
+      "customIsModal": true,
+      "serverEndpoint": "",
+      "viewUserKey": "scheduledJob-list-view",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "scheduledJob"
+    },
     {
       "displayName": "Settings action",
       "name": "settings-list-action",
@@ -4607,6 +4897,14 @@
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "queues-menu-item"
     },
+    {
+      "displayName": "Scheduled Jobs",
+      "name": "scheduledJob-menu-item",
+      "sequenceNumber": 2,
+      "actionUserKey": "scheduledJob-list-action",
+      "moduleUserKey": "solid-core",
+      "parentMenuItemUserKey": "other-menu-item"
+    },
     {
       "displayName": "Notification",
       "name": "notification-menu-item",
@@ -5783,6 +6081,13 @@
               "name": "localPath",
               "isSearchable": true
             }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "signedUrlExpiry",
+              "isSearchable": false
+            }
           }
         ]
       }
@@ -5857,6 +6162,13 @@
                       "name": "localPath",
                       "isSearchable": true
                     }
+                  },
+                  {
+                    "type": "field",
+                    "attrs": {
+                      "name": "signedUrlExpiry",
+                      "isSearchable": false
+                    }
                   }
                 ]
               }
@@ -8931,6 +9243,239 @@
         ]
       }
     },
+    {
+      "name": "scheduledJob-list-view",
+      "displayName": "Scheduled Job",
+      "type": "list",
+      "context": "{}",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "scheduledJob",
+      "layout": {
+        "type": "list",
+        "attrs": {
+          "pagination": true,
+          "pageSizeOptions": [
+            10,
+            25,
+            50
+          ],
+          "enableGlobalSearch": true,
+          "create": true,
+          "edit": true,
+          "delete": true
+        },
+        "children": [
+          {
+            "type": "field",
+            "attrs": {
+              "name": "id"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "scheduleName",
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "isActive"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "frequency",
+              "isSearchable": true
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "startTime"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "endTime"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "startDate"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "endDate"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "dayOfMonth"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "lastRunAt"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "nextRunAt"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "dayOfWeek"
+            }
+          },
+          {
+            "type": "field",
+            "attrs": {
+              "name": "job",
+              "sortable": true,
+              "filterable": true
+            }
+          }
+        ]
+      }
+    },
+    {
+      "name": "scheduledJob-form-view",
+      "displayName": "Scheduled Job",
+      "type": "form",
+      "context": "{}",
+      "moduleUserKey": "solid-core",
+      "modelUserKey": "scheduledJob",
+      "layout": {
+        "type": "form",
+        "attrs": {
+          "name": "form-1",
+          "label": "Scheduled Job",
+          "className": "grid"
+        },
+        "children": [
+          {
+            "type": "sheet",
+            "attrs": {
+              "name": "sheet-1"
+            },
+            "children": [
+              {
+                "type": "row",
+                "attrs": {
+                  "name": "sheet-1"
+                },
+                "children": [
+                  {
+                    "type": "column",
+                    "attrs": {
+                      "name": "group-1",
+                      "label": "Basic",
+                      "className": "col-6"
+                    },
+                    "children": [
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "scheduleName"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "job"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "type": "column",
+                    "attrs": {
+                      "name": "group-1",
+                      "label": "Configuration",
+                      "className": "col-6"
+                    },
+                    "children": [
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "isActive"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "frequency"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "startTime"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "endTime"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "startDate"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "endDate"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "lastRunAt"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "nextRunAt"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "dayOfWeek"
+                        }
+                      },
+                      {
+                        "type": "field",
+                        "attrs": {
+                          "name": "dayOfMonth"
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    },
     {
       "name": "settings-list-view",
       "displayName": "Settings",

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

@@ -28,7 +28,7 @@ export class ActionMetadataService extends CRUDService<ActionMetadata> {
     readonly moduleRef: ModuleRef
 
   ) {
-    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'actionMetadata', 'app-builder', moduleRef);
+    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'actionMetadata', 'solid-core', moduleRef);
   }
 
   async findOneByUserKey(name: string, relations = {}) {

package/src/services/authentication.service.ts

@@ -162,7 +162,7 @@ export class AuthenticationService {
             // Merge the extended signUpDto attributes into the user entity 
             //@ts-ignore 
             const extensionUser = extensionUserRepo.merge(extensionUserRepo.create() as T, extensionUserDto);
-            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(extensionUser, signUpDto, onForcePasswordChange);
+            var { user, pwd, autoGeneratedPwd } = await this.populateForSignup<T>(extensionUser, signUpDto, true, onForcePasswordChange);
             const savedUser = await extensionUserRepo.save(user);
 
             await this.handlePostSignup(savedUser, signUpDto.roles, pwd, autoGeneratedPwd);

package/src/services/crud.service.ts

@@ -1,5 +1,5 @@
-import { BadRequestException, Optional } from "@nestjs/common";
-import { ConfigService } from "@nestjs/config";
+import { BadRequestException, Inject, Optional } from "@nestjs/common";
+import { ConfigService, ConfigType } from "@nestjs/config";
 import { DiscoveryService, ModuleRef } from "@nestjs/core";
 import { EntityManager, In, IsNull, Not, QueryFailedError, SelectQueryBuilder } from "typeorm";
 import { Repository } from "typeorm/repository/Repository";
@@ -35,6 +35,7 @@ import { getMediaStorageProvider } from "./mediaStorageProviders";
 import { ModelMetadataService } from "./model-metadata.service";
 import { ModuleMetadataService } from "./module-metadata.service";
 import { isArray } from "class-validator";
+
 export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDto, so we get the proper types in our service
 
     constructor(
@@ -259,7 +260,7 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
     }
 
     private fieldCrudManager(fieldMetadata: FieldMetadata, entityManager: EntityManager, isPartialUpdate: boolean = false, isUpdate: boolean = false): FieldCrudManager {
-        const commonOptions = { required: fieldMetadata.required && !isPartialUpdate, fieldName: fieldMetadata.name, isUpdate};
+        const commonOptions = { required: fieldMetadata.required && !isPartialUpdate, fieldName: fieldMetadata.name, isUpdate };
         switch (fieldMetadata.type) {
             case SolidFieldType.shortText: {
                 const options = { ...commonOptions, length: fieldMetadata.max, regexPattern: fieldMetadata.regexPattern };
@@ -435,8 +436,8 @@ export class CRUDService<T> { // Add two generic value i.e Person,CreatePersonDt
         // Create above query on pincode table using query builder
         var qb: SelectQueryBuilder<T> = this.repo.createQueryBuilder(alias)
         qb = this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias);
-        if(internationalisation && draftPublishWorkflow){
-            qb = this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias,internationalisation, draftPublishWorkflow,this.moduleRef);
+        if (internationalisation && draftPublishWorkflow) {
+            qb = this.crudHelperService.buildFilterQuery(qb, basicFilterDto, alias, internationalisation, draftPublishWorkflow, this.moduleRef);
         }
 
         if (basicFilterDto.groupBy) {

package/src/services/file.service.ts

@@ -1,14 +1,12 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import * as fs from 'fs';
 // import * as AWS from 'aws-sdk';
-import { S3Client, PutObjectCommand, DeleteObjectCommand, ObjectCannedACL } from '@aws-sdk/client-s3';
+import { S3Client, PutObjectCommand, DeleteObjectCommand, ObjectCannedACL, GetObjectCommand } from '@aws-sdk/client-s3';
 import { ConfigType } from '@nestjs/config';
 import commonConfig, { AwsS3Config } from '../config/common.config';
 import path from 'path';
 import { Readable } from 'stream';
-
-
-
+import { getSignedUrl as awsGetSignedUrl } from '@aws-sdk/s3-request-presigner';
 
 @Injectable()
 export class FileService {
@@ -166,7 +164,7 @@ export class FileService {
   private isValidS3Config(config: AwsS3Config): boolean {
     return !!config.S3_AWS_ACCESS_KEY && !!config.S3_AWS_SECRET_KEY && !!config.S3_AWS_REGION_NAME;
   }
-  
+
   /**
    * Save a stream to a file
    * @param stream - Readable stream
@@ -198,5 +196,14 @@ export class FileService {
       return false;
     }
   }
-  
+
+  public async getSignedUrl(key: string, expiresIn: number, bucketName: string): Promise<string> {
+    const command = new GetObjectCommand({
+      Bucket: bucketName,
+      Key: key,
+    });
+
+    return awsGetSignedUrl(this.s3Client, command, { expiresIn });
+  }
+
 }