+
+
+
+
+
+
+
+
diff --git a/ui/src/views/admin/listForm/wizard/Wizard.tsx b/ui/src/views/admin/listForm/wizard/Wizard.tsx
index 888c14d9..0a0138ef 100644
--- a/ui/src/views/admin/listForm/wizard/Wizard.tsx
+++ b/ui/src/views/admin/listForm/wizard/Wizard.tsx
@@ -101,7 +101,7 @@ const initialValues: ListFormWizardDto = {
endExpr: '',
progressExpr: '',
scaleType: 'weeks',
- allowEditing: false,
+ editingEnabled: false,
allowTaskAdding: false,
allowTaskUpdating: false,
allowTaskResourceUpdating: false,
@@ -154,17 +154,17 @@ const initialValues: ListFormWizardDto = {
approvalIsResetWorkflow: false,
criteria: [],
},
- languageTextMenuEn: '',
- languageTextMenuTr: '',
- languageTextTitleEn: '',
- languageTextTitleTr: '',
- languageTextDescEn: '',
- languageTextDescTr: '',
- languageTextMenuParentEn: '',
- languageTextMenuParentTr: '',
+ menuEn: '',
+ menuTr: '',
+ titleEn: '',
+ titleTr: '',
+ descEn: '',
+ descTr: '',
+ menuParentEn: '',
+ menuParentTr: '',
permissionGroupName: '',
- permissionGroupDisplayNameEn: '',
- permissionGroupDisplayNameTr: '',
+ permissionGroupEn: '',
+ permissionGroupTr: '',
menuParentCode: '',
menuParentModuleId: '',
menuParentIcon: '',
@@ -194,10 +194,10 @@ const step1ValidationSchema = Yup.object().shape({
// İzin grubu menüden bağımsızdır: menüsüz wizard'da da izinler üretilir ve bir gruba yazılır.
permissionGroupName: Yup.string().required(),
// Grup adi ile birlikte iki dilli gorunen ad da seed dosyasina yazilir; bos birakilamaz.
- permissionGroupDisplayNameEn: Yup.string().required(),
- permissionGroupDisplayNameTr: Yup.string().required(),
- languageTextMenuEn: Yup.string().required(),
- languageTextMenuTr: Yup.string().required(),
+ permissionGroupEn: Yup.string().required(),
+ permissionGroupTr: Yup.string().required(),
+ menuEn: Yup.string().required(),
+ menuTr: Yup.string().required(),
})
/**
@@ -213,10 +213,10 @@ const requiredForListComponent =
(schema: T) =>
const step2ValidationSchema = Yup.object().shape({
listFormCode: requiredForListComponent(Yup.string()),
- languageTextTitleEn: requiredForListComponent(Yup.string()),
- languageTextTitleTr: requiredForListComponent(Yup.string()),
- languageTextDescEn: requiredForListComponent(Yup.string()),
- languageTextDescTr: requiredForListComponent(Yup.string()),
+ titleEn: requiredForListComponent(Yup.string()),
+ titleTr: requiredForListComponent(Yup.string()),
+ descEn: requiredForListComponent(Yup.string()),
+ descTr: requiredForListComponent(Yup.string()),
dataSourceCode: requiredForListComponent(Yup.string()),
dataSourceConnectionString: Yup.string(),
selectCommandType: requiredForListComponent(Yup.string()),
@@ -610,8 +610,8 @@ const Wizard = () => {
const formik = formikRef.current
formik?.setFieldValue('permissionGroupName', groupName)
if (!groupName) {
- formik?.setFieldValue('permissionGroupDisplayNameEn', '')
- formik?.setFieldValue('permissionGroupDisplayNameTr', '')
+ formik?.setFieldValue('permissionGroupEn', '')
+ formik?.setFieldValue('permissionGroupTr', '')
return
}
// Sirasiyla: mevcut grubun metinleri, cagiranin verdigi metinler, ayni koda sahip menunun
@@ -619,11 +619,11 @@ const Wizard = () => {
const texts = permissionGroupTextsRef.current[groupName]
const menu = rawMenuItems.find((item) => item.code === groupName)
formik?.setFieldValue(
- 'permissionGroupDisplayNameEn',
+ 'permissionGroupEn',
texts?.en || fallbackTexts?.en || menu?.menuTextEn || groupName,
)
formik?.setFieldValue(
- 'permissionGroupDisplayNameTr',
+ 'permissionGroupTr',
texts?.tr || fallbackTexts?.tr || menu?.menuTextTr || groupName,
)
}
@@ -651,8 +651,8 @@ const Wizard = () => {
: [...prev, { value: group.name, label: permissionGroupLabel(group) }],
)
formik?.setFieldValue('permissionGroupName', group.name)
- formik?.setFieldValue('permissionGroupDisplayNameEn', group.displayNameEn)
- formik?.setFieldValue('permissionGroupDisplayNameTr', group.displayNameTr)
+ formik?.setFieldValue('permissionGroupEn', group.displayNameEn)
+ formik?.setFieldValue('permissionGroupTr', group.displayNameTr)
}
useEffect(() => {
@@ -723,17 +723,17 @@ const Wizard = () => {
schedulerOptionDto: w.schedulerOptionDto ?? initialValues.schedulerOptionDto,
todoOptionDto: w.todoOptionDto ?? initialValues.todoOptionDto,
workflowDto: w.workflowDto ?? initialValues.workflowDto,
- languageTextMenuEn: w.languageTextMenuEn ?? '',
- languageTextMenuTr: w.languageTextMenuTr ?? '',
- languageTextTitleEn: w.languageTextTitleEn ?? '',
- languageTextTitleTr: w.languageTextTitleTr ?? '',
- languageTextDescEn: w.languageTextDescEn ?? '',
- languageTextDescTr: w.languageTextDescTr ?? '',
- languageTextMenuParentEn: w.languageTextMenuParentEn ?? '',
- languageTextMenuParentTr: w.languageTextMenuParentTr ?? '',
+ menuEn: w.menuEn ?? '',
+ menuTr: w.menuTr ?? '',
+ titleEn: w.titleEn ?? '',
+ titleTr: w.titleTr ?? '',
+ descEn: w.descEn ?? '',
+ descTr: w.descTr ?? '',
+ menuParentEn: w.menuParentEn ?? '',
+ menuParentTr: w.menuParentTr ?? '',
permissionGroupName: w.permissionGroupName ?? '',
- permissionGroupDisplayNameEn: w.permissionGroupDisplayNameEn ?? '',
- permissionGroupDisplayNameTr: w.permissionGroupDisplayNameTr ?? '',
+ permissionGroupEn: w.permissionGroupEn ?? '',
+ permissionGroupTr: w.permissionGroupTr ?? '',
menuParentCode: w.menuParentCode ?? '',
menuParentModuleId: w.menuParentModuleId ?? '',
menuParentIcon: w.menuParentIcon ?? '',
@@ -830,12 +830,12 @@ const Wizard = () => {
const setAutoText = (
field: keyof Pick<
ListFormWizardDto,
- | 'languageTextMenuEn'
- | 'languageTextMenuTr'
- | 'languageTextTitleEn'
- | 'languageTextTitleTr'
- | 'languageTextDescEn'
- | 'languageTextDescTr'
+ | 'menuEn'
+ | 'menuTr'
+ | 'titleEn'
+ | 'titleTr'
+ | 'descEn'
+ | 'descTr'
>,
) => {
const current = formik?.values[field]
@@ -847,12 +847,12 @@ const Wizard = () => {
formik?.setFieldValue('wizardName', name)
formik?.setFieldValue('listFormCode', derived)
formik?.setFieldValue('menuCode', derived)
- setAutoText('languageTextMenuEn')
- setAutoText('languageTextMenuTr')
- setAutoText('languageTextTitleEn')
- setAutoText('languageTextTitleTr')
- setAutoText('languageTextDescEn')
- setAutoText('languageTextDescTr')
+ setAutoText('menuEn')
+ setAutoText('menuTr')
+ setAutoText('titleEn')
+ setAutoText('titleTr')
+ setAutoText('descEn')
+ setAutoText('descTr')
}
/**
@@ -943,8 +943,8 @@ const Wizard = () => {
formik?.setFieldValue('menuParentCode', '')
formik?.setFieldValue('menuParentModuleId', '')
formik?.setFieldValue('menuParentIcon', '')
- formik?.setFieldValue('languageTextMenuParentEn', '')
- formik?.setFieldValue('languageTextMenuParentTr', '')
+ formik?.setFieldValue('menuParentEn', '')
+ formik?.setFieldValue('menuParentTr', '')
if (derivedFromParent) handlePermissionGroupChange('')
}
@@ -961,8 +961,8 @@ const Wizard = () => {
formik?.setFieldValue('menuParentCode', '')
formik?.setFieldValue('menuParentModuleId', '')
formik?.setFieldValue('menuParentIcon', '')
- formik?.setFieldValue('languageTextMenuParentEn', '')
- formik?.setFieldValue('languageTextMenuParentTr', '')
+ formik?.setFieldValue('menuParentEn', '')
+ formik?.setFieldValue('menuParentTr', '')
}
}
@@ -977,8 +977,8 @@ const Wizard = () => {
formik?.setFieldValue('menuParentCode', '')
formik?.setFieldValue('menuParentModuleId', '')
formik?.setFieldValue('menuParentIcon', '')
- formik?.setFieldValue('languageTextMenuParentEn', '')
- formik?.setFieldValue('languageTextMenuParentTr', '')
+ formik?.setFieldValue('menuParentEn', '')
+ formik?.setFieldValue('menuParentTr', '')
formik?.setFieldValue('menuIcon', '')
formik?.setFieldValue('menuOrder', 0)
}
@@ -996,8 +996,8 @@ const Wizard = () => {
}
const selectedMenu = rawMenuItems.find((item) => item.code === code)
formikRef.current?.setFieldValue('menuParentIcon', selectedMenu?.icon ?? '')
- formikRef.current?.setFieldValue('languageTextMenuParentEn', selectedMenu?.menuTextEn ?? '')
- formikRef.current?.setFieldValue('languageTextMenuParentTr', selectedMenu?.menuTextTr ?? '')
+ formikRef.current?.setFieldValue('menuParentEn', selectedMenu?.menuTextEn ?? '')
+ formikRef.current?.setFieldValue('menuParentTr', selectedMenu?.menuTextTr ?? '')
if (!code) {
formikRef.current?.setFieldValue('menuParentModuleId', '')
return
@@ -1023,8 +1023,8 @@ const Wizard = () => {
.reduce((max, item) => Math.max(max, item.order ?? 0), 0) + 1
formikRef.current?.setFieldValue('menuOrder', nextMenuOrder)
formikRef.current?.setFieldValue('menuParentIcon', menu.icon ?? '')
- formikRef.current?.setFieldValue('languageTextMenuParentEn', menu.menuTextEn)
- formikRef.current?.setFieldValue('languageTextMenuParentTr', menu.menuTextTr)
+ formikRef.current?.setFieldValue('menuParentEn', menu.menuTextEn)
+ formikRef.current?.setFieldValue('menuParentTr', menu.menuTextTr)
const rootCode = menu.parentCode ? findRootCode(rawMenuItems, menu.parentCode) : menu.code
const existingRoot = rawMenuItems.find((item) => item.code === rootCode)
diff --git a/ui/src/views/admin/listForm/wizard/WizardStepDataSettings.tsx b/ui/src/views/admin/listForm/wizard/WizardStepDataSettings.tsx
index 5890654b..862f9102 100644
--- a/ui/src/views/admin/listForm/wizard/WizardStepDataSettings.tsx
+++ b/ui/src/views/admin/listForm/wizard/WizardStepDataSettings.tsx
@@ -133,10 +133,10 @@ const WizardStepDataSettings = ({
translate('::App.Listform.ListformField.ConnectionString'),
!values.selectCommand && translate('::App.WizardStep2.SelectCommand'),
!values.keyFieldName && translate('::App.WizardStep4.KeyField'),
- !values.languageTextDescEn && translate('::App.WizardStep2.DescriptionTextEnglish'),
- !values.languageTextDescTr && translate('::App.WizardStep2.DescriptionTextTurkish'),
- !values.languageTextTitleEn && translate('::App.WizardStep2.TitleTextEnglish'),
- !values.languageTextTitleTr && translate('::App.WizardStep2.TitleTextTurkish'),
+ !values.descEn && translate('::App.WizardStep2.DescriptionTextEnglish'),
+ !values.descTr && translate('::App.WizardStep2.DescriptionTextTurkish'),
+ !values.titleEn && translate('::App.WizardStep2.TitleTextEnglish'),
+ !values.titleTr && translate('::App.WizardStep2.TitleTextTurkish'),
selectedColumns.size === 0 && translate('::App.WizardStep2.ColumnSelection'),
].filter(Boolean) as string[]
const step2CanGo = step2Missing.length === 0
@@ -653,13 +653,13 @@ const WizardStepDataSettings = ({
@@ -668,13 +668,13 @@ const WizardStepDataSettings = ({
@@ -683,13 +683,13 @@ const WizardStepDataSettings = ({
@@ -698,13 +698,13 @@ const WizardStepDataSettings = ({
diff --git a/ui/src/views/admin/listForm/wizard/WizardStepDeploy.tsx b/ui/src/views/admin/listForm/wizard/WizardStepDeploy.tsx
index 410a1b4c..efb3adc2 100644
--- a/ui/src/views/admin/listForm/wizard/WizardStepDeploy.tsx
+++ b/ui/src/views/admin/listForm/wizard/WizardStepDeploy.tsx
@@ -85,14 +85,14 @@ function buildLogSteps(
{
id: 3,
label: translate('::App.Step4Log.SavingLanguageTexts'),
- detail: `EN: ${values.languageTextMenuEn} / TR: ${values.languageTextMenuTr}`,
+ detail: `EN: ${values.menuEn} / TR: ${values.menuTr}`,
},
{
id: 4,
label: translate('::App.Step4Log.ConfiguringPermission', {
0: values.permissionGroupName,
}),
- detail: `EN: ${values.permissionGroupDisplayNameEn} / TR: ${values.permissionGroupDisplayNameTr}`,
+ detail: `EN: ${values.permissionGroupEn} / TR: ${values.permissionGroupTr}`,
},
{
id: 5,
@@ -116,14 +116,14 @@ function buildLogSteps(
{
id: 3,
label: translate('::App.Step4Log.SavingLanguageTexts'),
- detail: `EN: ${values.languageTextMenuEn} / TR: ${values.languageTextMenuTr}`,
+ detail: `EN: ${values.menuEn} / TR: ${values.menuTr}`,
},
{
id: 4,
label: translate('::App.Step4Log.ConfiguringPermission', {
0: values.permissionGroupName,
}),
- detail: `EN: ${values.permissionGroupDisplayNameEn} / TR: ${values.permissionGroupDisplayNameTr}`,
+ detail: `EN: ${values.permissionGroupEn} / TR: ${values.permissionGroupTr}`,
},
{
id: 5,
@@ -324,22 +324,22 @@ const WizardStepDeploy = ({
/>
|
|
|
- |
- |
+ |
+ |
|
|
@@ -362,19 +362,19 @@ const WizardStepDeploy = ({
/>
|
|
|
|
|
= 1) && translate('::App.WizardStep1.MenuOrder'),
!values.permissionGroupName && translate('::App.WizardStep1.PermissionGroupName'),
- !values.permissionGroupDisplayNameEn &&
+ !values.permissionGroupEn &&
translate('::App.WizardStep1.PermissionGroupDisplayNameEn'),
- !values.permissionGroupDisplayNameTr &&
+ !values.permissionGroupTr &&
translate('::App.WizardStep1.PermissionGroupDisplayNameTr'),
- !values.languageTextMenuEn && translate('::App.WizardStep4.MenuEn'),
- !values.languageTextMenuTr && translate('::App.WizardStep4.MenuTr'),
+ !values.menuEn && translate('::App.WizardStep4.MenuEn'),
+ !values.menuTr && translate('::App.WizardStep4.MenuTr'),
createMenu && !values.menuIcon && translate('::App.WizardStep4.MenuIcon'),
].filter(Boolean) as string[]
// Geçersiz ya da çakışan ad deploy'da menü/permission kayıtlarını bozar; adım burada durur.
@@ -805,13 +805,13 @@ const WizardStepMenu = ({
@@ -821,13 +821,13 @@ const WizardStepMenu = ({
@@ -881,8 +881,8 @@ const WizardStepMenu = ({
existingNames={permissionGroupList.map((o) => o.value ?? '')}
initialValue={{
name: values.permissionGroupName ?? '',
- displayNameEn: values.permissionGroupDisplayNameEn ?? '',
- displayNameTr: values.permissionGroupDisplayNameTr ?? '',
+ displayNameEn: values.permissionGroupEn ?? '',
+ displayNameTr: values.permissionGroupTr ?? '',
}}
onClose={() => setPermissionGroupDialogOpen(false)}
onSave={onPermissionGroupDefine}
diff --git a/ui/src/views/list/GanttView.tsx b/ui/src/views/list/GanttView.tsx
index b49489f1..03abfb75 100644
--- a/ui/src/views/list/GanttView.tsx
+++ b/ui/src/views/list/GanttView.tsx
@@ -585,7 +585,7 @@ const GanttView = (props: GanttViewProps) => {