@drax/identity-vue 0.11.5 → 0.12.7

package/package.json

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

package/src/combobox/RoleCombobox.vue

@@ -14,6 +14,8 @@ defineProps({
   rules: {type: Array as PropType<any[]>, default: () => []},
   multiple: {type: Boolean, default: false},
   clearable: {type: Boolean, default: false},
+  itemTitle: {type: String, default: "name"},
+  itemValue: {type: String, default: "_id"},
   readonly: {type: Boolean, default: false},
   label: {type: String, default: 'role.entity'},
   density: {type: String as PropType<'comfortable' | 'compact' | 'default'>, default: 'default'},
@@ -35,8 +37,8 @@ onMounted(async () => {
       v-model="model"
       :label="te(label) ? t(label) : label"
       :items="items"
-      item-title="name"
-      item-value="id"
+      :item-title="itemTitle"
+      :item-value="itemValue"
       :variant="variant"
       :error-messages="errorMessages"
       :multiple="multiple"

package/src/combobox/TenantCombobox.vue

@@ -8,6 +8,8 @@ defineProps({
   errorMessages: {type: String as PropType<string | string[] | undefined>,},
   clearable: {type: Boolean, default: false},
   readonly: {type: Boolean, default: false},
+  itemTitle: {type: String, default: "name"},
+  itemValue: {type: String, default: "_id"},
   rules: {type: Array as PropType<any[]>, default: () => []},
   label: {type: String, default: 'tenant.entity'},
   density: {type: String as PropType<'comfortable' | 'compact' | 'default'>, default: 'default'},
@@ -31,8 +33,8 @@ onMounted(async () => {
       v-model="model"
       :label="te(label) ? t(label) : label"
       :items="items"
-      item-title="name"
-      item-value="id"
+      :item-title="itemTitle"
+      :item-value="itemValue"
       :variant="variant"
       :error-messages="errorMessages"
       :clearable="clearable"

package/src/components/IdentityProfileDrawer/IdentityProfileDrawer.vue

@@ -26,12 +26,24 @@ const valueModel = defineModel<boolean>()
       <identity-profile-view></identity-profile-view>
       <v-divider></v-divider>
       <v-list>
+
+        <slot name="menu"></slot>
+
         <v-list-item
             @click="router.push({name:'Profile'})"
             prepend-icon="mdi-account-cog"
             :title="t('user.profile')"
         >
         </v-list-item>
+
+        <v-list-item
+            v-if="auth.hasPermission('userApiKey:manage')"
+            @click="router.push({name:'CrudUserApiKey'})"
+            prepend-icon="mdi-table-key"
+            :title="t('userapikey.menu')"
+        >
+        </v-list-item>
+
         <v-list-item
             @click="auth.logout()"
             prepend-icon="mdi-logout"

package/src/components/IdentityRegistration/IdentityRegistration.vue

@@ -44,8 +44,8 @@ function confirmPasswordRule(value: string) {
 async function submitRegistration() {
   try {
     loading.value = true
-    await register(form.value)
-    success.value = true
+    const result = await register(form.value)
+    success.value = result.success
   } catch (err) {
     if (err instanceof ClientError) {
       inputErrors.value = err.inputErrors
@@ -69,7 +69,7 @@ async function submitRegistration() {
       <v-card>
         <v-card-text>
           <v-alert type="success">
-            {{ t('user.event.registrationComplete') }}
+            {{ t('user.events.registrationComplete') }}
           </v-alert>
         </v-card-text>
         <v-card-text class="text-center">

package/src/composables/useRole.ts

@@ -4,6 +4,7 @@ import {RoleSystemFactory} from "@drax/identity-front";
 import type {IRole, IRoleBase} from "@drax/identity-share";
 import {ClientError} from "@drax/common-front";
 import type {IClientInputError} from "@drax/common-front";
+import type {IDraxPaginateOptions} from "@drax/crud-share";
 
 
 export function useRole() {
@@ -28,7 +29,7 @@ export function useRole() {
         return roles
     }
 
-    async function paginateRole({page = 1, limit = 5, orderBy = "", order = false, search = ""}) {
+    async function paginateRole({page = 1, limit = 5, orderBy = "", order = "asc", search = ""}: IDraxPaginateOptions) {
         loading.value = true
         let paginatedrole = roleSystem.paginate({page, limit, orderBy, order, search})
         loading.value = false

package/src/composables/useTenant.ts

@@ -4,6 +4,7 @@ import type { TenantSystem} from "@drax/identity-front";
 import { TenantSystemFactory} from "@drax/identity-front";
 import {ClientError} from "@drax/common-front";
 import type { IClientInputError} from "@drax/common-front";
+import type {IDraxPaginateOptions} from "@drax/crud-share";
 
 
 export function useTenant() {
@@ -21,7 +22,7 @@ export function useTenant() {
         return tenants
     }
 
-    async function paginateTenant({page= 1, limit= 5, orderBy="", order=false, search = ""}) {
+    async function paginateTenant({page= 1, limit= 5, orderBy="", order="asc", search = ""}: IDraxPaginateOptions) {
         loading.value = true
         let paginatedtenant = tenantSystem.paginate({page, limit, orderBy, order, search})
         loading.value = false

package/src/composables/useUser.ts

@@ -4,6 +4,7 @@ import  {UserSystemFactory} from "@drax/identity-front";
 import type {IClientInputError} from "@drax/common-front";
 import {ClientError} from "@drax/common-front";
 import type {IUser, IUserCreate, IUserUpdate} from "@drax/identity-share";
+import type {IDraxPaginateOptions} from "@drax/crud-share";
 
 
 export function useUser() {
@@ -14,7 +15,7 @@ export function useUser() {
     let inputErrors = ref<IClientInputError>()
     let loading = ref(false);
 
-    async function paginateUser({page= 1, limit= 5, orderBy="", order=false, search = ""}) {
+    async function paginateUser({page= 1, limit= 5, orderBy="", order = "asc", search = ""}:IDraxPaginateOptions) {
         loading.value = true
         let paginatedUser = userSystem.paginate({page, limit, orderBy, order, search})
         loading.value = false

package/src/composables/useUserApiKey.ts

@@ -3,6 +3,7 @@ import type {IUserApiKey, IUserApiKeyBase} from "@drax/identity-share";
 import { UserApiKeySystemFactory} from "@drax/identity-front";
 import {ClientError} from "@drax/common-front";
 import type { IClientInputError} from "@drax/common-front";
+import type {IDraxPaginateOptions} from "@drax/crud-share";
 
 
 export function useUserApiKey() {
@@ -14,7 +15,7 @@ export function useUserApiKey() {
     let loading = ref(false);
 
 
-    async function paginateUserApiKey({page= 1, limit= 5, orderBy="", order=false, search = ""}) {
+    async function paginateUserApiKey({page= 1, limit= 5, orderBy="", order="asc", search = ""}: IDraxPaginateOptions) {
         loading.value = true
         let paginateduserApiKey = userApiKeySystem.paginate({page, limit, orderBy, order, search})
         loading.value = false

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

@@ -58,7 +58,9 @@ class RoleCrud extends EntityCrud implements IEntityCrud {
 
   get fields(): IEntityCrudField[]{
     return [
-        {name: 'name', type: 'string', label: 'name', default:'', prependInnerIcon:'mdi-text-short'  }
+        {name: 'name', type: 'string', label: 'name', default:'', prependInnerIcon:'mdi-text-short'  },
+        {name: 'childRoles', type: 'array.ref', ref:'Role', refDisplay: 'name', label: 'childRoles', default:[], prependInnerIcon:'mdi-text-short'  },
+        {name: 'permissions', type: 'array.string',  label: 'childRoles', default:[], prependInnerIcon:'mdi-text-short'  }
     ]
   }
 

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

@@ -62,6 +62,8 @@ let passwordVisibility = ref(false)
         {{ t('role.readonly') }}
       </v-alert>
 
+      <v-card-subtitle v-if="valueModel.id">ID: {{ valueModel.id }}</v-card-subtitle>
+
       <v-card-text v-if="store.error">
         <v-alert color="error">{{ te(store.error) ? t(store.error) : store.error }}</v-alert>
       </v-card-text>

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

@@ -25,10 +25,8 @@ let userError = ref<string>('')
 
 async function savePassword() {
   if (passwordForm.value.newPassword === passwordForm.value.confirmPassword) {
-    passwordChanged.value = await changeUserPassword(user.id, passwordForm.value.newPassword)
-    return
-  } else {
-    return
+    await changeUserPassword(user._id, passwordForm.value.newPassword)
+    passwordChanged.value = true
   }
 }
 
@@ -54,8 +52,8 @@ async function changeUserPassword(id: string, newPassword: string) {
 <template>
   <v-dialog v-model="valueModel" max-width="800">
     <v-card>
-      <v-card-title>{{t('user.operation.changePassword')}}</v-card-title>
-      <v-card-subtitle>{{t('user.field.username')}}: {{user.username}}</v-card-subtitle>
+      <v-card-title>{{ t('user.operation.changePassword') }}</v-card-title>
+      <v-card-subtitle>{{ t('user.field.username') }}: {{ user.username }}</v-card-subtitle>
       <v-card-text>
         <user-password-form
             v-model="passwordForm"
@@ -80,7 +78,7 @@ async function changeUserPassword(id: string, newPassword: string) {
             @click="savePassword"
             :loading="loading"
         >
-          {{  t('action.change') }}
+          {{ t('action.change') }}
         </v-btn>
       </v-card-actions>
 

package/src/pages/crud/UserApiKeyCrudPage.vue

@@ -23,7 +23,6 @@ async function submit() {
 }
 
 function onCreated(item:IUserApiKey) {
-  console.log("User API Key created:", item);
   userApiKeyCreated.value = item;
   userApiKeyCreatedDialog.value = true;
 }