diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0aa863b6..05fa9e1ce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -253,7 +253,7 @@ package-app: only: - tags@framasoft/mobilizon artifacts: - expire_in: 30 days + expire_in: 2 days paths: - ${APP_ASSET} @@ -302,7 +302,7 @@ multi-arch-release: tags: - "privileged" artifacts: - expire_in: 30 days + expire_in: 2 days paths: - ${APP_ASSET} parallel: diff --git a/js/package.json b/js/package.json index 026d619ad..452b409e0 100644 --- a/js/package.json +++ b/js/package.json @@ -52,7 +52,7 @@ "intersection-observer": "^0.12.0", "jwt-decode": "^3.1.2", "leaflet": "^1.4.0", - "leaflet.locatecontrol": "^0.74.0", + "leaflet.locatecontrol": "^0.76.0", "lodash": "^4.17.11", "ngeohash": "^0.6.3", "p-debounce": "^4.0.0", @@ -75,7 +75,7 @@ "devDependencies": { "@types/jest": "^27.0.2", "@types/leaflet": "^1.5.2", - "@types/leaflet.locatecontrol": "^0.60.7", + "@types/leaflet.locatecontrol": "^0.74", "@types/lodash": "^4.14.141", "@types/ngeohash": "^0.6.2", "@types/phoenix": "^1.5.2", diff --git a/js/src/components/Event/EventMetadataBlock.vue b/js/src/components/Event/EventMetadataBlock.vue index e5a0bb88c..520370304 100644 --- a/js/src/components/Event/EventMetadataBlock.vue +++ b/js/src/components/Event/EventMetadataBlock.vue @@ -45,6 +45,7 @@ div.eventMetadataBlock { .content-wrapper { overflow: hidden; width: 100%; + max-width: calc(100vw - 32px - 20px); &.padding-left { padding: 0 20px; diff --git a/js/src/components/Event/OrganizerPicker.vue b/js/src/components/Event/OrganizerPicker.vue index eaca31a83..d9c2b1d13 100644 --- a/js/src/components/Event/OrganizerPicker.vue +++ b/js/src/components/Event/OrganizerPicker.vue @@ -51,6 +51,13 @@ import { MemberRole } from "@/types/enums"; groupMemberships: { query: LOGGED_USER_MEMBERSHIPS, update: (data) => data.loggedUser.memberships, + variables() { + return { + page: 1, + limit: 10, + membershipName: this.actorFilter, + }; + }, }, identities: IDENTITIES, currentActor: CURRENT_ACTOR_CLIENT, diff --git a/js/src/components/Event/OrganizerPickerWrapper.vue b/js/src/components/Event/OrganizerPickerWrapper.vue index de352277a..8a07705a6 100644 --- a/js/src/components/Event/OrganizerPickerWrapper.vue +++ b/js/src/components/Event/OrganizerPickerWrapper.vue @@ -65,42 +65,60 @@ />
{{ $t("Add a contact") }}
-
+ {{ actor.name }}
+ {{ actor.name }}
+ {{ `@${usernameWithDomain(actor)}` }}
+
+
+
{{ $t("Your profile will be shown as contact.") }}
@@ -122,6 +140,7 @@ import { Component, Prop, Vue, Watch } from "vue-property-decorator"; import { IMember } from "@/types/actor/member.model"; import { IActor, IGroup, IPerson, usernameWithDomain } from "../../types/actor"; import OrganizerPicker from "./OrganizerPicker.vue"; +import EmptyContent from "../Utils/EmptyContent.vue"; import { CURRENT_ACTOR_CLIENT, IDENTITIES, @@ -139,16 +158,17 @@ const MEMBER_ROLES = [ ]; @Component({ - components: { OrganizerPicker }, + components: { OrganizerPicker, EmptyContent }, apollo: { members: { query: GROUP_MEMBERS, variables() { return { - name: usernameWithDomain(this.selectedActor), + groupName: usernameWithDomain(this.selectedActor), page: this.membersPage, limit: 10, roles: MEMBER_ROLES.join(","), + name: this.contactFilter, }; }, update: (data) => data.group.members, @@ -161,9 +181,11 @@ const MEMBER_ROLES = [ currentActor: CURRENT_ACTOR_CLIENT, userMemberships: { query: LOGGED_USER_MEMBERSHIPS, - variables: { - page: 1, - limit: 100, + variables() { + return { + page: 1, + limit: 10, + }; }, update: (data) => data.loggedUser.memberships, }, diff --git a/js/src/components/Todo/FullTodo.vue b/js/src/components/Todo/FullTodo.vue index 0638beac3..ee515fcdb 100644 --- a/js/src/components/Todo/FullTodo.vue +++ b/js/src/components/Todo/FullTodo.vue @@ -11,7 +11,7 @@