@solidxai/core 0.1.10 → 0.1.11-beta.0

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

@@ -24,6 +24,7 @@ import { ImportTransaction } from '../entities/import-transaction.entity';
 import { MenuItemMetadata } from '../entities/menu-item-metadata.entity';
 import { UserViewMetadata } from '../entities/user-view-metadata.entity';
 import { PermissionMetadata } from '../entities/permission-metadata.entity';
+import { RoleMetadata } from '../entities/role-metadata.entity';
 import { ViewMetadata } from '../entities/view-metadata.entity';
 import { CommandService } from '../helpers/command.service';
 import {
@@ -37,7 +38,6 @@ import { CrudHelperService, FilterCombinator } from './crud-helper.service';
 import { CRUDService } from './crud.service';
 import { FieldMetadataService } from './field-metadata.service';
 import { MediaStorageProviderMetadataService } from './media-storage-provider-metadata.service';
-import { RoleMetadataService } from './role-metadata.service';
 import { SolidIntrospectService } from './solid-introspect.service';
 import { SolidTsMorphService } from './solid-ts-morph.service';
 
@@ -59,7 +59,6 @@ export class ModelMetadataService {
     private readonly crudHelperService: CrudHelperService,
     private readonly mediaStorageProviderMetadataService: MediaStorageProviderMetadataService,
     private readonly fieldMetadataService: FieldMetadataService,
-    private readonly roleService: RoleMetadataService,
     private readonly moduleMetadataHelperService: ModuleMetadataHelperService,
     readonly introspectService: SolidIntrospectService,
     private readonly solidTsMorphService: SolidTsMorphService,
@@ -501,6 +500,27 @@ export class ModelMetadataService {
 
     // if found
     if (existingModelMetadata) {
+      const hasChanges = Object.entries(updateDto).some(([key, value]) => {
+        if (key === 'module' || key === 'parentModel' || key === 'userKeyField') {
+          return existingModelMetadata[key]?.id !== value?.id;
+        }
+        if (key === 'fields') {
+          return JSON.stringify(existingModelMetadata.fields ?? null) !== JSON.stringify(value ?? null);
+        }
+        const currentValue = existingModelMetadata[key];
+        if (Array.isArray(currentValue) || Array.isArray(value)) {
+          return JSON.stringify(currentValue ?? null) !== JSON.stringify(value ?? null);
+        }
+        if (value && typeof value === 'object') {
+          return JSON.stringify(currentValue ?? null) !== JSON.stringify(value ?? null);
+        }
+        return currentValue !== value;
+      });
+
+      if (!hasChanges) {
+        return existingModelMetadata;
+      }
+
       const updatedModelMetadata = { ...existingModelMetadata, ...updateDto };
       const updatedModel = await this.modelMetadataRepo.save(updatedModelMetadata);
       return updatedModel
@@ -635,22 +655,27 @@ export class ModelMetadataService {
     const metaData = await this.moduleMetadataHelperService.getModuleMetadataConfiguration(filePath);
     if (metaData) {
       const moduleMetadata = metaData?.moduleMetadata ?? metaData;
+      const vamMetadata =
+        Array.isArray(metaData?.views) || Array.isArray(metaData?.actions) || Array.isArray(metaData?.menus)
+          ? metaData
+          : moduleMetadata;
       const removedActionNameSet = new Set(removedActionNames);
       const removedMenuNameSet = new Set(removedMenuNames);
       const removedViewNameSet = new Set(removedViewNames);
 
-      const existingModelIndex = metaData.moduleMetadata.models.findIndex(
+      const existingModels = Array.isArray(moduleMetadata?.models) ? moduleMetadata.models : [];
+      const existingModelIndex = existingModels.findIndex(
         (existingModel: any) => existingModel.singularName === modelEntity.singularName
       );
 
       // Remove the model to be deleted from the metadata
       if (existingModelIndex !== -1) {
-        metaData.moduleMetadata.models.splice(existingModelIndex, 1);
+        existingModels.splice(existingModelIndex, 1);
       }
 
       // Remove references to this model in the menu, action & view sections.
-      const existingViews = Array.isArray(moduleMetadata?.views) ? moduleMetadata.views : [];
-      moduleMetadata.views = existingViews.filter((view: any) => {
+      const existingViews = Array.isArray(vamMetadata?.views) ? vamMetadata.views : [];
+      vamMetadata.views = existingViews.filter((view: any) => {
         const shouldRemove = view?.modelUserKey === modelEntity.singularName || removedViewNameSet.has(view?.name);
         if (shouldRemove && view?.name) {
           removedViewNameSet.add(view.name);
@@ -658,8 +683,8 @@ export class ModelMetadataService {
         return !shouldRemove;
       });
 
-      const existingActions = Array.isArray(moduleMetadata?.actions) ? moduleMetadata.actions : [];
-      moduleMetadata.actions = existingActions.filter((action: any) => {
+      const existingActions = Array.isArray(vamMetadata?.actions) ? vamMetadata.actions : [];
+      vamMetadata.actions = existingActions.filter((action: any) => {
         const shouldRemove =
           action?.modelUserKey === modelEntity.singularName ||
           removedActionNameSet.has(action?.name) ||
@@ -671,7 +696,7 @@ export class ModelMetadataService {
         return !shouldRemove;
       });
 
-      let pendingMenus = Array.isArray(moduleMetadata?.menus) ? [...moduleMetadata.menus] : [];
+      let pendingMenus = Array.isArray(vamMetadata?.menus) ? [...vamMetadata.menus] : [];
       let menuRemovedOnPass = true;
       while (menuRemovedOnPass) {
         menuRemovedOnPass = false;
@@ -693,7 +718,7 @@ export class ModelMetadataService {
           return true;
         });
       }
-      moduleMetadata.menus = pendingMenus;
+      vamMetadata.menus = pendingMenus;
 
       const updatedContent = JSON.stringify(metaData, null, 2);
       await fs.writeFile(filePath, updatedContent);
@@ -1386,7 +1411,15 @@ export class ModelMetadataService {
       existingTreeViewAction = await actionRepo.save(createdTreeViewAction);
     }
 
-    const adminRole = await this.roleService.findRoleByName('Admin');
+    const roleRepo = this.dataSource.getRepository(RoleMetadata);
+    const adminRole = await roleRepo.findOne({
+      where: { name: 'Admin' },
+      select: { id: true, name: true }
+    });
+
+    if (!adminRole) {
+      throw new NotFoundException(`Entity #Admin not found`);
+    }
 
     const menuData = {
       displayName: `${model.displayName}`,
@@ -1394,7 +1427,6 @@ export class ModelMetadataService {
       sequenceNumber: 1,
       action: existingAction,
       module: resolvedModule,
-      roles: [adminRole],
       parentMenuItemUserKey: ""
     };
 
@@ -1402,7 +1434,12 @@ export class ModelMetadataService {
 
     if (!existingMenu) {
       const createdMenu = menuRepo.create(menuData);
-      await menuRepo.save(createdMenu);
+      existingMenu = await menuRepo.save(createdMenu);
+      await menuRepo
+        .createQueryBuilder()
+        .relation(MenuItemMetadata, 'roles')
+        .of(existingMenu.id)
+        .add(adminRole.id);
     }
   }
 

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

@@ -45,6 +45,20 @@ export class RoleMetadataService extends CRUDService<RoleMetadata> {
     return entity;
   }
 
+  async assertRoleExistsByName(roleName: string): Promise<void> {
+    const entity = await this.repo.findOne({
+      where: {
+        name: roleName
+      },
+      select: {
+        id: true
+      }
+    });
+    if (!entity) {
+      throw new NotFoundException(`Entity #${roleName} not found`);
+    }
+  }
+
   // OK
   async createRolesIfNotExists(roles: CreateRoleMetadataDto[]) {
     for (let id = 0; id < roles.length; id++) {

package/src/services/selection-providers/mq-dashboard-message-broker-variable-options-provider.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from "@nestjs/common";
 import { SelectionProvider } from "src/decorators/selection-provider.decorator";
 import { MqMessageRepository } from "src/repository/mq-message.repository";
 import { ISelectionProvider, ISelectionProviderContext, ISelectionProviderValues } from "src/interfaces";
+import { applyCaseInsensitiveContainsFilter } from "src/services/dashboard-providers/mq-dashboard-provider-utils";
 
 @SelectionProvider()
 @Injectable()
@@ -31,9 +32,7 @@ export class MqDashboardMessageBrokerVariableOptionsProvider implements ISelecti
         qb.select("DISTINCT mqMessage.messageBroker", "value")
             .where("mqMessage.messageBroker IS NOT NULL");
 
-        if (query) {
-            qb.andWhere("mqMessage.messageBroker ILIKE :query", { query: `%${query}%` });
-        }
+        applyCaseInsensitiveContainsFilter(qb, "mqMessage.messageBroker", query, "query");
 
         const rows = await qb
             .orderBy("value", "ASC")
@@ -49,4 +48,3 @@ export class MqDashboardMessageBrokerVariableOptionsProvider implements ISelecti
             }));
     }
 }
-

package/src/services/selection-providers/mq-dashboard-queue-name-variable-options-provider.service.ts

@@ -2,6 +2,7 @@ import { Injectable } from "@nestjs/common";
 import { SelectionProvider } from "src/decorators/selection-provider.decorator";
 import { MqMessageQueueRepository } from "src/repository/mq-message-queue.repository";
 import { ISelectionProvider, ISelectionProviderContext, ISelectionProviderValues } from "src/interfaces";
+import { applyCaseInsensitiveContainsFilter } from "src/services/dashboard-providers/mq-dashboard-provider-utils";
 
 @SelectionProvider()
 @Injectable()
@@ -32,9 +33,7 @@ export class MqDashboardQueueNameVariableOptionsProvider implements ISelectionPr
         const limit = Math.min(Math.max(ctxt?.limit ?? 25, 1), 200);
         const offset = Math.max(ctxt?.offset ?? 0, 0);
 
-        if (query) {
-            qb.andWhere("mqMessageQueue.name ILIKE :query", { query: `%${query}%` });
-        }
+        applyCaseInsensitiveContainsFilter(qb, "mqMessageQueue.name", query, "query");
 
         const records = await qb
             .select(["mqMessageQueue.name"])
@@ -48,4 +47,3 @@ export class MqDashboardQueueNameVariableOptionsProvider implements ISelectionPr
             .map((r) => ({ label: r.name, value: r.name }));
     }
 }
-

package/src/services/setting.service.ts

@@ -51,6 +51,10 @@ export class SettingService {
     return settings;
   }
 
+  private async getSettingsFromDbForSeeding(): Promise<Setting[]> {
+    return this.repo.find({ relations: ['moduleMetadata'] });
+  }
+
   private parseSettingValue(value: string, key: string): any {
     try {
       return JSON.parse(value);
@@ -194,15 +198,30 @@ export class SettingService {
     const saEditableAndAbove = this.getAllSettingsFromProviders().filter(i => [SettingLevel.SystemAdminEditable, SettingLevel.InternalUser].includes(i.level));
 
     // Get hold of the current values from the database.
-    const existingSettingsFromDb: Setting[] = await this.getSettingsFromDb();
+    const existingSettingsFromDb: Setting[] = await this.getSettingsFromDbForSeeding();
 
     // const existingKeysFromDb = new Set(existingSettingsFromDb.map(s => s.key));
     const existingSettingsFromDbByKey = new Map(existingSettingsFromDb.map(setting => [setting.key, setting]));
-    const settingsToMutate: Setting[] = [];
-    // const settingsToUpdate: Setting[] = [];
+    const settingsToCreate: Setting[] = [];
+    const settingsToUpdate: Setting[] = [];
+    const moduleNames = Array.from(
+      new Set(
+        saEditableAndAbove
+          .map(setting => setting.moduleName)
+          .filter((moduleName): moduleName is string => !!moduleName)
+      )
+    );
+    const moduleMetadataByName = new Map<string, Awaited<ReturnType<ModuleMetadataRepository['findOneBy']>>>();
+
+    await Promise.all(
+      moduleNames.map(async (moduleName) => {
+        const moduleMetadata = await this.moduleMetadataRepo.findOneBy({ name: moduleName });
+        moduleMetadataByName.set(moduleName, moduleMetadata);
+      })
+    );
 
     for (const { key, value, level, moduleName, encrypted } of saEditableAndAbove) {
-      const moduleMetadata = await this.moduleMetadataRepo.findOneBy({ name: moduleName });
+      const moduleMetadata = moduleName ? moduleMetadataByName.get(moduleName) : null;
       if (!existingSettingsFromDbByKey.has(key)) {
         const setting = new Setting();
         setting.key = key;
@@ -227,24 +246,36 @@ export class SettingService {
         }
         setting.value = rawValue;
 
-        settingsToMutate.push(setting);
+        settingsToCreate.push(setting);
       }
       else {
         const setting = existingSettingsFromDbByKey.get(key);
+        const existingModuleMetadataId = setting.moduleMetadata?.id ?? null;
+        const nextModuleMetadataId = moduleMetadata?.id ?? null;
+        const levelChanged = setting.level !== level;
+        const encryptedChanged = setting.encrypted !== !!encrypted;
+        const moduleChanged = !!moduleMetadata && existingModuleMetadataId !== nextModuleMetadataId;
+
+        if (!levelChanged && !encryptedChanged && !moduleChanged) {
+          continue;
+        }
+
         setting.level = level;
         setting.encrypted = !!encrypted;
-        if (moduleMetadata)
+        if (moduleMetadata) {
           setting.moduleMetadata = moduleMetadata;
-        settingsToMutate.push(setting);
+        }
+        settingsToUpdate.push(setting);
       }
     }
 
-    if (settingsToMutate.length > 0) {
-      await this.repo.save(settingsToMutate);
+    if (settingsToCreate.length > 0) {
+      await this.repo.save(settingsToCreate);
+    }
+
+    if (settingsToUpdate.length > 0) {
+      await this.repo.save(settingsToUpdate);
     }
-    // if (settingsToUpdate.length > 0) {
-    //   await this.repo.save(settingsToUpdate);
-    // }
   }
 
   /**

package/src/services/solid-ts-morph.service.ts

@@ -5,7 +5,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { Project, Node, ObjectLiteralExpression, ArrayLiteralExpression, QuoteKind, IndentationText } from "ts-morph";
 import { MethodDeclarationStructure, StructureKind } from "ts-morph";
 
-type Bucket = "providers" | "exports";
+type Bucket = "imports" | "providers" | "exports";
 
 // interface SolidTsMorphOptions {
 //     /** Absolute path to monorepo root. Defaults to auto-detect or ENV. */
@@ -470,4 +470,4 @@ export class SolidTsMorphService {
 
 
 
-}
+}

package/src/solid-core.module.ts

@@ -20,6 +20,8 @@ import { ModelMetadataController } from "./controllers/model-metadata.controller
 import { ModuleMetadataExplorerController } from "./controllers/module-metadata-explorer.controller";
 import { ModuleMetadataController } from "./controllers/module-metadata.controller";
 import { ModulePackageController } from "./controllers/module-package.controller";
+import { DatasourceManagementController } from "./controllers/datasource-management.controller";
+import { DatasourceIntrospectionController } from "./controllers/datasource-introspection.controller";
 import { TestController } from "./controllers/test.controller";
 import { FieldMetadata } from "./entities/field-metadata.entity";
 import { ListOfValues } from "./entities/list-of-values.entity";
@@ -36,6 +38,8 @@ import { PseudoForeignKeySelectionProvider } from "./services/selection-provider
 import { ModuleMetadataSeederService } from "./seeders/module-metadata-seeder.service";
 import { ModuleTestDataService } from "./seeders/module-test-data.service";
 import { CrudHelperService } from "./services/crud-helper.service";
+import { DatasourceManagementService } from "./services/datasource-management.service";
+import { DatasourceIntrospectionService } from "./services/datasource-introspection.service";
 import { FieldMetadataService } from "./services/field-metadata.service";
 import { DashboardRuntimeService } from "./services/dashboard-runtime.service";
 import { ListOfValuesService } from "./services/list-of-values.service";
@@ -379,6 +383,9 @@ import { DashboardUserLayout } from './entities/dashboard-user-layout.entity';
 import { DashboardUserLayoutService } from './services/dashboard-user-layout.service';
 import { DashboardUserLayoutController } from './controllers/dashboard-user-layout.controller';
 import { DashboardUserLayoutRepository } from './repositories/dashboard-user-layout.repository';
+import { MssqlDatasourceIntrospectionProviderService } from "./services/datasource-introspection/mssql-datasource-introspection-provider.service";
+import { MysqlDatasourceIntrospectionProviderService } from "./services/datasource-introspection/mysql-datasource-introspection-provider.service";
+import { PostgresDatasourceIntrospectionProviderService } from "./services/datasource-introspection/postgres-datasource-introspection-provider.service";
 
 @Global()
 @Module({
@@ -463,6 +470,8 @@ import { DashboardUserLayoutRepository } from './repositories/dashboard-user-lay
     ExportTransactionController,
     FieldMetadataController,
     DashboardController,
+    DatasourceManagementController,
+    DatasourceIntrospectionController,
     GoogleAuthenticationController,
     FacebookAuthenticationController,
     MicrosoftAuthenticationController,
@@ -526,6 +535,8 @@ import { DashboardUserLayoutRepository } from './repositories/dashboard-user-lay
       useClass: HttpExceptionFilter,
     },
     ModuleMetadataService,
+    DatasourceManagementService,
+    DatasourceIntrospectionService,
     ModuleMetadataExplorerService,
     ModuleMetadataHelperService,
     ModulePackageService,
@@ -723,7 +734,11 @@ import { DashboardUserLayoutRepository } from './repositories/dashboard-user-lay
     ExportTransactionService,
     ExcelService,
     CsvService,
+    DatasourceManagementService,
     DashboardRuntimeService,
+    MssqlDatasourceIntrospectionProviderService,
+    MysqlDatasourceIntrospectionProviderService,
+    PostgresDatasourceIntrospectionProviderService,
     ImportTransactionService,
     ImportTransactionErrorLogService,
     CreatedByUpdatedBySubscriber,
@@ -823,6 +838,7 @@ import { DashboardUserLayoutRepository } from './repositories/dashboard-user-lay
     ModelMetadataHelperService,
     ModelMetadataService,
     ModuleMetadataService,
+    DatasourceIntrospectionService,
     ModuleMetadataExplorerService,
     ModulePackageService,
     MqMessageQueueService,