Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 13 Pull requests Projects Releases 30 Packages Wiki Activity Actions

Merge branch 'develop' into milestone/ff-admin-unit

Browse source 
# Conflicts:
#	src/stores/admin/navigation.ts
This commit is contained in:
Julian Krauser 2025-05-20 18:55:02 +02:00
commit b6e80b358a
62 changed files with 248 additions and 477 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/stores/ability.ts
View file

@ -33,13 +33,21 @@ export const useAbilityStore = defineStore("ability", {
if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
if (permissions?.admin || permissions?.adminByOwner) return true;
if (
permissions[section]?.all == "*" ||
permissions[section]?.all?.includes(type) ||
(permissions[section]?.all == "*" || permissions[section]?.all?.includes(type)) &&
permissions[section] != undefined
)
return true;
return false;
},
canAccessSection:
(state) =>
(section: PermissionSection): boolean => {
const permissions = state.permissions;
if (state.isOwner) return true;
if (permissions?.admin || permissions?.adminByOwner) return true;
if (permissions[section] != undefined) return true;
return false;
},
isAdmin: (state) => (): boolean => {
const permissions = state.permissions;
if (state.isOwner) return true;
@ -72,13 +80,20 @@ export const useAbilityStore = defineStore("ability", {
if (type == "admin") return permissions?.admin ?? permissions?.adminByOwner ?? false;
if (permissions?.admin || permissions?.adminByOwner) return true;
if (
permissions[section]?.all == "*" ||
permissions[section]?.all?.includes(type) ||
(permissions[section]?.all == "*" || permissions[section]?.all?.includes(type)) &&
permissions[section] != undefined
)
return true;
return false;
},
_canAccessSection:
() =>
(permissions: PermissionObject, section: PermissionSection): boolean => {
// ignores ownership
if (permissions?.admin || permissions?.adminByOwner) return true;
if (permissions[section] != undefined) return true;
return false;
},
},
actions: {
setAbility(permissions: PermissionObject, isOwner: boolean) {

11
src/stores/admin/navigation.ts
View file

@ -48,7 +48,7 @@ export const useNavigationStore = defineStore("navigation", {
updateTopLevel() {
const abilityStore = useAbilityStore();
this.topLevel = [
...(abilityStore.canSection("read", "club")
...(abilityStore.canAccessSection("club")
? [
{
key: "club",
@ -57,7 +57,7 @@ export const useNavigationStore = defineStore("navigation", {
} as topLevelNavigationModel,
]
: []),
...(abilityStore.canSection("read", "unit")
...(abilityStore.canAccessSection("unit")
? [
{
key: "unit",
@ -66,7 +66,7 @@ export const useNavigationStore = defineStore("navigation", {
} as topLevelNavigationModel,
]
: []),
...(abilityStore.canSection("read", "configuration")
...(abilityStore.canAccessSection("configuration")
? [
{
key: "configuration",
@ -75,7 +75,7 @@ export const useNavigationStore = defineStore("navigation", {
} as topLevelNavigationModel,
]
: []),
...(abilityStore.canSection("read", "management")
...(abilityStore.canAccessSection("management")
? [
{
key: "management",
@ -156,7 +156,8 @@ export const useNavigationStore = defineStore("navigation", {
this.activeNavigationObject.main.findIndex((e) => e.key == this.activeLink) == -1 ||
this.activeLink == "default"
) {
let link = this.activeNavigationObject.main[0].key;
let link = this.activeNavigationObject.main.filter((m) => !m.key.startsWith("divider"))[0].key;
this.activeLink = link;
router.push({ name: `admin-${this.activeNavigation}-${link}` });
}
},