Lint files with prettier
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
parent
68e223e480
commit
0e15abfc26
@ -60,7 +60,8 @@ const CustomImage = Image.extend({
|
|||||||
top: realEvent.clientY,
|
top: realEvent.clientY,
|
||||||
});
|
});
|
||||||
if (!coordinates) return false;
|
if (!coordinates) return false;
|
||||||
const client = apolloProvider.defaultClient as ApolloClient<NormalizedCacheObject>;
|
const client =
|
||||||
|
apolloProvider.defaultClient as ApolloClient<NormalizedCacheObject>;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
images.forEach(async (image) => {
|
images.forEach(async (image) => {
|
||||||
|
@ -8,7 +8,8 @@ import apolloProvider from "@/vue-apollo";
|
|||||||
import { IPerson } from "@/types/actor";
|
import { IPerson } from "@/types/actor";
|
||||||
import pDebounce from "p-debounce";
|
import pDebounce from "p-debounce";
|
||||||
|
|
||||||
const client = apolloProvider.defaultClient as ApolloClient<NormalizedCacheObject>;
|
const client =
|
||||||
|
apolloProvider.defaultClient as ApolloClient<NormalizedCacheObject>;
|
||||||
|
|
||||||
const fetchItems = async (query: string): Promise<IPerson[]> => {
|
const fetchItems = async (query: string): Promise<IPerson[]> => {
|
||||||
const result = await client.query({
|
const result = await client.query({
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import gql from "graphql-tag";
|
import gql from "graphql-tag";
|
||||||
|
|
||||||
export const FETCH_PERSON = gql`
|
export const FETCH_PERSON = gql`
|
||||||
query($username: String!) {
|
query ($username: String!) {
|
||||||
fetchPerson(preferredUsername: $username) {
|
fetchPerson(preferredUsername: $username) {
|
||||||
id
|
id
|
||||||
url
|
url
|
||||||
@ -37,7 +37,7 @@ export const FETCH_PERSON = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const GET_PERSON = gql`
|
export const GET_PERSON = gql`
|
||||||
query(
|
query (
|
||||||
$actorId: ID!
|
$actorId: ID!
|
||||||
$organizedEventsPage: Int
|
$organizedEventsPage: Int
|
||||||
$organizedEventsLimit: Int
|
$organizedEventsLimit: Int
|
||||||
@ -433,7 +433,7 @@ export const PERSON_MEMBERSHIP_GROUP = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const GROUP_MEMBERSHIP_SUBSCRIPTION_CHANGED = gql`
|
export const GROUP_MEMBERSHIP_SUBSCRIPTION_CHANGED = gql`
|
||||||
subscription($actorId: ID!, $group: String!) {
|
subscription ($actorId: ID!, $group: String!) {
|
||||||
groupMembershipChanged(personId: $actorId, group: $group) {
|
groupMembershipChanged(personId: $actorId, group: $group) {
|
||||||
id
|
id
|
||||||
memberships {
|
memberships {
|
||||||
@ -522,7 +522,7 @@ export const DELETE_PERSON = gql`
|
|||||||
* Prefer CREATE_PERSON when creating another identity
|
* Prefer CREATE_PERSON when creating another identity
|
||||||
*/
|
*/
|
||||||
export const REGISTER_PERSON = gql`
|
export const REGISTER_PERSON = gql`
|
||||||
mutation(
|
mutation (
|
||||||
$preferredUsername: String!
|
$preferredUsername: String!
|
||||||
$name: String!
|
$name: String!
|
||||||
$summary: String!
|
$summary: String!
|
||||||
|
@ -46,7 +46,7 @@ export const COMMENT_RECURSIVE_FRAGMENT = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const FETCH_THREAD_REPLIES = gql`
|
export const FETCH_THREAD_REPLIES = gql`
|
||||||
query($threadId: ID!) {
|
query ($threadId: ID!) {
|
||||||
thread(id: $threadId) {
|
thread(id: $threadId) {
|
||||||
...CommentRecursive
|
...CommentRecursive
|
||||||
}
|
}
|
||||||
@ -55,7 +55,7 @@ export const FETCH_THREAD_REPLIES = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const COMMENTS_THREADS = gql`
|
export const COMMENTS_THREADS = gql`
|
||||||
query($eventUUID: UUID!) {
|
query ($eventUUID: UUID!) {
|
||||||
event(uuid: $eventUUID) {
|
event(uuid: $eventUUID) {
|
||||||
id
|
id
|
||||||
uuid
|
uuid
|
||||||
|
@ -150,7 +150,7 @@ export const DELETE_DISCUSSION = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const DISCUSSION_COMMENT_CHANGED = gql`
|
export const DISCUSSION_COMMENT_CHANGED = gql`
|
||||||
subscription($slug: String!) {
|
subscription ($slug: String!) {
|
||||||
discussionCommentChanged(slug: $slug) {
|
discussionCommentChanged(slug: $slug) {
|
||||||
id
|
id
|
||||||
lastComment {
|
lastComment {
|
||||||
|
@ -177,7 +177,7 @@ export const FETCH_EVENT = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const FETCH_EVENT_BASIC = gql`
|
export const FETCH_EVENT_BASIC = gql`
|
||||||
query($uuid: UUID!) {
|
query ($uuid: UUID!) {
|
||||||
event(uuid: $uuid) {
|
event(uuid: $uuid) {
|
||||||
id
|
id
|
||||||
uuid
|
uuid
|
||||||
@ -551,7 +551,7 @@ export const PARTICIPANTS = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const EVENT_PERSON_PARTICIPATION = gql`
|
export const EVENT_PERSON_PARTICIPATION = gql`
|
||||||
query($actorId: ID!, $eventId: ID!) {
|
query ($actorId: ID!, $eventId: ID!) {
|
||||||
person(id: $actorId) {
|
person(id: $actorId) {
|
||||||
id
|
id
|
||||||
participations(eventId: $eventId) {
|
participations(eventId: $eventId) {
|
||||||
@ -572,7 +572,7 @@ export const EVENT_PERSON_PARTICIPATION = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const EVENT_PERSON_PARTICIPATION_SUBSCRIPTION_CHANGED = gql`
|
export const EVENT_PERSON_PARTICIPATION_SUBSCRIPTION_CHANGED = gql`
|
||||||
subscription($actorId: ID!, $eventId: ID!) {
|
subscription ($actorId: ID!, $eventId: ID!) {
|
||||||
eventPersonParticipationChanged(personId: $actorId) {
|
eventPersonParticipationChanged(personId: $actorId) {
|
||||||
id
|
id
|
||||||
participations(eventId: $eventId) {
|
participations(eventId: $eventId) {
|
||||||
@ -593,7 +593,7 @@ export const EVENT_PERSON_PARTICIPATION_SUBSCRIPTION_CHANGED = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const FETCH_GROUP_EVENTS = gql`
|
export const FETCH_GROUP_EVENTS = gql`
|
||||||
query(
|
query (
|
||||||
$name: String!
|
$name: String!
|
||||||
$afterDateTime: DateTime
|
$afterDateTime: DateTime
|
||||||
$beforeDateTime: DateTime
|
$beforeDateTime: DateTime
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import gql from "graphql-tag";
|
import gql from "graphql-tag";
|
||||||
|
|
||||||
export const GROUP_FOLLOWERS = gql`
|
export const GROUP_FOLLOWERS = gql`
|
||||||
query(
|
query (
|
||||||
$name: String!
|
$name: String!
|
||||||
$followersPage: Int
|
$followersPage: Int
|
||||||
$followersLimit: Int
|
$followersLimit: Int
|
||||||
|
@ -188,7 +188,7 @@ export const GROUP_FIELDS_FRAGMENTS = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const FETCH_GROUP = gql`
|
export const FETCH_GROUP = gql`
|
||||||
query(
|
query (
|
||||||
$name: String!
|
$name: String!
|
||||||
$afterDateTime: DateTime
|
$afterDateTime: DateTime
|
||||||
$beforeDateTime: DateTime
|
$beforeDateTime: DateTime
|
||||||
@ -206,7 +206,7 @@ export const FETCH_GROUP = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const GET_GROUP = gql`
|
export const GET_GROUP = gql`
|
||||||
query(
|
query (
|
||||||
$id: ID!
|
$id: ID!
|
||||||
$afterDateTime: DateTime
|
$afterDateTime: DateTime
|
||||||
$beforeDateTime: DateTime
|
$beforeDateTime: DateTime
|
||||||
|
@ -55,7 +55,7 @@ export const REJECT_INVITATION = gql`
|
|||||||
`;
|
`;
|
||||||
|
|
||||||
export const GROUP_MEMBERS = 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) {
|
group(preferredUsername: $name) {
|
||||||
id
|
id
|
||||||
url
|
url
|
||||||
|
@ -14,9 +14,8 @@ export default class IdentityEditionMixin extends Mixins(Vue) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (this.identity.preferredUsername === oldUsername) {
|
if (this.identity.preferredUsername === oldUsername) {
|
||||||
this.identity.preferredUsername = IdentityEditionMixin.convertToUsername(
|
this.identity.preferredUsername =
|
||||||
newDisplayName
|
IdentityEditionMixin.convertToUsername(newDisplayName);
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.oldDisplayName = newDisplayName;
|
this.oldDisplayName = newDisplayName;
|
||||||
|
@ -344,14 +344,16 @@ export default class AdminGroupProfile extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
confirmSuspendProfile(): void {
|
confirmSuspendProfile(): void {
|
||||||
const message = (this.group.domain
|
const message = (
|
||||||
? this.$t(
|
this.group.domain
|
||||||
"Are you sure you want to <b>suspend</b> 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.",
|
? this.$t(
|
||||||
{ instance: this.group.domain }
|
"Are you sure you want to <b>suspend</b> 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 <b>suspend</b> this group? All members - including remote ones - will be notified and removed from the group, and <b>all of the group data (events, posts, discussions, todos…) will be irretrievably destroyed</b>."
|
: this.$t(
|
||||||
)) as string;
|
"Are you sure you want to <b>suspend</b> this group? All members - including remote ones - will be notified and removed from the group, and <b>all of the group data (events, posts, discussions, todos…) will be irretrievably destroyed</b>."
|
||||||
|
)
|
||||||
|
) as string;
|
||||||
|
|
||||||
this.$buefy.dialog.confirm({
|
this.$buefy.dialog.confirm({
|
||||||
title: this.$t("Suspend group") as string,
|
title: this.$t("Suspend group") as string,
|
||||||
|
@ -774,9 +774,11 @@ export default class EditEvent extends Vue {
|
|||||||
get updateEventMessage(): string {
|
get updateEventMessage(): string {
|
||||||
if (this.unmodifiedEvent.draft && !this.event.draft)
|
if (this.unmodifiedEvent.draft && !this.event.draft)
|
||||||
return this.$i18n.t("The event has been updated and published") as string;
|
return this.$i18n.t("The event has been updated and published") as string;
|
||||||
return (this.event.draft
|
return (
|
||||||
? this.$i18n.t("The draft event has been updated")
|
this.event.draft
|
||||||
: this.$i18n.t("The event has been updated")) as string;
|
? this.$i18n.t("The draft event has been updated")
|
||||||
|
: this.$i18n.t("The event has been updated")
|
||||||
|
) as string;
|
||||||
}
|
}
|
||||||
|
|
||||||
private handleError(err: any) {
|
private handleError(err: any) {
|
||||||
|
@ -874,7 +874,8 @@ export default class Event extends EventMixin {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
if (window.isSecureContext) {
|
if (window.isSecureContext) {
|
||||||
this.anonymousParticipation = await this.anonymousParticipationConfirmed();
|
this.anonymousParticipation =
|
||||||
|
await this.anonymousParticipationConfirmed();
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (e instanceof AnonymousParticipationNotFoundError) {
|
if (e instanceof AnonymousParticipationNotFoundError) {
|
||||||
|
@ -562,9 +562,10 @@ export default class Resources extends Mixins(ResourceMixin) {
|
|||||||
const updatedResource: IResource = data.updateResource;
|
const updatedResource: IResource = data.updateResource;
|
||||||
|
|
||||||
// eslint-disable-next-line vue/max-len
|
// eslint-disable-next-line vue/max-len
|
||||||
oldParentCachedResource.children.elements = oldParentCachedResource.children.elements.filter(
|
oldParentCachedResource.children.elements =
|
||||||
(cachedResource) => cachedResource.id !== updatedResource.id
|
oldParentCachedResource.children.elements.filter(
|
||||||
);
|
(cachedResource) => cachedResource.id !== updatedResource.id
|
||||||
|
);
|
||||||
|
|
||||||
store.writeQuery({
|
store.writeQuery({
|
||||||
query: GET_RESOURCE,
|
query: GET_RESOURCE,
|
||||||
|
@ -155,7 +155,10 @@
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="columns">
|
<div class="columns">
|
||||||
<div
|
<div
|
||||||
class="column is-one-third-desktop is-offset-one-third-desktop"
|
class="
|
||||||
|
column
|
||||||
|
is-one-third-desktop is-offset-one-third-desktop
|
||||||
|
"
|
||||||
>
|
>
|
||||||
<h1 class="title">
|
<h1 class="title">
|
||||||
{{ $t("Deleting your Mobilizon account") }}
|
{{ $t("Deleting your Mobilizon account") }}
|
||||||
|
@ -251,8 +251,10 @@ export default class Notifications extends Vue {
|
|||||||
if (this.loggedUser && this.loggedUser.settings) {
|
if (this.loggedUser && this.loggedUser.settings) {
|
||||||
this.notificationOnDay = this.loggedUser.settings.notificationOnDay;
|
this.notificationOnDay = this.loggedUser.settings.notificationOnDay;
|
||||||
this.notificationEachWeek = this.loggedUser.settings.notificationEachWeek;
|
this.notificationEachWeek = this.loggedUser.settings.notificationEachWeek;
|
||||||
this.notificationBeforeEvent = this.loggedUser.settings.notificationBeforeEvent;
|
this.notificationBeforeEvent =
|
||||||
this.notificationPendingParticipation = this.loggedUser.settings.notificationPendingParticipation;
|
this.loggedUser.settings.notificationBeforeEvent;
|
||||||
|
this.notificationPendingParticipation =
|
||||||
|
this.loggedUser.settings.notificationPendingParticipation;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -106,29 +106,27 @@ const decreaseFetches = () => {
|
|||||||
Cypress.env("fetchCount", count - 1);
|
Cypress.env("fetchCount", count - 1);
|
||||||
};
|
};
|
||||||
|
|
||||||
const buildTrackableFetchWithSessionId = (fetch) => (
|
const buildTrackableFetchWithSessionId =
|
||||||
fetchUrl,
|
(fetch) => (fetchUrl, fetchOptions) => {
|
||||||
fetchOptions
|
const { headers } = fetchOptions;
|
||||||
) => {
|
const modifiedHeaders = {
|
||||||
const { headers } = fetchOptions;
|
"x-session-id": Cypress.env("sessionId"),
|
||||||
const modifiedHeaders = {
|
...headers,
|
||||||
"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) => {
|
Cypress.on("window:before:load", (win) => {
|
||||||
cy.stub(win, "fetch", buildTrackableFetchWithSessionId(fetch));
|
cy.stub(win, "fetch", buildTrackableFetchWithSessionId(fetch));
|
||||||
});
|
});
|
||||||
|
@ -74,8 +74,7 @@ export const eventCommentThreadsMock = {
|
|||||||
__typename: "Comment",
|
__typename: "Comment",
|
||||||
id: "2",
|
id: "2",
|
||||||
uuid: "e37910ea-fd5a-4756-9679-00971f3f4107",
|
uuid: "e37910ea-fd5a-4756-9679-00971f3f4107",
|
||||||
url:
|
url: "https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-00971f3f4107",
|
||||||
"https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-00971f3f4107",
|
|
||||||
text: "my comment text",
|
text: "my comment text",
|
||||||
local: true,
|
local: true,
|
||||||
visibility: "PUBLIC",
|
visibility: "PUBLIC",
|
||||||
@ -100,8 +99,7 @@ export const eventCommentThreadsMock = {
|
|||||||
__typename: "Comment",
|
__typename: "Comment",
|
||||||
id: "29",
|
id: "29",
|
||||||
uuid: "e37910ea-fd5a-4756-9679-01171f3f4107",
|
uuid: "e37910ea-fd5a-4756-9679-01171f3f4107",
|
||||||
url:
|
url: "https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-01171f3f4107",
|
||||||
"https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-01171f3f4107",
|
|
||||||
text: "a second comment",
|
text: "a second comment",
|
||||||
local: true,
|
local: true,
|
||||||
visibility: "PUBLIC",
|
visibility: "PUBLIC",
|
||||||
@ -139,8 +137,7 @@ export const newCommentForEventResponse: DataMock = {
|
|||||||
__typename: "Comment",
|
__typename: "Comment",
|
||||||
id: "79",
|
id: "79",
|
||||||
uuid: "e37910ea-fd5a-4756-9679-01171f3f4444",
|
uuid: "e37910ea-fd5a-4756-9679-01171f3f4444",
|
||||||
url:
|
url: "https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-01171f3f4444",
|
||||||
"https://some-instance.tld/comments/e37910ea-fd5a-4756-9679-01171f3f4444",
|
|
||||||
text: newCommentForEventMock.text,
|
text: newCommentForEventMock.text,
|
||||||
local: true,
|
local: true,
|
||||||
visibility: "PUBLIC",
|
visibility: "PUBLIC",
|
||||||
|
Loading…
Reference in New Issue
Block a user