A custom new page name localization string (ed.newPageName) is ignore… (#6697)

* A custom new page name localization string (ed.newPageName) is ignored when pages are added via a property grid collection editor fix #6687

* Fix unit tests

* Fix unit tests

Author: andrewtelnov

packages/survey-creator-core/src/property-grid/matrices.ts

@@ -685,7 +685,7 @@ export class PropertyGridEditorMatrixPages extends PropertyGridEditorMatrix {
     return "name";
   }
   protected getBaseValue(prop: JsonObjectProperty): string {
-    return "page";
+    return editorLocalization.getString("ed.newPageName");
   }
   protected getAllowRowDragDrop(prop: JsonObjectProperty): boolean { return true; }
 }

packages/survey-creator-core/tests/creator-base-v1.tests.ts

@@ -922,8 +922,8 @@ test("creator.onAddPanel and undo-redo manager, Bug#972", () => {
 });
 
 test("SurveyPropertyConditionEditor, set correct locale into internal survey, Bug #953", () => {
-  editorLocalization.currentLocale = "de";
   const creator = new CreatorTester();
+  editorLocalization.currentLocale = "de";
   creator.JSON = {
     elements: [
       { name: "q1", type: "text" },
@@ -941,8 +941,8 @@ test("SurveyPropertyConditionEditor, set correct locale into internal survey, Bu
   editorLocalization.currentLocale = "";
 });
 test("creator.onSurveyInstanceCreated, can pass ConditionEditor as model", () => {
-  editorLocalization.currentLocale = "de";
   const creator = new CreatorTester();
+  editorLocalization.currentLocale = "de";
   creator.JSON = {
     elements: [
       { name: "q1", type: "text" },

packages/survey-creator-core/tests/creator-tester.ts

@@ -13,6 +13,8 @@ export class CreatorTester extends SurveyCreatorModel {
       creatorSetting.defaultNewSurveyJSON = { pages: [{ name: "page1" }] };
     }
     super(options, options2);
+    //Reset the locale to the default one from the previous tests
+    this.locale = "";
     this.autoSaveDelay = 0;
     this.onSurveyInstanceCreated.add((creator, options) => {
       options.survey.getRendererForString = (element: Base, name: string): any => {

packages/survey-creator-core/tests/property-grid/property-grid.tests.ts

@@ -237,8 +237,10 @@ test("dropdown property editor, get choices on callback", () => {
   Serializer.removeProperty("survey", "region");
 });
 test("Serializer.addpropery, type: 'dropdown' cuts the text before dots, provided into choices. Bug#5787", (): any => {
-  Serializer.addProperty("survey", { name: "prop1:dropdown", type: "dropdown",
-    choices: ["Gemini 1.5 Pro", "Claude 3.5 Sonnet"] });
+  Serializer.addProperty("survey", {
+    name: "prop1:dropdown", type: "dropdown",
+    choices: ["Gemini 1.5 Pro", "Claude 3.5 Sonnet"]
+  });
   const survey = new SurveyModel();
   const propertyGrid = new PropertyGridModelTester(survey);
   const question = propertyGrid.survey.getQuestionByName("prop1");
@@ -3324,6 +3326,47 @@ test("check pages editor respects onPageAdding", () => {
   expect(creator.survey.pages.length).toBe(1);
   settings.defaultNewSurveyJSON = savedNewJSON;
 });
+test("Localication and survey.pages property, Bug#6687", () => {
+  const deutschStrings: any = {
+    ed: {
+      newPageName: "Seite"
+    }
+  };
+  editorLocalization.locales["de"] = deutschStrings;
+  const creator = new CreatorTester();
+  creator.locale = "de";
+  creator.JSON = {};
+  const propertyGrid = new PropertyGridModelTester(creator.survey);
+  const pagesQuestion = <QuestionMatrixDynamicModel>(
+    propertyGrid.survey.getQuestionByName("pages")
+  );
+  const propertyEditor = new PropertyGridEditorMatrixPages();
+  const options = { titleActions: [], question: pagesQuestion };
+  propertyEditor.onGetQuestionTitleActions(creator.survey, options, creator);
+  const addNewPageAction = options.titleActions[0] as IAction;
+
+  expect(creator.survey.pages.length).toBe(0);
+  addNewPageAction.action!();
+
+  expect(creator.survey.pages.length).toBe(1);
+  expect(creator.survey.pages[0].name).toBe("Seite1");
+});
+test("panellayoutcolumns doesn't have adding button", () => {
+  const creator = new CreatorTester();
+  creator.JSON = {
+    gridLayoutEnabled: true,
+    elements: [{ type: "text", name: "q1" }]
+  };
+  const propertyGrid = new PropertyGridModelTester(creator.survey.pages[0]);
+  const gridColumnsQuestion = <QuestionMatrixDynamicModel>(propertyGrid.survey.getQuestionByName("gridLayoutColumns"));
+  expect(gridColumnsQuestion).toBeTruthy();
+  expect(gridColumnsQuestion.allowAddRows).toBeFalsy();
+  expect(gridColumnsQuestion.getTitleToolbar()).toBeTruthy();
+  const helpButton = gridColumnsQuestion.titleActions.find(a => a.id === "property-grid-help");
+  const addButton = gridColumnsQuestion.titleActions.find(a => a.id === "add-item");
+  expect(helpButton).toBeTruthy();
+  expect(addButton).toBeFalsy();
+});
 test("Set property name into correct category", () => {
   Serializer.addProperty("question", {
     name: "validation",

packages/survey-creator-core/tests/tabs/test.tests.ts

@@ -1120,8 +1120,8 @@ test("The Preview Survey button text is not translated Bug#6016", (): any => {
   expect(loc).toBeTruthy();
   if (!loc.ed) loc.ed = {};
   loc.ed.testSurveyAgain = deText;
-  editorLocalization.currentLocale = "en";
   const creator: CreatorTester = new CreatorTester();
+  editorLocalization.currentLocale = "en";
   expect(creator.locale).toBe("en");
   const testPlugin: TabTestPlugin = <TabTestPlugin>creator.getPlugin("test");
   expect(testPlugin.model).toBeFalsy();