merge with main

Author: larisaVasile

src/ng-generate/table-prompter/index.ts

@@ -202,6 +202,7 @@ function getTtlPaths(promptSubj: Subject<any>, allAnswers: Schema, subscriber: S
                 case singleAnswer.name === configFileName.name: {
                     if (singleAnswer.answer !== WIZARD_CONFIG_FILE) {
                         WIZARD_CONFIG_FILE = `${singleAnswer.answer}-${WIZARD_CONFIG_FILE}`;
+                        allAnswers.configFile = WIZARD_CONFIG_FILE;
                     }
                     promptSubj.next(pathDecision);
                     break;

src/ng-generate/table/index.ts

@@ -64,10 +64,19 @@ export default function (options: Schema): Rule {
 export function generateTable(options: Schema): Rule {
     options.spinner = ora().start();
 
-    if (!options.skipImport) {
-        options.skipImport = false;
+    const defaultOptions = {
+        skipImport: false,
+    };
+
+    if (options.configFile !== WIZARD_CONFIG_FILE) {
+        options.configFile = WIZARD_CONFIG_FILE;
     }
 
+    options = {
+        ...defaultOptions,
+        ...options,
+    };
+
     loadAndApplyConfigFile(options.configFile, options);
 
     if (options.aspectModelTFilesString) {

src/ng-generate/table/schema.ts

@@ -69,4 +69,5 @@ export interface Schema extends ComponentSchema, DefaultSchema {
     complexProps: Array<{prop: string; propsToShow: ComplexEntityProperty[]}>;
     skipInstall: boolean;
     getOptionalMaterialTheme: boolean;
+    skipImport: boolean;
 }

src/ng-generate/types/index.ts

@@ -19,12 +19,17 @@ import {formatGeneratedFiles, loadAndApplyConfigFile} from '../../utils/file';
 import {TemplateHelper} from '../../utils/template-helper';
 import {visitAspectModel} from './aspect-model-type-generator-visitor';
 import {Schema} from './schema';
+import {WIZARD_CONFIG_FILE} from "../table-prompter/index";
 
 export default function (options: Schema): Rule {
     const spinner = ora().start();
     options.spinner = spinner;
     options.templateHelper = new TemplateHelper();
 
+    if(options.configFile !== WIZARD_CONFIG_FILE) {
+        options.configFile = WIZARD_CONFIG_FILE;
+    }
+
     loadAndApplyConfigFile(options.configFile, options);
 
     if (options.aspectModelTFilesString) {