Menu ve Sql Query Manager Required
This commit is contained in:
parent
62f38a27a5
commit
a7e8d7995b
4 changed files with 25 additions and 25 deletions
|
|
@ -954,6 +954,16 @@
|
||||||
"RequiredPermissionName": "App.Definitions.WorkHour",
|
"RequiredPermissionName": "App.Definitions.WorkHour",
|
||||||
"IsDisabled": false
|
"IsDisabled": false
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"ParentCode": "App.Administration.Definitions",
|
||||||
|
"Code": "App.IpRestrictions",
|
||||||
|
"DisplayName": "App.IpRestrictions",
|
||||||
|
"Order": 3,
|
||||||
|
"Url": "/admin/list/App.IpRestrictions",
|
||||||
|
"Icon": "FcNfcSign",
|
||||||
|
"RequiredPermissionName": "App.IpRestrictions",
|
||||||
|
"IsDisabled": false
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"ParentCode": "App.Administration",
|
"ParentCode": "App.Administration",
|
||||||
"Code": "Abp.Identity",
|
"Code": "Abp.Identity",
|
||||||
|
|
@ -1024,21 +1034,11 @@
|
||||||
"RequiredPermissionName": "Abp.Identity.OrganizationUnits",
|
"RequiredPermissionName": "Abp.Identity.OrganizationUnits",
|
||||||
"IsDisabled": false
|
"IsDisabled": false
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"ParentCode": "Abp.Identity",
|
|
||||||
"Code": "App.IpRestrictions",
|
|
||||||
"DisplayName": "App.IpRestrictions",
|
|
||||||
"Order": 7,
|
|
||||||
"Url": "/admin/list/App.IpRestrictions",
|
|
||||||
"Icon": "FcNfcSign",
|
|
||||||
"RequiredPermissionName": "App.IpRestrictions",
|
|
||||||
"IsDisabled": false
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"ParentCode": "Abp.Identity",
|
"ParentCode": "Abp.Identity",
|
||||||
"Code": "App.AuditLogs",
|
"Code": "App.AuditLogs",
|
||||||
"DisplayName": "App.AuditLogs",
|
"DisplayName": "App.AuditLogs",
|
||||||
"Order": 8,
|
"Order": 7,
|
||||||
"Url": "/admin/list/App.AuditLogs",
|
"Url": "/admin/list/App.AuditLogs",
|
||||||
"Icon": "FcMultipleInputs",
|
"Icon": "FcMultipleInputs",
|
||||||
"RequiredPermissionName": "App.AuditLogs",
|
"RequiredPermissionName": "App.AuditLogs",
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,8 @@ const formatLabel = (text: string) => {
|
||||||
.join(" ");
|
.join(" ");
|
||||||
};
|
};
|
||||||
|
|
||||||
function newGroupItem(colName: string, sqlType = ''): WizardGroupItem {
|
function newGroupItem(colName: string, meta?: DatabaseColumnDto): WizardGroupItem {
|
||||||
|
const sqlType = meta?.dataType ?? ''
|
||||||
return {
|
return {
|
||||||
id: `${colName}_${Date.now()}`,
|
id: `${colName}_${Date.now()}`,
|
||||||
dataField: colName,
|
dataField: colName,
|
||||||
|
|
@ -92,7 +93,7 @@ function newGroupItem(colName: string, sqlType = ''): WizardGroupItem {
|
||||||
editorOptions: '',
|
editorOptions: '',
|
||||||
editorScript: '',
|
editorScript: '',
|
||||||
colSpan: 1,
|
colSpan: 1,
|
||||||
isRequired: false,
|
isRequired: meta?.isNullable === false,
|
||||||
turkishCaption: formatLabel(colName),
|
turkishCaption: formatLabel(colName),
|
||||||
englishCaption: formatLabel(colName),
|
englishCaption: formatLabel(colName),
|
||||||
}
|
}
|
||||||
|
|
@ -467,8 +468,7 @@ const WizardStep3 = ({
|
||||||
const availableColumns = [...selectedColumns].filter((c) => !placedColumns.has(c))
|
const availableColumns = [...selectedColumns].filter((c) => !placedColumns.has(c))
|
||||||
|
|
||||||
// ── Helpers ───────────────────────────────────────────────────────────────
|
// ── Helpers ───────────────────────────────────────────────────────────────
|
||||||
const colMeta = (name: string) =>
|
const colMeta = (name: string) => selectCommandColumns.find((c) => c.columnName === name)
|
||||||
selectCommandColumns.find((c) => c.columnName === name)?.dataType ?? ''
|
|
||||||
|
|
||||||
const addColumnToGroup = (colName: string, targetGroupId: string) => {
|
const addColumnToGroup = (colName: string, targetGroupId: string) => {
|
||||||
onGroupsChange(
|
onGroupsChange(
|
||||||
|
|
|
||||||
|
|
@ -263,7 +263,7 @@ function RolesPermission({
|
||||||
return permissionList ? (
|
return permissionList ? (
|
||||||
<Container>
|
<Container>
|
||||||
<Dialog
|
<Dialog
|
||||||
width="60%"
|
width="min(900px, 95vw)"
|
||||||
isOpen={open}
|
isOpen={open}
|
||||||
onAfterOpen={() => changeGroup(permissionList?.groups[0].name)}
|
onAfterOpen={() => changeGroup(permissionList?.groups[0].name)}
|
||||||
onClose={onDialogClose}
|
onClose={onDialogClose}
|
||||||
|
|
@ -275,12 +275,12 @@ function RolesPermission({
|
||||||
<hr className="mt-1 mb-2"></hr>
|
<hr className="mt-1 mb-2"></hr>
|
||||||
|
|
||||||
<div className="flex flex-col md:flex-row gap-4 mb-1">
|
<div className="flex flex-col md:flex-row gap-4 mb-1">
|
||||||
<div style={{ width: '30%' }}>
|
<div className="w-full md:w-1/3">
|
||||||
<Checkbox name="all" checked={isAllSelected} onChange={onSelectAll}>
|
<Checkbox name="all" checked={isAllSelected} onChange={onSelectAll}>
|
||||||
{translate('AbpPermissionManagement::SelectAllInAllTabs')}
|
{translate('AbpPermissionManagement::SelectAllInAllTabs')}
|
||||||
</Checkbox>
|
</Checkbox>
|
||||||
</div>
|
</div>
|
||||||
<div style={{ width: '70%' }}>
|
<div className="w-full md:w-2/3">
|
||||||
<Checkbox name="group" checked={isAllSelectedForGroup} onChange={onSelectAll}>
|
<Checkbox name="group" checked={isAllSelectedForGroup} onChange={onSelectAll}>
|
||||||
{translate('AbpPermissionManagement::SelectAllInThisTab')}
|
{translate('AbpPermissionManagement::SelectAllInThisTab')}
|
||||||
</Checkbox>
|
</Checkbox>
|
||||||
|
|
@ -288,7 +288,7 @@ function RolesPermission({
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-col md:flex-row gap-4">
|
<div className="flex flex-col md:flex-row gap-4">
|
||||||
<div style={{ width: '30%' }} className="max-h-[450px] overflow-y-auto">
|
<div className="w-full md:w-1/3 max-h-[450px] overflow-y-auto">
|
||||||
<hr className="mb-2"></hr>
|
<hr className="mb-2"></hr>
|
||||||
<Menu
|
<Menu
|
||||||
className="w-full"
|
className="w-full"
|
||||||
|
|
@ -308,7 +308,7 @@ function RolesPermission({
|
||||||
))}
|
))}
|
||||||
</Menu>
|
</Menu>
|
||||||
</div>
|
</div>
|
||||||
<div style={{ width: '70%' }} className="max-h-[450px] overflow-y-auto">
|
<div className="w-full md:w-2/3 max-h-[450px] overflow-y-auto">
|
||||||
<hr className="mb-2"></hr>
|
<hr className="mb-2"></hr>
|
||||||
<Input
|
<Input
|
||||||
size="sm"
|
size="sm"
|
||||||
|
|
|
||||||
|
|
@ -218,7 +218,7 @@ function UsersPermission({
|
||||||
|
|
||||||
return permissionList ? (
|
return permissionList ? (
|
||||||
<Dialog
|
<Dialog
|
||||||
width="60%"
|
width="min(900px, 95vw)"
|
||||||
isOpen={open}
|
isOpen={open}
|
||||||
onAfterOpen={() => changeGroup(permissionList?.groups[0].name)}
|
onAfterOpen={() => changeGroup(permissionList?.groups[0].name)}
|
||||||
onClose={onDialogClose}
|
onClose={onDialogClose}
|
||||||
|
|
@ -230,12 +230,12 @@ function UsersPermission({
|
||||||
<hr className="mt-1 mb-2"></hr>
|
<hr className="mt-1 mb-2"></hr>
|
||||||
|
|
||||||
<div className="flex flex-col md:flex-row gap-4">
|
<div className="flex flex-col md:flex-row gap-4">
|
||||||
<div style={{ width: '30%' }}>
|
<div className="w-full md:w-1/3">
|
||||||
<Checkbox name="all" checked={isAllSelected} onChange={onSelectAll}>
|
<Checkbox name="all" checked={isAllSelected} onChange={onSelectAll}>
|
||||||
{translate('AbpPermissionManagement::SelectAllInAllTabs')}
|
{translate('AbpPermissionManagement::SelectAllInAllTabs')}
|
||||||
</Checkbox>
|
</Checkbox>
|
||||||
</div>
|
</div>
|
||||||
<div style={{ width: '70%' }}>
|
<div className="w-full md:w-2/3">
|
||||||
<Checkbox name="group" checked={isAllSelectedForGroup} onChange={onSelectAll}>
|
<Checkbox name="group" checked={isAllSelectedForGroup} onChange={onSelectAll}>
|
||||||
{translate('AbpPermissionManagement::SelectAllInThisTab')}
|
{translate('AbpPermissionManagement::SelectAllInThisTab')}
|
||||||
</Checkbox>
|
</Checkbox>
|
||||||
|
|
@ -243,7 +243,7 @@ function UsersPermission({
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-col md:flex-row gap-4">
|
<div className="flex flex-col md:flex-row gap-4">
|
||||||
<div style={{ width: '30%' }} className="max-h-[450px] overflow-y-auto">
|
<div className="w-full md:w-1/3 max-h-[450px] overflow-y-auto">
|
||||||
<hr className="mt-2 mb-2"></hr>
|
<hr className="mt-2 mb-2"></hr>
|
||||||
<Menu variant={mode} defaultActiveKeys={[selectedGroup?.displayName ?? '']}>
|
<Menu variant={mode} defaultActiveKeys={[selectedGroup?.displayName ?? '']}>
|
||||||
{permissionList?.groups.map((group) => (
|
{permissionList?.groups.map((group) => (
|
||||||
|
|
@ -261,7 +261,7 @@ function UsersPermission({
|
||||||
))}
|
))}
|
||||||
</Menu>
|
</Menu>
|
||||||
</div>
|
</div>
|
||||||
<div style={{ width: '70%' }} className="max-h-[450px] overflow-y-auto">
|
<div className="w-full md:w-2/3 max-h-[450px] overflow-y-auto">
|
||||||
<hr className="mt-2 mb-2"></hr>
|
<hr className="mt-2 mb-2"></hr>
|
||||||
<div className="card-body">
|
<div className="card-body">
|
||||||
{selectedGroupPermissions.map((permission) => (
|
{selectedGroupPermissions.map((permission) => (
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue