Update PermissionCheckEditor, remove Administration module index

serenity-is · Oct 21, 2024 · 0541f28 · 0541f28
1 parent 0b7c844
commit 0541f28
Show file tree

Hide file tree

Showing 16 changed files with 345 additions and 410 deletions.
diff --git a/serene/src/Serene.Web/Imports/ClientTypes/Administration.PermissionCheckEditorAttribute.cs b/serene/src/Serene.Web/Imports/ClientTypes/Administration.PermissionCheckEditorAttribute.cs
@@ -15,9 +15,27 @@ public PermissionCheckEditorAttribute()
     {
     }
 
+    public object ImplicitPermissions
+    {
+        get { return GetOption<object>("implicitPermissions"); }
+        set { SetOption("implicitPermissions", value); }
+    }
+
+    public object RolePermissions
+    {
+        get { return GetOption<object>("rolePermissions"); }
+        set { SetOption("rolePermissions", value); }
+    }
+
     public bool ShowRevoke
     {
         get { return GetOption<bool>("showRevoke"); }
         set { SetOption("showRevoke", value); }
     }
+
+    public object Value
+    {
+        get { return GetOption<object>("value"); }
+        set { SetOption("value", value); }
+    }
 }
diff --git a/serene/src/Serene.Web/Modules/Administration/Language/LanguageDialog.ts b/serene/src/Serene.Web/Modules/Administration/Language/LanguageDialog.ts
@@ -1,4 +1,4 @@
-import { LanguageRow, LanguageForm, LanguageService } from "../";
+import { LanguageRow, LanguageForm, LanguageService } from "@/ServerTypes/Administration";
 import { Decorators, EntityDialog } from "@serenity-is/corelib"
 
 @Decorators.registerClass('Serene.Administration.LanguageDialog')

diff --git a/serene/src/Serene.Web/Modules/Administration/Language/LanguageGrid.ts b/serene/src/Serene.Web/Modules/Administration/Language/LanguageGrid.ts
@@ -1,5 +1,5 @@
+import { LanguageRow, LanguageColumns, LanguageService } from "@/ServerTypes/Administration";
 import { LanguageDialog } from "./LanguageDialog";
-import { LanguageColumns, LanguageRow, LanguageService } from "../";
 import { Decorators, EntityGrid } from "@serenity-is/corelib"
 
 @Decorators.registerClass('Serene.Administration.LanguageGrid')

diff --git a/serene/src/Serene.Web/Modules/Administration/Role/RoleDialog.ts b/serene/src/Serene.Web/Modules/Administration/Role/RoleDialog.ts
@@ -1,7 +1,7 @@
-import { RoleRow, RoleForm, RoleService } from "../";
-import { RolePermissionDialog } from "../RolePermission/RolePermissionDialog";
-import { Texts } from "../../ServerTypes/Texts"
+import { RoleForm, RoleRow, RoleService } from "@/ServerTypes/Administration";
 import { Decorators, EntityDialog } from "@serenity-is/corelib";
+import { Texts } from "../../ServerTypes/Texts";
+import { RolePermissionDialog } from "../RolePermission/RolePermissionDialog";
 
 const editPermissions = "edit-permissions";
 
