Fix roles

Author: mekanix

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@freenit-framework/core",
-  "version": "0.0.50",
+  "version": "0.0.51",
   "private": false,
   "author": "Goran Mekić <meka@tilda.center>",
   "license": "BSD-2-Clause",

package.json

@@ -39,13 +39,13 @@
     let response
     if (event.target.checked) {
       response = await store.role.assign(
-        store.role.detail.id || store.role.detail.dn,
-        user.id || user.dn,
+        store.role.detail.id ?? store.role.detail.dn,
+        user.id ?? user.dn,
       )
     } else {
       response = await store.role.deassign(
-        store.role.detail.id || store.role.detail.dn,
-        user.id || user.dn,
+        store.role.detail.id ?? store.role.detail.dn,
+        user.id ?? user.dn,
       )
     }
     if (!response.ok) {
@@ -88,9 +88,9 @@
       <div class="heading">Member</div>
       {#each store.user.list.data as user}
         <div class="data">{user.id || user.dn}</div>
-        <div class="data">{user.email}</div>
+        <a class="data" href={`/users/${user.id ?? user.dn}`}>{user.email}</a>
         <div class="data">
-          <input disabled type="checkbox" checked={user.active || user.userClass == 'enabled'} />
+          <input disabled type="checkbox" checked={user.active ?? user.userClass == 'enabled'} />
         </div>
         <div class="data">
           <input disabled type="checkbox" checked={user.admin} />

src/lib/Role.svelte

@@ -37,7 +37,8 @@
     showCreate = !showCreate
   }
 
-  async function create() {
+  async function create(event: Event) {
+    event.preventDefault()
     const response = await store.role.create({ name })
     if (!response.ok) {
       error(response.statusText)

src/lib/Roles.svelte

@@ -22,7 +22,8 @@
   })
 
   const member = (role: any) => {
-    const myroles = store.user.detail.roles.filter((r: any) => r.id === role.id)
+    const roles = store.user.detail.roles ?? []
+    const myroles = roles.filter((r: any) => r.id === role.id)
     return myroles.length > 0
   }
 
@@ -69,9 +70,10 @@
       <div class="heading">ID</div>
       <div class="heading">Name</div>
       <div class="heading">Member</div>
+
       {#each store.role.list.data as role}
-        <div class="data">{role.id || role.dn}</div>
-        <div class="data">{role.name || role.cn}</div>
+        <div class="data">{role.id ?? role.dn}</div>
+        <a class="data" href={`/roles/${role.id ?? role.dn}`}>{role.name ?? role.cn}</a>
         <div class="data">
           <input type="checkbox" checked={member(role)} onchange={toggleMembership(role)} />
         </div>

src/lib/User.svelte

@@ -28,6 +28,8 @@ export default class RoleStore {
     const response = await methods.post(`${this.prefix}/roles`, fields)
     if (response.ok) {
       const data = await response.json()
+      this.list.data.push(data)
+      this.list.total += 1
       return { ...data, ok: true }
     }
     return response
@@ -38,7 +40,6 @@ export default class RoleStore {
     const response = await methods.get(`${this.prefix}/roles/${id}`)
     if (response.ok) {
       const data = await response.json()
-      console.log('fetch', data)
       this.detail = data
       return { ...data, ok: true }
     }
@@ -78,7 +79,7 @@ export default class RoleStore {
   }
 
   deassign = async (role_id: number, user_id: number) => {
-    await this.store.auth.refresh_refresh()
+    await this.store.auth.refresh_token()
     const response = await methods.delete(`${this.prefix}/roles/${role_id}/${user_id}`)
     if (response.ok) {
       const data = await response.json()

src/lib/base-store/role.svelte.ts

@@ -2,8 +2,8 @@ import { methods } from '..'
 
 export default class UserStore {
   list = $state({ page: 0, perpage: 0, data: [], total: 0 })
-  detail = $state({ id: 0, email: '', active: false, admin: false })
-  profile = $state({ id: 0, email: '', active: false, admin: false })
+  detail = $state({ id: 0, email: '', active: false, admin: false, roles: [] })
+  profile = $state({ id: 0, email: '', active: false, admin: false, roles: [] })
 
   constructor(store, prefix: string) {
     this.store = store