diff --git a/js/src/components/Editor/Image.ts b/js/src/components/Editor/Image.ts index f8b268997..a67b82756 100644 --- a/js/src/components/Editor/Image.ts +++ b/js/src/components/Editor/Image.ts @@ -60,7 +60,8 @@ const CustomImage = Image.extend({ top: realEvent.clientY, }); if (!coordinates) return false; - const client = apolloProvider.defaultClient as ApolloClient; + const client = + apolloProvider.defaultClient as ApolloClient; try { images.forEach(async (image) => { diff --git a/js/src/components/Editor/Mention.ts b/js/src/components/Editor/Mention.ts index d2361d90c..0842b1764 100644 --- a/js/src/components/Editor/Mention.ts +++ b/js/src/components/Editor/Mention.ts @@ -8,7 +8,8 @@ import { IPerson } from "@/types/actor"; import pDebounce from "p-debounce"; import { NormalizedCacheObject } from "@apollo/client/cache/inmemory/types"; -const client = apolloProvider.defaultClient as ApolloClient; +const client = + apolloProvider.defaultClient as ApolloClient; const fetchItems = async (query: string): Promise => { const result = await client.query({ diff --git a/js/src/components/Logo.vue b/js/src/components/Logo.vue index 647025a5e..f907dc71e 100644 --- a/js/src/components/Logo.vue +++ b/js/src/components/Logo.vue @@ -6,7 +6,7 @@ import { Component, Prop, Vue } from "vue-property-decorator"; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore -import MobilizonLogo from "../assets/logo_chapril_mobilizon.png"; +// import MobilizonLogo from "../assets/logo_chapril_mobilizon.png"; @Component export default class Logo extends Vue { diff --git a/js/src/graphql/discussion.ts b/js/src/graphql/discussion.ts index b456d917e..ef66d22c6 100644 --- a/js/src/graphql/discussion.ts +++ b/js/src/graphql/discussion.ts @@ -160,7 +160,7 @@ export const DELETE_DISCUSSION = gql` `; export const DISCUSSION_COMMENT_CHANGED = gql` - subscription($slug: String!) { + subscription ($slug: String!) { discussionCommentChanged(slug: $slug) { id lastComment { diff --git a/js/src/graphql/followers.ts b/js/src/graphql/followers.ts index 660c2e7db..48f4f0abc 100644 --- a/js/src/graphql/followers.ts +++ b/js/src/graphql/followers.ts @@ -1,7 +1,7 @@ import gql from "graphql-tag"; export const GROUP_FOLLOWERS = gql` - query( + query ( $name: String! $followersPage: Int $followersLimit: Int diff --git a/js/src/graphql/member.ts b/js/src/graphql/member.ts index 02b928e6c..305ae7239 100644 --- a/js/src/graphql/member.ts +++ b/js/src/graphql/member.ts @@ -55,7 +55,7 @@ export const REJECT_INVITATION = gql` `; export const GROUP_MEMBERS = gql` - query($name: String!, $roles: String, $page: Int, $limit: Int) { + query ($name: String!, $roles: String, $page: Int, $limit: Int) { group(preferredUsername: $name) { id url diff --git a/js/src/mixins/identityEdition.ts b/js/src/mixins/identityEdition.ts index 5602529d1..246b423ce 100644 --- a/js/src/mixins/identityEdition.ts +++ b/js/src/mixins/identityEdition.ts @@ -14,9 +14,8 @@ export default class IdentityEditionMixin extends Mixins(Vue) { ); if (this.identity.preferredUsername === oldUsername) { - this.identity.preferredUsername = IdentityEditionMixin.convertToUsername( - newDisplayName - ); + this.identity.preferredUsername = + IdentityEditionMixin.convertToUsername(newDisplayName); } this.oldDisplayName = newDisplayName; diff --git a/js/src/views/Admin/AdminGroupProfile.vue b/js/src/views/Admin/AdminGroupProfile.vue index 2bd100d8a..b5a560d8c 100644 --- a/js/src/views/Admin/AdminGroupProfile.vue +++ b/js/src/views/Admin/AdminGroupProfile.vue @@ -398,14 +398,16 @@ export default class AdminGroupProfile extends Vue { } confirmSuspendProfile(): void { - const message = (this.group.domain - ? this.$t( - "Are you sure you want to suspend this group? As this group originates from instance {instance}, this will only remove local members and delete the local data, as well as rejecting all the future data.", - { instance: this.group.domain } - ) - : this.$t( - "Are you sure you want to suspend this group? All members - including remote ones - will be notified and removed from the group, and all of the group data (events, posts, discussions, todos…) will be irretrievably destroyed." - )) as string; + const message = ( + this.group.domain + ? this.$t( + "Are you sure you want to suspend this group? As this group originates from instance {instance}, this will only remove local members and delete the local data, as well as rejecting all the future data.", + { instance: this.group.domain } + ) + : this.$t( + "Are you sure you want to suspend this group? All members - including remote ones - will be notified and removed from the group, and all of the group data (events, posts, discussions, todos…) will be irretrievably destroyed." + ) + ) as string; this.$buefy.dialog.confirm({ title: this.$t("Suspend group") as string, diff --git a/js/src/views/Event/Event.vue b/js/src/views/Event/Event.vue index 57f3c81ac..bd0ded10e 100755 --- a/js/src/views/Event/Event.vue +++ b/js/src/views/Event/Event.vue @@ -684,7 +684,8 @@ export default class Event extends EventMixin { try { if (window.isSecureContext) { - this.anonymousParticipation = await this.anonymousParticipationConfirmed(); + this.anonymousParticipation = + await this.anonymousParticipationConfirmed(); } } catch (e) { if (e instanceof AnonymousParticipationNotFoundError) { diff --git a/js/src/views/Resources/ResourceFolder.vue b/js/src/views/Resources/ResourceFolder.vue index 59a49c52e..7f563010b 100644 --- a/js/src/views/Resources/ResourceFolder.vue +++ b/js/src/views/Resources/ResourceFolder.vue @@ -621,9 +621,10 @@ export default class Resources extends Mixins(ResourceMixin) { const updatedResource: IResource = data.updateResource; // eslint-disable-next-line vue/max-len - oldParentCachedResource.children.elements = oldParentCachedResource.children.elements.filter( - (cachedResource) => cachedResource.id !== updatedResource.id - ); + oldParentCachedResource.children.elements = + oldParentCachedResource.children.elements.filter( + (cachedResource) => cachedResource.id !== updatedResource.id + ); store.writeQuery({ query: GET_RESOURCE, diff --git a/js/src/views/Settings/AccountSettings.vue b/js/src/views/Settings/AccountSettings.vue index 24e257c74..8c1f222ca 100644 --- a/js/src/views/Settings/AccountSettings.vue +++ b/js/src/views/Settings/AccountSettings.vue @@ -155,7 +155,10 @@

{{ $t("Deleting your Mobilizon account") }} diff --git a/js/tests/e2e/support/commands.js b/js/tests/e2e/support/commands.js index 8268b7ee3..442fb374e 100644 --- a/js/tests/e2e/support/commands.js +++ b/js/tests/e2e/support/commands.js @@ -106,29 +106,27 @@ const decreaseFetches = () => { Cypress.env("fetchCount", count - 1); }; -const buildTrackableFetchWithSessionId = (fetch) => ( - fetchUrl, - fetchOptions -) => { - const { headers } = fetchOptions; - const modifiedHeaders = { - "x-session-id": Cypress.env("sessionId"), - ...headers, +const buildTrackableFetchWithSessionId = + (fetch) => (fetchUrl, fetchOptions) => { + const { headers } = fetchOptions; + const modifiedHeaders = { + "x-session-id": Cypress.env("sessionId"), + ...headers, + }; + + const modifiedOptions = { ...fetchOptions, headers: modifiedHeaders }; + + return fetch(fetchUrl, modifiedOptions) + .then((result) => { + decreaseFetches(); + return Promise.resolve(result); + }) + .catch((result) => { + decreaseFetches(); + return Promise.reject(result); + }); }; - const modifiedOptions = { ...fetchOptions, headers: modifiedHeaders }; - - return fetch(fetchUrl, modifiedOptions) - .then((result) => { - decreaseFetches(); - return Promise.resolve(result); - }) - .catch((result) => { - decreaseFetches(); - return Promise.reject(result); - }); -}; - Cypress.on("window:before:load", (win) => { cy.stub(win, "fetch", buildTrackableFetchWithSessionId(fetch)); }); diff --git a/js/tests/unit/specs/mocks/event.ts b/js/tests/unit/specs/mocks/event.ts index 5bdacb5d9..e1bcd0be9 100644 --- a/js/tests/unit/specs/mocks/event.ts +++ b/js/tests/unit/specs/mocks/event.ts @@ -85,8 +85,7 @@ export const eventCommentThreadsMock = { __typename: "Comment", id: "2", uuid: "e37910ea-fd5a-4756-9679-00971f3f4107", - url: - "https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-00971f3f4107", + url: "https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-00971f3f4107", text: "my comment text", local: true, visibility: "PUBLIC", @@ -116,8 +115,7 @@ export const eventCommentThreadsMock = { __typename: "Comment", id: "29", uuid: "e37910ea-fd5a-4756-9679-01171f3f4107", - url: - "https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-01171f3f4107", + url: "https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-01171f3f4107", text: "a second comment", local: true, visibility: "PUBLIC", @@ -161,8 +159,7 @@ export const newCommentForEventResponse: DataMock = { __typename: "Comment", id: "79", uuid: "e37910ea-fd5a-4756-9679-01171f3f4444", - url: - "https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-01171f3f4444", + url: "https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-01171f3f4444", text: newCommentForEventMock.text, local: true, visibility: "PUBLIC",