@izara_project/izara-core-generate-service-code 1.0.28 → 1.0.30

package/src/generateCode.js

@@ -37,7 +37,6 @@ import generateTemplateDataInitialSetup from './generateCode/generateInitialSetu
 import generateTemplateDataOther from './generateCode/generateOther/generateCodeOther.js';
 
 import generateTemplateDataRole from './generateCode/generateRole/generateCodeRole.js';
-import generateTemplateTranslations from './generateCode/generateTranslation/generateTranslation.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -73,14 +72,15 @@ async function generateCodeWithTemplate(
     // ── 1. Fetch all schemas ─────────────────────────────────────────────────
     console.info('[INFO] [generateCode] STATUS=FETCHING  | schemas...');
     const fetchStartTime = Date.now();
-    const [allLocalFlowSchemas, allObjSchemas, allLocalRelationshipSchemas] =
+    const [allLocalFlowSchemas, allObjSchemas, allLocalRelationshipSchemas, allLocalNotificationSystem] =
       await Promise.all([
         getObjectSchema.getAllLocalFlowSchemas(_izContext, schemasPath),
         getObjectSchema.getAllLocalObjectSchemasWithHierarchy(
           _izContext,
           schemasPath
         ),
-        getObjectSchema.getAllLocalRelationshipSchema(_izContext, schemasPath)
+        getObjectSchema.getAllLocalRelationshipSchema(_izContext, schemasPath),
+        getObjectSchema.getLocalNotificationSystemSchemas(_izContext, schemasPath)
       ]);
 
     const fetchDuration = Date.now() - fetchStartTime;
@@ -98,7 +98,6 @@ async function generateCodeWithTemplate(
       schemaResult,
       initialSetupResult,
       otherResult,
-      translationResult
     ] = await Promise.all([
       generateTemplateDataFromFlowSchema(
         _izContext,
@@ -112,6 +111,7 @@ async function generateCodeWithTemplate(
         allObjSchemas,
         allLocalRelationshipSchemas,
         allLocalFlowSchemas.records,
+        allLocalNotificationSystem,
         settings
       ).catch(error => {
         console.error('[generateCode] schemaResult error:', error);
@@ -126,13 +126,7 @@ async function generateCodeWithTemplate(
         allLocalFlowSchemas.records,
         settings
       ),
-      generateTemplateDataOther(_izContext, appPath),
-      generateTemplateTranslations(
-        _izContext,
-        appPath,
-        allObjSchemas,
-        allLocalFlowSchemas
-      )
+      generateTemplateDataOther(_izContext, appPath)
     ]);
 
     const genDuration = Date.now() - genStartTime;
@@ -146,7 +140,6 @@ async function generateCodeWithTemplate(
       ...schemaResult,
       ...initialSetupResult,
       ...otherResult,
-      ...translationResult
     ];
 
     // ── 3. Generate role configs ─────────────────────────────────────────────

package/src/libs/Consts.js

@@ -93,8 +93,12 @@ const SOURCE_PATH = {
   resourceLocationCreateRecordComplete:
     'src/generatedCode/CreateRecordComplete/',
 
-  // translations
-  translationSchema: 'translations/'
+  // systemText
+  systemTextSchema: 'SystemTextSchema/generatedCode/',
+
+  // rbac
+  rbac: '/src/generatedCode/Rbac/source/',
+  resourceLocationRbac: 'src/generatedCode/Rbac/source/'
 };
 
 const SQS_RESOURCE = {
@@ -146,16 +150,18 @@ const SAVE_FILE_NAME = {
   sharedResourceYaml: 'generate-shared-resource',
   authorizerYaml: 'authorizer',
   findData: 'find-data',
+  rbac: 'rbac',
 
   externalLambdaRole: 'generatedLambdaRoleServiceConfig',
   snsSubscription: 'generatedSnsServiceConfig',
-  translateId: 'TranslateIdsRequest',
+  tableName: "generatedTableNameConfig",
+  // translateId: 'TranslateIdsRequest',
   S3Bucket: 'generated-s3-bucket',
   objectRelationship: 'ObjectRelationships',
   refObjectRelationship: 'RefObjectRelationships',
   objectSchema: 'ObjectFieldSchema',
   roleNameConfig: 'RoleNameConfig',
-  translationSchema: 'TranslationsSchema'
+  systemTextSchema: 'SystemTextSchema'
 };
 
 const FUNCTION_NAME = {

package/src/libs/Libs.js

@@ -50,7 +50,9 @@ function resourceNames(resourceClass, resourceName) {
       'arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:${self:custom.iz_resourcePrefix}' +
       resourceName,
     [RESOURCE_CLASSES.webSocket]:
-      'arn:aws:execute-api:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_webSocketHostId}/${self:custom.iz_stage}/POST/@connections/{connectionId}'
+      'arn:aws:execute-api:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_webSocketHostId}/${self:custom.iz_stage}/POST/@connections/{connectionId}',
+    [RESOURCE_CLASSES.s3]:
+      'arn:aws:s3:::${self:custom.iz_serviceSchemaBucketName}/' + resourceName,
   }[resourceClass];
 }
 
@@ -62,6 +64,10 @@ function resourceNames(resourceClass, resourceName) {
  * @returns {{ effect, action, resource}}
  */
 function createIamRole(action, resource = [], effect = 'Allow') {
+  if (!Array.isArray(resource)) {
+    resource = [resource];
+  };
+
   if (Array.isArray(action)) {
     const actionObj = {};
     action.forEach(act => {