@drax/identity-vue 0.0.22 → 0.0.24

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.22",
+  "version": "0.0.24",
   "type": "module",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
@@ -24,7 +24,9 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@drax/common-front": "^0.0.22",
+    "@drax/common-front": "^0.0.24",
+    "@drax/common-share": "^0.0.24",
+    "@drax/identity-share": "^0.0.24",
     "vue-i18n": "^9.13.1"
   },
   "peerDependencies": {
@@ -61,5 +63,5 @@
     "vue-tsc": "^2.0.11",
     "vuetify": "^3.6.4"
   },
-  "gitHead": "2ff21dad6e1e9cc9119bf3c3095c3b291d850e53"
+  "gitHead": "318180aac2065faa88cb3dffed31a4651e5af0a5"
 }

package/src/composables/useRole.ts

@@ -1,6 +1,6 @@
 import {inject, ref} from "vue";
 import  {RoleSystem} from "@drax/identity-front";
-import type {IRole, IRoleBase} 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";
 
@@ -27,9 +27,9 @@ export function useRole() {
         return roles
     }
 
-    async function paginateRole(page = 1, perPage = 5, string = "") {
+    async function paginateRole({page= 1, limit= 5, orderBy="", orderDesc=false, search = ""}) {
         loading.value = true
-        let paginatedrole = roleSystem.paginateRole(page, perPage,string)
+        let paginatedrole = roleSystem.paginate({page, limit, orderBy, orderDesc, search})
         loading.value = false
         return paginatedrole
     }
@@ -37,7 +37,7 @@ export function useRole() {
     async function createRole(roleData: IRoleBase) {
         try {
             loading.value = true
-            let role: IRole =  await roleSystem.createRole(roleData)
+            let role: IRole =  await roleSystem.create(roleData)
             return role
         } catch (err) {
             if (err instanceof ClientError) {
@@ -55,7 +55,7 @@ export function useRole() {
     async function editRole(id: string, roleData: IRoleBase) {
         try {
             loading.value = true
-            let role: IRole = await roleSystem.editRole(id, roleData)
+            let role: IRole = await roleSystem.update(id, roleData)
             return role
         } catch (err) {
 
@@ -74,9 +74,9 @@ export function useRole() {
     async function deleteRole(id: string) {
         try {
             loading.value = true
-            await roleSystem.deleteRole(id)
+            await roleSystem.delete(id)
         } catch (err) {
-            console.log("composable deleteRole error: ", err, )
+            console.log("composable delete error: ", err, )
             if (err instanceof ClientError) {
                 inputErrors.value = err.inputErrors
             }

package/src/composables/useTenant.ts

@@ -1,5 +1,6 @@
 import {inject, ref} from "vue";
-import type {ITenant, ITenantBase, TenantSystem} from "@drax/identity-front";
+import type {ITenant, ITenantBase} from "@drax/identity-share";
+import type { TenantSystem} from "@drax/identity-front";
 import {ClientError} from "@drax/common-front";
 import type { IClientInputError} from "@drax/common-front";
 
@@ -19,9 +20,9 @@ export function useTenant() {
         return tenants
     }
 
-    async function paginateTenant(page = 1, perPage = 5, string = "") {
+    async function paginateTenant({page= 1, limit= 5, orderBy="", orderDesc=false, search = ""}) {
         loading.value = true
-        let paginatedtenant = tenantSystem.paginateTenant(page, perPage,string)
+        let paginatedtenant = tenantSystem.paginate({page, limit, orderBy, orderDesc, search})
         loading.value = false
         return paginatedtenant
     }
@@ -29,7 +30,7 @@ export function useTenant() {
     async function createTenant(tenantData: ITenantBase) {
         try {
             loading.value = true
-            let tenant: ITenant =  await tenantSystem.createTenant(tenantData)
+            let tenant: ITenant =  await tenantSystem.create(tenantData)
             return tenant
         } catch (err) {
             if (err instanceof ClientError) {
@@ -47,7 +48,7 @@ export function useTenant() {
     async function editTenant(id: string, tenantData: ITenantBase) {
         try {
             loading.value = true
-            let tenant: ITenant = await tenantSystem.editTenant(id, tenantData)
+            let tenant: ITenant = await tenantSystem.update(id, tenantData)
             return tenant
         } catch (err) {
 
@@ -66,9 +67,9 @@ export function useTenant() {
     async function deleteTenant(id: string) {
         try {
             loading.value = true
-            await tenantSystem.deleteTenant(id)
+            await tenantSystem.delete(id)
         } catch (err) {
-            console.log("composable deleteTenant error: ", err, )
+            console.log("composable delete error: ", err, )
             if (err instanceof ClientError) {
                 inputErrors.value = err.inputErrors
             }

package/src/composables/useUser.ts

@@ -1,9 +1,8 @@
 import {inject, ref} from "vue";
 import type {UserSystem} from "@drax/identity-front";
-import type {IUser} from "@drax/identity-front";
 import type {IClientInputError} from "@drax/common-front";
 import {ClientError} from "@drax/common-front";
-import type {IUserCreate, IUserUpdate} from "@drax/identity-front";
+import type {IUser, IUserCreate, IUserUpdate} from "@drax/identity-share";
 
 
 export function useUser() {
@@ -14,9 +13,9 @@ export function useUser() {
     let inputErrors = ref<IClientInputError>()
     let loading = ref(false);
 
-    async function paginateUser(page = 1, perPage = 5, search = "") {
+    async function paginateUser({page= 1, limit= 5, orderBy="", orderDesc=false, search = ""}) {
         loading.value = true
-        let paginatedUser = userSystem.paginateUser(page, perPage, search)
+        let paginatedUser = userSystem.paginate({page, limit, orderBy, orderDesc, search})
         loading.value = false
         return paginatedUser
     }
@@ -24,7 +23,7 @@ export function useUser() {
     async function createUser(userData: IUserCreate) {
         try {
             loading.value = true
-            let user: IUser =  await userSystem.createUser(userData)
+            let user: IUser =  await userSystem.create(userData)
             return user
         } catch (err) {
             if (err instanceof ClientError) {
@@ -59,7 +58,7 @@ export function useUser() {
     async function editUser(id: string, userData: IUserUpdate) {
         try {
             loading.value = true
-            let user: IUser = await userSystem.editUser(id, userData)
+            let user: IUser = await userSystem.update(id, userData)
             return user
         } catch (err) {
             if (err instanceof ClientError) {
@@ -77,9 +76,9 @@ export function useUser() {
     async function deleteUser(id: string) {
         try {
             loading.value = true
-            await userSystem.deleteUser(id)
+            await userSystem.delete(id)
         } catch (err) {
-            console.log("composable deleteUser error: ", err, )
+            console.log("composable delete error: ", err, )
             if (err instanceof ClientError) {
                 inputErrors.value = err.inputErrors
             }

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

@@ -2,7 +2,7 @@
 import {computed, ref} from 'vue'
 import RoleList from "./RoleList.vue";
 import {useRole} from "../../composables/useRole";
-import type {IRole, IRoleBase} from "@drax/identity-front";
+import type {IRole, IRoleBase} from "@drax/identity-share";
 import RoleForm from "../../forms/RoleForm.vue";
 import RoleView from "../../views/RoleView.vue";
 

package/src/cruds/role-crud/RoleList.vue

@@ -4,7 +4,7 @@ import {defineProps, type Ref, ref} from "vue";
 import {useRole} from "../../composables/useRole";
 import {useAuth} from "../../composables/useAuth";
 import {useI18n} from "vue-i18n";
-import type {IRole} from "@drax/identity-front";
+import type {IRole} from "@drax/identity-share";
 
 const {hasPermission} = useAuth()
 const {paginateRole} = useRole()
@@ -36,7 +36,10 @@ const search = ref('')
 async function loadItems(){
   try{
     loading.value = true
-    const r = await paginateRole(page.value,itemsPerPage.value, search.value)
+    const r = await paginateRole({
+      page: page.value,
+      limit: itemsPerPage.value,
+      search: search.value})
     serverItems.value = r.items
     totalItems.value = r.total
   }catch (e){

package/src/cruds/tenant-crud/TenantCrud.vue

@@ -2,7 +2,7 @@
 import {computed, ref} from 'vue'
 import TenantList from "./TenantList.vue";
 import {useTenant} from "../../composables/useTenant";
-import type {ITenant, ITenantBase} from "@drax/identity-front";
+import type {ITenant, ITenantBase} from "@drax/identity-share";
 import TenantForm from "../../forms/TenantForm.vue";
 import TenantView from "../../views/TenantView.vue";
 

package/src/cruds/tenant-crud/TenantList.vue

@@ -4,7 +4,7 @@ import {defineProps, type Ref, ref} from "vue";
 import {useTenant} from "../../composables/useTenant";
 import {useAuth} from "../../composables/useAuth";
 import {useI18n} from "vue-i18n";
-import type {ITenant} from "@drax/identity-front";
+import type {ITenant} from "@drax/identity-share";
 
 const {hasPermission} = useAuth()
 const {paginateTenant} = useTenant()
@@ -19,20 +19,22 @@ defineProps({
 
 const itemsPerPage = ref(5)
 const page = ref(1)
-const headers = ref<any>([
-  { title: t('tenant.name') as string, key: 'name', align: 'start' },
-  { title: '', key: 'actions', align: 'end', minWidth: '150px' },
-])
-
 const serverItems: Ref<ITenant[]> = ref([]);
 const totalItems = ref(0)
 const loading = ref(false)
 const search = ref('')
+const headers = ref<any>([
+  { title: t('tenant.name') as string, key: 'name', align: 'start' },
+  { title: '', key: 'actions', align: 'end', minWidth: '150px' },
+])
 
 async function loadItems(){
   try{
     loading.value = true
-    const r = await paginateTenant(page.value,itemsPerPage.value, search.value)
+    const r = await paginateTenant({
+      page: page.value,
+      limit: itemsPerPage.value,
+      search: search.value})
     serverItems.value = r.items
     totalItems.value = r.total
   }catch (e){

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

@@ -2,8 +2,8 @@
 import {computed, ref} from 'vue'
 import UserList from "./UserList.vue";
 import {useUser} from "../../composables/useUser";
-import type {IUser} from "@drax/identity-front";
-import type {IUserCreate, IUserUpdate, IUserPassword} from "@drax/identity-front/src/interfaces/IUser";
+import type {IUser, IUserCreate, IUserUpdate} from "@drax/identity-share";
+import type {IUserPassword} from "@drax/identity-front";
 import UserCreateForm from "../../forms/UserCreateForm.vue";
 import UserEditForm from "../../forms/UserEditForm.vue";
 import UserPasswordForm from "../../forms/UserPasswordForm.vue";
@@ -107,7 +107,7 @@ function toEdit(item: IUser) {
     email: item.email,
     phone: item.phone,
     role: item.role.id,
-    tenant: item.tenant.id,
+    tenant: item?.tenant?.id,
     active: item.active
   };
   dialog.value = true;

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

@@ -4,7 +4,7 @@ import {ref, defineProps, type Ref} from "vue";
 import {useUser} from "../../composables/useUser";
 import {useAuth} from "../../composables/useAuth";
 import {useI18n} from "vue-i18n";
-import type {IUser} from "@drax/identity-front";
+import type {IUser} from "@drax/identity-share";
 
 const {hasPermission} = useAuth()
 const {paginateUser} = useUser()
@@ -38,7 +38,10 @@ const search = ref('')
 async function loadItems(){
   try{
     loading.value = true
-    const r = await paginateUser(page.value,itemsPerPage.value, search.value)
+    const r = await paginateUser({
+      page: page.value,
+      limit: itemsPerPage.value,
+      search: search.value})
     serverItems.value = r.items
     totalItems.value = r.total
   }catch (e){