⚠️
Hata: {error}
@@ -214,11 +217,13 @@ const Assistant = () => {
val === null || val === undefined
? '—'
: typeof val === 'boolean'
- ? val ? 'Evet' : 'Hayır'
+ ? val
+ ? 'Evet'
+ : 'Hayır'
: typeof val === 'string' && val.endsWith('T00:00:00.000Z')
? new Date(val).toLocaleDateString('tr-TR')
: String(val)
-
+
return (
{display}
@@ -238,7 +243,7 @@ const Assistant = () => {
{JSON.stringify(answer, null, 2)}
)}
-
+
{chart && (
![]() {
)
}
-
+
return {String(message.content)}
}
-
+
// Render
return (
<>
@@ -322,7 +327,10 @@ const Assistant = () => {
item.key === selectedBot)?.name || translate('::AI.SelectModel') }
+ title={
+ bot.find((item) => item.key === selectedBot)?.name ||
+ translate('::AI.SelectModel')
+ }
>
{bot.map((item) => (
diff --git a/ui/src/views/auth/ExtendLogin.tsx b/ui/src/views/auth/ExtendLogin.tsx
index 9af42981..95fa16cb 100644
--- a/ui/src/views/auth/ExtendLogin.tsx
+++ b/ui/src/views/auth/ExtendLogin.tsx
@@ -5,7 +5,7 @@ import Button from '@/components/ui/Button'
import { FormContainer, FormItem } from '@/components/ui/Form'
import Input from '@/components/ui/Input'
import { ROUTES_ENUM } from '@/routes/route.constant'
-import { sendExtendLoginRequest } from '@/proxy/account/account.service'
+import { sendExtendLoginRequest } from '@/services/account.service'
import { store } from '@/store'
import { useLocalization } from '@/utils/hooks/useLocalization'
import useTimeOutMessage from '@/utils/hooks/useTimeOutMessage'
@@ -53,17 +53,17 @@ const ExtendLogin = () => {
return emailSent ? (
<>
- { translate('::Abp.Account.ExtendLogin.Title')}
- { translate('::Abp.Account.ExtendLogin.Description')}
+ {translate('::Abp.Account.ExtendLogin.Title')}
+ {translate('::Abp.Account.ExtendLogin.Description')}
{translate('::Abp.Account.Backto')}
- { translate('::Abp.Account.SignIn')}
+ {translate('::Abp.Account.SignIn')}
{' '}
) : (
- { translate('::Abp.Account.ExtendLogin')}
+ {translate('::Abp.Account.ExtendLogin')}
{message && (
@@ -108,7 +108,7 @@ const ExtendLogin = () => {
{translate('::Abp.Account.Backto')}
- { translate('::Abp.Account.SignIn')}
+ {translate('::Abp.Account.SignIn')}
diff --git a/ui/src/views/auth/ForgotPassword.tsx b/ui/src/views/auth/ForgotPassword.tsx
index e0bbe244..bbeb1922 100644
--- a/ui/src/views/auth/ForgotPassword.tsx
+++ b/ui/src/views/auth/ForgotPassword.tsx
@@ -5,7 +5,7 @@ import Button from '@/components/ui/Button'
import { FormContainer, FormItem } from '@/components/ui/Form'
import Input from '@/components/ui/Input'
import { ROUTES_ENUM } from '@/routes/route.constant'
-import { sendPasswordResetCode } from '@/proxy/account/account.service'
+import { sendPasswordResetCode } from '@/services/account.service'
import { store } from '@/store'
import { useLocalization } from '@/utils/hooks/useLocalization'
import useTimeOutMessage from '@/utils/hooks/useTimeOutMessage'
@@ -69,8 +69,8 @@ const ForgotPassword = () => {
) : (
<>
- { translate('::Abp.Account.ForgotPassword')}
- { translate('::Abp.Account.ForgotPassword.Message')}
+ {translate('::Abp.Account.ForgotPassword')}
+ {translate('::Abp.Account.ForgotPassword.Message')}
)}
@@ -117,7 +117,7 @@ const ForgotPassword = () => {
{translate('::Abp.Account.Backto')}
- { translate('::Abp.Account.SignIn')}
+ {translate('::Abp.Account.SignIn')}
diff --git a/ui/src/views/auth/Login.tsx b/ui/src/views/auth/Login.tsx
index e319ed57..efe44237 100644
--- a/ui/src/views/auth/Login.tsx
+++ b/ui/src/views/auth/Login.tsx
@@ -9,7 +9,7 @@ import { FormContainer, FormItem } from '@/components/ui/Form'
import Input from '@/components/ui/Input'
import PlatformLoginResultType from '@/constants/login.result.enum'
import { ROUTES_ENUM } from '@/routes/route.constant'
-import { getTenantByName } from '@/proxy/admin/tenant/tenant.service'
+import { getTenantByName } from '@/services/tenant.service'
import { useStoreActions, useStoreState } from '@/store'
import useAuth from '@/utils/hooks/useAuth'
import { useLocalization } from '@/utils/hooks/useLocalization'
diff --git a/ui/src/views/auth/ResetPassword.tsx b/ui/src/views/auth/ResetPassword.tsx
index 0d0c2831..9d24d831 100644
--- a/ui/src/views/auth/ResetPassword.tsx
+++ b/ui/src/views/auth/ResetPassword.tsx
@@ -4,7 +4,7 @@ import Alert from '@/components/ui/Alert'
import Button from '@/components/ui/Button'
import { FormContainer, FormItem } from '@/components/ui/Form'
import { ROUTES_ENUM } from '@/routes/route.constant'
-import { resetPassword } from '@/proxy/account/account.service'
+import { resetPassword } from '@/services/account.service'
import { useLocalization } from '@/utils/hooks/useLocalization'
import useTimeOutMessage from '@/utils/hooks/useTimeOutMessage'
import type { AxiosError } from 'axios'
diff --git a/ui/src/views/auth/VerifyConfirmationCode.tsx b/ui/src/views/auth/VerifyConfirmationCode.tsx
index 319b5f3b..c3168672 100644
--- a/ui/src/views/auth/VerifyConfirmationCode.tsx
+++ b/ui/src/views/auth/VerifyConfirmationCode.tsx
@@ -12,7 +12,7 @@ const VerifyConfirmationCode = () => {
useQuery({
queryKey: ['verifyConfirmationCode', userId, token],
- queryFn: () => verifyConfirmationCode(userId, token),
+ queryFn: () => verifyConfirmationCode(userId!, token!),
retry: false,
refetchOnWindowFocus: false,
})
diff --git a/ui/src/views/chart/Chart.tsx b/ui/src/views/chart/Chart.tsx
index e04c9480..6ca62e3d 100644
--- a/ui/src/views/chart/Chart.tsx
+++ b/ui/src/views/chart/Chart.tsx
@@ -2,20 +2,20 @@ import { CommonProps } from '@/@types/common'
import { Meta } from '@/@types/routes'
import { Container } from '@/components/shared'
import { DX_CLASSNAMES } from '@/constants/app.constant'
-import { getChartOptions } from '@/proxy/charts/chart.service'
import { useLocalization } from '@/utils/hooks/useLocalization'
import DxChart from 'devextreme-react/chart'
import { useEffect, useState } from 'react'
import { Helmet } from 'react-helmet'
import { useParams, useSearchParams } from 'react-router-dom'
import { getChartOptionsDto } from './utils'
+import { getChartOptions } from '@/services/chart.service'
interface ChartProps extends CommonProps, Meta {
chartCode: string
isSubForm?: boolean
level?: number
- refreshData?: () => Promise,
- filter?: string
+ refreshData?: () => Promise
+ filter?: string
}
const Chart = (props: ChartProps) => {
diff --git a/ui/src/views/chart/utils.ts b/ui/src/views/chart/utils.ts
index c875a0fc..cfbb5014 100644
--- a/ui/src/views/chart/utils.ts
+++ b/ui/src/views/chart/utils.ts
@@ -1,6 +1,6 @@
-import { ChartDto } from '@/proxy/charts'
-import { getChartSelect } from '@/proxy/charts/chart.service'
import CustomStore from 'devextreme/data/custom_store'
+import { ChartDto } from '../../proxy/charts/models'
+import { getChartSelect } from '../../services/chart.service'
export function getChartOptionsDto(chartCode: string, chartDto: ChartDto, filter?: string) {
if (!chartDto || !chartCode) {
diff --git a/ui/src/views/dashboard/WidgetProgress.tsx b/ui/src/views/dashboard/WidgetProgress.tsx
index 00174d7d..c7d60a71 100644
--- a/ui/src/views/dashboard/WidgetProgress.tsx
+++ b/ui/src/views/dashboard/WidgetProgress.tsx
@@ -1,11 +1,6 @@
import { Card, Progress } from '@/components/ui'
-import Chart from '../chart/Chart'
-const WidgetProgress = ({
- percent
-}: {
- percent: number
-}) => {
+const WidgetProgress = ({ percent }: { percent: number }) => {
const ProgressInfo = ({ precent }: { precent?: string }) => {
return (
diff --git a/ui/src/views/dashboard/Widgets.tsx b/ui/src/views/dashboard/Widgets.tsx
index 818eac23..46d22301 100644
--- a/ui/src/views/dashboard/Widgets.tsx
+++ b/ui/src/views/dashboard/Widgets.tsx
@@ -1,39 +1,37 @@
-import { Loading } from "@/components/shared"
-import Widget from "./Widget"
-import { WidgetsData } from "./models"
+import { Loading } from '@/components/shared'
+import Widget from './Widget'
+import { WidgetsData } from '@/proxy/dashboard/models'
-const Widgets = ({
- loading,
- widgetData
-}: {
- loading: boolean;
- widgetData: WidgetsData[] | undefined
+const Widgets = ({
+ loading,
+ widgetData,
+}: {
+ loading: boolean
+ widgetData: WidgetsData[] | undefined
}) => {
- return (
-
-
- {
- widgetData?.map((item, index) => {
- const formattedValue = new Intl.NumberFormat(undefined, {
- minimumFractionDigits: 1,
- maximumFractionDigits: 1,
- }).format(item.datavalue);
-
- return (
-
- )
- })
- }
-
-
- )
+ return (
+
+
+ {widgetData?.map((item, index) => {
+ const formattedValue = new Intl.NumberFormat(undefined, {
+ minimumFractionDigits: 1,
+ maximumFractionDigits: 1,
+ }).format(item.datavalue)
+
+ return (
+
+ )
+ })}
+
+
+ )
}
export default Widgets
diff --git a/ui/src/views/dashboard/models.ts b/ui/src/views/dashboard/models.ts
deleted file mode 100644
index 02105051..00000000
--- a/ui/src/views/dashboard/models.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface WidgetsData {
- label: string
- datavalue: number,
- datagrowShrink: number,
- valuePrefix: string
- date: Date
- };
\ No newline at end of file
diff --git a/ui/src/views/form/FormButtons.tsx b/ui/src/views/form/FormButtons.tsx
index edaa6a23..a58095a5 100644
--- a/ui/src/views/form/FormButtons.tsx
+++ b/ui/src/views/form/FormButtons.tsx
@@ -1,6 +1,5 @@
import { Badge, Button, Dialog, Notification, toast } from '@/components/ui'
import navigationIcon from '@/configs/navigation-icon.config'
-import { GridDto } from '@/proxy/form'
import { useLocalization } from '@/utils/hooks/useLocalization'
import CustomStore from 'devextreme/data/custom_store'
import { useState } from 'react'
@@ -9,6 +8,7 @@ import { useNavigate } from 'react-router-dom'
import { GridColumnData } from '../list/GridColumnData'
import { useToolbar } from '../list/useToolbar'
import { PermissionResults, RowMode } from './types'
+import { GridDto } from '@/proxy/form/models'
const FormButtons = (props: {
mode: RowMode
diff --git a/ui/src/views/form/FormDevExpress.tsx b/ui/src/views/form/FormDevExpress.tsx
index 77ba8370..6883a1ca 100644
--- a/ui/src/views/form/FormDevExpress.tsx
+++ b/ui/src/views/form/FormDevExpress.tsx
@@ -1,5 +1,4 @@
import { DX_CLASSNAMES } from '@/constants/app.constant'
-import { PlatformEditorTypes } from '@/proxy/form'
import {
Form as FormDx,
GroupItem as GroupItemDx,
@@ -11,6 +10,7 @@ import { Dispatch, RefObject } from 'react'
import { GridBoxEditorComponent } from './editors/GridBoxEditorComponent'
import { TagBoxEditorComponent } from './editors/TagBoxEditorComponent'
import { RowMode, SimpleItemWithColData } from './types'
+import { PlatformEditorTypes } from '@/proxy/form/models'
const FormDevExpress = (props: {
mode: RowMode
diff --git a/ui/src/views/form/SubForms.tsx b/ui/src/views/form/SubForms.tsx
index 74d0bdcd..3d69e362 100644
--- a/ui/src/views/form/SubForms.tsx
+++ b/ui/src/views/form/SubForms.tsx
@@ -2,7 +2,6 @@ import { Tabs } from '@/components/ui'
import TabContent from '@/components/ui/Tabs/TabContent'
import TabList from '@/components/ui/Tabs/TabList'
import TabNav from '@/components/ui/Tabs/TabNav'
-import { GridDto, SubFormDto, SubFormTabTypeEnum } from '@/proxy/form'
import { useEffect, useState } from 'react'
import { MdBarChart, MdList } from 'react-icons/md'
import { useLocation, useNavigate } from 'react-router-dom'
@@ -11,6 +10,7 @@ import FormEdit from './FormEdit'
import FormNew from './FormNew'
import FormView from './FormView'
import Chart from '../chart/Chart'
+import { GridDto, SubFormDto, SubFormTabTypeEnum } from '@/proxy/form/models'
const SubForms = (props: {
gridDto: GridDto
diff --git a/ui/src/views/form/types.ts b/ui/src/views/form/types.ts
index 3e87d414..44d9d8d3 100644
--- a/ui/src/views/form/types.ts
+++ b/ui/src/views/form/types.ts
@@ -1,8 +1,8 @@
-import { Meta } from '@/@types/routes'
import { FormItemComponent, SimpleItem } from 'devextreme/ui/form'
import { GridColumnData } from '../list/GridColumnData'
-import { Overwrite } from '@/utils/types'
-import { GridBoxOptionsDto, PlatformEditorTypes, TagBoxOptionsDto } from '@/proxy/form'
+import { Overwrite } from '../../utils/types'
+import { GridBoxOptionsDto, PlatformEditorTypes, TagBoxOptionsDto } from '../../proxy/form/models'
+import { Meta } from 'easy-peasy'
export type EditorType2 = FormItemComponent | PlatformEditorTypes.dxGridBox
export type SimpleItemWithColData = Overwrite<
diff --git a/ui/src/views/form/useGridData.tsx b/ui/src/views/form/useGridData.tsx
index 878c4deb..b0bb341f 100644
--- a/ui/src/views/form/useGridData.tsx
+++ b/ui/src/views/form/useGridData.tsx
@@ -1,6 +1,5 @@
import { Notification, toast } from '@/components/ui'
-import { EditingFormItemDto, GridDto, PlatformEditorTypes } from '@/proxy/form'
-import { getList } from '@/proxy/form/form.service'
+import { getList } from '@/services/form.service'
import { useListFormColumns } from '@/shared/useListFormColumns'
import { useListFormCustomDataSource } from '@/shared/useListFormCustomDataSource'
import { useLocalization } from '@/utils/hooks/useLocalization'
@@ -14,6 +13,7 @@ import { useNavigate, useSearchParams } from 'react-router-dom'
import { GridColumnData } from '../list/GridColumnData'
import { addCss, addJs } from '../list/Utils'
import { PermissionResults, RowMode, SimpleItemWithColData } from './types'
+import { EditingFormItemDto, GridDto, PlatformEditorTypes } from '@/proxy/form/models'
const useGridData = (props: {
mode: RowMode
@@ -176,7 +176,7 @@ const useGridData = (props: {
d:
gridDto?.gridOptions.editingOptionDto.allowDeleting === true &&
checkPermission(gridDto?.gridOptions.permissionDto.d),
- e: checkPermission(gridDto?.gridOptions.permissionDto.e)
+ e: checkPermission(gridDto?.gridOptions.permissionDto.e),
})
// Set js and css
@@ -198,17 +198,17 @@ const useGridData = (props: {
setDataSource(dataSource)
const items = gridDto?.gridOptions.editingFormDto
- ?.sort((a, b) => {
+ ?.sort((a: any, b: any) => {
return a.order >= b.order ? 1 : -1
})
- .map((e) => {
+ .map((e: any) => {
return {
itemType: e.itemType,
colCount: e.colCount,
colSpan: e.colSpan,
caption: e.caption,
items: e.items
- ?.sort((a, b) => {
+ ?.sort((a: any, b: any) => {
return a.order >= b.order ? 1 : -1
})
.map((i: EditingFormItemDto) => {
@@ -218,15 +218,16 @@ const useGridData = (props: {
} catch {}
const item: SimpleItemWithColData = {
canRead:
- gridDto.columnFormats.find((x) => x.fieldName === i.dataField)?.canRead ?? false,
+ gridDto.columnFormats.find((x: any) => x.fieldName === i.dataField)?.canRead ??
+ false,
canUpdate:
- gridDto.columnFormats.find((x) => x.fieldName === i.dataField)?.canUpdate ??
+ gridDto.columnFormats.find((x: any) => x.fieldName === i.dataField)?.canUpdate ??
false,
canCreate:
- gridDto.columnFormats.find((x) => x.fieldName === i.dataField)?.canCreate ??
+ gridDto.columnFormats.find((x: any) => x.fieldName === i.dataField)?.canCreate ??
false,
canExport:
- gridDto.columnFormats.find((x) => x.fieldName === i.dataField)?.canExport ??
+ gridDto.columnFormats.find((x: any) => x.fieldName === i.dataField)?.canExport ??
false,
dataField: i.dataField,
name: i.dataField,
@@ -251,7 +252,7 @@ const useGridData = (props: {
}
return item
})
- .filter((a) => {
+ .filter((a: any) => {
if (mode === 'view') {
return a.canRead
} else if (mode === 'new') {
diff --git a/ui/src/views/index.ts b/ui/src/views/index.ts
deleted file mode 100644
index 6d75b4ae..00000000
--- a/ui/src/views/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Views from './Views'
-
-export default Views
diff --git a/ui/src/views/list/Grid.tsx b/ui/src/views/list/Grid.tsx
index bc6bf541..7829e351 100644
--- a/ui/src/views/list/Grid.tsx
+++ b/ui/src/views/list/Grid.tsx
@@ -7,12 +7,12 @@ import {
GridDto,
ListFormCustomizationTypeEnum,
PlatformEditorTypes,
-} from '@/proxy/form'
-import { getList } from '@/proxy/form/form.service'
+} from '@/proxy/form/models'
+import { getList } from '@/services/form.service'
import {
getListFormCustomization,
postListFormCustomization,
-} from '@/proxy/form/list-form-customization.service'
+} from '@/services/list-form-customization.service'
import { useListFormColumns } from '@/shared/useListFormColumns'
import { useListFormCustomDataSource } from '@/shared/useListFormCustomDataSource'
import { useLocalization } from '@/utils/hooks/useLocalization'
@@ -558,17 +558,17 @@ const Grid = (props: GridProps) => {
items:
gridDto.gridOptions.editingFormDto?.length > 0
? gridDto.gridOptions.editingFormDto
- ?.sort((a, b) => {
+ ?.sort((a: any, b: any) => {
return a.order >= b.order ? 1 : -1
})
- .map((e) => {
+ .map((e: any) => {
return {
itemType: e.itemType,
colCount: e.colCount,
colSpan: e.colSpan,
caption: e.caption,
items: e.items
- ?.sort((a, b) => {
+ ?.sort((a: any, b: any) => {
return a.order >= b.order ? 1 : -1
})
.map((i: EditingFormItemDto) => {
@@ -586,7 +586,7 @@ const Grid = (props: GridProps) => {
} catch {}
const fieldName = i.dataField.split(':')[0]
const listFormField = gridDto.columnFormats.find(
- (x) => x.fieldName === fieldName,
+ (x: any) => x.fieldName === fieldName,
)
if (listFormField?.sourceDbType === DbTypeEnum.Date) {
editorOptions = {
@@ -642,7 +642,7 @@ const Grid = (props: GridProps) => {
return item
})
- .filter((a) => {
+ .filter((a: any) => {
// return a.canRead
if (mode === 'view') {
return a.canRead
@@ -693,7 +693,7 @@ const Grid = (props: GridProps) => {
visible={gridDto.gridOptions.pagerOptionDto?.visible}
allowedPageSizes={gridDto.gridOptions.pagerOptionDto?.allowedPageSizes
?.split(',')
- .map((a) => +a)}
+ .map((a: any) => +a)}
showPageSizeSelector={gridDto.gridOptions.pagerOptionDto?.showPageSizeSelector}
showInfo={gridDto.gridOptions.pagerOptionDto?.showInfo}
showNavigationButtons={gridDto.gridOptions.pagerOptionDto?.showNavigationButtons}
@@ -714,8 +714,8 @@ const Grid = (props: GridProps) => {
>
{gridDto.columnFormats
- .filter((x) => !!x.columnTotalSummaryDto?.summaryType)
- .map((x) => (
+ .filter((x: any) => !!x.columnTotalSummaryDto?.summaryType)
+ .map((x: any) => (
{
/>
))}
{gridDto.columnFormats
- .filter((x) => !!x.columnGroupSummaryDto?.summaryType)
- .map((x) => (
+ .filter((x: any) => !!x.columnGroupSummaryDto?.summaryType)
+ .map((x: any) => (
void
getSelectedRowsData: () => any
- refreshData: () => void
- getFilter: () => void
+ refreshData: () => void
+ getFilter: () => void
}): {
toolbarData: ToolbarItem[]
toolbarModalData: ToolbarModalData | undefined
@@ -38,7 +38,7 @@ const useToolbar = ({
const dialog: any = useDialogContext()
const { translate } = useLocalization()
const { checkPermission } = usePermission()
- const isPwaMode = usePWA();
+ const isPwaMode = usePWA()
const [toolbarData, setToolbarData] = useState([])
const [toolbarModalData, setToolbarModalData] = useState()
diff --git a/ui/src/views/menu/MenuItemComponent.tsx b/ui/src/views/menu/MenuItemComponent.tsx
index 67542d47..1b62c640 100644
--- a/ui/src/views/menu/MenuItemComponent.tsx
+++ b/ui/src/views/menu/MenuItemComponent.tsx
@@ -4,7 +4,6 @@ import { CSS } from '@dnd-kit/utilities'
import { MenuItem } from '@/@types/menu'
import { useLocalization } from '@/utils/hooks/useLocalization'
import { MenuService } from '@/services/menu.service'
-import { MenuDto } from '@/proxy/menus'
import navigationIcon from '@/configs/navigation-icon.config'
import { FaQuestionCircle } from 'react-icons/fa'
import {
@@ -20,10 +19,11 @@ import {
} from '@/components/ui'
import { Field, FieldProps, Form, Formik } from 'formik'
import { SelectBoxOption } from '@/shared/types'
-import { getPermissionsList } from '@/proxy/admin/identity.service'
-import { PermissionDefinitionRecord } from '@/proxy/admin'
+import { getPermissionsList } from '@/services/identity.service'
+import { PermissionDefinitionRecord } from '@/proxy/admin/models'
import * as Yup from 'yup'
import { ExternalLink, FileText, Plus, Trash2 } from 'lucide-react'
+import { MenuDto } from '@/proxy/menus/models'
interface MenuItemComponentProps {
item: MenuItem
@@ -223,8 +223,15 @@ export const MenuItemComponent: React.FC = ({
{({ values, errors, touched, isSubmitting, handleChange }) => (
|