complexqa_frontend_core 1.17.11 → 1.17.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "complexqa_frontend_core",
-  "version": "1.17.11",
+  "version": "1.17.12",
   "description": "core of web ",
   "type": "module",
   "exports": {

package/publish/app_configuration/table/helpers/column_factory.js

@@ -30,6 +30,7 @@ export function createColumn(model, locale, field, overrides = {})
 
 	return new typeTableColumn({
 		...COLUMN_DEFAULTS,
+		header_field,
 		header_name: overrides.header_name ?? header_model.get_attribute_name_translate(header_field, locale),
 		field,
 		...overrides,

package/publish/app_configuration/table/helpers/column_locale.js

@@ -0,0 +1,66 @@
+import { typeTableColumn } from '../../../types/family_service/typeTableColumn.js';
+import { typeTableConfiguration } from '../../../types/family_service/typeTableConfiguration.js';
+import { TABLE_ELEMENT_MODELS } from './table_element_models.js';
+
+/**
+ * @param {typeTableColumn} column
+ * @param {string} element_type
+ * @param {string} lang
+ * @returns {typeTableColumn}
+ */
+export function localizeTableColumn(column, element_type, lang)
+{
+	if (column.column_kind !== 'data' || !column.header_field)
+	{
+		return column;
+	}
+
+	const model_key  = column.header_element_type || element_type;
+	const ModelClass = TABLE_ELEMENT_MODELS[ model_key ];
+
+	if (!ModelClass)
+	{
+		return column;
+	}
+
+	const model       = new ModelClass();
+	const header_name = model.get_attribute_name_translate(column.header_field, lang);
+
+	return new typeTableColumn({
+		header_name         : header_name,
+		field               : column.field,
+		width               : column.width,
+		sort_order          : column.sort_order,
+		cell_classes        : column.cell_classes,
+		default_sort        : column.default_sort,
+		is_sortable         : column.is_sortable,
+		is_filter           : column.is_filter,
+		is_hide             : column.is_hide,
+		is_editable         : column.is_editable,
+		column_kind         : column.column_kind,
+		is_required         : column.is_required,
+		is_title            : column.is_title,
+		header_element_type : column.header_element_type,
+		header_field        : column.header_field,
+	});
+}
+
+
+/**
+ * @param {{ config: typeTableConfiguration }} section
+ * @param {string} element_type
+ * @param {string} lang
+ */
+export function localizeTableSection(section, element_type, lang)
+{
+	const config = section.config;
+
+	return {
+		config: new typeTableConfiguration({
+			columns                : config.columns.map((column) => localizeTableColumn(column, element_type, lang)),
+			for                    : config.for,
+			contained_element_type : config.contained_element_type,
+			documentation          : config.documentation,
+		}),
+	};
+}

package/publish/app_configuration/table/helpers/table_element_models.js

@@ -0,0 +1,26 @@
+import { typeTestCase } from '../../../types/family_elements/typeTestCase.js';
+import { typeProject } from '../../../types/family_elements/typeProject.js';
+import { typeTestRun } from '../../../types/family_elements/typeTestRun.js';
+import { typeBug } from '../../../types/family_elements/typeBug.js';
+import { typeTestRunResult } from '../../../types/family_elements/typeTestRunResult.js';
+import { typeTestAccount } from '../../../types/family_elements/typeTestAccount.js';
+import { typeTeamMember } from '../../../types/family_elements/typeTeamMember.js';
+import { typeTestCaseStep } from '../../../types/family_elements/typeTestCaseStep.js';
+import { typeUser } from '../../../types/family_elements/typeUser.js';
+import { typeTeam } from '../../../types/family_elements/typeTeam.js';
+
+/**
+ * Модели сущностей для таблиц (row id, перевод заголовков колонок).
+ */
+export const TABLE_ELEMENT_MODELS = {
+	test_case      : typeTestCase,
+	project        : typeProject,
+	test_run       : typeTestRun,
+	bug            : typeBug,
+	test_run_result: typeTestRunResult,
+	test_account   : typeTestAccount,
+	team_member    : typeTeamMember,
+	test_case_step : typeTestCaseStep,
+	user           : typeUser,
+	team           : typeTeam,
+};

package/publish/app_configuration/table/sections/team_member.js

@@ -1,5 +1,4 @@
 import { typeTeamMember } from '../../../types/family_elements/typeTeamMember.js';
-import { typeUser } from '../../../types/family_elements/typeUser.js';
 import { UserService } from '../../../services/UserService.js';
 import { createColumn } from '../helpers/column_factory.js';
 import { createListingFor, registerSection } from '../helpers/section_registry.js';
@@ -7,29 +6,26 @@ import { createListingFor, registerSection } from '../helpers/section_registry.j
 function build_team_member_listing_columns(locale)
 {
 	const model = new typeTeamMember();
-	const user_model = new typeUser();
 
 	return [
 		createColumn(model, locale, 'user_id.first_name', {
-			header_name : user_model.get_attribute_name_translate('first_name', locale),
+			header_field: 'first_name',
 			width       : '200',
 			is_filter   : false,
 			is_editable : false,
-			header_element_type: 'user',
 		}),
 		createColumn(model, locale, 'user_id.last_name', {
-			header_name : user_model.get_attribute_name_translate('last_name', locale),
+			header_field: 'last_name',
 			width       : '200',
 			is_filter   : false,
 			is_editable : false,
-			header_element_type: 'user',
 		}),
 		createColumn(model, locale, 'user_id.email', {
-			header_name : user_model.get_attribute_name_translate('email', locale),
-			width       : '200',
-			is_filter   : false,
-			is_editable : false,
-			header_element_type: 'user',
+			header_field        : 'email',
+			header_element_type : 'user',
+			width               : '200',
+			is_filter           : false,
+			is_editable         : false,
 		}),
 		createColumn(model, locale, 'team_member_status', { width: '160', is_filter: false, is_editable: true }),
 		createColumn(model, locale, 'member_role', { width: '200', is_filter: false, is_editable: true }),

package/publish/app_configuration/table/sections/test_run_result.js

@@ -1,5 +1,4 @@
 import { typeTestRunResult } from '../../../types/family_elements/typeTestRunResult.js';
-import { typeTestCase } from '../../../types/family_elements/typeTestCase.js';
 import { UserService } from '../../../services/UserService.js';
 import { createColumn, createGoToColumn, createPrimaryKeyColumn, createRowSelectColumn } from '../helpers/column_factory.js';
 import { createListingFor, registerSection } from '../helpers/section_registry.js';
@@ -7,7 +6,6 @@ import { createListingFor, registerSection } from '../helpers/section_registry.j
 function build_test_run_result_listing_columns(locale, { include_select = true } = {})
 {
 	const model = new typeTestRunResult();
-	const test_case_model = new typeTestCase();
 	const columns = [];
 
 	if (include_select)
@@ -16,10 +14,11 @@ function build_test_run_result_listing_columns(locale, { include_select = true }
 	}
 
 	columns.push(createColumn(model, locale, 'test_case_id.test_case_title', {
-		header_name : test_case_model.get_attribute_name_translate('test_case_title', locale),
-		width       : '480',
-		is_editable : false,
-		is_required : true,
+		header_field        : 'test_case_title',
+		header_element_type : 'test_case',
+		width               : '480',
+		is_editable         : false,
+		is_required         : true,
 	}));
 	columns.push(createColumn(model, locale, 'assigned_to', { width: '220', is_editable: true, is_required: true }));
 	columns.push(createColumn(model, locale, 'created_at', { width: '170', is_required: true }));
@@ -35,16 +34,15 @@ function build_test_run_result_listing_columns(locale, { include_select = true }
 function build_test_run_result_todo_columns(locale)
 {
 	const model = new typeTestRunResult();
-	const test_case_model = new typeTestCase();
-
 	return [
 		createPrimaryKeyColumn(model, locale),
 		createColumn(model, locale, 'test_case_id.test_case_title', {
-			header_name : test_case_model.get_attribute_name_translate('test_case_title', locale),
-			width       : '480',
-			is_editable : false,
-			is_required : true,
-			is_title    : true,
+			header_field        : 'test_case_title',
+			header_element_type : 'test_case',
+			width               : '480',
+			is_editable         : false,
+			is_required         : true,
+			is_title            : true,
 		}),
 		createColumn(model, locale, 'assigned_to', { width: '220', is_editable: true, is_required: true }),
 		createColumn(model, locale, 'test_result_status', { width: '150', is_editable: true, is_required: true }),

package/publish/app_configuration/table/table_base_config.js

@@ -1,28 +1,6 @@
 import { LOCALE_AG_GRID_RU } from '../locale_table_ru.js';
 import { LOCALE_AG_GRID_EG } from '../table_locale_ar.js';
-import { typeTestCase } from '../../types/family_elements/typeTestCase.js';
-import { typeProject } from '../../types/family_elements/typeProject.js';
-import { typeTestRun } from '../../types/family_elements/typeTestRun.js';
-import { typeBug } from '../../types/family_elements/typeBug.js';
-import { typeTestRunResult } from '../../types/family_elements/typeTestRunResult.js';
-import { typeTestAccount } from '../../types/family_elements/typeTestAccount.js';
-import { typeTeamMember } from '../../types/family_elements/typeTeamMember.js';
-import { typeTestCaseStep } from '../../types/family_elements/typeTestCaseStep.js';
-import { typeUser } from '../../types/family_elements/typeUser.js';
-import { typeTeam } from '../../types/family_elements/typeTeam.js';
-
-const ROW_NODE_MODELS = {
-	test_case      : typeTestCase,
-	project        : typeProject,
-	test_run       : typeTestRun,
-	bug            : typeBug,
-	test_run_result: typeTestRunResult,
-	test_account   : typeTestAccount,
-	team_member    : typeTeamMember,
-	test_case_step : typeTestCaseStep,
-	user           : typeUser,
-	team           : typeTeam,
-};
+import { TABLE_ELEMENT_MODELS } from './helpers/table_element_models.js';
 
 /**
  * Базовые опции ag-grid, общие для всех таблиц.
@@ -84,7 +62,7 @@ export class TableBaseConfig
 		return function (data)
 		{
 			let id           = 0;
-			const ModelClass = ROW_NODE_MODELS[ element_type ];
+			const ModelClass = TABLE_ELEMENT_MODELS[ element_type ];
 
 			if (ModelClass)
 			{

package/publish/app_configuration/table/table_configuration.js

@@ -9,6 +9,7 @@ import { bootstrap_team_member } from './sections/team_member.js';
 import { bootstrap_user } from './sections/user.js';
 import { bootstrap_team } from './sections/team.js';
 import { bootstrap_project } from './sections/project.js';
+import { localizeTableSection } from './helpers/column_locale.js';
 
 /**
  * Реестр конфигураций таблиц (ag-grid).
@@ -47,21 +48,22 @@ export class TableConfiguration extends abstractAppConfiguration
 	 * @param {string} section
 	 * @param {string} lang
 	 *
-	 * @todo - header_name модифицируем под локаль
 	 */
-	static get_config(element_type, section, lang)
+	static get_config(element_type, section, lang = 'en')
 	{
 		if (!this.state.loaded)
 		{
 			this.bootstrap();
 		}
 
-		if (this.config?.[ element_type ]?.[ section ])
+		const section_config = this.config?.[ element_type ]?.[ section ];
+
+		if (!section_config)
 		{
-			return this.config?.[ element_type ]?.[ section ];
+			return false;
 		}
 
-		return false;
+		return localizeTableSection(section_config, element_type, lang || 'en');
 	}
 
 

package/publish/types/family_service/typeTableColumn.js

@@ -38,6 +38,11 @@ export class typeTableColumn extends familyService
 	 */
 	header_element_type = false;
 
+	/**
+	 * Имя атрибута для перевода заголовка (если отличается от field).
+	 */
+	header_field = false;
+
 
 	constructor(data = false)
 	{