Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@
/>
</span>
</dd>
<dt>{{ $gettext('Login') }}</dt>
<dd>{{ loginDisplayValue }}</dd>

<template v-if="!graphUsersEditLoginAllowedDisabled">
<dt>{{ $gettext('Login') }}</dt>
<dd>{{ loginDisplayValue }}</dd>
</template>

<dt>{{ $gettext('Quota') }}</dt>
<dd>
<span v-if="showUserQuota" v-text="quotaDisplayValue" />
Expand Down Expand Up @@ -73,8 +77,9 @@
import { computed, defineComponent, PropType } from 'vue'
import UserInfoBox from './UserInfoBox.vue'
import { AppRole, User } from '@opencloud-eu/web-client/graph/generated'
import { formatFileSize } from '@opencloud-eu/web-pkg'
import { formatFileSize, useCapabilityStore } from '@opencloud-eu/web-pkg'
import { useGettext } from 'vue3-gettext'
import { storeToRefs } from 'pinia'

export default defineComponent({
name: 'DetailsPanel',
Expand All @@ -98,12 +103,14 @@ export default defineComponent({
},
setup() {
const language = useGettext()
const currentLanguage = computed(() => {
return language.current
})
const currentLanguage = computed(() => language.current)

const capabilityStore = useCapabilityStore()
const { graphUsersEditLoginAllowedDisabled } = storeToRefs(capabilityStore)

return {
currentLanguage
currentLanguage,
graphUsersEditLoginAllowedDisabled
}
},
computed: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
/>
<div class="oc-text-input-message"></div>
</div>
<div class="mb-2">
<div class="mb-2" v-if="!graphUsersEditLoginAllowedDisabled">
<oc-select
id="login-input"
:disabled="isLoginInputDisabled"
Expand Down Expand Up @@ -175,7 +175,7 @@ export default defineComponent({
const eventBus = useEventBus()
const { showErrorMessage } = useMessages()
const { $gettext } = useGettext()

const { graphUsersEditLoginAllowedDisabled } = storeToRefs(capabilityStore)
const editUser: MaybeRef<User> = ref()
const formData = ref({
displayName: {
Expand Down Expand Up @@ -298,6 +298,7 @@ export default defineComponent({
maxQuota: capabilityRefs.spacesMaxQuota,
isInputFieldReadOnly,
isLoginInputDisabled,
graphUsersEditLoginAllowedDisabled,
editUser,
formData,
groupOptions,
Expand Down
34 changes: 21 additions & 13 deletions packages/web-app-admin-settings/src/components/Users/UsersList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ import { findIndex } from 'lodash-es'
import Mark from 'mark.js'
import { OcTable } from '@opencloud-eu/design-system/components'
import { FieldType } from '@opencloud-eu/design-system/helpers'
import { useCapabilityStore } from '@opencloud-eu/web-pkg'

export default defineComponent({
name: 'UsersList',
Expand All @@ -174,7 +175,8 @@ export default defineComponent({

const lastSelectedUserIndex = ref(0)
const lastSelectedUserId = ref(null)

const capabilityStore = useCapabilityStore()
const { graphUsersEditLoginAllowedDisabled } = storeToRefs(capabilityStore)
const userSettingsStore = useUserSettingsStore()
const { users, selectedUsers } = storeToRefs(userSettingsStore)

Expand Down Expand Up @@ -337,7 +339,7 @@ export default defineComponent({
)

const fields = computed<FieldType[]>(() => {
return [
const cols: FieldType[] = [
{
name: 'select',
title: '',
Expand Down Expand Up @@ -372,21 +374,27 @@ export default defineComponent({
title: $gettext('Role'),
type: 'slot',
sortable: true
},
{
}
]

if (!graphUsersEditLoginAllowedDisabled.value) {
cols.push({
name: 'accountEnabled',
title: $gettext('Login'),
type: 'slot',
sortable: true
},
{
name: 'actions',
title: $gettext('Actions'),
sortable: false,
type: 'slot',
alignH: 'right'
}
]
})
}

cols.push({
name: 'actions',
title: $gettext('Actions'),
sortable: false,
type: 'slot',
alignH: 'right'
})

return cols
})

const markInstance = ref<Mark>(null)
Expand Down
3 changes: 2 additions & 1 deletion packages/web-app-admin-settings/src/views/Users.vue
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ export default defineComponent({
const route = useRoute()
const capabilityStore = useCapabilityStore()
const capabilityRefs = storeToRefs(capabilityStore)
const { graphUsersEditLoginAllowedDisabled } = storeToRefs(capabilityStore)
const clientService = useClientService()
const configStore = useConfigStore()

Expand Down Expand Up @@ -393,7 +394,7 @@ export default defineComponent({
...unref(editQuotaActions),
...unref(addToGroupsActions),
...unref(removeFromGroupsActions),
...unref(editLoginActions)
...(!graphUsersEditLoginAllowedDisabled.value ? unref(editLoginActions) : [])
].filter((item) => item.isVisible({ resources: unref(selectedUsers) }))
})

Expand Down
1 change: 1 addition & 0 deletions packages/web-client/src/ocs/capabilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ export interface Capabilities {
create_disabled?: boolean
delete_disabled?: boolean
read_only_attributes?: string[]
edit_login_allowed_disabled?: boolean
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion packages/web-pkg/src/composables/piniaStores/capabilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ const defaultValues = {
change_password_self_disabled: true,
create_disabled: false,
delete_disabled: false,
read_only_attributes: [] as string[]
read_only_attributes: [] as string[],
edit_login_allowed_disabled: false
}
},
notifications: {
Expand Down Expand Up @@ -92,6 +93,9 @@ export const useCapabilityStore = defineStore('capabilities', () => {
const graphUsersReadOnlyAttributes = computed(
() => unref(capabilities).graph.users.read_only_attributes
)
const graphUsersEditLoginAllowedDisabled = computed(
() => unref(capabilities).graph.users.edit_login_allowed_disabled
)

const filesAppProviders = computed(() => unref(capabilities).files.app_providers)
const filesFavorites = computed(() => unref(capabilities).files.favorites)
Expand Down Expand Up @@ -155,6 +159,7 @@ export const useCapabilityStore = defineStore('capabilities', () => {
graphUsersCreateDisabled,
graphUsersDeleteDisabled,
graphUsersChangeSelfPasswordDisabled,
graphUsersEditLoginAllowedDisabled,
graphUsersReadOnlyAttributes,
filesAppProviders,
filesFavorites,
Expand Down