From e4fc51d02adef4e6c5947888e9d179324d7ea905 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Wed, 21 May 2025 01:54:00 +0300 Subject: [PATCH 1/2] theme change command updated --- .../packages/schematics/src/commands/change-theme/index.ts | 6 ++++-- .../schematics/src/commands/change-theme/style-map.ts | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts index cb6a216d66..774dedc48a 100644 --- a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts @@ -320,7 +320,8 @@ export function removeProviderFromNgModuleMetadata( export function insertImports(projectName: string, selectedTheme: ThemeOptionsEnum): Rule { return addRootImport(projectName, code => { - const selected = importMap.get(selectedTheme); + const selectedThemeImports = importMap.get(selectedTheme); + const selected = selectedThemeImports?.filter(s => !!s.doNotImport); if (!selected?.length) return code.code``; const expressions: string[] = []; @@ -338,7 +339,8 @@ export function insertImports(projectName: string, selectedTheme: ThemeOptionsEn } export function insertProviders(projectName: string, selectedTheme: ThemeOptionsEnum): Rule { return addRootProvider(projectName, code => { - const selected = importMap.get(selectedTheme); + const selectedThemeImports = importMap.get(selectedTheme); + const selected = selectedThemeImports?.filter(s => !!s.doNotImport); if (!selected || selected.length === 0) return code.code``; const providers = selected diff --git a/npm/ng-packs/packages/schematics/src/commands/change-theme/style-map.ts b/npm/ng-packs/packages/schematics/src/commands/change-theme/style-map.ts index 8cae3b4641..49cde5070f 100644 --- a/npm/ng-packs/packages/schematics/src/commands/change-theme/style-map.ts +++ b/npm/ng-packs/packages/schematics/src/commands/change-theme/style-map.ts @@ -13,6 +13,7 @@ export type ImportDefinition = { importName: string; provider?: string; expression?: string; + doNotImport?: boolean; }; export const styleMap = new Map(); @@ -366,6 +367,12 @@ importMap.set(ThemeOptionsEnum.LeptonX, [ importName: 'SideMenuLayoutModule', expression: 'SideMenuLayoutModule.forRoot()', }, + { + path: '@volosoft/abp.ng.theme.lepton-x/layouts', + importName: 'TopMenuLayoutModule', + expression: 'TopMenuLayoutModule.forRoot()', + doNotImport: true, + }, { path: '@abp/ng.theme.shared', importName: 'ThemeSharedModule', From be4302d3c8b7b1f2e1e6cf0a333adc5bf3eacd11 Mon Sep 17 00:00:00 2001 From: erdemcaygor Date: Wed, 21 May 2025 10:44:38 +0300 Subject: [PATCH 2/2] theme change command updated --- .../packages/schematics/src/commands/change-theme/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts index 774dedc48a..6c7897eb65 100644 --- a/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts +++ b/npm/ng-packs/packages/schematics/src/commands/change-theme/index.ts @@ -321,7 +321,7 @@ export function removeProviderFromNgModuleMetadata( export function insertImports(projectName: string, selectedTheme: ThemeOptionsEnum): Rule { return addRootImport(projectName, code => { const selectedThemeImports = importMap.get(selectedTheme); - const selected = selectedThemeImports?.filter(s => !!s.doNotImport); + const selected = selectedThemeImports?.filter(s => !s.doNotImport); if (!selected?.length) return code.code``; const expressions: string[] = []; @@ -340,7 +340,7 @@ export function insertImports(projectName: string, selectedTheme: ThemeOptionsEn export function insertProviders(projectName: string, selectedTheme: ThemeOptionsEnum): Rule { return addRootProvider(projectName, code => { const selectedThemeImports = importMap.get(selectedTheme); - const selected = selectedThemeImports?.filter(s => !!s.doNotImport); + const selected = selectedThemeImports?.filter(s => !s.doNotImport); if (!selected || selected.length === 0) return code.code``; const providers = selected