@@ -15,16 +15,14 @@ export class RoleDialog extends EntityDialog<RoleRow, any> {
 
     protected form = new RoleForm(this.idPrefix);
 
-    protected getToolbarButtons()
-    {
+    protected getToolbarButtons() {
         let buttons = super.getToolbarButtons();
 
         buttons.push({
             title: Texts.Site.RolePermissionDialog.EditButton,
             cssClass: editPermissions,
             icon: 'fa-lock text-green',
-            onClick: () =>
-            {
+            onClick: () => {
                 new RolePermissionDialog({
                     roleID: this.entity.RoleId,
                     title: this.entity.RoleName

diff --git a/serene/src/Serene.Web/Modules/Administration/Role/RoleGrid.ts b/serene/src/Serene.Web/Modules/Administration/Role/RoleGrid.ts
@@ -1,5 +1,5 @@
+import { RoleRow, RoleColumns, RoleService } from "@/ServerTypes/Administration";
 import { RoleDialog } from "./RoleDialog";
-import { RoleColumns, RoleRow, RoleService } from "../";
 import { Decorators, EntityGrid } from "@serenity-is/corelib";
 
 @Decorators.registerClass('Serene.Administration.RoleGrid')

diff --git a/serene/src/Serene.Web/Modules/Administration/RolePermission/RolePermissionDialog.ts b/serene/src/Serene.Web/Modules/Administration/RolePermission/RolePermissionDialog.ts
@@ -1,9 +1,9 @@
-import { Decorators, TemplatedDialog } from "@serenity-is/corelib";
-import { format, getRemoteData, notifySuccess, localText } from "@serenity-is/corelib";
-import { RolePermissionService, UserPermissionRow } from "../";
+import { BaseDialog, stringFormat, getRemoteData, localText, notifySuccess } from "@serenity-is/corelib";
 import { PermissionCheckEditor } from "../UserPermission/PermissionCheckEditor";
+import { RolePermissionService, UserPermissionRow } from "@/ServerTypes/Administration";
+import { RemoteDataKeys } from "../../ServerTypes/RemoteDataKeys";
 
-export class RolePermissionDialog extends TemplatedDialog<RolePermissionDialogOptions> {
+export class RolePermissionDialog extends BaseDialog<RolePermissionDialogOptions> {
 
     private permissions: PermissionCheckEditor;
 
@@ -20,7 +20,7 @@ export class RolePermissionDialog extends TemplatedDialog<RolePermissionDialogOp
             this.permissions.value = response.Entities.map(x => (<UserPermissionRow>{ PermissionKey: x }));
         });
 
-        this.permissions.implicitPermissions = getRemoteData('Administration.ImplicitPermissions');
+        this.permissions.implicitPermissions = getRemoteData(RemoteDataKeys.Administration.ImplicitPermissions);
     }
 
     protected getDialogOptions()  {
@@ -43,7 +43,7 @@ export class RolePermissionDialog extends TemplatedDialog<RolePermissionDialogOp
                 click: () => this.dialogClose()
             }];
 
-        opt.title = format(localText('Site.RolePermissionDialog.DialogTitle'),
+        opt.title = stringFormat(localText('Site.RolePermissionDialog.DialogTitle'),
             this.options.title);
 
         return opt;

diff --git a/serene/src/Serene.Web/Modules/Administration/Translation/TranslationGrid.ts b/serene/src/Serene.Web/Modules/Administration/Translation/TranslationGrid.ts
@@ -1,6 +1,7 @@
+import { TranslationService } from "@/ServerTypes/Administration";
 import { confirmDialog, Decorators, EntityGrid, Fluent, GridUtils, isEmptyOrNull, isTrimmedEmpty, localText, LookupEditor, LookupEditorOptions, notifySuccess, outerHtml, stripDiacritics, ToolButton, trimToEmpty, trimToNull, Widget } from "@serenity-is/corelib";
+import { TranslationItem } from "@serenity-is/extensions";
 import { Column } from "@serenity-is/sleekgrid";
-import { TranslationItem, TranslationService } from "../";
 
 @Decorators.registerClass()
 export class TranslationGrid extends EntityGrid<TranslationItem, any> {
@@ -10,7 +11,7 @@ export class TranslationGrid extends EntityGrid<TranslationItem, any> {
 
     private hasChanges: boolean;
     private searchText: string;
-    private sourceLanguage: LookupEditor; 
+    private sourceLanguage: LookupEditor;
     private targetLanguage: LookupEditor;
     private targetLanguageKey: string;
 
@@ -41,7 +42,7 @@ export class TranslationGrid extends EntityGrid<TranslationItem, any> {
 
         if (Fluent(e.target).hasClass('source-text')) {
             e.preventDefault();
-                
+
             done = () => {
                 item.CustomText = item.SourceText;
                 this.view.updateItem(item.Key, item);
@@ -183,7 +184,7 @@ export class TranslationGrid extends EntityGrid<TranslationItem, any> {
         this.hasChanges = false;
         return super.onViewSubmit();
     }
-    
+
     protected getButtons(): ToolButton[] {
         return [{
             title: localText('Db.Administration.Translation.SaveChangesButton'),

diff --git a/serene/src/Serene.Web/Modules/Administration/User/Authentication/Authorization.ts b/serene/src/Serene.Web/Modules/Administration/User/Authentication/Authorization.ts
@@ -1,5 +1,5 @@
+import { ScriptUserDefinition } from "@/ServerTypes/ScriptUserDefinition";
 import { getRemoteData } from "@serenity-is/corelib";
-import { ScriptUserDefinition } from "../..";
 
 export function userDefinition() {
     return getRemoteData('UserData') as ScriptUserDefinition;

diff --git a/serene/src/Serene.Web/Modules/Administration/User/UserDialog.ts b/serene/src/Serene.Web/Modules/Administration/User/UserDialog.ts
@@ -1,8 +1,7 @@
-import { UserForm, UserRow, UserService } from "../";
-import { UserPermissionDialog } from "../UserPermission/UserPermissionDialog";
-import { Decorators, EditorUtils, EntityDialog } from "@serenity-is/corelib"
-import { format, localText } from "@serenity-is/corelib";
+import { UserForm, UserRow, UserService } from "@/ServerTypes/Administration";
 import { Texts } from "@/ServerTypes/Texts";
+import { Decorators, EditorUtils, EntityDialog, localText, stringFormat } from "@serenity-is/corelib";
+import { UserPermissionDialog } from "../UserPermission/UserPermissionDialog";
 
 @Decorators.registerClass()
 export class UserDialog extends EntityDialog<UserRow, any> {
@@ -24,7 +23,7 @@ export class UserDialog extends EntityDialog<UserRow, any> {
 
         this.form.Password.addValidationRule(this.uniqueName, e => {
             if (this.form.Password.value.length < 6)
-                return format(localText(Texts.Validation.MinRequiredPasswordLength), 6);
+                return stringFormat(localText(Texts.Validation.MinRequiredPasswordLength), 6);
         });
 
         this.form.PasswordConfirm.addValidationRule(this.uniqueName, e => {