diff --git a/js/src/apollo/utils.ts b/js/src/apollo/utils.ts index 694db7d6e..917936c3a 100644 --- a/js/src/apollo/utils.ts +++ b/js/src/apollo/utils.ts @@ -164,7 +164,7 @@ function doMerge( incoming: Array, args: Record | null ): Array { - const merged = existing ? existing.slice(0) : []; + const merged = existing && Array.isArray(existing) ? existing.slice(0) : []; let res; if (args) { // Assume an page of 1 if args.page omitted. diff --git a/js/src/components/Discussion/DiscussionListItem.vue b/js/src/components/Discussion/DiscussionListItem.vue index c8efe750a..25b66fdb0 100644 --- a/js/src/components/Discussion/DiscussionListItem.vue +++ b/js/src/components/Discussion/DiscussionListItem.vue @@ -32,7 +32,10 @@ }} -
+
{{ htmlTextEllipsis }}
@@ -105,7 +108,7 @@ export default class DiscussionListItem extends Vue { } } - div.has-text-grey { + div.ellipsis { overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; diff --git a/js/src/views/Admin/AdminGroupProfile.vue b/js/src/views/Admin/AdminGroupProfile.vue index 9a8e8a18b..b5a560d8c 100644 --- a/js/src/views/Admin/AdminGroupProfile.vue +++ b/js/src/views/Admin/AdminGroupProfile.vue @@ -438,6 +438,10 @@ export default class AdminGroupProfile extends Vue { query: GET_GROUP, variables: { id: profileId, + organizedEventsPage: this.organizedEventsPage, + organizedEventsLimit: EVENTS_PER_PAGE, + postsPage: this.postsPage, + postsLimit: POSTS_PER_PAGE, }, }); diff --git a/js/src/views/Admin/AdminProfile.vue b/js/src/views/Admin/AdminProfile.vue index 8f30cfa36..96ebf0a4f 100644 --- a/js/src/views/Admin/AdminProfile.vue +++ b/js/src/views/Admin/AdminProfile.vue @@ -275,6 +275,7 @@ import EmptyContent from "../../components/Utils/EmptyContent.vue"; import { ApolloCache, FetchResult } from "@apollo/client/core"; import VueRouter from "vue-router"; import { MemberRole } from "@/types/enums"; +import cloneDeep from "lodash/cloneDeep"; const { isNavigationFailure, NavigationFailureType } = VueRouter; const EVENTS_PER_PAGE = 10; @@ -402,6 +403,10 @@ export default class AdminProfile extends Vue { actorId: profileId, organizedEventsPage: 1, organizedEventsLimit: EVENTS_PER_PAGE, + participationsPage: 1, + participationLimit: PARTICIPATIONS_PER_PAGE, + membershipsPage: 1, + membershipsLimit: MEMBERSHIPS_PER_PAGE, }, }); @@ -414,7 +419,8 @@ export default class AdminProfile extends Vue { }, data: { person: { - ...person, + ...cloneDeep(person), + participations: { total: 0, elements: [] }, suspended: true, avatar: null, name: "", diff --git a/js/src/views/Event/Participants.vue b/js/src/views/Event/Participants.vue index bb71a4417..328a9dc74 100644 --- a/js/src/views/Event/Participants.vue +++ b/js/src/views/Event/Participants.vue @@ -109,7 +109,7 @@ props.row.actor.name }}
- @{{ usernameWithDomain(props.row.actor) }} @@ -148,10 +148,11 @@ - - {{ props.row.metadata.message | ellipsize }} - - +

+ {{ props.row.metadata.message | ellipsize }} +

+ +
+

{{ $t("No message") }} - +

@@ -177,7 +192,7 @@