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
20 changes: 9 additions & 11 deletions assets/vue/components/layout/TopbarLoggedIn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,13 @@
</BaseAppLink>

<BaseAppLink
v-if="messagingEnabled"
:class="{ 'item-button--unread': !!btnInboxBadge }"
:to="{ name: 'MessageList' }"
class="item-button"
>
<BaseIcon
class="item-button__icon"
icon="inbox"
/>
<span
v-if="btnInboxBadge"
class="item-button__badge"
v-text="btnInboxBadge"
/>
<BaseIcon class="item-button__icon" icon="inbox" />
<span v-if="btnInboxBadge" class="item-button__badge" v-text="btnInboxBadge" />
</BaseAppLink>
</div>
<div class="app-topbar__end">
Expand Down Expand Up @@ -81,6 +75,7 @@ const platformConfigStore = usePlatformConfig()
const messageRelUserStore = useMessageRelUserStore()
const notification = useNotification()
const cidReqStore = useCidReqStore()
const messagingEnabled = computed(() => platformConfigStore.getSetting("message.allow_message_tool") === "true")

const ticketUrl = computed(() => {
const searchParms = new URLSearchParams()
Expand Down Expand Up @@ -137,9 +132,12 @@ function toggleUserMenu(event) {
}

const btnInboxBadge = computed(() => {
if (!messagingEnabled.value) return null
const unreadCount = messageRelUserStore.countUnread
return unreadCount > 20 ? "9+" : unreadCount > 0 ? unreadCount.toString() : null
return unreadCount > 20 ? "20+" : unreadCount > 0 ? unreadCount.toString() : null
})

messageRelUserStore.findUnreadCount().catch((e) => notification.showErrorNotification(e))
if (messagingEnabled.value) {
messageRelUserStore.findUnreadCount().catch((e) => notification.showErrorNotification(e))
}
</script>
28 changes: 12 additions & 16 deletions assets/vue/components/social/SocialSideMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,14 @@
{{ t("Home") }}
</BaseAppLink>
</li>
<li :class="['menu-item', { active: isActive('/resources/messages') }]">
<li
v-if="messagingEnabled"
:class="['menu-item', { active: isActive('/resources/messages') }]"
>
<BaseAppLink to="/resources/messages">
<i
aria-hidden="true"
class="mdi mdi-email"
></i>
<i aria-hidden="true" class="mdi mdi-email"></i>
{{ t("Messages") }}
<span
v-if="unreadMessagesCount > 0"
class="badge badge-warning"
>{{ unreadMessagesCount }}</span
>
<span v-if="unreadMessagesCount > 0" class="badge badge-warning">{{ unreadMessagesCount }}</span>
</BaseAppLink>
</li>
<li :class="['menu-item', { active: isActive('/resources/friends/invitations') }]">
Expand Down Expand Up @@ -126,16 +122,13 @@
{{ t("Home") }}
</BaseAppLink>
</li>
<li class="menu-item">
<li class="menu-item" v-if="messagingEnabled">
<a
class="ajax"
href="/main/inc/ajax/user_manager.ajax.php?a=get_user_popup&user_id={{user.id}}"
rel="noopener noreferrer"
>
<i
aria-hidden="true"
class="mdi mdi-email"
></i>
<i aria-hidden="true" class="mdi mdi-email"></i>
{{ t("Send message") }}
</a>
</li>
Expand Down Expand Up @@ -166,6 +159,7 @@ const isCurrentUser = inject("is-current-user")
const groupLink = ref({ name: "UserGroupShow" })
const platformConfigStore = usePlatformConfig()
const globalForumsCourse = computed(() => platformConfigStore.getSetting("forum.global_forums_course_id"))
const messagingEnabled = computed(() => platformConfigStore.getSetting("message.allow_message_tool") === "true")
const isValidGlobalForumsCourse = computed(() => {
const courseId = globalForumsCourse.value
return courseId !== null && courseId !== undefined && courseId > 0
Expand Down Expand Up @@ -203,7 +197,9 @@ watchEffect(() => {
currentNodeId.value = currentUser.resourceNode.id
}
}
messageRelUserStore.findUnreadCount()
if (messagingEnabled.value) {
messageRelUserStore.findUnreadCount()
}
if (user.value && user.value.id) {
fetchInvitationsCount(user.value.id)
}
Expand Down
82 changes: 52 additions & 30 deletions assets/vue/composables/useSocialMenuItems.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ export function useSocialMenuItems() {
const { isCurrentUser } = useSocialInfo()
const { user } = storeToRefs(securityStore)

const unreadMessagesCount = computed(() => messageRelUserStore.countUnread)
const messagingEnabled = computed(() => platformConfigStore.getSetting("message.allow_message_tool") === "true")

const unreadMessagesCount = computed(() => (messagingEnabled.value ? messageRelUserStore.countUnread : 0))

const globalForumsCourse = computed(() => platformConfigStore.getSetting("forum.global_forums_course_id"))
const hideSocialGroupBlock = computed(
() => platformConfigStore.getSetting("social.hide_social_groups_block") === "true",
Expand All @@ -42,11 +45,7 @@ export function useSocialMenuItems() {
const getGroupLink = async () => {
try {
const response = await axios.get("/social-network/get-forum-link")
if (isValidGlobalForumsCourse.value) {
groupLink.value = response.data.go_to
} else {
groupLink.value = { name: "UserGroupList" }
}
groupLink.value = isValidGlobalForumsCourse.value ? response.data.go_to : { name: "UserGroupList" }
} catch (error) {
console.error("Error fetching forum link:", error)
groupLink.value = { name: "UserGroupList" }
Expand All @@ -59,43 +58,66 @@ export function useSocialMenuItems() {
}

const items = computed(() => {
const menuItems = [
{ icon: "mdi mdi-home", label: t("Home"), route: "/social" },
{
const menuItems = []

// Home
menuItems.push({ icon: "mdi mdi-home", label: t("Home"), route: "/social" })

if (messagingEnabled.value) {
menuItems.push({
icon: "mdi mdi-email",
label: t("Messages"),
route: "/resources/messages",
badgeCount: unreadMessagesCount.value,
},
{ icon: "mdi mdi-handshake", label: t("My friends"), route: { name: "UserRelUserList" } },
{
icon: "mdi mdi-briefcase",
label: t("My files"),
route: { name: "PersonalFileList", params: { node: securityStore.user.resourceNode.id } },
},
{ icon: "mdi mdi-account", label: t("Personal data"), route: "/resources/users/personal_data" },
]
})
}

// My friends
menuItems.push({
icon: "mdi mdi-handshake",
label: t("My friends"),
route: { name: "UserRelUserList" },
})

if (!hideSocialGroupBlock.value) {
menuItems.splice(3, 0, {
menuItems.push({
icon: "mdi mdi-group",
label: t("Social groups"),
route: groupLink.value,
isLink: isValidGlobalForumsCourse.value,
})
}

return isCurrentUser.value
? menuItems
: [
{ icon: "mdi mdi-home", label: t("Home"), route: "/social" },
{
icon: "mdi mdi-email",
label: t("Send message"),
link: `/main/inc/ajax/user_manager.ajax.php?a=get_user_popup&user_id=${user.value.id}`,
isExternal: true,
},
]
// My files
menuItems.push({
icon: "mdi mdi-briefcase",
label: t("My files"),
route: { name: "PersonalFileList", params: { node: securityStore.user.resourceNode.id } },
})

// Personal data
menuItems.push({
icon: "mdi mdi-account",
label: t("Personal data"),
route: "/resources/users/personal_data",
})

if (!isCurrentUser.value) {
const othersMenu = [{ icon: "mdi mdi-home", label: t("Home"), route: "/social" }]

if (messagingEnabled.value) {
othersMenu.push({
icon: "mdi mdi-email",
label: t("Send message"),
link: `/main/inc/ajax/user_manager.ajax.php?a=get_user_popup&user_id=${user.value.id}`,
isExternal: true,
})
}

return othersMenu
}

return menuItems
})

return { items }
Expand Down
7 changes: 7 additions & 0 deletions assets/vue/views/message/MessageList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ import InputGroup from "primevue/inputgroup"
import InputText from "primevue/inputtext"
import messageRelUserService from "../../services/messagereluser"
import { useMessageReceiverFormatter } from "../../composables/message/messageFormatter"
import { usePlatformConfig } from "../../store/platformConfig"

const route = useRoute()
const router = useRouter()
Expand All @@ -324,6 +325,8 @@ const messageRelUserStore = useMessageRelUserStore()
const { abbreviatedDatetime } = useFormatDate()

const { mapReceiverMixToUsers } = useMessageReceiverFormatter()
const platformConfigStore = usePlatformConfig()
const messagingEnabled = computed(() => platformConfigStore.getSetting("message.allow_message_tool") === "true")

const mItemsMarkAs = ref([
{
Expand Down Expand Up @@ -629,6 +632,10 @@ function showDlgConfirmDeleteMultiple() {
}

onMounted(() => {
if (!messagingEnabled.value) {
router.replace("/social")
return
}
showInbox()
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ public function list(SettingsManager $settingsManager): Response
'platform.push_notification_settings',
'session.user_session_display_mode',
'course.resource_sequence_show_dependency_in_course_intro',
'message.allow_message_tool',
];

$user = $this->userHelper->getCurrent();
Expand Down
Loading