@drax/identity-vue 0.30.0 → 0.33.0

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.30.0",
+  "version": "0.33.0",
   "type": "module",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
@@ -24,12 +24,12 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@drax/common-front": "^0.30.0",
-    "@drax/common-vue": "^0.30.0",
-    "@drax/crud-front": "^0.30.0",
-    "@drax/crud-share": "^0.30.0",
-    "@drax/crud-vue": "^0.30.0",
-    "@drax/identity-share": "^0.30.0"
+    "@drax/common-front": "^0.33.0",
+    "@drax/common-vue": "^0.33.0",
+    "@drax/crud-front": "^0.33.0",
+    "@drax/crud-share": "^0.33.0",
+    "@drax/crud-vue": "^0.33.0",
+    "@drax/identity-share": "^0.33.0"
   },
   "peerDependencies": {
     "pinia": "^2.2.2",
@@ -66,5 +66,5 @@
     "vue-tsc": "^2.1.6",
     "vuetify": "^3.7.1"
   },
-  "gitHead": "f7f06578327be29f20dcb7e2c8a2eac9e9145cab"
+  "gitHead": "2a006597a635f61776d252f92bb3899371244379"
 }

package/src/cruds/role-crud/RoleCrud.ts

@@ -22,11 +22,11 @@ class RoleCrud extends EntityCrud implements IEntityCrud {
 
   get permissions(){
     return {
-      manage: 'tenant:manage',
-      view: 'tenant:view',
-      create: 'tenant:create',
-      update: 'tenant:update',
-      delete: 'tenant:delete'
+      manage: 'role:manage',
+      view: 'role:view',
+      create: 'role:create',
+      update: 'role:update',
+      delete: 'role:delete'
     }
   }
 

package/src/cruds/user-crud/UserCrud.ts

@@ -4,6 +4,11 @@ import {EntityCrud} from "@drax/crud-vue";
 import {UserSystemFactory} from "@drax/identity-front";
 import {RoleCrud} from '../role-crud/RoleCrud'
 import {TenantCrud} from '../tenant-crud/TenantCrud'
+import {useAuthStore} from '../../stores/auth/AuthStore'
+
+
+
+
 import type {
   IEntityCrud,
   IEntityCrudField,
@@ -31,11 +36,11 @@ class UserCrud extends EntityCrud implements IEntityCrud {
 
   get permissions(){
     return {
-      manage: 'tenant:manage',
-      view: 'tenant:view',
-      create: 'tenant:create',
-      update: 'tenant:update',
-      delete: 'tenant:delete'
+      manage: 'user:manage',
+      view: 'user:view',
+      create: 'user:create',
+      update: 'user:update',
+      delete: 'user:delete'
     }
   }
 
@@ -75,7 +80,7 @@ class UserCrud extends EntityCrud implements IEntityCrud {
         {name: 'email', type: 'string', label: 'email', default:'' },
         {name: 'phone', type: 'string', label: 'phone', default:'' },
         {name: 'role', type: 'ref', ref: 'role', label: 'role', default:null },
-        {name: 'tenant', type: 'ref', ref: 'tenant', label: 'tenant', default:null },
+        {name: 'tenant', type: 'ref', ref: 'tenant', label: 'tenant', default:null, permission: 'tenant:manage' },
         {name: 'active', type: 'boolean',  label: 'active', default:true },
 
     ]
@@ -106,6 +111,20 @@ class UserCrud extends EntityCrud implements IEntityCrud {
   get isImportable(){
     return false
   }
+
+  get isEditable(){
+    return true
+  }
+
+  isItemEditable(item?:any) {
+    const authStore = useAuthStore()
+    if(authStore?.authUser?.role?.childRoles){
+      return  authStore.authUser.role.childRoles.some(role => role.name === item.role.name)
+    }else{
+      return true
+    }
+  }
+
 }
 
 export default UserCrud

package/src/cruds/user-crud/UserForm.vue

@@ -4,12 +4,15 @@ import {defineEmits, defineModel, defineProps, type PropType, ref} from "vue";
 import {useI18nValidation} from "@drax/common-vue";
 import RoleCombobox from "../../combobox/RoleCombobox.vue";
 import TenantCombobox from "../../combobox/TenantCombobox.vue";
+import {useAuth} from "../../composables/useAuth";
 import {useI18n} from "vue-i18n";
 import type {IEntityCrudOperation} from "@drax/crud-share";
 
 const {$ta} = useI18nValidation()
 const {t, te} = useI18n()
 
+const {hasPermission} = useAuth()
+
 const {operation} = defineProps({
   operation: {type: String as PropType<IEntityCrudOperation>, required: true},
   enablePassword: {type: Boolean, default: false}
@@ -119,6 +122,7 @@ let passwordVisibility = ref(false)
         ></RoleCombobox>
 
         <TenantCombobox
+            v-if="hasPermission('tenant:manage')"
             v-model="valueModel.tenant"
             :label="t('user.field.tenant')"
             :variant="variant"

package/src/pages/crud/UserCrudPage.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import {ref} from "vue"
 import UserCrud from "../../cruds/user-crud/UserCrud";
+import {useAuth} from "../../composables/useAuth";
 import {Crud, useCrud} from "@drax/crud-vue";
 import UserForm from "../../cruds/user-crud/UserForm.vue";
 import PasswordUpdateButton from "../../cruds/user-crud/PasswordUpdateButton.vue";
@@ -12,6 +13,8 @@ const {onCancel, onSubmit,form, operation } = useCrud(UserCrud.instance);
 const dialogPassword = ref(false);
 const userSelected = ref();
 
+const {hasPermission } = useAuth();
+
 function onChangePassword(user:IUser){
   console.log("onChangePassword for user: ", user);
   userSelected.value = user;
@@ -43,7 +46,9 @@ function onChangePassword(user:IUser){
 
 
       <template v-slot:item.actions="{ item }">
-        <password-update-button @click="onChangePassword(item as IUser)"></password-update-button>
+        <password-update-button v-if="hasPermission('user:changePassword')"
+                                @click="onChangePassword(item as IUser)"
+        ></password-update-button>
       </template>