From b49828f85c8ae32962fe886bcabce4a6502e8c48 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Fri, 21 Feb 2025 14:07:16 +0300 Subject: [PATCH 1/2] saas prefix removed --- .../packages/schematics/src/utils/model.ts | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/utils/model.ts b/npm/ng-packs/packages/schematics/src/utils/model.ts index a46eff612d..9479a4ba1f 100644 --- a/npm/ng-packs/packages/schematics/src/utils/model.ts +++ b/npm/ng-packs/packages/schematics/src/utils/model.ts @@ -33,7 +33,7 @@ export function createImportRefsToModelReducer(params: ModelGeneratorParams) { const reduceImportRefsToInterfaces = createImportRefToInterfaceReducerCreator(params); const createRefToImportReducer = createRefToImportReducerCreator(params); const { solution, types } = params; - + console.log("import refs --->>>>"); return (models: Model[], importRefs: string[]) => { const enums: string[] = []; const interfaces = importRefs.reduce(reduceImportRefsToInterfaces, []); @@ -214,8 +214,6 @@ export function resolveAbpPackages(models: Model[]) { renamePropForTenant(model.interfaces); model.imports.forEach((imp, i) => { - fixImportNameForTenant(imp); - for (const ref of imp.refs) { const path = VOLO_PACKAGE_PROXY_IMPORTS.get(ref); if (path) { @@ -234,21 +232,12 @@ function renamePropForTenant(interfaces: Interface[]) { if (isTenant && isSaasDto) { prop.type = 'Saas' + prop.type; + console.log(prop.type); } } } } -function fixImportNameForTenant(imp: Import) { - imp.specifiers.forEach((spe, index) => { - const isTenant = spe.toLocaleLowerCase().includes(TENANT_KEY); - - if (isTenant) { - imp.specifiers[index] = 'Saas' + spe; - } - }); -} - export function resolveSelfGenericProps(params: Partial) { const { types, solution } = params; if (!types || !solution) { From 75348e7e4e841433b594f34e44667200ac92c6a3 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Fri, 21 Feb 2025 14:51:49 +0300 Subject: [PATCH 2/2] logs removed --- npm/ng-packs/packages/schematics/src/utils/model.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/utils/model.ts b/npm/ng-packs/packages/schematics/src/utils/model.ts index 9479a4ba1f..eee8b8c441 100644 --- a/npm/ng-packs/packages/schematics/src/utils/model.ts +++ b/npm/ng-packs/packages/schematics/src/utils/model.ts @@ -33,7 +33,6 @@ export function createImportRefsToModelReducer(params: ModelGeneratorParams) { const reduceImportRefsToInterfaces = createImportRefToInterfaceReducerCreator(params); const createRefToImportReducer = createRefToImportReducerCreator(params); const { solution, types } = params; - console.log("import refs --->>>>"); return (models: Model[], importRefs: string[]) => { const enums: string[] = []; const interfaces = importRefs.reduce(reduceImportRefsToInterfaces, []); @@ -232,7 +231,6 @@ function renamePropForTenant(interfaces: Interface[]) { if (isTenant && isSaasDto) { prop.type = 'Saas' + prop.type; - console.log(prop.type); } } }