AG-12106 Fix localisation related example generation

robstrader · Jul 4, 2024 · 75d71b5 · 75d71b5
1 parent f5e3f53
commit 75d71b5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/...-files/src/executors/generate/generator/transformation-scripts/grid-vanilla-to-angular.ts b/...-files/src/executors/generate/generator/transformation-scripts/grid-vanilla-to-angular.ts
@@ -132,6 +132,11 @@ function addPackageImports(
         addBindingImports(bImports, imports, true, true);
     }
 
+    const localeImport = findLocaleImport(bindings.imports);
+    if (localeImport) {
+        imports.push(`import { ${localeImport.imports[0]} } from '@ag-grid-community/locale';`);
+    }
+
     return imports;
 }
 
@@ -148,11 +153,6 @@ function getImports(
         imports.push("import { HttpClient, HttpClientModule } from '@angular/common/http';");
     }
 
-    const localeImport = findLocaleImport(bindings.imports);
-    if (localeImport) {
-        imports.push(`import { ${localeImport.imports[0]} } from '@ag-grid-community/locale';`);
-    }
-
     if (importType === 'packages') {
         addPackageImports(imports, bindings, exampleConfig, allStylesheets);
     } else {

diff --git a/...les/src/executors/generate/generator/transformation-scripts/grid-vanilla-to-typescript.ts b/...les/src/executors/generate/generator/transformation-scripts/grid-vanilla-to-typescript.ts
@@ -1,7 +1,7 @@
 import type { ExampleConfig, ImportType, ParsedBindings } from '../types';
 import {
     addBindingImports,
-    addGenericInterfaceImport,
+    addGenericInterfaceImport, findLocaleImport,
     getIntegratedDarkModeCode,
     removeModuleRegistration,
 } from './parser-utils';
@@ -80,11 +80,20 @@ function getPackageImports(bindings: ParsedBindings): string[] {
 }
 
 function getImports(bindings: ParsedBindings, importType: ImportType): string[] {
+    const imports = [];
+
+    const localeImport = findLocaleImport(bindings.imports);
+    if (localeImport) {
+        imports.push(`import { ${localeImport.imports[0]} } from '@ag-grid-community/locale';`);
+    }
+
     if (importType === 'packages') {
-        return getPackageImports(bindings);
+        imports.push(...getPackageImports(bindings));
     } else {
-        return getModuleImports(bindings);
+        imports.push(...getModuleImports(bindings));
     }
+
+    return imports;
 }
 
 export function vanillaToTypescript(

diff --git a/...ate-example-files/src/executors/generate/generator/transformation-scripts/parser-utils.ts b/...ate-example-files/src/executors/generate/generator/transformation-scripts/parser-utils.ts
@@ -630,7 +630,7 @@ export function getInterfaceFileContents(tsBindings: ParsedBindings, currentFile
 }
 
 export function findLocaleImport(bindingImports) {
-    return bindingImports.find((bindingImport) => bindingImport.module.includes('ag-grid-local'));
+    return bindingImports.find((bindingImport) => bindingImport.module.includes('@ag-grid-community/locale'));
 }
 
 function getGenericInterface(tData) {