M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-02-19 12:27:59 +03:00
parent 76e7ca2e4a
commit 1ced1b1649
6 changed files with 76 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ui/src/layouts/MainLayout.vue
View File

@@ -226,25 +226,25 @@ const menuItems = [
{
label: 'Rol + Departman Yetkileri',
to: '/app/role-dept-permissions',
permission: 'user:update'
permission: 'system:update'
},
{
label: 'Kullanıcı Yetkileri',
to: '/app/user-permissions',
permission: 'user:update'
permission: 'system:update'
},
{
label: 'Loglar',
to: '/app/activity-logs',
permission: 'user:view'
permission: 'system:read'
},
{
label: 'Test Mail',
to: '/app/test-mail',
permission: 'user:insert'
permission: 'system:update'
}
]
@@ -258,7 +258,7 @@ const menuItems = [
{
label: 'Kullanıcılar',
to: '/app/users',
permission: 'user:view'
permission: 'system:read'
}
]
}

48
ui/src/pages/RoleDepartmentPermissionList.vue
View File

@@ -46,6 +46,9 @@
<q-item clickable @click="selectAllModules">
<q-item-section>Tümünü Seç</q-item-section>
</q-item>
<q-item clickable @click="clearAllModules">
<q-item-section>Tümünü Temizle</q-item-section>
</q-item>
<q-separator />
<q-item
v-for="m in store.modules"
@@ -78,6 +81,9 @@
<q-item clickable @click="selectAllActionsForActive">
<q-item-section>Tümünü Seç</q-item-section>
</q-item>
<q-item clickable @click="clearAllActionsForActive">
<q-item-section>Tümünü Temizle</q-item-section>
</q-item>
<q-separator />
<q-item
v-for="a in actionsForActiveModule"
@@ -180,6 +186,7 @@ const canUpdateUser = canUpdate('user')
const selectedModules = ref([])
const selectedActionsByModule = ref({})
const activeModuleCode = ref('')
const allowEmptySelection = ref(false)
const actionLabelMap = {
update: 'Güncelleme',
@@ -284,9 +291,15 @@ function syncSelections () {
}
const selected = selectedModules.value.filter((m) => availableModules.includes(m))
selectedModules.value = selected.length ? selected : [...availableModules]
if (selected.length) {
selectedModules.value = selected
} else {
selectedModules.value = allowEmptySelection.value ? [] : [...availableModules]
}
if (!selectedModules.value.includes(activeModuleCode.value)) {
if (!selectedModules.value.length) {
activeModuleCode.value = ''
} else if (!selectedModules.value.includes(activeModuleCode.value)) {
activeModuleCode.value = selectedModules.value[0]
}
@@ -295,7 +308,7 @@ function syncSelections () {
const allActions = actionsByModule.value[m] || []
const prev = selectedActionsByModule.value[m] || []
const filtered = prev.filter((a) => allActions.includes(a))
next[m] = filtered.length ? filtered : [...allActions]
next[m] = filtered.length ? filtered : (allowEmptySelection.value ? [] : [...allActions])
})
selectedActionsByModule.value = next
}
@@ -313,6 +326,7 @@ function isModuleSelected (moduleCode) {
}
function toggleModule (moduleCode, checked) {
allowEmptySelection.value = false
const set = new Set(selectedModules.value)
if (checked) {
set.add(moduleCode)
@@ -321,9 +335,8 @@ function toggleModule (moduleCode, checked) {
}
selectedModules.value = [...set]
if (!selectedModules.value.length) {
selectedModules.value = [moduleCode]
}
if (!selectedModules.value.includes(activeModuleCode.value)) {
activeModuleCode.value = ''
} else if (!selectedModules.value.includes(activeModuleCode.value)) {
activeModuleCode.value = selectedModules.value[0]
}
syncSelections()
@@ -334,24 +347,31 @@ function onModuleRowClick (moduleCode) {
}
function selectAllModules () {
allowEmptySelection.value = false
selectedModules.value = (store.modules || []).map((m) => m.value)
syncSelections()
}
function clearAllModules () {
allowEmptySelection.value = true
selectedModules.value = []
selectedActionsByModule.value = {}
activeModuleCode.value = ''
syncSelections()
}
function isActionSelected (moduleCode, action) {
return (selectedActionsByModule.value[moduleCode] || []).includes(action)
}
function toggleAction (moduleCode, action, checked) {
allowEmptySelection.value = false
const current = new Set(selectedActionsByModule.value[moduleCode] || [])
if (checked) {
current.add(action)
} else {
current.delete(action)
}
if (current.size === 0) {
current.add(action)
}
selectedActionsByModule.value = {
...selectedActionsByModule.value,
[moduleCode]: [...current]
@@ -359,6 +379,7 @@ function toggleAction (moduleCode, action, checked) {
}
function selectAllActionsForActive () {
allowEmptySelection.value = false
if (!activeModuleCode.value) return
selectedActionsByModule.value = {
...selectedActionsByModule.value,
@@ -366,6 +387,15 @@ function selectAllActionsForActive () {
}
}
function clearAllActionsForActive () {
allowEmptySelection.value = true
if (!activeModuleCode.value) return
selectedActionsByModule.value = {
...selectedActionsByModule.value,
[activeModuleCode.value]: []
}
}
const permissionColumns = computed(() => {
const cols = []
selectedModules.value.forEach((m) => {

14
ui/src/router/index.js
View File

@@ -14,6 +14,9 @@ export default route(function () {
routes
})
if (typeof window !== 'undefined' && process.env.DEV) {
window.__router = router
}
/* ============================================================
🔐 GLOBAL GUARD
@@ -23,6 +26,17 @@ export default route(function () {
const auth = useAuthStore()
const perm = usePermissionStore()
if (typeof window !== 'undefined') {
console.warn('🧭 ROUTE GUARD HIT:', {
path: to.fullPath,
meta: to.meta
})
}
if (typeof window !== 'undefined' && process.env.DEV) {
window.__auth = auth
window.__perm = perm
}
/* ================= PUBLIC ================= */

14
ui/src/router/routes.js
View File

@@ -69,7 +69,7 @@ const routes = [
path: '',
name: 'dashboard',
component: () => import('pages/Dashboard.vue'),
meta: { permission: 'system:read' }
meta: {}
},
@@ -86,28 +86,28 @@ const routes = [
path: 'role-dept-permissions',
name: 'role-dept-permissions',
component: () => import('pages/RoleDepartmentPermissionGateway.vue'),
meta: { permission: 'user:update' }
meta: { permission: 'system:update' }
},
{
path: 'role-dept-permissions/list',
name: 'role-dept-permissions-list',
component: () => import('pages/RoleDepartmentPermissionList.vue'),
meta: { permission: 'user:update' }
meta: { permission: 'system:update' }
},
{
path: 'role-dept-permissions/editor',
name: 'role-dept-permissions-editor',
component: () => import('pages/RoleDepartmentPermissionPage.vue'),
meta: { permission: 'user:update' }
meta: { permission: 'system:update' }
},
{
path: 'user-permissions',
name: 'user-permissions',
component: () => import('pages/UserPermissionPage.vue'),
meta: { permission: 'user:update' }
meta: { permission: 'system:update' }
},
@@ -190,7 +190,7 @@ const routes = [
path: 'activity-logs',
name: 'activity-logs',
component: () => import('pages/ActivityLogs.vue'),
meta: { permission: 'user:view' }
meta: { permission: 'system:read' }
},
@@ -200,7 +200,7 @@ const routes = [
path: 'test-mail',
name: 'test-mail',
component: () => import('pages/TestMail.vue'),
meta: { permission: 'user:insert' }
meta: { permission: 'system:update' }
},

10
ui/src/stores/authStore.js
View File

@@ -78,15 +78,7 @@ export const useAuthStore = defineStore('auth', {
========================================================= */
setSession ({ token, user }) {
this.token = token
if (user) {
// Keep prior role fields if backend returns partial user payload.
this.user = {
...(this.user || {}),
...user
}
} else {
this.user = null
}
this.user = user || null
this.forcePasswordChange = !!user?.force_password_change
localStorage.setItem('token', token)